Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
<PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
<!-- dotnet-symuploader -->
<PackageVersion Include="Microsoft.SymbolUploader" Version="$(MicrosoftSymbolUploaderVersion)" />
<!-- symreader-converter -->
<PackageVersion Include="Microsoft.DiaSymReader.Converter" Version="$(MicrosoftDiaSymReaderConverterVersion)" />
<!-- diagnostics -->
<PackageVersion Include="Microsoft.SymbolManifestGenerator" Version="$(MicrosoftSymbolManifestGeneratorVersion)" />
<!-- msbuild -->
Expand Down
5 changes: 0 additions & 5 deletions Documentation/ArcadeSdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -986,11 +986,6 @@ When `UsingToolNuGetRepack` is true _shipping_ packages are repackaged as releas

Set to `true` in projects that build Visual Studio Build (CoreXT) packages. These packages are non-shipping, but their content is shipping. They are inserted into and referenced from the internal DevDiv `VS` repository.

### `PublishWindowsPdb` (bool)

`true` (default) if the PDBs produced by the project should be converted to Windows PDB and published to Microsoft symbol servers.
Set to `false` to override the default (uncommon).

### `ApplyNgenOptimization` (`partial`, `full` or empty)

Set to `partial` or `full` in a shipping project to require IBC optimization data to be available for the project and embed them into the binary during official build. The value of `partial` indicates partial NGEN, whereas `full` means full NGEN optimization.
Expand Down
1 change: 0 additions & 1 deletion Documentation/RepoToolset/MigrationToArcade.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Below is a list of changes required to migrate to Arcade.
searchPattern: `artifacts\$(BuildConfiguration)\packages\*Shipping\*.nupkg`
3. Remove PublishOutputToSymStore property from projects if your projects used it before.
- By default Windows PDBs for all shipping projects are published to symbol server.
- PublishWindowsPdb property can be used to suppress publishing Windows PDB for the project.
4. Review usages of $(PackageOutputPath)
Replace with `$(ArtifactsShippingPackagesDir)` or `$(ArtifactsNonShippingPackagesDir)`.

Expand Down
8 changes: 0 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,6 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e091728607ca0fc9efca55ccfb3e59259c6b5a0a</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
<Uri>https://github.com/dotnet/symreader-converter</Uri>
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader.Converter" Version="1.1.0-beta2-19575-01">
<Uri>https://github.com/dotnet/symreader-converter</Uri>
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
</Dependency>
<Dependency Name="Microsoft.SymbolManifestGenerator" Version="8.0.0-preview.24461.2">
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>3007744d190d50dc586acdb761c4ce6c0d5bdc15</Sha>
Expand Down
3 changes: 0 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@
<!-- The version is overridden by the VMR to use the version from the previous (n-1) build of Arcade. -->
<MicrosoftApplicationInsightsVersion>2.22.0</MicrosoftApplicationInsightsVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<!-- symreader-converter -->
<MicrosoftDiaSymReaderConverterVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterVersion>
<MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbVersion>
<!-- diagnostics -->
<MicrosoftSymbolManifestGeneratorVersion>8.0.0-preview.24461.2</MicrosoftSymbolManifestGeneratorVersion>
<!-- templating -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<PropertyGroup>
<ArcadeSdkVersion>$(PackageVersion)</ArcadeSdkVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetVersion)</MicrosoftNetCompilersToolsetVersion>
<MicrosoftDiaSymReaderPdb2PdbVersion>$(MicrosoftDiaSymReaderPdb2PdbVersion)</MicrosoftDiaSymReaderPdb2PdbVersion>
<MicrosoftDotNetXliffTasksVersion>$(PackageVersion)</MicrosoftDotNetXliffTasksVersion>
<MicrosoftSymbolUploaderBuildTaskVersion>$(MicrosoftSymbolUploaderBuildTaskVersion)</MicrosoftSymbolUploaderBuildTaskVersion>
<MicrosoftTemplateEngineAuthoringTasksVersion>$(MicrosoftTemplateEngineAuthoringTasksVersion)</MicrosoftTemplateEngineAuthoringTasksVersion>
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@
<Import Project="Localization.targets" />
<Import Project="VisualStudio.targets" Condition="'$(UsingToolVSSDK)' == 'true' and ('$(IsVsixProject)' == 'true' or '$(IsSwixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true') and '$(MSBuildRuntimeType)' != 'Core'"/>
<Import Project="OptimizationData.targets" Condition="'$(UsingToolIbcOptimization)' == 'true'"/>
<Import Project="SymStore.targets" Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' == 'Windows_NT'"/>

