From fb4845ea57a01b3db7d2d0261c20242d8362dbac Mon Sep 17 00:00:00 2001 From: Ricardo Arenas Date: Wed, 13 Oct 2021 10:00:00 -0700 Subject: [PATCH] Revert "Enabling ConvertPdbsToWindowsPdbs (#8007)" This reverts commit a661399307c8c72eeff4e0cf6e221a78ae1ea765. --- eng/publishing/v3/publish-assets.yml | 1 - .../SdkTasks/PublishArtifactsInManifest.proj | 2 -- .../PublishToSymbolServerTest.cs | 2 +- .../src/PublishArtifactsInManifest.cs | 3 --- .../src/PublishArtifactsInManifestBase.cs | 16 ++++------------ .../src/PublishArtifactsInManifestV3.cs | 3 --- 6 files changed, 5 insertions(+), 22 deletions(-) diff --git a/eng/publishing/v3/publish-assets.yml b/eng/publishing/v3/publish-assets.yml index 4a8ff5a9eee..7753ebf8db3 100644 --- a/eng/publishing/v3/publish-assets.yml +++ b/eng/publishing/v3/publish-assets.yml @@ -103,7 +103,6 @@ jobs: /p:DotNetBuildsPublicChecksumsUriBase64='$(dotnetbuilds-public-container-checksum-uri-base64)' /p:DotNetBuildsInternalUriBase64='$(dotnetbuilds-internal-container-uri-base64)' /p:DotNetBuildsInternalChecksumsUriBase64='$(dotnetbuilds-internal-container-checksum-uri-base64)' - /p:ConvertPortablePdbsToWindowsPdbs='true' - template: /eng/common/templates/steps/publish-logs.yml parameters: StageLabel: '${{ parameters.stageName }}' diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj index d6848ec4dad..73f4f779fef 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj @@ -108,7 +108,6 @@ $(InternalChecksumsAzureAccountKey) false false - false $(BlobBasePath) 12 16 @@ -173,7 +172,6 @@ FeedKeys="@(FeedKey)" FeedSasUris="@(FeedSasUri)" FeedOverrides="@(FeedOverride)" - ConvertPortablePdbsToWindowsPdbs="$(ConvertPortablePdbsToWindowsPdbs)" /> diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs index 8c3c7b0377e..a197e5c6bdd 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs @@ -91,7 +91,7 @@ public async Task TemporarySymbolDirectoryDoesNotExists() }; var path = TestInputs.GetFullPath("Symbol"); var buildAsset = new Dictionary>(); - await task.HandleSymbolPublishingAsync(path, MsdlToken, SymWebToken, "", false, false, buildAsset, null, path); + await task.HandleSymbolPublishingAsync(path, MsdlToken, SymWebToken, "", false, buildAsset, null, path); Assert.True(task.Log.HasLoggedErrors); } diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs index 84d07a01af2..5fac2130aeb 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs @@ -139,8 +139,6 @@ public class PublishArtifactsInManifest : MSBuildTaskBase /// public bool PublishSpecialClrFiles { get; set; } - public bool ConvertPortablePdbsToWindowsPdbs { get; set; } - /// /// If true, safety checks only print messages and do not error /// - Internal asset to public feed @@ -344,7 +342,6 @@ internal PublishArtifactsInManifestBase ConstructPublishingV3Task(BuildModel bui MsdlToken = this.MsdlToken, SymbolPublishingExclusionsFile = this.SymbolPublishingExclusionsFile, PublishSpecialClrFiles = this.PublishSpecialClrFiles, - ConvertPortablePdbsToWindowsPdbs = this.ConvertPortablePdbsToWindowsPdbs, BuildQuality = this.BuildQuality, ArtifactsBasePath = this.ArtifactsBasePath, AzdoApiToken = this.AzdoApiToken, diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs index 756fef8f50f..d139ae33ec4 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs @@ -396,7 +396,6 @@ public void CheckForStableAssetsInNonIsolatedFeeds() /// Right now we do not add any files to this, so this is going to be null /// If true, the special coreclr module indexed files like DBI, DAC and SOS are published /// To avoid starting too many processes - /// If true, convert protable pdbs to windows pdbs /// Task public async Task PublishSymbolsUsingStreamingAsync( string pdbArtifactsBasePath, @@ -404,12 +403,11 @@ public async Task PublishSymbolsUsingStreamingAsync( string symWebToken, string symbolPublishingExclusionsFile, bool publishSpecialClrFiles, - bool convertPortablePdbsToWindowsPdbs, Dictionary> buildAssets, SemaphoreSlim clientThrottle) { Log.LogMessage(MessageImportance.High, - $"Performing symbol publishing... \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : {convertPortablePdbsToWindowsPdbs} \ndryRun: false "); + $"Performing symbol publishing... \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : false \ndryRun: false "); var symbolCategory = TargetFeedContentType.Symbols; using HttpClient httpClient = CreateAzdoClient(AzureDevOpsOrg, false, AzureProject); @@ -504,7 +502,7 @@ await PublishSymbolsHelper.PublishAsync( null, excludeFiles, ExpirationInDays, - convertPortablePdbsToWindowsPdbs, + false, publishSpecialClrFiles, null, false, @@ -602,14 +600,12 @@ await PublishSymbolsHelper.PublishAsync( /// Path to Symbol.nupkgs /// To avoid starting too many processes /// If true, the special coreclr module indexed files like DBI, DAC and SOS are published - /// If true, convert protable pdbs to windows pdbs public async Task HandleSymbolPublishingAsync ( string pdbArtifactsBasePath, string msdlToken, string symWebToken, string symbolPublishingExclusionsFile, bool publishSpecialClrFiles, - bool convertPortablePdbsToWindowsPdbs, Dictionary> buildAssets, SemaphoreSlim clientThrottle = null, string temporarySymbolsLocation = null) @@ -622,7 +618,6 @@ await PublishSymbolsUsingStreamingAsync( symWebToken, symbolPublishingExclusionsFile, publishSpecialClrFiles, - convertPortablePdbsToWindowsPdbs, buildAssets, clientThrottle); } @@ -634,7 +629,6 @@ await PublishSymbolsfromBlobArtifactsAsync( symWebToken, symbolPublishingExclusionsFile, publishSpecialClrFiles, - convertPortablePdbsToWindowsPdbs, temporarySymbolsLocation); } } @@ -648,14 +642,12 @@ await PublishSymbolsfromBlobArtifactsAsync( /// Right now we do not add any files to this, so this is going to be null /// Path to Symbol.nupkgs /// If true, the special coreclr module indexed files like DBI, DAC and SOS are published - /// If true, convert protable pdbs to windows pdbs public async Task PublishSymbolsfromBlobArtifactsAsync( string pdbArtifactsBasePath, string msdlToken, string symWebToken, string symbolPublishingExclusionsFile, bool publishSpecialClrFiles, - bool convertPortablePdbsToWindowsPdbs, string temporarySymbolsLocation = null) { if (Directory.Exists(temporarySymbolsLocation)) @@ -690,7 +682,7 @@ public async Task PublishSymbolsfromBlobArtifactsAsync( var serverPath = server.Key; var token = server.Value;; Log.LogMessage(MessageImportance.High, - $"Performing symbol publishing...\nSymbolServerPath : ${serverPath} \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : {convertPortablePdbsToWindowsPdbs} \ndryRun: false \nTotal number of symbol files : {fileEntries.Length} "); + $"Performing symbol publishing...\nSymbolServerPath : ${serverPath} \nExpirationInDays : {ExpirationInDays} \nConvertPortablePdbsToWindowsPdb : false \ndryRun: false \nTotal number of symbol files : {fileEntries.Length} "); try { @@ -702,7 +694,7 @@ await PublishSymbolsHelper.PublishAsync( filesToSymbolServer, null, ExpirationInDays, - convertPortablePdbsToWindowsPdbs, + false, publishSpecialClrFiles, null, false, diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs index 3c52c65c564..d024b7d7478 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestV3.cs @@ -38,8 +38,6 @@ public class PublishArtifactsInManifestV3 : PublishArtifactsInManifestBase public bool AllowFeedOverrides { get; set; } - public bool ConvertPortablePdbsToWindowsPdbs { get; set;} - public ITaskItem[] FeedKeys { get; set; } public ITaskItem[] FeedSasUris { get; set; } @@ -195,7 +193,6 @@ await Task.WhenAll(new Task[] SymWebToken, SymbolPublishingExclusionsFile, PublishSpecialClrFiles, - ConvertPortablePdbsToWindowsPdbs, buildAssets, clientThrottle, temporarySymbolsLocation)