User v2 Sign Service

Ix.NET/Source/build-new.ps1

@@ -11,7 +11,7 @@ $artifacts = Join-Path $rootPath "artifacts"
 
 $signClientSettings = Join-Path (Join-Path (Get-Item $scriptPath).Parent.Parent.FullName "scripts") "SignClientSettings.json"
 $hasSignClientSecret = !([string]::IsNullOrEmpty($env:SignClientSecret))
-$signClientAppPath = Join-Path (Join-Path (Join-Path .\Packages "SignClient") "Tools") "SignClient.dll"
+$signClientAppPath = ".\packages\SignClient\tools\netcoreapp2.0\SignClient.dll"
 
 #remove any old coverage file
 md -Force $outputLocation | Out-Null
@@ -24,14 +24,14 @@ Remove-Item $outputPath -Force -Recurse
 md -Force $outputLocation | Out-Null
 
 if (!(Test-Path .\nuget.exe)) {
-    wget "https://dist.nuget.org/win-x86-commandline/v4.3.0/nuget.exe" -outfile .\nuget.exe
+    wget "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -outfile .\nuget.exe
 }
 
 # get tools
-.\nuget.exe install -excludeversion SignClient -Version 0.7.0 -outputdirectory packages
+.\nuget.exe install -excludeversion SignClient -Version 0.9.0 -outputdirectory packages
 .\nuget.exe install -excludeversion JetBrains.dotCover.CommandLineTools -pre -outputdirectory packages
-.\nuget.exe install -excludeversion Nerdbank.GitVersioning -Version 2.0.37-beta -pre -outputdirectory packages
-.\nuget.exe install -excludeversion xunit.runner.console -pre -outputdirectory packages
+.\nuget.exe install -excludeversion Nerdbank.GitVersioning -Version 2.0.41 -outputdirectory packages
+.\nuget.exe install -excludeversion xunit.runner.console -outputdirectory packages
 .\nuget.exe install -excludeversion ReportGenerator -outputdirectory packages
 #.\nuget.exe install -excludeversion coveralls.io -outputdirectory packages
 .\nuget.exe install -excludeversion coveralls.io.dotcover -outputdirectory packages