</Project>
5 changes: 0 additions & 5 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,6 @@
<ItemsToPushToBlobFeed Include="@(_PackageToPublish);@(_ExistingSymbolPackage)" Exclude="@(ItemsToPushToBlobFeed)" />
</ItemGroup>

<!--
Publish Windows PDBs produced by SymStore.targets (by default, only shipping PDBs are placed there).
SymbolUploader doesn't support embedded PDBs yet, so let SymStore.targets do the conversion for now.
https://github.com/dotnet/symstore/issues/143
-->
<ItemGroup>
<FilesToPublishToSymbolServer Include="$(ArtifactsSymStoreDirectory)**\*.pdb"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@
- InternalInstallersTargetStaticFeedKey
- InternalChecksumsTargetStaticFeed
- InternalChecksumsTargetStaticFeedKey

NOTE: For symbol publishing using V3, ConvertPortablePdbsToWindowsPdbs is always set to false, because this is an expensive task so this is done in the staging pipeline post signing.
-->

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
<PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Maestro.Tasks.*" />
</ItemGroup>

<!--
ConvertPortablePdbsToWindowsPdbs is set to true only in staging pipeline, because this is an expensive task and we don't want to do it for every build.
-->
<PropertyGroup>
<DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
<PublishToSymbolServer>true</PublishToSymbolServer>
Expand All @@ -49,8 +46,6 @@
<PublishToSymbolServer Condition="'@(FilesToPublishToSymbolServer)' == '' and '@(PackagesToPublishToSymbolServer)' == ''">false</PublishToSymbolServer>
<PublishSpecialClrFiles Condition="'$(PublishSpecialClrFiles)' == ''">true</PublishSpecialClrFiles>
<DryRun Condition="'$(DryRun)' == ''">false</DryRun>
<ConvertPortablePdbsToWindowsPdbs Condition="'$(ConvertPortablePdbsToWindowsPdbs)' == ''">false</ConvertPortablePdbsToWindowsPdbs>
<TreatPdbConversionIssuesAsInfo Condition="'$(TreatPdbConversionIssuesAsInfo)' == ''">false</TreatPdbConversionIssuesAsInfo>
</PropertyGroup>

<Message
Expand Down Expand Up @@ -104,11 +99,9 @@
ExpirationInDays="$(DotNetSymbolExpirationInDays)"
VerboseLogging="true"
DryRun="$(DryRun)"
ConvertPortablePdbsToWindowsPdbs="$(ConvertPortablePdbsToWindowsPdbs)"
PdbConversionTreatAsWarning=""
PublishSpecialClrFiles="$(PublishSpecialClrFiles)"
Condition="$(PublishToSymbolServer)"
TreatPdbConversionIssuesAsInfo="$(TreatPdbConversionIssuesAsInfo)"/>
Condition="$(PublishToSymbolServer)" />
</Target>

