diff --git a/azure-pipelines.client.yml b/azure-pipelines.client.yml index f9185e2e..a6240ded 100644 --- 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 index 0971bd56..ad0a7b70 100644 --- a/src/SignClient/SignClient.csproj +++ b/src/SignClient/SignClient.csproj @@ -1,23 +1,23 @@  - netcoreapp2.1 + netcoreapp2.1;netcoreapp3.1;net5.0 Exe true Major Client-side tools for the .NET Foundation Sign Service - © 2006-2019 .NET Foundation and Contributors + © 2006-2021 .NET Foundation and Contributors MIT https://github.com/dotnet/SignService - - - + + + - + diff --git a/src/SignService/Services/GraphHttpService.cs b/src/SignService/Services/GraphHttpService.cs index 7ac5a239..3a710d22 100644 --- 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, IOptionsSnapshot adminConfig, IOptionsSnapshot resources, IUser user, IHttpContextAccessor contextAccessor) diff --git a/src/SignService/Services/KeyVaultAdminService.cs b/src/SignService/Services/KeyVaultAdminService.cs index 9c6f0ed4..f09ed3da 100644 --- a/src/SignService/Services/KeyVaultAdminService.cs +++ b/src/SignService/Services/KeyVaultAdminService.cs @@ -246,7 +246,7 @@ public async Task 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 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 index b1e7d3fa..70d3e68b 100644 --- a/src/SignService/SignService.csproj +++ b/src/SignService/SignService.csproj @@ -63,14 +63,14 @@ - + - - + +