Merge pull request #349 from dotnet/updates

Dependency Updates
dotnet · Feb 24, 2021 · ec2d263 · ec2d263
2 parents 5e472f3 + af781fe
commit ec2d263
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/azure-pipelines.client.yml b/azure-pipelines.client.yml
@@ -39,7 +39,7 @@ stages:
     steps:
     - task: UseDotNet@2
       inputs:
-        version: 3.1.x
+        version: 5.x
 
     - task: DotNetCoreCLI@2
       inputs:

diff --git a/src/SignClient/SignClient.csproj b/src/SignClient/SignClient.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
     <RollForward>Major</RollForward>
     <Description>Client-side tools for the .NET Foundation Sign Service</Description>
-    <Copyright>© 2006-2019 .NET Foundation and Contributors</Copyright>
+    <Copyright>© 2006-2021 .NET Foundation and Contributors</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/dotnet/SignService</PackageProjectUrl>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.27.0" />
-    <PackageReference Include="Refit" Version="5.2.4" />
+    <PackageReference Include="Refit" Version="6.0.24" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SignService/Services/GraphHttpService.cs b/src/SignService/Services/GraphHttpService.cs
@@ -19,7 +19,7 @@ public class GraphHttpService : IGraphHttpService
         readonly AzureADOptions azureAdOptions;
         readonly AdminConfig adminConfig;
         readonly AuthenticationContext adalContext;
-        static readonly HttpMethod PatchMethod = new HttpMethod("PATCH");
+        static readonly HttpMethod PatchMethod = new("PATCH");
         readonly string graphResourceId;
 
         public GraphHttpService(IOptionsSnapshot<AzureADOptions> azureAdOptions, IOptionsSnapshot<AdminConfig> adminConfig, IOptionsSnapshot<ResourceIds> resources, IUser user, IHttpContextAccessor contextAccessor)

diff --git a/src/SignService/Services/KeyVaultAdminService.cs b/src/SignService/Services/KeyVaultAdminService.cs
@@ -246,7 +246,7 @@ public async Task<VaultModel> CreateVaultForUserAsync(string objectId, string up
 
             // for the vault name, we get up to 24 characters, so use the following:
             // upn up to the @ then a dash then fill with a guid truncated
-            var vaultName = $"{upn.Substring(0, upn.IndexOf('@'))}-{Guid.NewGuid().ToString("N")}";
+            var vaultName = $"{upn.Substring(0, upn.IndexOf('@'))}-{Guid.NewGuid():N}";
 
             // Truncate to 24 chars
             vaultName = vaultName.Substring(0, 24);
@@ -305,7 +305,7 @@ public async Task<CertificateOperation> CreateCsrAsync(string vaultName, string
             var policy = new CertificatePolicy("Unknown", $"CN={displayName}")
             {
                 KeyType = CertificateKeyType.RsaHsm,
-                KeySize = 2048
+                KeySize = 4092
             };
 
             var vault = await GetVaultAsync(vaultName).ConfigureAwait(false);

diff --git a/src/SignService/SignService.csproj b/src/SignService/SignService.csproj
@@ -63,14 +63,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Extensions.Configuration.Secrets" Version="1.0.0-preview.1" />
+    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.0.2" />    
     <PackageReference Include="Azure.Identity" Version="1.3.0" />    
     <PackageReference Include="AzureSign.Core" Version="2.0.17" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.SnapshotCollector" Version="1.3.7.5" />
     <PackageReference Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
-	  <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.7" />
-    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.7" />    
+	  <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.12" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.12" />    
     <PackageReference Include="Microsoft.Azure.ActiveDirectory.GraphClient" Version="2.1.1" NoWarn="NU1701" />
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="2.4.0-preview" />
     <PackageReference Include="Microsoft.Data.Services.Client" Version="5.8.4" />