<ItemGroup>
Expand Down
94 changes: 0 additions & 94 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/SymStore.targets

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
the symbol publishing doesn't run on framework anyway (this project has a throwing stub for .NET framework in that path
due to the reliance in maestro). Until we really need to multitarget, this is the better path. -->
<ProjectReference Include="..\Microsoft.DotNet.Internal.SymbolHelper\Microsoft.DotNet.Internal.SymbolHelper.csproj" />
<!-- Additionally, SymbolHelper relies on Microsoft.DiaSymReader which brings NS.Library 1.6.1 and the slew of
old packages with it. Upgrade to keep CG happy. -->
<PackageReference Include="NETStandard.Library" IsImplicitlyDefined="false" PrivateAssets="all" ExcludeAssets="runtime" VersionOverride="2.0.3" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,8 +658,6 @@ Task<SymbolUploadHelper> CreatePublishSymbolHelper(string symbolPublishingExclus
TempSymbolsAzureDevOpsOrg,
creds,
packageFileExcludeList: exclusions,
convertPortablePdbs: false,
treatPdbConversionIssuesAsInfo: false,
pdbConversionTreatAsWarning: null,
dotnetInternalPublishSpecialClrFiles: publishSpecialClrFiles,
verboseClient: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,10 @@
</PropertyGroup>

<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<!-- Upgrade Microsoft.DiaSymReader.Converter's transitive NETStandard.Library
dependency to avoid .NET Standard 1.x dependencies. -->
<PackageReference Include="NETStandard.Library"
IsImplicitlyDefined="false"
PrivateAssets="all"
ExcludeAssets="runtime"
VersionOverride="2.0.3" />

<PackageReference Include="Azure.Core" />
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Microsoft.DiaSymReader.Converter" />
<PackageReference Include="Microsoft.SymbolManifestGenerator" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Polly.Core" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ public sealed class SymbolPublisherOptions
/// <param name="azdoOrg">The Azure DevOps organization to publish to.</param>
/// <param name="credential">The token credential with symbol write scope.</param>
/// <param name="packageFileExcludeList">The list of package files to exclude from package publishing. Doesn't contribute to loose file publishing. Empty by default.</param>
/// <param name="convertPortablePdbs">A flag indicating whether to convert portable PDBs to windows PDBs. Defaults to false. </param>
/// <param name="treatPdbConversionIssuesAsInfo">A flag indicating whether to treat PDB conversion issues as informational rather than warn/error. Defaults to false.</param>
/// <param name="pdbConversionTreatAsWarning">The list of PDB conversion issue IDs to treat as warnings. Defaults to empty.</param>
/// <param name="operationTimeoutInMins">Symbol client per-operation timeout in minutes. Defaults to 10 mins.</param>
/// <param name="dotnetInternalPublishSpecialClrFiles">A flag indicating whether to publish CLR files under their special diagnostic indexes. Defaults to false.</param>
Expand All @@ -28,8 +26,6 @@ public SymbolPublisherOptions(
string azdoOrg,
TokenCredential credential,
IEnumerable<string>? packageFileExcludeList = null,
bool convertPortablePdbs = false,
bool treatPdbConversionIssuesAsInfo = false,
IEnumerable<int>? pdbConversionTreatAsWarning = null,
uint operationTimeoutInMins = 10,
bool dotnetInternalPublishSpecialClrFiles = false,
Expand All @@ -39,8 +35,6 @@ public SymbolPublisherOptions(
AzdoOrg = azdoOrg is not null and not "" ? azdoOrg : throw new ArgumentException("Organization can't be null or empty", nameof(azdoOrg));
Credential = credential ?? throw new ArgumentNullException(nameof(credential));
PackageFileExcludeList = packageFileExcludeList is null ? FrozenSet<string>.Empty : packageFileExcludeList.ToFrozenSet();
ConvertPortablePdbs = convertPortablePdbs;
TreatPdbConversionIssuesAsInfo = treatPdbConversionIssuesAsInfo;
PdbConversionTreatAsWarning = pdbConversionTreatAsWarning is null ? FrozenSet<int>.Empty : pdbConversionTreatAsWarning.ToFrozenSet();
OperationTimeoutInMins = operationTimeoutInMins;
DotnetInternalPublishSpecialClrFiles = dotnetInternalPublishSpecialClrFiles;
Expand All @@ -63,16 +57,6 @@ public SymbolPublisherOptions(
/// </summary>
public FrozenSet<string> PackageFileExcludeList { get; }

/// <summary>
/// A flag indicating whether the client should try to convert portable PDBs to classic on upload.
/// </summary>
public bool ConvertPortablePdbs { get; }

/// <summary>
/// A flag indicating whether to treat PDB conversion issues as information.
/// </summary>
public bool TreatPdbConversionIssuesAsInfo { get; }

/// <summary>
/// List of PDB conversion issue IDs to treat as warnings.
/// </summary>
Expand Down
Loading
Loading