From 8499136a9a79fd37a4acb9dc690a4815edd8081d Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Fri, 6 Apr 2018 17:32:51 -0700 Subject: [PATCH] Publish symbols using Microsoft.SymbolUploader.Build.Task package (#17463) Added PB_SymbolExpirationInDays (settable at queue time), PB_MsdlSymbolServerPAT, PB_SymwebSymbolServerPAT variables. Added "msdl" (publish symbols to public Microsoft server) and "symweb" (publish symbols to symweb) variables to PB_PublishType. Update to version 1.0.0-beta-62806-01 of the symbol uploader. Issue #16482 --- .../DotNet-Trusted-Publish-Symbols.json | 152 ++++++++++++----- buildpipeline/DotNet-Trusted-Publish.json | 157 +++--------------- dependencies.props | 6 + init-tools.msbuild | 3 + src/publish.proj | 17 ++ 5 files changed, 157 insertions(+), 178 deletions(-) diff --git a/buildpipeline/DotNet-Trusted-Publish-Symbols.json b/buildpipeline/DotNet-Trusted-Publish-Symbols.json index 507c9e1b1a82..ad915ba7da1f 100644 --- a/buildpipeline/DotNet-Trusted-Publish-Symbols.json +++ b/buildpipeline/DotNet-Trusted-Publish-Symbols.json @@ -45,10 +45,30 @@ } }, { + "environment": {}, "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Sync packages", + "displayName": "Setup vs dev env", + "timeoutInMinutes": 0, + "task": { + "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(Pipeline.SourcesDirectory)\\setup_vs_tools.cmd", + "arguments": "", + "modifyEnvironment": "true", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sync symbol packages", "timeoutInMinutes": 0, "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", @@ -57,51 +77,69 @@ }, "inputs": { "filename": "sync.cmd", - "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_BuildType)\\symbolpkg", + "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(ConfigurationGroup)/symbolpkg/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(AzureContainerSymbolPackageDirectory)symbolpkg", "workingFolder": "$(Pipeline.SourcesDirectory)", "failOnStandardError": "false" } }, { + "environment": {}, "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Extract symbol packages", + "displayName": "Symbol Packages -> Blob Feed", "timeoutInMinutes": 0, + "condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.ConfigurationGroup, 'Release'))", "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "-BuildType $(PB_BuildType) -SymPkgGlob $(PB_AzureContainerSymbolPackageGlob) -Branch $(SourceBranch)", + "filename": "msbuild", + "arguments": "src\\publish.proj /v:D /t:PublishSymbolPackages /p:__PublishSymbols=true $(FeedPublishArguments) /fileloggerparameters:Verbosity=diag;LogFile=publishsympkg.log", "workingFolder": "$(Pipeline.SourcesDirectory)", - "inlineScript": "param($BuildType, $SymPkgGlob, $Branch)\nif ($BuildType -ne \"Release\") { exit }\n\n.\\run.cmd build -- `\n/t:UnzipSymbolPackagesForPublish `\n/p:SymbolPackagesToPublishGlob=$SymPkgGlob `\n/v:D", - "failOnStandardError": "true" + "failOnStandardError": "false" } }, { + "environment": {}, "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Publish Symbols to Artifact Services", + "displayName": "Publish symbols to msdl", "timeoutInMinutes": 0, + "condition": "and(succeeded(), contains(variables.PB_PublishType, 'msdl'), eq(variables.ConfigurationGroup, 'Release'))", "task": { - "id": "29827cd1-5c33-4ff0-a817-abd46970ffc4", - "versionSpec": "0.*", + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", "definitionType": "task" }, "inputs": { - "symbolServiceURI": "https://microsoft.artifacts.visualstudio.com/DefaultCollection", - "requestName": "$(system.teamProject)/$(Build.BuildNumber)/$(Build.BuildId)", - "sourcePath": "$(Pipeline.SourcesDirectory)\\bin\\obj\\SymbolsRequest\\ExtractedPackages", - "assemblyPath": "", - "toLowerCase": "true", - "detailedLog": "true", - "expirationInDays": "30", - "usePat": "false" + "filename": "msbuild", + "arguments": "src\\publish.proj /v:D /t:PublishAllSymbols $(FeedPublishArguments) /p:SymbolServerPath=$(PB_MsdlSymbolServerPath) /p:SymbolServerPAT=$(PB_MsdlSymbolServerPAT) /p:SymbolExpirationInDays=$(PB_SymbolExpirationInDays)", + "workingFolder": "$(Pipeline.SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "environment": {}, + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Publish symbols to symweb", + "timeoutInMinutes": 0, + "condition": "and(succeeded(), contains(variables.PB_PublishType, 'symweb'), eq(variables.ConfigurationGroup, 'Release'))", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "msbuild", + "arguments": "src\\publish.proj /v:D /t:PublishAllSymbols $(FeedPublishArguments) /p:SymbolServerPath=$(PB_SymwebSymbolServerPath) /p:SymbolServerPAT=$(PB_SymwebSymbolServerPAT) /p:SymbolExpirationInDays=$(PB_SymbolExpirationInDays)", + "workingFolder": "$(Pipeline.SourcesDirectory)", + "failOnStandardError": "false" } }, { @@ -177,8 +215,8 @@ "value": "false", "allowOverride": true }, - "PB_BuildType": { - "value": "Release", + "ConfigurationGroup": { + "value": "$(PB_BuildType)", "allowOverride": true }, "CloudDropAccountName": { @@ -190,12 +228,25 @@ "allowOverride": true, "isSecret": true }, - "OfficialBuildId": { + "PB_ContainerName": { "value": "$(Build.BuildNumber)", "allowOverride": true }, - "Label": { - "value": "$(Build.BuildNumber)", + "PB_BlobNamePrefix": { + "value": "$(PB_PipeBuildIdentifier)/", + "allowOverride": true + }, + "AzureBlobFeedAccountName": { + "value": "dotnetfeed", + "allowOverride": true + }, + "AzureBlobFeedAccessToken": { + "value": null, + "allowOverride": true, + "isSecret": true + }, + "AzureBlobFeedContainerName": { + "value": "dotnet-core", "allowOverride": true }, "Pipeline.SourcesDirectory": { @@ -215,6 +266,10 @@ "value": null, "isSecret": true }, + "OfficialBuildId": { + "value": "$(Build.BuildNumber)", + "allowOverride": true + }, "SourceVersion": { "value": "master", "allowOverride": true @@ -223,39 +278,48 @@ "value": "master", "allowOverride": true }, + "AzureContainerSymbolPackageDirectory": { + "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\", + "allowOverride": true + }, "AzureContainerSymbolPackageGlob": { "value": "symbolpkg\\*.nupkg", + }, + "FeedPublishArguments": { + "value": "$(PB_BuildOutputManifestArguments) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:CloudDropAccessToken=$(PB_PublishBlobFeedKey) /p:CloudDropAccountName=$(AzureBlobFeedAccountName) /p:ContainerName=$(AzureBlobFeedContainerName) /p:OverwriteOnPublish=true /p:PackagesPatternDir=$(AzureContainerSymbolPackageDirectory) /p:__BuildType=$(ConfigurationGroup) /p:OfficialPublish=true /p:PublishFlatContainer=false" + }, + "PB_PublishType": { + "value": "", "allowOverride": true }, - "PB_AzureContainerSymbolPackageGlob": { - "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(PB_BuildType)\\$(AzureContainerSymbolPackageGlob)", + "PB_PublishBlobFeedUrl": { + "value": "", "allowOverride": true }, - "PB_DotNetCoreShareDir": { - "value": "passed-by-pipebuild", + "PB_PublishBlobFeedKey": { + "value": "", "allowOverride": true }, - "SymbolsProject": { - "value": "CLR" + "PB_BuildOutputManifestArguments": { + "value": "/p:ManifestBuildId=$(OfficialBuildId) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion)" }, - "SymbolsStatusMail": { - "value": "dagood;mawilkie" + "PB_MsdlSymbolServerPath": { + "value": "https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection" }, - "SymbolsUserName": { - "value": "dlab" + "PB_MsdlSymbolServerPAT": { + "value": null, + "isSecret": true }, - "SymbolsRelease": { - "value": "rtm" + "PB_SymwebSymbolServerPath": { + "value": "https://microsoft.artifacts.visualstudio.com/DefaultCollection" }, - "SymbolsProductGroup": { - "value": "Visual_Studio" + "PB_SymwebSymbolServerPAT": { + "value": null, + "isSecret": true }, - "SymbolsProductName": { - "value": "dotnetcore" + "PB_SymbolExpirationInDays": { + "value": "30" }, - "SymbolPublishDestinationDir": { - "value": "$(PB_DotNetCoreShareDir)\\$(PB_VstsRepositoryName)\\$(Label)\\" - } }, "retentionRules": [ { diff --git a/buildpipeline/DotNet-Trusted-Publish.json b/buildpipeline/DotNet-Trusted-Publish.json index eb24555a538f..ed8c3206fa2f 100644 --- a/buildpipeline/DotNet-Trusted-Publish.json +++ b/buildpipeline/DotNet-Trusted-Publish.json @@ -32,7 +32,6 @@ "displayName": "Install Signing Plugin", "timeoutInMinutes": 0, "condition": "and(succeeded(), in(variables.PB_SignType, 'real', 'test'))", - "refName": "Task2", "task": { "id": "30666190-6959-11e5-9f96-f56098202fef", "versionSpec": "1.*", @@ -51,9 +50,8 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Fetch custom tooling (NuGet, EmbedIndex)", + "displayName": "Fetch custom tooling (NuGet)", "timeoutInMinutes": 0, - "refName": "Task3", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -75,7 +73,6 @@ "alwaysRun": false, "displayName": "Set up pipeline-specific git repository", "timeoutInMinutes": 0, - "refName": "Task4", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -97,7 +94,6 @@ "alwaysRun": false, "displayName": "Setup vs dev env", "timeoutInMinutes": 0, - "refName": "Task1", "task": { "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", "versionSpec": "1.*", @@ -118,7 +114,6 @@ "alwaysRun": false, "displayName": "Sync packages", "timeoutInMinutes": 0, - "refName": "Task5", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -126,53 +121,11 @@ }, "inputs": { "filename": "sync.cmd", - "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(PB_BuildType)/pkg/flatcontainer/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\pkg", + "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(ConfigurationGroup)/pkg/flatcontainer/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(AzureContainerPackageDirectory)pkg", "workingFolder": "$(Pipeline.SourcesDirectory)", "failOnStandardError": "false" } }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Sync symbol packages", - "timeoutInMinutes": 0, - "refName": "Task6", - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "sync.cmd", - "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_ContainerName) -BlobNamePrefix=$(PB_BlobNamePrefix)$(PB_BuildType)/symbolpkg/ -- /p:DownloadFlatFiles=true /p:BlobNameExtension=\".nupkg\" /p:DownloadDirectory=$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\symbolpkg", - "workingFolder": "$(Pipeline.SourcesDirectory)", - "failOnStandardError": "false" - } - }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Index symbol packages", - "timeoutInMinutes": 0, - "refName": "Task8", - "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "", - "workingFolder": "", - "inlineScript": "if ($env:ConfigurationGroup -ne \"Release\") { exit }\n\n& $env:Build_SourcesDirectory\\scripts\\DotNet-Trusted-Publish\\Embed-Index.ps1 `\n $env:Pipeline_SourcesDirectory\\packages\\AzureTransfer\\$env:ConfigurationGroup\\$env:SymbolPackageLocation `\n $env:Build_StagingDirectory\\IndexedSymbolPackages", - "failOnStandardError": "true" - } - }, { "environment": {}, "enabled": true, @@ -180,7 +133,6 @@ "alwaysRun": false, "displayName": "Generate Version Assets", "timeoutInMinutes": 0, - "refName": "Task9", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -202,7 +154,6 @@ "alwaysRun": false, "displayName": "Log Native Version Assets Files", "timeoutInMinutes": 0, - "refName": "Task10", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -223,7 +174,6 @@ "displayName": "packages -> dotnet.myget.org", "timeoutInMinutes": 0, "condition": "and(succeeded(), contains(variables.PB_PublishType, 'myget'), eq(variables.ConfigurationGroup, 'Release'))", - "refName": "Task11", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -232,35 +182,12 @@ "inputs": { "scriptType": "inlineScript", "scriptName": "", - "arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\$(AzureContainerPackageGlob) -MyGetFeedUrl $(MyGetFeedUrl)", + "arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(AzureContainerPackageDirectory)$(AzureContainerPackageGlob) -MyGetFeedUrl $(MyGetFeedUrl)", "workingFolder": "$(Pipeline.SourcesDirectory)", "inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl)\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", "failOnStandardError": "true" } }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "symbol packages -> dotnet.myget.org", - "timeoutInMinutes": 0, - "condition": "and(succeeded(), contains(variables.PB_PublishType, 'myget'), eq(variables.ConfigurationGroup, 'Release'))", - "refName": "Task12", - "task": { - "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "scriptType": "inlineScript", - "scriptName": "", - "arguments": "-ApiKey $(MyGetApiKey) -ConfigurationGroup $(ConfigurationGroup) -PackagesGlob $(Build.StagingDirectory)\\IndexedSymbolPackages\\*.nupkg -MyGetFeedUrl $(MyGetFeedUrl)", - "workingFolder": "$(Pipeline.SourcesDirectory)", - "inlineScript": "param($ApiKey, $ConfigurationGroup, $PackagesGlob, $MyGetFeedUrl)\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", - "failOnStandardError": "true" - } - }, { "environment": {}, "enabled": true, @@ -269,7 +196,6 @@ "displayName": "Packages -> Blob Feed", "timeoutInMinutes": 0, "condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.ConfigurationGroup, 'Release'))", - "refName": "Task13", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -282,27 +208,6 @@ "failOnStandardError": "false" } }, - { - "environment": {}, - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Symbol Packages -> Blob Feed", - "timeoutInMinutes": 0, - "condition": "and(succeeded(), contains(variables.PB_PublishType, 'blob'), eq(variables.ConfigurationGroup, 'Release'))", - "refName": "Task14", - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "msbuild", - "arguments": "src\\publish.proj /t:PublishSymbolPackages /p:__PublishSymbols=true $(FeedPublishArguments) /fileloggerparameters:Verbosity=diag;LogFile=publishsympkg.log", - "workingFolder": "$(Pipeline.SourcesDirectory)", - "failOnStandardError": "false" - } - }, { "environment": {}, "enabled": false, @@ -310,7 +215,6 @@ "alwaysRun": false, "displayName": "Create VSTS auth NuGet.Config", "timeoutInMinutes": 0, - "refName": "Task15", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -332,7 +236,6 @@ "alwaysRun": false, "displayName": "packages -> VSTS", "timeoutInMinutes": 0, - "refName": "Task16", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -343,7 +246,7 @@ "scriptName": "", "arguments": "", "workingFolder": "", - "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", + "inlineScript": "if ($env:ConfigurationGroup -ne \"Release\") { exit }\n& $env:CustomNuGetPath push $env:AzureContainerPackageDirectory$env:AzureContainerPackageGlob placeholderapikey -Source vsts-dotnet-core -ConfigFile $env:VstsAuthedNuGetConfigPath -Timeout 3600", "failOnStandardError": "true" } }, @@ -355,7 +258,6 @@ "displayName": "Update versions repository", "timeoutInMinutes": 0, "condition": "and(succeeded(), contains(variables.PB_PublishType, 'versions'), eq(variables.ConfigurationGroup, 'Release'))", - "refName": "Task17", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -366,7 +268,7 @@ "scriptName": "", "arguments": "-gitHubAuthToken $(UpdatePublishedVersions.AuthToken) -root $(Pipeline.SourcesDirectory) -configGroup $(ConfigurationGroup)", "workingFolder": "", - "inlineScript": "param($gitHubAuthToken, $root, $configGroup)\nif ($configGroup -ne \"Release\" ) { exit }\ncd $root\n. $root\\UpdatePublishedVersions.ps1 `\n -gitHubUser dotnet-build-bot -gitHubEmail dotnet-build-bot@microsoft.com `\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", + "inlineScript": "param($gitHubAuthToken, $root, $configGroup)\nif ($configGroup -ne \"Release\" ) { exit }\ncd $root\n. $root\\UpdatePublishedVersions.ps1 `\n -gitHubUser dotnet-build-bot -gitHubEmail dotnet-build-bot@microsoft.com `\n -gitHubAuthToken $gitHubAuthToken `\n -versionsRepoOwner $env:VersionsRepoOwner -versionsRepo versions `\n -versionsRepoPath build-info/dotnet/$env:GitHubRepositoryName/$env:SourceBranch `\n -nupkgPath $env:AzureContainerPackageDirectory$env:AzureContainerPackageGlob", "failOnStandardError": "true" } }, @@ -377,7 +279,6 @@ "alwaysRun": false, "displayName": "Get Build Number", "timeoutInMinutes": 0, - "refName": "Task18", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -399,7 +300,6 @@ "alwaysRun": false, "displayName": "Publish to Artifact Services Drop (OfficialBuildId)", "timeoutInMinutes": 0, - "refName": "PublishBuildArtifacts1", "task": { "id": "f9d96d25-0c81-4e77-8282-1ad1f785cbb4", "versionSpec": "0.*", @@ -408,7 +308,7 @@ "inputs": { "dropServiceURI": "https://devdiv.artifacts.visualstudio.com/DefaultCollection", "buildNumber": "dotnet/$(GitHubRepositoryName)/$(SourceBranch)/$(OfficialBuildId)/packages/$(ConfigurationGroup)", - "sourcePath": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)", + "sourcePath": "$(AzureContainerPackageDirectory)", "dropExePath": "", "toLowerCase": "true", "detailedLog": "false", @@ -424,7 +324,6 @@ "alwaysRun": false, "displayName": "Publish to Artifact Services Drop (BuildNumber)", "timeoutInMinutes": 0, - "refName": "PublishBuildArtifacts2", "task": { "id": "f9d96d25-0c81-4e77-8282-1ad1f785cbb4", "versionSpec": "0.*", @@ -433,7 +332,7 @@ "inputs": { "dropServiceURI": "https://devdiv.artifacts.visualstudio.com/DefaultCollection", "buildNumber": "dotnet/$(GitHubRepositoryName)/$(SourceBranch)/$(BuildNumber)/packages/$(ConfigurationGroup)", - "sourcePath": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)", + "sourcePath": "$(AzureContainerPackageDirectory)", "dropExePath": "", "toLowerCase": "true", "detailedLog": "false", @@ -450,7 +349,6 @@ "displayName": "Copy Files to: $(Build.StagingDirectory)\\DebugLogs", "timeoutInMinutes": 0, "condition": "succeededOrFailed()", - "refName": "CopyFiles1", "task": { "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c", "versionSpec": "2.*", @@ -473,7 +371,6 @@ "displayName": "Publish Artifact: DebugLogs", "timeoutInMinutes": 0, "condition": "succeededOrFailed()", - "refName": "PublishBuildArtifacts3", "task": { "id": "2ff763a7-ce83-4e1f-bc89-0ae63477cebe", "versionSpec": "1.*", @@ -496,7 +393,6 @@ "displayName": "Send Telemetry", "timeoutInMinutes": 0, "condition": "always()", - "refName": "Task19", "task": { "id": "521a94ea-9e68-468a-8167-6dcf361ea776", "versionSpec": "1.*", @@ -570,9 +466,6 @@ "value": "$(PB_BuildType)", "allowOverride": true }, - "TeamName": { - "value": "DotNetCore" - }, "CloudDropAccountName": { "value": "dotnetbuildoutput", "allowOverride": true @@ -582,6 +475,17 @@ "allowOverride": true, "isSecret": true }, + "PB_ContainerName": { + "value": "$(Build.BuildNumber)", + "allowOverride": true + }, + "PB_BlobNamePrefix": { + "value": "$(PB_PipeBuildIdentifier)/", + "allowOverride": true + }, + "TeamName": { + "value": "DotNetCore" + }, "AzureBlobFeedAccountName": { "value": "dotnetfeed", "allowOverride": true @@ -599,10 +503,6 @@ "value": "$(Build.BuildNumber)", "allowOverride": true }, - "Label": { - "value": "$(Build.BuildNumber)", - "allowOverride": true - }, "MyGetFeedUrl": { "value": "https://dotnet.myget.org/F/dotnet-core-test/api/v2/package", "allowOverride": true @@ -660,9 +560,6 @@ "BranchGroup": { "value": "" }, - "SymbolRoot": { - "value": "\\\\fake\\symbol\\root" - }, "DefinitionNames": { "value": "Fake-Windows Fake-Windows-Native" }, @@ -701,17 +598,12 @@ "value": "master", "allowOverride": true }, - "AzureContainerPackageGlob": { - "value": "pkg\\*.nupkg", - "allowOverride": true - }, - "AzureContainerSymbolPackageGlob": { - "value": "symbolpkg\\*.nupkg", + "AzureContainerPackageDirectory": { + "value": "$(Pipeline.SourcesDirectory)\\packages\\AzureTransfer\\$(ConfigurationGroup)\\", "allowOverride": true }, - "SymbolPackageLocation": { - "value": "symbolpkg\\*.nupkg", - "allowOverride": true + "AzureContainerPackageGlob": { + "value": "pkg\\*.nupkg", }, "GitHubRepositoryName": { "value": "corefx", @@ -722,10 +614,7 @@ "allowOverride": true }, "FeedPublishArguments": { - "value": "$(PB_BuildOutputManifestArguments) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:CloudDropAccessToken=$(PB_PublishBlobFeedKey) /p:CloudDropAccountName=$(AzureBlobFeedAccountName) /p:ContainerName=$(AzureBlobFeedContainerName) /p:OverwriteOnPublish=true /p:PackagesPatternDir=../packages/AzureTransfer/Release/ /p:__BuildType=$(ConfigurationGroup) /p:OfficialPublish=true /p:PublishFlatContainer=false" - }, - "PB_SymbolCatalogCertificateId": { - "value": "400" + "value": "$(PB_BuildOutputManifestArguments) /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:CloudDropAccessToken=$(PB_PublishBlobFeedKey) /p:CloudDropAccountName=$(AzureBlobFeedAccountName) /p:ContainerName=$(AzureBlobFeedContainerName) /p:OverwriteOnPublish=true /p:PackagesPatternDir=$(AzureContainerPackageDirectory) /p:__BuildType=$(ConfigurationGroup) /p:OfficialPublish=true /p:PublishFlatContainer=false", }, "PB_PublishType": { "value": "", diff --git a/dependencies.props b/dependencies.props index 108a437e7325..c9b97a9a65d3 100644 --- a/dependencies.props +++ b/dependencies.props @@ -54,6 +54,12 @@ 2.1.0-preview3-02704-01 + + + Microsoft.SymbolUploader.Build.Task + 1.0.0-beta-62806-01 + + build-info/dotnet/ diff --git a/init-tools.msbuild b/init-tools.msbuild index 5ac3d71f95bf..280c6bb692cd 100644 --- a/init-tools.msbuild +++ b/init-tools.msbuild @@ -17,6 +17,9 @@ $(FeedTasksPackageVersion) + + $(PublishSymbolsPackageVersion) + $(ILLinkTasksPackageVersion) diff --git a/src/publish.proj b/src/publish.proj index 42a98e48b451..37d9d277cc65 100644 --- a/src/publish.proj +++ b/src/publish.proj @@ -3,6 +3,7 @@ + @@ -133,5 +134,21 @@ Overwrite="$(OverwriteOnPublish)" /> + + + + + true + true + + + + + + + + +