From c8b229f43f7c5379ca4b2ac11c934961800fa249 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 4 Dec 2018 15:23:53 -0800 Subject: [PATCH] Set up signing in CI --- eng/build.yml | 5 +++-- eng/{setcitestinfo.bat => setbuildinfo.bat} | 12 +++++++++++- eng/{setcitestinfo.sh => setbuildinfo.sh} | 0 3 files changed, 14 insertions(+), 3 deletions(-) rename eng/{setcitestinfo.bat => setbuildinfo.bat} (60%) rename eng/{setcitestinfo.sh => setbuildinfo.sh} (100%) diff --git a/eng/build.yml b/eng/build.yml index 8475fdaac..4a3ee1d9c 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -25,10 +25,10 @@ phases: AdditionalBuildParameters: $(_AdditionalBuildParameters) steps: - - script: 'eng\setcitestinfo.bat $(BuildArchitecture)' + - script: 'eng\setbuildinfo.bat $(BuildArchitecture) $(BuildConfig)' condition: eq(variables['_AgentOSName'], 'Windows_NT') displayName: Set test info (Windows) - - script: 'eng/setcitestinfo.sh $(BuildArchitecture)' + - script: 'eng/setbuildinfo.sh $(BuildArchitecture) $(BuildConfig)' condition: ne(variables['_AgentOSName'], 'Windows_NT') displayName: Set test info (Non-Windows) - script: 'echo TestParameter: $(TestParameter)' @@ -41,6 +41,7 @@ phases: -pack -publish -Configuration $(BuildConfig) -Architecture $(BuildArchitecture) + -p:SignCoreSdk=true -p:DotNetSignType=$(SignType) $(AdditionalBuildParameters) displayName: Build env: diff --git a/eng/setcitestinfo.bat b/eng/setbuildinfo.bat similarity index 60% rename from eng/setcitestinfo.bat rename to eng/setbuildinfo.bat index ce8d9c28f..479f97ac7 100644 --- a/eng/setcitestinfo.bat +++ b/eng/setbuildinfo.bat @@ -3,6 +3,7 @@ setlocal set Architecture=%1 +set Config=%2 IF /I "%Architecture:~0,3%"=="ARM" ( ECHO ARM @@ -12,4 +13,13 @@ IF /I "%Architecture:~0,3%"=="ARM" ( ECHO NOT ARM ECHO ##vso[task.setvariable variable=TestParameter]-test ECHO ##vso[task.setvariable variable=RunTests]true -) \ No newline at end of file +) + +if /I "%SYSTEM_TEAMPROJECT%" == "Public" ( + ECHO Public CI + ECHO ##vso[task.setvariable variable=SignType]test +) ELSE ( + ECHO Not public CI + ECHO ##vso[task.setvariable variable=SignType]real +) + diff --git a/eng/setcitestinfo.sh b/eng/setbuildinfo.sh similarity index 100% rename from eng/setcitestinfo.sh rename to eng/setbuildinfo.sh