Merge pull request #14 from Eastrall/azure-pipelines

Set up CI with Azure Pipelines

Author: Eastrall

.azure/pipelines/azure-pipelines.yml

@@ -0,0 +1,16 @@
+pool:
+  vmImage: 'ubuntu-latest'
+
+steps:
+- task: UseDotNet@2
+  inputs:
+    packageType: 'sdk'
+    version: '5.0.x'
+
+- script: |
+    dotnet build EntityFrameworkCore.DataEncryption.sln --configuration Release
+  displayName: 'Build'
+
+- script: |
+    dotnet test EntityFrameworkCore.DataEncryption.sln --configuration Release
+  displayName: 'Test'

.travis.yml

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.421
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3EC10767-1816-46B2-A78E-9856071CCFDB}"
 EndProject
@@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{3A8D80
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		.travis.yml = .travis.yml
 		README.md = README.md
 	EndProjectSection
 EndProject

EntityFrameworkCore.DataEncryption.sln

@@ -1,7 +1,6 @@
 # EntityFrameworkCore.DataEncryption
 
-[![Build Status](https://travis-ci.org/Eastrall/EntityFrameworkCore.DataEncryption.svg?branch=master)](https://travis-ci.org/Eastrall/EntityFrameworkCore.DataEncryption)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/2bfb621fd6fc453488d022a3eec8069e)](https://www.codacy.com/app/Eastrall/EntityFrameworkCore.DataEncryption?utm_source=github.com&utm_medium=referral&utm_content=Eastrall/EntityFrameworkCore.DataEncryption&utm_campaign=Badge_Grade)
+[![Build Status](https://dev.azure.com/eastrall/EntityFrameworkCore.DataEncryption/_apis/build/status/EntityFrameworkCore.DataEncryption?branchName=refs%2Fpull%2F14%2Fmerge)](https://dev.azure.com/eastrall/EntityFrameworkCore.DataEncryption/_build/latest?definitionId=9&branchName=refs%2Fpull%2F14%2Fmerge)[![Codacy Badge](https://api.codacy.com/project/badge/Grade/2bfb621fd6fc453488d022a3eec8069e)](https://www.codacy.com/app/Eastrall/EntityFrameworkCore.DataEncryption?utm_source=github.com&utm_medium=referral&utm_content=Eastrall/EntityFrameworkCore.DataEncryption&utm_campaign=Badge_Grade)
 [![codecov](https://codecov.io/gh/Eastrall/EntityFrameworkCore.DataEncryption/branch/master/graph/badge.svg)](https://codecov.io/gh/Eastrall/EntityFrameworkCore.DataEncryption)
 [![Nuget](https://img.shields.io/nuget/v/EntityFrameworkCore.DataEncryption.svg)](https://www.nuget.org/packages/EntityFrameworkCore.DataEncryption)
 

README.md

@@ -10,8 +10,15 @@ namespace Microsoft.EntityFrameworkCore.DataEncryption.Providers
     /// </summary>
     public class AesProvider : IEncryptionProvider
     {
-        private const int AesBlockSize = 128;
-        private const int InitializationVectorSize = 16;
+        /// <summary>
+        /// AES block size constant.
+        /// </summary>
+        public const int AesBlockSize = 128;
+
+        /// <summary>
+        /// Initialization vector size constant.
+        /// </summary>
+        public const int InitializationVectorSize = 16;
 
         private readonly byte[] _key;
         private readonly CipherMode _mode;
@@ -59,20 +66,16 @@ public string Encrypt(string dataToEncrypt)
 
                 byte[] initializationVector = cryptoServiceProvider.IV;
 
-                using (ICryptoTransform encryptor = cryptoServiceProvider.CreateEncryptor(_key, initializationVector))
+                using ICryptoTransform encryptor = cryptoServiceProvider.CreateEncryptor(_key, initializationVector);
+                using var memoryStream = new MemoryStream();
+                using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
                 {
-                    using (var memoryStream = new MemoryStream())
-                    {
-                        using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
-                        {
-                            memoryStream.Write(initializationVector, 0, initializationVector.Length);
-                            cryptoStream.Write(input, 0, input.Length);
-                            cryptoStream.FlushFinalBlock();
-                        }
-
-                        encrypted = memoryStream.ToArray();
-                    }
+                    memoryStream.Write(initializationVector, 0, initializationVector.Length);
+                    cryptoStream.Write(input, 0, input.Length);
+                    cryptoStream.FlushFinalBlock();
                 }
+
+                encrypted = memoryStream.ToArray();
             }
 
             return Convert.ToBase64String(encrypted);

src/EntityFrameworkCore.DataEncryption/Providers/AesProvider.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <AssemblyName>Microsoft.EntityFrameworkCore.Encryption.Test</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore.Encryption.Test</RootNamespace>
@@ -12,9 +12,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>