Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 5a7de4e

Browse files
wtgodbewtgodbe
committed
Modify signing for 2.0.0 branch
1 parent c4c1394 commit 5a7de4e

File tree

4 files changed

+22
-58
lines changed

4 files changed

+22
-58
lines changed

‎buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
"alwaysRun": false,
77
"displayName": "Install Signing Plugin",
88
"timeoutInMinutes": 0,
9+
"condition": "ne(variables['PB_SignType'], 'oss')",
910
"task": {
1011
"id": "30666190-6959-11e5-9f96-f56098202fef",
1112
"versionSpec": "1.*",
1213
"definitionType": "task"
1314
},
1415
"inputs": {
15-
"signType": "$(SignType)",
16+
"signType": "real",
1617
"zipSources": "false",
1718
"version": "",
1819
"feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"
@@ -86,7 +87,7 @@
8687
},
8788
"inputs": {
8889
"filename": "build.cmd",
89-
"arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority)",
90+
"arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) -OfficialBuildId=$(OfficialBuildId) -skiprestore -Priority=$(Priority) -- /p:SignType=$(PB_SignType)",
9091
"workingFolder": "",
9192
"failOnStandardError": "false"
9293
}
@@ -106,7 +107,7 @@
106107
"solution": "src\\sign.builds",
107108
"platform": "",
108109
"configuration": "",
109-
"msbuildArguments": "/p:SignType=$(SignType) /p:BuildType=$(PB_BuildType) /p:BuildArch=$(Architecture)",
110+
"msbuildArguments": "/p:SignType=$(PB_SignType) /p:BuildType=$(PB_BuildType) /p:BuildArch=$(Architecture)",
110111
"clean": "false",
111112
"maximumCpuCount": "false",
112113
"restoreNugetPackages": "false",
@@ -131,7 +132,7 @@
131132
},
132133
"inputs": {
133134
"filename": "build-packages.cmd",
134-
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:OfficialBuildId=$(OfficialBuildId)",
135+
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:SignType=$(PB_SignType) /p:OfficialBuildId=$(OfficialBuildId)",
135136
"workingFolder": "",
136137
"failOnStandardError": "false"
137138
}
@@ -276,8 +277,9 @@
276277
"Label": {
277278
"value": "$(Build.BuildNumber)"
278279
},
279-
"SignType": {
280-
"value": "test"
280+
"PB_SignType": {
281+
"value": "test",
282+
"allowOverride": true
281283
},
282284
"TeamName": {
283285
"value": "DotNetCore"

‎buildpipeline/DotNet-CoreClr-Trusted-Windows.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
"alwaysRun": false,
77
"displayName": "Install Signing Plugin",
88
"timeoutInMinutes": 0,
9+
"condition": "ne(variables['PB_SignType'], 'oss')",
910
"task": {
1011
"id": "30666190-6959-11e5-9f96-f56098202fef",
1112
"versionSpec": "1.*",
1213
"definitionType": "task"
1314
},
1415
"inputs": {
15-
"signType": "$(SignType)",
16+
"signType": "real",
1617
"zipSources": "false",
1718
"version": "",
1819
"feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"
@@ -86,7 +87,7 @@
8687
},
8788
"inputs": {
8889
"filename": "build.cmd",
89-
"arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -disableoss -- /flp:\"v=diag\"",
90+
"arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) toolset_dir C:\\tools\\clr -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -- /p:SignType=$(PB_SignType) /flp:\"v=diag\"",
9091
"workingFolder": "",
9192
"failOnStandardError": "false"
9293
}
@@ -106,7 +107,7 @@
106107
"solution": "src\\sign.builds",
107108
"platform": "",
108109
"configuration": "",
109-
"msbuildArguments": "/p:SignType=$(SignType) /p:BuildType=$(PB_BuildType) /p:BuildArch=$(Architecture)",
110+
"msbuildArguments": "/p:SignType=$(PB_SignType) /p:BuildType=$(PB_BuildType) /p:BuildArch=$(Architecture)",
110111
"clean": "false",
111112
"maximumCpuCount": "false",
112113
"restoreNugetPackages": "false",
@@ -131,7 +132,7 @@
131132
},
132133
"inputs": {
133134
"filename": "build-packages.cmd",
134-
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:OfficialBuildId=$(OfficialBuildId)",
135+
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:SignType=$(PB_SignType) /p:OfficialBuildId=$(OfficialBuildId)",
135136
"workingFolder": "",
136137
"failOnStandardError": "false"
137138
}
@@ -278,7 +279,7 @@
278279
"Label": {
279280
"value": "$(Build.BuildNumber)"
280281
},
281-
"SignType": {
282+
"PB_SignType": {
282283
"value": "test",
283284
"allowOverride": true
284285
},

‎buildpipeline/DotNet-Trusted-Publish.json‎

Lines changed: 7 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"alwaysRun": false,
2626
"displayName": "Fetch custom tooling (NuGet, EmbedIndex)",
2727
"timeoutInMinutes": 0,
28+
"condition": "and(succeeded(), ne(variables['PB_SignType'], 'oss'))",
2829
"task": {
2930
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
3031
"versionSpec": "1.*",
@@ -151,9 +152,9 @@
151152
"inputs": {
152153
"scriptType": "inlineScript",
153154
"scriptName": "",
154-
"arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\$(AzureContainerPackageGlob) -MyGetFeedUrl $(MyGetFeedUrl)",
155+
"arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\$(AzureContainerPackageGlob) -MyGetFeedUrl $(MyGetFeedUrl) -SignType $(PB_SignType)",
155156
"workingFolder": "$(Pipeline.SourcesDirectory)",
156-
"inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl)\n\nif ($ConfigurationGroup -ne \"Release\") { exit }\n\nmsbuild /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob",
157+
"inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl, $SignType=\"unset\")\n\nif ($ConfigurationGroup.ToLower() -ne \"release\") { Write-host \"Chose not to publish\"; exit }\n\nmsbuild /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob",
157158
"failOnStandardError": "true"
158159
}
159160
},
@@ -171,49 +172,9 @@
171172
"inputs": {
172173
"scriptType": "inlineScript",
173174
"scriptName": "",
174-
"arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(Build.StagingDirectory)\\IndexedSymbolPackages\\*.nupkg -MyGetFeedUrl $(MyGetFeedUrl)",
175+
"arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(Build.StagingDirectory)\\IndexedSymbolPackages\\*.nupkg -MyGetFeedUrl $(MyGetFeedUrl) -SignType $(PB_SignType)",
175176
"workingFolder": "$(Pipeline.SourcesDirectory)",
176-
"inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl)\n\nif ($ConfigurationGroup -ne \"Release\") { exit }\nif ($env:SourceBranch.StartsWith(\"release/\")) { exit }\n\nmsbuild /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob",
177-
"failOnStandardError": "true"
178-
}
179-
},
180-
{
181-
"enabled": false,
182-
"continueOnError": false,
183-
"alwaysRun": false,
184-
"displayName": "Create VSTS auth NuGet.Config",
185-
"timeoutInMinutes": 0,
186-
"task": {
187-
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
188-
"versionSpec": "1.*",
189-
"definitionType": "task"
190-
},
191-
"inputs": {
192-
"scriptType": "inlineScript",
193-
"scriptName": "",
194-
"arguments": "$(VstsAuthedNuGetConfigPath) $(VstsFeedUrl) $(VstsPat)",
195-
"inlineScript": "param($path, $url, $pat)\n\nSet-Content $path @\"\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<configuration>\n <packageSources>\n <add key=\"vsts-dotnet-core\" value=\"$url\" />\n </packageSources>\n <packageSourceCredentials>\n <vsts-dotnet-core>\n <add key=\"Username\" value=\"VssSessionToken\" />\n <add key=\"ClearTextPassword\" value=\"$pat\" />\n </vsts-dotnet-core>\n </packageSourceCredentials>\n</configuration>\n\"@",
196-
"workingFolder": "",
197-
"failOnStandardError": "true"
198-
}
199-
},
200-
{
201-
"enabled": false,
202-
"continueOnError": false,
203-
"alwaysRun": false,
204-
"displayName": "packages -> VSTS",
205-
"timeoutInMinutes": 0,
206-
"task": {
207-
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
208-
"versionSpec": "1.*",
209-
"definitionType": "task"
210-
},
211-
"inputs": {
212-
"scriptType": "inlineScript",
213-
"scriptName": "",
214-
"arguments": "",
215-
"inlineScript": "if ($env:ConfigurationGroup -ne \"Release\") { exit }\n& $env:CustomNuGetPath push $env:Pipeline.SourcesDirectory\\packages\\AzureTransfer\\$env:ConfigurationGroup\\$env:AzureContainerPackageGlob placeholderapikey -Source vsts-dotnet-core -ConfigFile $env:VstsAuthedNuGetConfigPath -Timeout 3600",
216-
"workingFolder": "",
177+
"inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl, $SignType=\"unset\")\n\nif ($ConfigurationGroup.ToLower() -ne \"release\") { Write-host \"Chose not to publish\"; exit }\nif ($env:SourceBranch.StartsWith(\"release/\")) { exit }\n\nmsbuild /t:NuGetPush /v:Normal `\n/p:NuGetExePath=$env:CustomNuGetPath `\n/p:NuGetApiKey=$ApiKey `\n/p:NuGetSource=$MyGetFeedUrl `\n/p:PackagesGlob=$PackagesGlob",
217178
"failOnStandardError": "true"
218179
}
219180
},
@@ -231,8 +192,8 @@
231192
"inputs": {
232193
"scriptType": "inlineScript",
233194
"scriptName": "",
234-
"arguments": "-gitHubAuthToken $(UpdatePublishedVersions.AuthToken) -root $(Pipeline.SourcesDirectory) -configGroup $(ConfigurationGroup)",
235-
"inlineScript": "param($gitHubAuthToken, $root, $configGroup)\nif ($configGroup -ne \"Release\") { exit }\ncd $root\n. $root\\UpdatePublishedVersions.ps1 `\n -gitHubUser dotnet-build-bot -gitHubEmail [email protected] `\n -gitHubAuthToken $gitHubAuthToken `\n -versionsRepoOwner $env:VersionsRepoOwner -versionsRepo versions `\n -versionsRepoPath build-info/dotnet/$env:GitHubRepositoryName/$env:SourceBranch `\n -nupkgPath $root\\packages\\AzureTransfer\\$env:ConfigurationGroup\\$env:AzureContainerPackageGlob",
195+
"arguments": "-gitHubAuthToken $(UpdatePublishedVersions.AuthToken) -root $(Pipeline.SourcesDirectory) -configGroup $(ConfigurationGroup) -SignType $(PB_SignType)",
196+
"inlineScript": "param($gitHubAuthToken, $root, $configGroup, $SignType=\"unset\")\nif ($configGroup -ne \"Release\" -or $SignType.ToLower() -ne \"real\" ) { exit }\ncd $root\n. $root\\UpdatePublishedVersions.ps1 `\n -gitHubUser dotnet-build-bot -gitHubEmail [email protected] `\n -gitHubAuthToken $gitHubAuthToken `\n -versionsRepoOwner $env:VersionsRepoOwner -versionsRepo versions `\n -versionsRepoPath build-info/dotnet/$env:GitHubRepositoryName/$env:SourceBranch `\n -nupkgPath $root\\packages\\AzureTransfer\\$env:ConfigurationGroup\\$env:AzureContainerPackageGlob",
236197
"workingFolder": "",
237198
"failOnStandardError": "true"
238199
}

‎src/sign.builds‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</Target>
4343

4444
<Target Name="Build"
45-
Condition="'$(SkipSigning)' != 'true' and '$(SignType)' != 'oss'"
45+
Condition="'$(SkipSigning)' != 'true'"
4646
DependsOnTargets="GetFilesToSignItems;SignFiles">
4747

4848
<!-- now that the files have been signed delete the marker files -->

0 commit comments

Comments
 (0)