From dc4001f5876b6c3144cc45f8df4e91a938788490 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Thu, 20 May 2021 14:38:28 -0700 Subject: [PATCH 01/38] symbols test --- .../src/PublishArtifactsInManifestBase.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs index c336a196ed9..bd61645de93 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs @@ -420,6 +420,16 @@ public async Task PublishSymbolsUsingStreamingAsync( HashSet feedConfigsForSymbols = FeedConfigs[symbolCategory]; Dictionary serversToPublish = GetTargetSymbolServers(feedConfigsForSymbols, msdlToken, symWebToken); + HashSet excludeFiles = new HashSet(); + + if(File.Exists(symbolPublishingExclusionsFile)){ + string[] files = File.ReadAllLines(symbolPublishingExclusionsFile); + + foreach(var file in files){ + excludeFiles.Add(file); + } + + } if (symbolsToPublish != null && symbolsToPublish.Any()) { @@ -465,7 +475,7 @@ await PublishSymbolsHelper.PublishAsync( token, symbolFiles, null, - null, + excludeFiles, ExpirationInDays, false, publishSpecialClrFiles, @@ -531,7 +541,7 @@ await PublishSymbolsHelper.PublishAsync( token, null, filesToSymbolServer, - null, + excludeFiles, ExpirationInDays, false, publishSpecialClrFiles, From 3962338e690a72222e9a031b76abcca3f681eca7 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Thu, 20 May 2021 15:34:20 -0700 Subject: [PATCH 02/38] test-sdk --- NuGet.config | 1 + eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 68c003692a7..012ae92bc9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index be9e08022f1..9c33652fbf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21264.2 + 6.0.0-beta.21270.2 6.0.0-beta.21264.2 1.22.0 1.1.2 diff --git a/global.json b/global.json index 4af823ee231..ff1ff0f79c7 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-preview.3.21202.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21270.2", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" } } From d972aa0ab011c48012e7f4020887556ec099a064 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Thu, 20 May 2021 16:33:35 -0700 Subject: [PATCH 03/38] test path --- eng/publishing/v3/publish-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/publishing/v3/publish-assets.yml b/eng/publishing/v3/publish-assets.yml index 17c85fba28b..b56c23e38e1 100644 --- a/eng/publishing/v3/publish-assets.yml +++ b/eng/publishing/v3/publish-assets.yml @@ -83,7 +83,7 @@ jobs: /p:AkaMSClientSecret=$(akams-client-secret) ${{ parameters.artifactsPublishingAdditionalParameters }} /p:PDBArtifactsBasePath='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:SymbolPublishingExclusionsFile='/eng/SymbolPublishingExclusionsFile.txt' ${{ parameters.symbolPublishingAdditionalParameters}} /p:MsdlToken=$(microsoft-symbol-server-pat) /p:SymWebToken=$(symweb-symbol-server-pat) From 34b1862bb98ae68689861bbf869c04b07857a9ad Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Fri, 21 May 2021 17:27:42 -0700 Subject: [PATCH 04/38] Test --- eng/Versions.props | 2 +- global.json | 2 +- .../src/PublishArtifactsInManifestBase.cs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9c33652fbf6..be9e08022f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21270.2 + 6.0.0-beta.21264.2 6.0.0-beta.21264.2 1.22.0 1.1.2 diff --git a/global.json b/global.json index ff1ff0f79c7..4af823ee231 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-preview.3.21202.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21270.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" } } diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs index bd61645de93..731bd6e421f 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs @@ -423,9 +423,11 @@ public async Task PublishSymbolsUsingStreamingAsync( HashSet excludeFiles = new HashSet(); if(File.Exists(symbolPublishingExclusionsFile)){ + Log.LogMessage(MessageImportance.High, $"SymbolPublishingExclusionFile exists"); string[] files = File.ReadAllLines(symbolPublishingExclusionsFile); foreach(var file in files){ + Log.LogMessage(MessageImportance.High, $"Exclude the file {file} from publishing to symbol server"); excludeFiles.Add(file); } From 7d529ec48c4d2bf8a387c608f6463b059484f4c6 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Fri, 21 May 2021 17:56:37 -0700 Subject: [PATCH 05/38] test sdk --- eng/Versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index be9e08022f1..060910dade5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21264.2 + 6.0.0-beta.21271.4 6.0.0-beta.21264.2 1.22.0 1.1.2 diff --git a/global.json b/global.json index 4af823ee231..23babb1abae 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-preview.3.21202.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.4", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" } } From 685a8fbda08ca797fc72e8a056d2453e1c3889d4 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Fri, 21 May 2021 18:33:58 -0700 Subject: [PATCH 06/38] revert test changes --- NuGet.config | 1 - eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 012ae92bc9e..68c003692a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Versions.props b/eng/Versions.props index 060910dade5..949640b8fb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 2.1.1 2.1.0 3.10.0-4.21262.12 - 6.0.100-preview.5.21268.2 + 6.0.100-preview.5.21270.1 16.7.1 4.8.3 5.3.0.1 @@ -65,7 +65,7 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21271.4 + 6.0.0-beta.21264.2 6.0.0-beta.21264.2 1.22.0 1.1.2 diff --git a/global.json b/global.json index 23babb1abae..4af823ee231 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-preview.3.21202.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.4", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" } } From 57bc8962a3388ef26938c659bc1ba74404f2741e Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 2 Jun 2021 14:35:22 -0700 Subject: [PATCH 07/38] test --- NuGet.config | 1 + eng/SymbolPublishingExclusionsFile.txt | 2 ++ eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 eng/SymbolPublishingExclusionsFile.txt diff --git a/NuGet.config b/NuGet.config index 68c003692a7..012ae92bc9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/SymbolPublishingExclusionsFile.txt b/eng/SymbolPublishingExclusionsFile.txt new file mode 100644 index 00000000000..d002af777ce --- /dev/null +++ b/eng/SymbolPublishingExclusionsFile.txt @@ -0,0 +1,2 @@ +Microsoft.Arcade.Common +Microsoft.DotNet.XUnitExtensions diff --git a/eng/Versions.props b/eng/Versions.props index 949640b8fb2..be9e08022f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 2.1.1 2.1.0 3.10.0-4.21262.12 - 6.0.100-preview.5.21270.1 + 6.0.100-preview.5.21268.2 16.7.1 4.8.3 5.3.0.1 From a802f7a0ece8d127e3f2b492a5d2ab0a0bf6cd22 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 2 Jun 2021 17:55:07 -0700 Subject: [PATCH 08/38] Test --- eng/Versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 52274c92638..8edfea9a04c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21277.1 + 6.0.0-beta.21302.2 6.0.0-beta.21277.1 1.22.0 1.1.2 diff --git a/global.json b/global.json index 7e3a90e2fbe..aed138c4df3 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-preview.3.21202.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21277.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21302.2", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21277.1" } } From 0ac230111eed93da7b706a744325e978f03a3e22 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 9 Jun 2021 13:48:02 -0700 Subject: [PATCH 09/38] Test symbols download --- .../templates/job/publish-build-assets.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 3b9e2524ff3..dd1b09dfebf 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -94,6 +94,22 @@ jobs: PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' PublishLocation: Container ArtifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolExclusionFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = Test-Path -Path "$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt" + Write-Output "##vso[task.setvariable variable=SymbolExclusionFile]$symbolExclusionfile" + + - eq(variables['SymbolExclusionFile'], True): + - task: PublishBuildArtifacts@1 + displayName: Publish SymbplExclusionFile Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: SymbolsExclusion - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml From 9cf085c84ac614c2a22c413ad60d993f53bb8fcb Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 9 Jun 2021 13:49:27 -0700 Subject: [PATCH 10/38] fix --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index dd1b09dfebf..a98361af583 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -103,7 +103,7 @@ jobs: $symbolExclusionfile = Test-Path -Path "$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt" Write-Output "##vso[task.setvariable variable=SymbolExclusionFile]$symbolExclusionfile" - - eq(variables['SymbolExclusionFile'], True): + - if eq(variables['SymbolExclusionFile'], True): - task: PublishBuildArtifacts@1 displayName: Publish SymbplExclusionFile Artifact inputs: From 13fbcfd4def1d6289cb7abbb56712677f418f55e Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 9 Jun 2021 13:50:50 -0700 Subject: [PATCH 11/38] fix --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index a98361af583..71844a2d248 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -103,7 +103,7 @@ jobs: $symbolExclusionfile = Test-Path -Path "$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt" Write-Output "##vso[task.setvariable variable=SymbolExclusionFile]$symbolExclusionfile" - - if eq(variables['SymbolExclusionFile'], True): + - ${{ if eq(variables['SymbolExclusionFile'], 'true') }}: - task: PublishBuildArtifacts@1 displayName: Publish SymbplExclusionFile Artifact inputs: From a008035f0700b0521d5314c377800790a37ebd32 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 9 Jun 2021 16:24:00 -0700 Subject: [PATCH 12/38] Test --- eng/common/templates/job/publish-build-assets.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 71844a2d248..5b24458c148 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -100,12 +100,19 @@ jobs: inputs: targetType: inline script: | - $symbolExclusionfile = Test-Path -Path "$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt" - Write-Output "##vso[task.setvariable variable=SymbolExclusionFile]$symbolExclusionfile" + $symbolExclusionfile = "$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]$symbolExclusionfile" + } + else{ + Write-Host "Symbols Exclusion file does not exists" + } - ${{ if eq(variables['SymbolExclusionFile'], 'true') }}: - task: PublishBuildArtifacts@1 - displayName: Publish SymbplExclusionFile Artifact + displayName: Publish SymbolExclusionFile Artifact inputs: PathtoPublish: '$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container From f6450836c7b58a21a3f642d33104f59eab56c94d Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 9 Jun 2021 16:43:13 -0700 Subject: [PATCH 13/38] Test --- eng/common/templates/job/publish-build-assets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 5b24458c148..94ca0069936 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -100,7 +100,7 @@ jobs: inputs: targetType: inline script: | - $symbolExclusionfile = "$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "/eng/SymbolPublishingExclusionsFile.txt" if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -114,7 +114,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolExclusionFile Artifact inputs: - PathtoPublish: '$(Build.StagingDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PathtoPublish: '/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: SymbolsExclusion From 8a660b96d7415784559db554370370edae4b0383 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Thu, 10 Jun 2021 17:44:34 -0700 Subject: [PATCH 14/38] Test --- eng/Versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 501438be9d8..0d438e715c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21303.2 + 6.0.0-beta.21309.9 6.0.0-beta.21303.2 1.22.0 1.1.2 diff --git a/global.json b/global.json index a3127be1474..6afbd4d71d6 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-preview.4.21255.9" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21303.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21309.9", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21303.2" } } From 5759cb19cf3784a8e259f727837e1470825b2d28 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Thu, 29 Jul 2021 15:36:57 -0700 Subject: [PATCH 15/38] test --- eng/common/templates/job/publish-build-assets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 94ca0069936..472626ea415 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -100,7 +100,7 @@ jobs: inputs: targetType: inline script: | - $symbolExclusionfile = "/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -114,7 +114,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolExclusionFile Artifact inputs: - PathtoPublish: '/eng/SymbolPublishingExclusionsFile.txt' + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: SymbolsExclusion From 055cbc390113f749fbbfc128d703d38bca590821 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Thu, 29 Jul 2021 16:37:29 -0700 Subject: [PATCH 16/38] test --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 472626ea415..bcde59e9de0 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -104,7 +104,7 @@ jobs: if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]$symbolExclusionfile" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" } else{ Write-Host "Symbols Exclusion file does not exists" From ed7539b56800f95952e622282b1c089f458964a6 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Thu, 29 Jul 2021 17:24:24 -0700 Subject: [PATCH 17/38] test --- .../templates/job/publish-build-assets.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index bcde59e9de0..43d8db2d34f 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -23,6 +23,8 @@ parameters: # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing publishUsingPipelines: false + SymbolExclusionFile: false + jobs: - job: Asset_Registry_Publish @@ -104,19 +106,19 @@ jobs: if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" + parameters.SymbolExclusionFile = 'true' Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" } else{ Write-Host "Symbols Exclusion file does not exists" } - - ${{ if eq(variables['SymbolExclusionFile'], 'true') }}: - - task: PublishBuildArtifacts@1 - displayName: Publish SymbolExclusionFile Artifact - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: SymbolsExclusion + - task: PublishBuildArtifacts@1 + displayName: Publish SymbolExclusionFile Artifact + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: SymbolsExclusion - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml From 380250150ef89756c23a48a4688d0c45e73597c5 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Thu, 29 Jul 2021 17:44:10 -0700 Subject: [PATCH 18/38] TEst --- eng/common/templates/job/publish-build-assets.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 43d8db2d34f..7f10e02718b 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -106,7 +106,6 @@ jobs: if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" - parameters.SymbolExclusionFile = 'true' Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" } else{ From 4967e160d44cfcec179d309610df6a4df7dde79f Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Fri, 30 Jul 2021 15:19:35 -0700 Subject: [PATCH 19/38] test --- eng/publishing/v3/publish-assets.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/publishing/v3/publish-assets.yml b/eng/publishing/v3/publish-assets.yml index 1170d437797..416eb0b4cef 100644 --- a/eng/publishing/v3/publish-assets.yml +++ b/eng/publishing/v3/publish-assets.yml @@ -43,6 +43,7 @@ jobs: AssetManifests/** BlobArtifacts/MergedManifest.xml PdbArtifacts/** + SymbolExclusion/** downloadPath: '$(Build.ArtifactStagingDirectory)' - task: NuGetToolInstaller@1 @@ -84,7 +85,7 @@ jobs: /p:AkaMSClientSecret=$(akams-client-secret) ${{ parameters.artifactsPublishingAdditionalParameters }} /p:PDBArtifactsBasePath='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:SymbolPublishingExclusionsFile='/eng/SymbolPublishingExclusionsFile.txt' + /p:SymbolPublishingExclusionsFile='$(Build.ArtifactStagingDirectory)/SymbolsExclusion/SymbolPublishingExclusionsFile.txt' ${{ parameters.symbolPublishingAdditionalParameters}} /p:MsdlToken=$(microsoft-symbol-server-pat) /p:SymWebToken=$(symweb-symbol-server-pat) From 6a369ef3541c30fa26dd4a9446f4a85ef9eb31f5 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Fri, 30 Jul 2021 17:24:38 -0700 Subject: [PATCH 20/38] updated --- eng/publishing/v3/publish-assets.yml | 2 +- .../src/PublishArtifactsInManifestBase.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/publishing/v3/publish-assets.yml b/eng/publishing/v3/publish-assets.yml index 416eb0b4cef..48f0a7927da 100644 --- a/eng/publishing/v3/publish-assets.yml +++ b/eng/publishing/v3/publish-assets.yml @@ -43,7 +43,7 @@ jobs: AssetManifests/** BlobArtifacts/MergedManifest.xml PdbArtifacts/** - SymbolExclusion/** + SymbolsExclusion/** downloadPath: '$(Build.ArtifactStagingDirectory)' - task: NuGetToolInstaller@1 diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs index 4fed2389285..e3650313c99 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs @@ -438,6 +438,9 @@ public async Task PublishSymbolsUsingStreamingAsync( } } + else { + Log.LogMessage(MessageImportance.High, $"SymbolPublishingExclusionFile does not exits, check path ${symbolPublishingExclusionsFile} "); + } if (symbolsToPublish != null && symbolsToPublish.Any()) { From f6f6ec6604f3ac22df80be6dd0cb67de9683b6f0 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Mon, 2 Aug 2021 12:31:52 -0700 Subject: [PATCH 21/38] test --- eng/Versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d343f4e0b3c..df340b48dd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21378.2 + 6.0.0-beta.21380.1 6.0.0-beta.21378.2 1.22.0 1.1.2 diff --git a/global.json b/global.json index aee2d816476..946d83a6738 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-preview.6.21355.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21378.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21380.1", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21378.2" } } From faba61ef67e193210c5eb30b82d0e3be8d1ba97c Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 14:54:00 -0700 Subject: [PATCH 22/38] Test --- .../templates/job/publish-build-assets.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 7f10e02718b..db33bdc5f3d 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -23,8 +23,6 @@ parameters: # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing publishUsingPipelines: false - SymbolExclusionFile: false - jobs: - job: Asset_Registry_Publish @@ -98,7 +96,7 @@ jobs: ArtifactName: ReleaseConfigs - task: powershell@2 - displayName: Check if SymbolExclusionFile.txt exists + displayName: Check if SymbolPublishingExclusionsFile.txt exists inputs: targetType: inline script: | @@ -112,12 +110,13 @@ jobs: Write-Host "Symbols Exclusion file does not exists" } - - task: PublishBuildArtifacts@1 - displayName: Publish SymbolExclusionFile Artifact - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: SymbolsExclusion + - ${{ if (eq($(SymbolExclusionFile), 'true') }}: + - task: PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: SymbolsExclusion - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml From 63c1c9e584d4b9b860ab9886fb1dd39f90c2f8e7 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 14:55:22 -0700 Subject: [PATCH 23/38] Test --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index db33bdc5f3d..d7960d368f7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -110,7 +110,7 @@ jobs: Write-Host "Symbols Exclusion file does not exists" } - - ${{ if (eq($(SymbolExclusionFile), 'true') }}: + - ${{ if (eq($(SymbolExclusionFile)), 'true') }}: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact inputs: From b58987e6594447956601cfb1090da529d8a684de Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 14:56:07 -0700 Subject: [PATCH 24/38] typo --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d7960d368f7..9941b87fb16 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -110,7 +110,7 @@ jobs: Write-Host "Symbols Exclusion file does not exists" } - - ${{ if (eq($(SymbolExclusionFile)), 'true') }}: + - ${{ if (eq(SymbolExclusionFile), 'true') }}: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact inputs: From 7fdedd8a8b3422cd79d691151ca9eea359a1f4d2 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 14:57:28 -0700 Subject: [PATCH 25/38] test --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 9941b87fb16..760cd686337 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -110,7 +110,7 @@ jobs: Write-Host "Symbols Exclusion file does not exists" } - - ${{ if (eq(SymbolExclusionFile), 'true') }}: + - ${{ if eq($(SymbolExclusionFile), 'true') }}: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact inputs: From 3a043b48f3f11709b0546caf31026edbd6affc36 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 14:58:09 -0700 Subject: [PATCH 26/38] Test --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 760cd686337..ff3b8583c26 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -110,7 +110,7 @@ jobs: Write-Host "Symbols Exclusion file does not exists" } - - ${{ if eq($(SymbolExclusionFile), 'true') }}: + - ${{ if eq(SymbolExclusionFile, 'true') }}: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact inputs: From 6fd3a3f171258a24cf7b1b56fa49d6033b1cc42c Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 15:25:26 -0700 Subject: [PATCH 27/38] test variable --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index ff3b8583c26..c96cd0fe958 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -110,7 +110,7 @@ jobs: Write-Host "Symbols Exclusion file does not exists" } - - ${{ if eq(SymbolExclusionFile, 'true') }}: + - ${{ if eq(variables['SymbolExclusionFile'], 'true') }}: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact inputs: From f40d540932180418c5030e15e8d9735e2304611a Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 16:55:14 -0700 Subject: [PATCH 28/38] check if file exists --- eng/common/templates/job/publish-build-assets.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c96cd0fe958..10a65d3a12a 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -110,13 +110,13 @@ jobs: Write-Host "Symbols Exclusion file does not exists" } - - ${{ if eq(variables['SymbolExclusionFile'], 'true') }}: - - task: PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: SymbolsExclusion + - task: PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: SymbolsExclusion + condition: (variables['SymbolExclusionFile'], 'true') - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml From 1354defa50d3a6f325d017aedc632a902ea22325 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 17:38:39 -0700 Subject: [PATCH 29/38] minor fixes --- NuGet.config | 1 - eng/SymbolPublishingExclusionsFile.txt | 2 -- eng/Versions.props | 12 ++++++------ global.json | 6 +++--- .../src/PublishArtifactsInManifestBase.cs | 17 +++++++++++------ 5 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 eng/SymbolPublishingExclusionsFile.txt diff --git a/NuGet.config b/NuGet.config index 012ae92bc9e..68c003692a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/SymbolPublishingExclusionsFile.txt b/eng/SymbolPublishingExclusionsFile.txt deleted file mode 100644 index d002af777ce..00000000000 --- a/eng/SymbolPublishingExclusionsFile.txt +++ /dev/null @@ -1,2 +0,0 @@ -Microsoft.Arcade.Common -Microsoft.DotNet.XUnitExtensions diff --git a/eng/Versions.props b/eng/Versions.props index df340b48dd0..733b9af0655 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 2.1.1 2.1.0 3.10.0-4.21329.37 - 6.0.100-preview.6.21378.1 + 6.0.100-preview.6.21362.3 16.7.1 4.8.3 5.3.0.1 @@ -65,8 +65,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21380.1 - 6.0.0-beta.21378.2 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 1.22.0 1.1.2 2.0.0 @@ -77,10 +77,10 @@ 1.1.0-beta.20258.6 1.1.0-beta-21309-01 1.1.0-beta-21309-01 - 6.0.0-beta.21378.2 - 1.0.0-beta.21378.1 + 6.0.0-beta.21359.3 + 1.0.0-beta.21358.1 1.1.0-beta.21228.1 - 1.0.0-prerelease.21373.1 + 1.0.0-prerelease.21357.4 1.1.156602 1.1.156602 6.0.100-preview.5.21254.11 diff --git a/global.json b/global.json index 946d83a6738..7ea4d9f101a 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "tools": { - "dotnet": "6.0.100-preview.6.21355.2" + "dotnet": "6.0.100-preview.4.21255.9" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21380.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21378.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21359.3" } } diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs index e3650313c99..32c62fca646 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs @@ -428,17 +428,22 @@ public async Task PublishSymbolsUsingStreamingAsync( GetTargetSymbolServers(feedConfigsForSymbols, msdlToken, symWebToken); HashSet excludeFiles = new HashSet(); - if(File.Exists(symbolPublishingExclusionsFile)){ + if(File.Exists(symbolPublishingExclusionsFile)) + { Log.LogMessage(MessageImportance.High, $"SymbolPublishingExclusionFile exists"); string[] files = File.ReadAllLines(symbolPublishingExclusionsFile); - foreach(var file in files){ - Log.LogMessage(MessageImportance.High, $"Exclude the file {file} from publishing to symbol server"); - excludeFiles.Add(file); + foreach(var file in files) + { + if(!string.IsNullOrEmpty(file)) + { + Log.LogMessage(MessageImportance.High, $"Exclude the file {file} from publishing to symbol server"); + excludeFiles.Add(file); + } } - } - else { + else + { Log.LogMessage(MessageImportance.High, $"SymbolPublishingExclusionFile does not exits, check path ${symbolPublishingExclusionsFile} "); } From c5a73f77ddb667966a1e3b7d8b22ef75108ca019 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 3 Aug 2021 17:40:35 -0700 Subject: [PATCH 30/38] Revert test changes --- eng/Versions.props | 12 ++++++------ global.json | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 733b9af0655..d343f4e0b3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 2.1.1 2.1.0 3.10.0-4.21329.37 - 6.0.100-preview.6.21362.3 + 6.0.100-preview.6.21378.1 16.7.1 4.8.3 5.3.0.1 @@ -65,8 +65,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21359.3 - 6.0.0-beta.21359.3 + 6.0.0-beta.21378.2 + 6.0.0-beta.21378.2 1.22.0 1.1.2 2.0.0 @@ -77,10 +77,10 @@ 1.1.0-beta.20258.6 1.1.0-beta-21309-01 1.1.0-beta-21309-01 - 6.0.0-beta.21359.3 - 1.0.0-beta.21358.1 + 6.0.0-beta.21378.2 + 1.0.0-beta.21378.1 1.1.0-beta.21228.1 - 1.0.0-prerelease.21357.4 + 1.0.0-prerelease.21373.1 1.1.156602 1.1.156602 6.0.100-preview.5.21254.11 diff --git a/global.json b/global.json index 7ea4d9f101a..aee2d816476 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "tools": { - "dotnet": "6.0.100-preview.4.21255.9" + "dotnet": "6.0.100-preview.6.21355.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21359.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21378.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21378.2" } } From 7e4e1d743d0902ea1495692fc2029f39829a8f50 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 4 Aug 2021 12:43:04 -0700 Subject: [PATCH 31/38] Review comments --- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/publishing/v3/publish-assets.yml | 4 ++-- .../src/PublishArtifactsInManifestBase.cs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 10a65d3a12a..ddaa791c857 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -115,7 +115,7 @@ jobs: inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container - ArtifactName: SymbolsExclusion + ArtifactName: ReleaseConfigs condition: (variables['SymbolExclusionFile'], 'true') - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: diff --git a/eng/publishing/v3/publish-assets.yml b/eng/publishing/v3/publish-assets.yml index 48f0a7927da..60dca2adcde 100644 --- a/eng/publishing/v3/publish-assets.yml +++ b/eng/publishing/v3/publish-assets.yml @@ -43,7 +43,7 @@ jobs: AssetManifests/** BlobArtifacts/MergedManifest.xml PdbArtifacts/** - SymbolsExclusion/** + ReleaseConfigs/SymbolPublishingExclusionsFile.txt downloadPath: '$(Build.ArtifactStagingDirectory)' - task: NuGetToolInstaller@1 @@ -85,7 +85,7 @@ jobs: /p:AkaMSClientSecret=$(akams-client-secret) ${{ parameters.artifactsPublishingAdditionalParameters }} /p:PDBArtifactsBasePath='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.ArtifactStagingDirectory)/SymbolsExclusion/SymbolPublishingExclusionsFile.txt' + /p:SymbolPublishingExclusionsFile='$(Build.ArtifactStagingDirectory)/ReleaseConfigs/SymbolPublishingExclusionsFile.txt' ${{ parameters.symbolPublishingAdditionalParameters}} /p:MsdlToken=$(microsoft-symbol-server-pat) /p:SymWebToken=$(symweb-symbol-server-pat) diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs index 32c62fca646..1d8614b0ec7 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs @@ -430,21 +430,21 @@ public async Task PublishSymbolsUsingStreamingAsync( if(File.Exists(symbolPublishingExclusionsFile)) { - Log.LogMessage(MessageImportance.High, $"SymbolPublishingExclusionFile exists"); + Log.LogMessage(MessageImportance.Normal, $"SymbolPublishingExclusionFile exists"); string[] files = File.ReadAllLines(symbolPublishingExclusionsFile); foreach(var file in files) { if(!string.IsNullOrEmpty(file)) { - Log.LogMessage(MessageImportance.High, $"Exclude the file {file} from publishing to symbol server"); + Log.LogMessage(MessageImportance.Normal, $"Exclude the file {file} from publishing to symbol server"); excludeFiles.Add(file); } } } else { - Log.LogMessage(MessageImportance.High, $"SymbolPublishingExclusionFile does not exits, check path ${symbolPublishingExclusionsFile} "); + Log.LogMessage(MessageImportance.Normal, $"SymbolPublishingExclusionFile was not found at ${symbolPublishingExclusionsFile} "); } if (symbolsToPublish != null && symbolsToPublish.Any()) From 11c6e18949bd94b05a048f2cef076b7aed192ef4 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 4 Aug 2021 13:21:17 -0700 Subject: [PATCH 32/38] default value --- eng/common/templates/job/publish-build-assets.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index ddaa791c857..66057b5a42b 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -108,6 +108,7 @@ jobs: } else{ Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" } - task: PublishBuildArtifacts@1 From 1c81853b63a3fb6bff3dfb34daebb1fd4979d6e0 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 4 Aug 2021 13:46:42 -0700 Subject: [PATCH 33/38] fix --- eng/common/templates/job/publish-build-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 66057b5a42b..a5147146b40 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -117,7 +117,7 @@ jobs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs - condition: (variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml From 055c61059512a3262476e29e753d015678752666 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Wed, 4 Aug 2021 14:47:12 -0700 Subject: [PATCH 34/38] use this in the right place --- eng/common/templates/job/publish-build-assets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index a5147146b40..fe9dfdf720c 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -113,12 +113,12 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs - condition: eq(variables['SymbolExclusionFile'], 'true') - + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: From f3893f82757cb4e316eb703dcc6863e0f82d2a5e Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Mon, 9 Aug 2021 19:11:31 -0700 Subject: [PATCH 35/38] Test sdk --- NuGet.config | 1 + eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 68c003692a7..012ae92bc9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index d343f4e0b3c..96111ad5919 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21378.2 + 6.0.0-beta.21409.1 6.0.0-beta.21378.2 1.22.0 1.1.2 diff --git a/global.json b/global.json index aee2d816476..09909dca6cd 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-preview.6.21355.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21378.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21409.1", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21378.2" } } From 8a38e89b25e759c8a10bcf1d3dea22aed9246924 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 10 Aug 2021 12:32:02 -0700 Subject: [PATCH 36/38] minor fix to unblock runtime --- .../src/PublishArtifactsInManifestBase.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs index 1d8614b0ec7..b626d27ef90 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs @@ -426,12 +426,13 @@ public async Task PublishSymbolsUsingStreamingAsync( HashSet feedConfigsForSymbols = FeedConfigs[symbolCategory]; Dictionary serversToPublish = GetTargetSymbolServers(feedConfigsForSymbols, msdlToken, symWebToken); - HashSet excludeFiles = new HashSet(); + HashSet excludeFiles = null; if(File.Exists(symbolPublishingExclusionsFile)) { Log.LogMessage(MessageImportance.Normal, $"SymbolPublishingExclusionFile exists"); string[] files = File.ReadAllLines(symbolPublishingExclusionsFile); + excludeFiles = new HashSet(); foreach(var file in files) { From 887eeaf620b7059c4855aaa3bdceb286f1e41ac3 Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 10 Aug 2021 12:42:51 -0700 Subject: [PATCH 37/38] Revert test changes --- NuGet.config | 1 - eng/Versions.props | 14 +++++++------- global.json | 6 +++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 012ae92bc9e..68c003692a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Versions.props b/eng/Versions.props index 96111ad5919..6c15afaab23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 2.1.1 2.1.0 3.10.0-4.21329.37 - 6.0.100-preview.6.21378.1 + 6.0.100-preview.6.21403.3 16.7.1 4.8.3 5.3.0.1 @@ -65,8 +65,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21409.1 - 6.0.0-beta.21378.2 + 6.0.0-beta.21403.5 + 6.0.0-beta.21403.5 1.22.0 1.1.2 2.0.0 @@ -77,10 +77,10 @@ 1.1.0-beta.20258.6 1.1.0-beta-21309-01 1.1.0-beta-21309-01 - 6.0.0-beta.21378.2 - 1.0.0-beta.21378.1 - 1.1.0-beta.21228.1 - 1.0.0-prerelease.21373.1 + 6.0.0-beta.21403.5 + 1.0.0-beta.21380.1 + 1.1.0-beta.21378.2 + 1.0.0-prerelease.21378.1 1.1.156602 1.1.156602 6.0.100-preview.5.21254.11 diff --git a/global.json b/global.json index 09909dca6cd..865a18a5ec1 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "tools": { - "dotnet": "6.0.100-preview.6.21355.2" + "dotnet": "6.0.100-rc.1.21379.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21409.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21378.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21403.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21403.5" } } From 684341844039412a739addad40d57f68599de18a Mon Sep 17 00:00:00 2001 From: Epsitha Ananth Date: Tue, 10 Aug 2021 12:45:23 -0700 Subject: [PATCH 38/38] revert --- eng/Versions.props | 10 +++++----- global.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6c15afaab23..7f2bafb02a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 2.1.1 2.1.0 3.10.0-4.21329.37 - 6.0.100-preview.6.21403.3 + 6.0.100-preview.6.21405.1 16.7.1 4.8.3 5.3.0.1 @@ -65,8 +65,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21403.5 - 6.0.0-beta.21403.5 + 6.0.0-beta.21406.6 + 6.0.0-beta.21406.6 1.22.0 1.1.2 2.0.0 @@ -77,8 +77,8 @@ 1.1.0-beta.20258.6 1.1.0-beta-21309-01 1.1.0-beta-21309-01 - 6.0.0-beta.21403.5 - 1.0.0-beta.21380.1 + 6.0.0-beta.21406.6 + 1.0.0-beta.21405.1 1.1.0-beta.21378.2 1.0.0-prerelease.21378.1 1.1.156602 diff --git a/global.json b/global.json index 865a18a5ec1..34428aeca0e 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "6.0.100-rc.1.21379.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21403.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21403.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21406.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21406.6" } }