Support PB_SignType with public instead of oss potential values

Commit migrated from https://github.com/dotnet/corefx/commit/1d3bea669d00feeb3138e8ac24484717b2e5bb81

diff --git a/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json b/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json
index f980cf4..8f9b6d7 100644 (file)
--- a/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json
+++ b/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json
@@ -69,7 +69,7 @@
       "alwaysRun": false,
       "displayName": "Install Signing Plugin",
       "timeoutInMinutes": 0,
-      "condition": "ne(variables['PB_SignType'], 'oss')",
+      "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))",
       "refName": "Task4",
       "task": {
         "id": "30666190-6959-11e5-9f96-f56098202fef",

diff --git a/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Windows.json b/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Windows.json
index 2f4f9c3..9ffc9d1 100644 (file)
--- a/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Windows.json
+++ b/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Windows.json
@@ -69,7 +69,7 @@
       "alwaysRun": false,
       "displayName": "Install Signing Plugin",
       "timeoutInMinutes": 0,
-      "condition": "ne(variables['PB_SignType'], 'oss')",
+      "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))",
       "refName": "Task4",
       "task": {
         "id": "30666190-6959-11e5-9f96-f56098202fef",

diff --git a/src/libraries/buildpipeline/DotNet-Trusted-Publish.json b/src/libraries/buildpipeline/DotNet-Trusted-Publish.json
index 4884d7b..849adf0 100644 (file)
--- a/src/libraries/buildpipeline/DotNet-Trusted-Publish.json
+++ b/src/libraries/buildpipeline/DotNet-Trusted-Publish.json
@@ -7,7 +7,7 @@
       "alwaysRun": false,
       "displayName": "Install Signing Plugin",
       "timeoutInMinutes": 0,
-      "condition": "and(succeeded(), ne(variables['PB_SignType'], 'oss'))",
+      "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))",
       "refName": "Task1",
       "task": {
         "id": "30666190-6959-11e5-9f96-f56098202fef",

diff --git a/src/libraries/shims/shims.proj b/src/libraries/shims/shims.proj
index fa06e8d..216e429 100644 (file)
--- a/src/libraries/shims/shims.proj
+++ b/src/libraries/shims/shims.proj
@@ -52,13 +52,13 @@
           WorkingDirectory="$(ToolRuntimePath)" />
 
     <WriteSigningRequired
-        Condition="'@(NetFxContracts)' != '' and '$(SkipSigning)' != 'true' and '$(SignType)' != 'oss'"
+        Condition="'@(NetFxContracts)' != '' and '$(SkipSigning)' != 'true' and '$(SignType)' != 'public'"
         AuthenticodeSig="Microsoft"
         StrongNameSig="%(NetFxContracts.StrongNameSig)"
         MarkerFile="$(GenFacadesOutputPath)%(NetFxContracts.Filename)%(NetFxContracts.Extension).requires_signing" />
 
     <WriteSigningRequired
-        Condition="'@(NETStandardContracts)' != '' and '$(SkipSigning)' != 'true' and '$(SignType)' != 'oss'"
+        Condition="'@(NETStandardContracts)' != '' and '$(SkipSigning)' != 'true' and '$(SignType)' != 'public'"
         AuthenticodeSig="Microsoft"
         StrongNameSig="Open"
         MarkerFile="$(GenFacadesOutputPath)%(NETStandardContracts.Filename)%(NETStandardContracts.Extension).requires_signing" />