@@ -102,7 +102,7 @@ if($hasSignClientSecret) {
   foreach ($nupkg in $nupgks) {
     Write-Host "Submitting $nupkg for signing"
 
-    dotnet $signClientAppPath 'sign' -c $signClientSettings -i $nupkg -s $env:SignClientSecret -n 'Ix.NET' -d 'Interactive Extensions for .NET' -u 'http://reactivex.io/' 
+    dotnet $signClientAppPath 'sign' -c $signClientSettings -i $nupkg -r $env:SignClientUser -s $env:SignClientSecret -n 'Ix.NET' -d 'Interactive Extensions for .NET' -u 'http://reactivex.io/' 
 
     if ($LastExitCode -ne 0) { 
         Write-Host "Error signing $nupkg" -Foreground Red

Rx.NET/Source/build-new.ps1

@@ -11,7 +11,7 @@ $artifacts = Join-Path $rootPath "artifacts"
 
 $signClientSettings = Join-Path (Join-Path (Get-Item $scriptPath).Parent.Parent.FullName "scripts") "SignClientSettings.json"
 $hasSignClientSecret = !([string]::IsNullOrEmpty($env:SignClientSecret))
-$signClientAppPath = Join-Path (Join-Path (Join-Path .\Packages "SignClient") "Tools") "SignClient.dll"
+$signClientAppPath = ".\packages\SignClient\tools\netcoreapp2.0\SignClient.dll"
 
 #remove any old coverage file
 md -Force $outputLocation | Out-Null
@@ -25,10 +25,10 @@ if (!(Test-Path .\nuget.exe)) {
 }
 
 # get tools
-.\nuget.exe install -excludeversion SignClient -Version 0.7.0 -outputdirectory packages
+.\nuget.exe install -excludeversion SignClient -Version 0.9.0 -outputdirectory packages
 .\nuget.exe install -excludeversion JetBrains.dotCover.CommandLineTools -pre -outputdirectory packages
-.\nuget.exe install -excludeversion Nerdbank.GitVersioning -Version 2.0.37-beta -pre -outputdirectory packages
-.\nuget.exe install -excludeversion xunit.runner.console -pre -outputdirectory packages
+.\nuget.exe install -excludeversion Nerdbank.GitVersioning -Version 2.0.41 -outputdirectory packages
+.\nuget.exe install -excludeversion xunit.runner.console -outputdirectory packages
 #.\nuget.exe install -excludeversion OpenCover -Version 4.6.519 -outputdirectory packages
 .\nuget.exe install -excludeversion ReportGenerator -outputdirectory packages
 #.\nuget.exe install -excludeversion coveralls.io -outputdirectory packages
@@ -84,7 +84,7 @@ if($hasSignClientSecret) {
   foreach ($nupkg in $nupgks) {
     Write-Host "Submitting $nupkg for signing"
 
-    dotnet $signClientAppPath 'sign' -c $signClientSettings -i $nupkg -s $env:SignClientSecret -n 'Rx.NET' -d 'Reactive Extensions for .NET' -u 'http://reactivex.io/' 
+    dotnet $signClientAppPath 'sign' -c $signClientSettings -i $nupkg -r $env:SignClientUser -s $env:SignClientSecret -n 'Rx.NET' -d 'Reactive Extensions for .NET' -u 'http://reactivex.io/' 
 
     if ($LastExitCode -ne 0) { 
         Write-Host "Error signing $nupkg" -Foreground Red

appveyor.ix.yml

@@ -4,7 +4,9 @@ environment:
   COVERALLS_REPO_TOKEN:
     secure: DOSlU041NY0WKjv9njrNqj14CLEzrF4ogZsbvqIXnNLd492oNlQf4dD5yr7TSK/S
   SignClientSecret:
-    secure: oR9TMOkkvP/prmXyMT+p6mQhjyw3JDLbuywezBABvXzkvNsdNZgi2yPaHhgaofrb
+    secure: FHkjtWF9Y3ZjXI9muiLfpnpUZPNz2NWGWJlLRRaMs5E=
+  SignClientUser:
+    secure: 8dxp/8LR7WGOUvOz7gdmd3PlqRM4yH4Tmq52eNTuqMn1UfX9v2LbQDmk7VG/mTUX
 
 init:
   - git config --global core.autocrlf input

appveyor.rx.yml

@@ -4,7 +4,9 @@ environment:
   COVERALLS_REPO_TOKEN:
     secure: DOSlU041NY0WKjv9njrNqj14CLEzrF4ogZsbvqIXnNLd492oNlQf4dD5yr7TSK/S
   SignClientSecret:
-    secure: oR9TMOkkvP/prmXyMT+p6mQhjyw3JDLbuywezBABvXzkvNsdNZgi2yPaHhgaofrb
+    secure: FHkjtWF9Y3ZjXI9muiLfpnpUZPNz2NWGWJlLRRaMs5E=
+  SignClientUser:
+    secure: 8dxp/8LR7WGOUvOz7gdmd3PlqRM4yH4Tmq52eNTuqMn1UfX9v2LbQDmk7VG/mTUX
 
 init:
   - git config --global core.autocrlf input

appveyor.yml

@@ -4,7 +4,9 @@ environment:
   COVERALLS_REPO_TOKEN:
     secure: DOSlU041NY0WKjv9njrNqj14CLEzrF4ogZsbvqIXnNLd492oNlQf4dD5yr7TSK/S
   SignClientSecret:
-    secure: oR9TMOkkvP/prmXyMT+p6mQhjyw3JDLbuywezBABvXzkvNsdNZgi2yPaHhgaofrb
+    secure: FHkjtWF9Y3ZjXI9muiLfpnpUZPNz2NWGWJlLRRaMs5E=
+  SignClientUser:
+    secure: 8dxp/8LR7WGOUvOz7gdmd3PlqRM4yH4Tmq52eNTuqMn1UfX9v2LbQDmk7VG/mTUX
 
 init:
   - git config --global core.autocrlf input

scripts/SignClientSettings.json

@@ -2,12 +2,12 @@
   "SignClient": {
     "AzureAd": {
       "AADInstance": "https://login.microsoftonline.com/",
-      "ClientId": "7ac43fb3-01d7-4bc9-9372-d8064cadeb44",
-      "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"
     }
   }
 }