diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 176e6003..2c773c43 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -2,18 +2,6 @@ "version": 1, "isRoot": true, "tools": { - "azuresigntool": { - "version": "2.0.17", - "commands": [ - "azuresigntool" - ] - }, - "nugetkeyvaultsigntool": { - "version": "1.2.28", - "commands": [ - "NuGetKeyVaultSignTool" - ] - }, "dotnet-reportgenerator-globaltool": { "version": "4.4.0", "commands": [ @@ -21,4 +9,4 @@ ] } } -} \ No newline at end of file +} diff --git a/Directory.Build.props b/Directory.Build.props index f1f89c02..7399e219 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -34,10 +34,6 @@ annotations $(MSBuildThisFileDirectory)src\StrongName.snk true - https://nmcmaster.vault.azure.net - 6a27a2da-bb78-4baa-bd2b-150fe89ea039 - $(KEYVAULT_CLIENT_SECRET) - DigiCertCodeSign true true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 34b79a6c..f0e4b95f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,6 @@ pr: - '*' variables: -- group: AzureKeyVault - name: BUILD_NUMBER value: $[counter('buildnumber', 1)] @@ -39,8 +38,6 @@ jobs: packageType: runtime - powershell: ./build.ps1 -ci displayName: Invoke build.ps1 - env: - KEYVAULT_CLIENT_SECRET: $(kv-access-token) - task: PublishTestResults@2 displayName: Publish test results condition: always() diff --git a/build.ps1 b/build.ps1 index bb1d4e81..c1f7704f 100755 --- a/build.ps1 +++ b/build.ps1 @@ -5,8 +5,6 @@ param( $Configuration = $null, [switch] $ci, - [switch] - $sign, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$MSBuildArgs ) @@ -39,12 +37,6 @@ if (-not (Test-Path variable:\IsCoreCLR)) { $IsWindows = $true } -$CodeSign = $sign -or ($ci -and -not $isPr -and $IsWindows) - -if ($CodeSign) { - $MSBuildArgs += '-p:CodeSign=true' -} - $artifacts = "$PSScriptRoot/artifacts/" Remove-Item -Recurse $artifacts -ErrorAction Ignore diff --git a/src/CodeSign.targets b/src/CodeSign.targets deleted file mode 100644 index 8a287b59..00000000 --- a/src/CodeSign.targets +++ /dev/null @@ -1,57 +0,0 @@ - - - $(IntermediateOutputPath)$(TargetFileName).codesign.cache - $(IntermediateOutputPath)$(PackageId)$(PackageVersion).packagesign.cache - - - - - - dotnet tool run azuresigntool sign - $(SignToolArgs) --file-digest sha256 - $(SignToolArgs) --description-url $(PackageProjectUrl) - $(SignToolArgs) --no-page-hashing - $(SignToolArgs) --timestamp-rfc3161 http://timestamp.digicert.com - $(SignToolArgs) --timestamp-digest sha256 - $(SignToolArgs) --azure-key-vault-url $(AzureKeyVaultUrl) - $(SignToolArgs) --azure-key-vault-client-id $(AzureKeyVaultClientId) - $(SignToolArgs) --azure-key-vault-client-secret $(AzureKeyVaultClientSecret) - $(SignToolArgs) --azure-key-vault-certificate $(CodeSignCertName) - $(SignToolArgs) "$(TargetPath)" - - - - - - - - - - $(PackageOutputAbsolutePath)$(PackageId).$(PackageVersion).nupkg - - dotnet tool run NuGetKeyVaultSignTool sign - $(NupkgSignToolArgs) --file-digest sha256 - $(NupkgSignToolArgs) --timestamp-rfc3161 http://timestamp.digicert.com - $(NupkgSignToolArgs) --timestamp-digest sha256 - $(NupkgSignToolArgs) --azure-key-vault-url $(AzureKeyVaultUrl) - $(NupkgSignToolArgs) --azure-key-vault-client-id $(AzureKeyVaultClientId) - $(NupkgSignToolArgs) --azure-key-vault-client-secret $(AzureKeyVaultClientSecret) - $(NupkgSignToolArgs) --azure-key-vault-certificate $(CodeSignCertName) - $(NupkgSignToolArgs) "$(NupkgTargetPath)" - - - - - - - diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index f1b158d5..f1315d31 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -14,6 +14,4 @@ - -