Merge pull request #106 from novotnyllc/update-deps

novotnyllc · Oct 27, 2021 · 1a08428 · 1a08428
2 parents 92b985a + 4bb7c51
commit 1a08428
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Directory.Build.Props b/Directory.Build.Props
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="all" />
   </ItemGroup>
 
 

diff --git a/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj b/NuGetKeyVaultSignTool.Core/NuGetKeyVaultSignTool.Core.csproj
@@ -6,16 +6,16 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.9" />
-    <PackageReference Include="NuGet.Packaging" Version="5.8.0-preview.3.6823" />
-    <PackageReference Include="NuGet.Protocol" Version="5.8.0-preview.3.6823" />    
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="NuGet.Packaging" Version="6.0.0-preview.4.243" />
+    <PackageReference Include="NuGet.Protocol" Version="6.0.0-preview.4.243" />    
     <PackageReference Include="RSAKeyVaultProvider" Version="2.1.1" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-rc.1.20451.14" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Update="NuGet.Packaging" Version="5.6.0-xprivate.60020" />
-    <PackageReference Update="NuGet.Protocol" Version="5.6.0-xprivate.60020" />
+    <PackageReference Update="NuGet.Packaging" Version="6.0.0-xprivate.60026" />
+    <PackageReference Update="NuGet.Protocol" Version="6.0.0-xprivate.60026" />
   </ItemGroup>
 
 </Project>
diff --git a/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj b/NuGetKeyVaultSignTool/NuGetKeyVaultSignTool.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <PackAsTool>true</PackAsTool>
     <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.4.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.9" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.9" />
+    <PackageReference Include="Azure.Identity" Version="1.5.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
     <ProjectReference Include="..\NuGetKeyVaultSignTool.Core\NuGetKeyVaultSignTool.Core.csproj" />
   </ItemGroup>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,17 +11,17 @@ stages:
   jobs:
   - job: Build
     pool:
-      vmImage: windows-latest
+      vmImage: windows-2022
 
     variables: 
       BuildConfiguration: Release
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 
     steps:
     - task: UseDotNet@2
-      displayName: 'Use .NET Core SDK 5.0.x'
+      displayName: 'Use .NET Core SDK 6.x'
       inputs:
-        version: 5.0.x
+        version: 6.x
         includePreviewVersions: true
 
     - task: DotNetCoreCLI@2  

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1",
+  "version": "3.2",
   "publicReleaseRefSpec": [
     "^refs/heads/main$", // we release out of main
     "^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N