Merge a655f3c into 7184cc9

reactiveui · Nov 29, 2017 · 6b70bbe · 6b70bbe
2 parents 7184cc9 + a655f3c
commit 6b70bbe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/SignPackages.json b/SignPackages.json
@@ -2,12 +2,12 @@
   "SignClient": {
     "AzureAd": {
       "AADInstance": "https://login.microsoftonline.com/",
-      "ClientId": "33c2e042-364a-4afa-aee4-49f7fb0a2cd1",
-      "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"
     }
   }
 }
diff --git a/SignPackages.ps1 b/SignPackages.ps1
@@ -17,7 +17,7 @@ $nupgks = ls $currentDirectory\artifacts\*.nupkg | Select -ExpandProperty FullNa
 foreach ($nupkg in $nupgks){
     Write-Host "Submitting $nupkg for signing"
 
-    dotnet $appPath 'sign' -c $appSettings -i $nupkg -s $env:SIGNCLIENT_SECRET -n 'ReactiveUI' -d 'ReactiveUI' -u 'https://reactiveui.net' 
+    dotnet $appPath 'sign' -c $appSettings -i $nupkg -r $env:SIGNCLIENT_USER -s $env:SIGNCLIENT_SECRET -n 'ReactiveUI' -d 'ReactiveUI' -u 'https://reactiveui.net' 
 
     Write-Host "Finished signing $nupkg"
 }

diff --git a/appveyor.yml b/appveyor.yml
@@ -16,7 +16,9 @@
     NUGET_APIKEY:
       secure: cANUegIQhgeZ7Yg4sosXNGmFF33i77nTriEjaeniQ4S26btcwYsopOO3qXKlbrvf
     SIGNCLIENT_SECRET:
-      secure: MMu26EDCyAEM/Vfj2kyTMVdvVXd3jhpqYAogqQ9/+HYytbwOHvna7G0jSmrluhez
+      secure: TGMBTw6fMix/D/hPuoS6J6XQdY5L1hlL6JPpzgKBbDg=
+    SIGNCLIENT_USER:
+      secure: wwm115V/GOIkqGLbOom1aGBqkMQy6REFKPaG8P0b4//f0r01dc9pTWruOxLyi4X8
   init:
   - mkdir %ANDROID_HOME%"
   - cd "%ANDROID_HOME%"
@@ -62,7 +64,9 @@
     NUGET_APIKEY:
       secure: KTszzEEs33kbeqkpGGMvM58elvNLeTJhytpv7s9fPHoY4ZZmk5fMwofKDtK2lhno
     SIGNCLIENT_SECRET:
-      secure: MMu26EDCyAEM/Vfj2kyTMVdvVXd3jhpqYAogqQ9/+HYytbwOHvna7G0jSmrluhez
+      secure: TGMBTw6fMix/D/hPuoS6J6XQdY5L1hlL6JPpzgKBbDg=
+    SIGNCLIENT_USER:
+      secure: wwm115V/GOIkqGLbOom1aGBqkMQy6REFKPaG8P0b4//f0r01dc9pTWruOxLyi4X8
   init:
   - mkdir %ANDROID_HOME%"
   - cd "%ANDROID_HOME%"