Merge master into release-0.x

godaddy · Mar 25, 2021 · 2bb4672 · 2bb4672
2 parents 2a4a4b1 + 9423010
commit 2bb4672
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 30 deletions.
diff --git a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj
@@ -7,14 +7,19 @@
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
     <ItemGroup Label="Package References">
-        <PackageReference Include="coverlet.msbuild" Version="2.8.0" />
-        <PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-        <PackageReference Include="Moq" Version="4.13.1" />
+        <PackageReference Include="coverlet.msbuild" Version="3.0.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.1.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+        <PackageReference Include="Moq" Version="4.16.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-        <PackageReference Include="MySql.Data" Version="8.0.19" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     </ItemGroup>
     <ItemGroup Label="CLI Tool References">

diff --git a/...tion/AppEncryption.IntegrationTests/SecureMemory/Multithreaded/MultiThreadedSecretTest.cs b/...tion/AppEncryption.IntegrationTests/SecureMemory/Multithreaded/MultiThreadedSecretTest.cs
@@ -25,7 +25,7 @@ public MultiThreadedSecretTest()
         [Fact]
         private void MultiThreadedWithSecretBytesAccess()
         {
-            ISecretFactory secretFactory = new ProtectedMemorySecretFactory();
+            ISecretFactory secretFactory = new ProtectedMemorySecretFactory(null);
             Secret secret = secretFactory.CreateSecret(payload.Clone() as byte[]);
 
             // Get the current settings and try to force minWorkers

diff --git a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj
@@ -7,16 +7,22 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="coverlet.msbuild" Version="2.8.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="coverlet.msbuild" Version="3.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Net.Security" Version="4.3.2" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="TestContainers" Version="0.0.2.64" />
+    <PackageReference Include="TestContainers" Version="0.0.2.107" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup Label="CLI Tool References">

diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj
@@ -21,21 +21,16 @@
     <!-- End of Properties related to NuGet packaging: -->
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.105.15" />
-    <PackageReference Include="AWSSDK.KeyManagementService" Version="3.3.105.18" />
-    <PackageReference Include="LanguageExt.Core" Version="3.4.13" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="App.Metrics" Version="3.2.0" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.5.4.37" />
+    <PackageReference Include="AWSSDK.KeyManagementService" Version="3.5.2.19" />
+    <PackageReference Include="LanguageExt.Core" Version="3.4.15" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="App.Metrics" Version="4.1.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
-  <ItemGroup Label="Package References" Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.1"/>
-  </ItemGroup>
-  <ItemGroup Label="Package References" Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.3"/>
-  </ItemGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="../Crypto/Crypto.csproj" />
   </ItemGroup>

diff --git a/csharp/AppEncryption/Crypto/Crypto.csproj b/csharp/AppEncryption/Crypto/Crypto.csproj
@@ -13,9 +13,9 @@
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="BouncyCastle.NetCore" Version="1.8.5" />
+    <PackageReference Include="BouncyCastle.NetCore" Version="1.8.8" />
     <PackageReference Include="GoDaddy.Asherah.Logging" Version="0.1.3" />
-    <PackageReference Include="GoDaddy.Asherah.SecureMemory" Version="0.1.3" />
+    <PackageReference Include="GoDaddy.Asherah.SecureMemory" Version="0.1.10" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/csharp/AppEncryption/Directory.Build.props b/csharp/AppEncryption/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.2.0</Version>
+    <Version>0.2.1</Version>
   </PropertyGroup>
 </Project>
diff --git a/csharp/AppEncryption/README.md b/csharp/AppEncryption/README.md
@@ -23,7 +23,7 @@ You can get the latest release from [Nuget](https://www.nuget.org/packages/GoDad
 
 ```xml
 <ItemGroup>
-    <PackageReference Include="GoDaddy.Asherah.AppEncryption" Version="0.1.5" />
+    <PackageReference Include="GoDaddy.Asherah.AppEncryption" Version="0.2.1" />
 </ItemGroup>
 ```
 

diff --git a/csharp/SecureMemory/README.md b/csharp/SecureMemory/README.md
@@ -15,7 +15,7 @@ This class provides a way for applications to keep secret information (like cryp
 You can get the latest release from [Nuget](https://www.nuget.org/packages/GoDaddy.Asherah.SecureMemory/):
 ```xml
 <ItemGroup>
-    <PackageReference Include="GoDaddy.Asherah.SecureMemory" Version="0.1.1" />
+    <PackageReference Include="GoDaddy.Asherah.SecureMemory" Version="0.1.10" />
 </ItemGroup>
 ```