diff --git a/SignClient/Sign-Package.ps1 b/SignClient/Sign-Package.ps1 index c39d5fec..3898bffc 100644 --- a/SignClient/Sign-Package.ps1 +++ b/SignClient/Sign-Package.ps1 @@ -10,14 +10,14 @@ if([string]::IsNullOrEmpty($env:SignClientSecret)){ $appSettings = "$currentDirectory\appsettings.json" -$appPath = "$currentDirectory\..\packages\SignClient\tools\SignClient.dll" +$appPath = "$currentDirectory\..\packages\SignClient\tools\netcoreapp2.0\SignClient.dll" $releases = ls $currentDirectory\..\Releases\*.exe | Select -ExpandProperty FullName foreach ($release in $releases){ Write-Host "Submitting $release for signing" - dotnet $appPath 'sign' -c $appSettings -i $release -s $env:SignClientSecret -n 'Open Live Writer' -d 'Open Live Writer' -u 'http://openlivewriter.org' + dotnet $appPath 'sign' -c $appSettings -i $release -r $env:SignClientUser -s $env:SignClientSecret -n 'Open Live Writer' -d 'Open Live Writer' -u 'http://openlivewriter.org' Write-Host "Finished signing $release" } diff --git a/SignClient/appsettings.json b/SignClient/appsettings.json index 408d6158..3276a45d 100644 --- a/SignClient/appsettings.json +++ b/SignClient/appsettings.json @@ -2,12 +2,12 @@ "SignClient": { "AzureAd": { "AADInstance": "https://login.microsoftonline.com/", - "ClientId": "1d2c0ac7-8c6d-4a4e-a568-67425aa48bd0", - "TenantId": "dotnetfoundation.onmicrosoft.com" + "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8", + "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e" }, "Service": { - "Url": "https://dnfsignservice.azurewebsites.net/", - "ResourceId": "http://sign.dotnetfoundation.org/server" + "Url": "https://codesign.dotnetfoundation.org/", + "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001" } } -} +} \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 9b2547ea..d858f1bc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,9 @@ environment: OlwBloggerClientSecret: secure: ym7cbPINJz58iEgVlQCDbRz2W1CTYnxWsvMpMvxHFY4= SignClientSecret: - secure: CHm+63iqVR0ddIHjGwE8nYF2EdUikH5VzCcszekUwptHkCLTuJ3C9ci8fcyox03s + secure: Ks35w5ZOk78Bla9953hrhvDm2+t2NY83VgI+IcW92L0= + SignClientUser: + secure: v2LT5VnPWsq3/aLDN0xsyNjdwCZutUSH8CS/htCB8yXbzmwWrQIWs7TvJdrFqZB+ nuget: disable_publish_on_pr: true build_script: @@ -19,7 +21,7 @@ build_script: - cmd: ./build.cmd test: off install: - - cmd: nuget install SignClient -Version 0.7.0 -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion + - cmd: nuget install SignClient -Version 0.9.0 -SolutionDir %APPVEYOR_BUILD_FOLDER% -Verbosity quiet -ExcludeVersion after_build: - ps: '.\SignClient\Sign-Package.ps1' artifacts: