Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove references to SymUploader and the tasks it provided #15119

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
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 @@ -31,8 +31,6 @@
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformation)" />
<!-- deployment-tools -->
<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 -->
Expand Down
2 changes: 1 addition & 1 deletion Documentation/CorePackages/Publishing.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ In order to use the new publishing mechanism, the easiest way to start is by tur
| enableSourceLinkValidation | bool | Run SourceLink validation during the post-build stage. | false |
| enableSigningValidation | bool | Run signing validation during the post-build stage. | true |
| enableNugetValidation | bool | Run NuGet package validation tool during the post build stage. | true |
| symbolPublishingAdditionalParameters | string | Additional arguments for the PublishToSymbolServers sdk task. | '' |
| symbolPublishingAdditionalParameters | string | Additional arguments for the symbol publishing. Only supported in v3 publishing. | '' |
| artifactsPublishingAdditionalParameters | string | Additional arguments for the PublishArtifactsInManifest sdk task. | '' |
| signingValidationAdditionalParameters | string | Additional arguments for the SigningValidation sdk task. | '' |
| publishInstallersAndChecksums | bool | Publish installers packages and checksums from the build artifacts to the dotnetcli storage account. Documentation for opting in to automatic checksum generation can be found in the [Checksum section](https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md#checksum-generation) of this document. | true |
Expand Down
8 changes: 0 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>e091728607ca0fc9efca55ccfb3e59259c6b5a0a</Sha>
</Dependency>
<Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="2.0.0-preview.1.23470.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
<Sha>d617bc8ed2787c235a57cf0dcdfd087b86ff9521</Sha>
</Dependency>
<Dependency Name="Microsoft.SymbolUploader" Version="2.0.0-preview.1.23470.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
<Sha>d617bc8ed2787c235a57cf0dcdfd087b86ff9521</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-alpha.1.24468.1">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>bdb2faf6e645c173495d7b68606ce0b623bfa3ef</Sha>
Expand Down
3 changes: 0 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<SystemRuntimeInteropServicesRuntimeInformation>4.3.0</SystemRuntimeInteropServicesRuntimeInformation>
<!-- deployment-tools -->
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24305.1</MicrosoftDeploymentDotNetReleasesVersion>
<!-- dotnet-symuploader -->
<MicrosoftSymbolUploaderBuildTaskVersion>2.0.0-preview.1.23470.14</MicrosoftSymbolUploaderBuildTaskVersion>
<MicrosoftSymbolUploaderVersion>2.0.0-preview.1.23470.14</MicrosoftSymbolUploaderVersion>
<!-- msbuild -->
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.8.3</MicrosoftBuildTasksCoreVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
<MicrosoftDiaSymReaderPdb2PdbVersion>$(MicrosoftDiaSymReaderPdb2PdbVersion)</MicrosoftDiaSymReaderPdb2PdbVersion>
<MicrosoftDotNetXliffTasksVersion>$(PackageVersion)</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetMaestroTasksVersion>$(MicrosoftDotNetMaestroTasksVersion)</MicrosoftDotNetMaestroTasksVersion>
<MicrosoftSymbolUploaderBuildTaskVersion>$(MicrosoftSymbolUploaderBuildTaskVersion)</MicrosoftSymbolUploaderBuildTaskVersion>
<MicrosoftTemplateEngineAuthoringTasksVersion>$(MicrosoftTemplateEngineAuthoringTasksVersion)</MicrosoftTemplateEngineAuthoringTasksVersion>
<MicrosoftDotNetXUnitAssertVersion>$(PackageVersion)</MicrosoftDotNetXUnitAssertVersion>
</PropertyGroup>
Expand Down
14 changes: 0 additions & 14 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,6 @@

<!-- If `DotNetPublishUsingPipelines` is not set we default it to false. -->
<DotNetPublishUsingPipelines Condition="'$(DotNetPublishUsingPipelines)' == ''">false</DotNetPublishUsingPipelines>

<!--
If DotNetPublishUsingPipelines is set we don't publish symbols during the build stage,
only in the Maestro post-build stages. If DotNetPublishUsingPipelines is NOT set then
we publish symbols during the build stage.
-->
<PublishToSymbolServer>true</PublishToSymbolServer>
<PublishToSymbolServer Condition="'$(DotNetPublishUsingPipelines)' == 'true'">false</PublishToSymbolServer>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -159,9 +151,6 @@
<!-- Used in the SDK (Tools.proj) to control whether Build.Tasks.Feed will be restored or not. -->
<_RestoreToolsProps Include="Publish=$(Publish)"/>

<!-- Used in the SDK (Tools.proj) to control whether SymbolUploader.Build.Task will be restored or not. -->
<_RestoreToolsProps Include="PublishToSymbolServer=$(PublishToSymbolServer)"/>

<!-- Forward this property because we can't assume it will be available globally. -->
<_RestoreToolsProps Include="DotNetPublishUsingPipelines=$(DotNetPublishUsingPipelines)"/>
</ItemGroup>
Expand All @@ -181,9 +170,6 @@
<!-- Used in a few places in the stack to decide if publishing was enabled or not. -->
<_PublishProps Include="Publish=$(Publish)"/>

<!-- Used in the SDK (Publish.proj) to control whether in-build symbol publishing should be performed. -->
<_PublishProps Include="PublishToSymbolServer=$(PublishToSymbolServer)"/>

<!-- Forward this property because we can't assume it will be available globally. -->
<_PublishProps Include="DotNetPublishUsingPipelines=$(DotNetPublishUsingPipelines)"/>
</ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<UsingToolIbcOptimization Condition="'$(UsingToolIbcOptimization)' == ''">false</UsingToolIbcOptimization>
<UsingToolVisualStudioIbcTraining Condition="'$(UsingToolVisualStudioIbcTraining)' == ''">false</UsingToolVisualStudioIbcTraining>
<UsingToolNuGetRepack Condition="'$(UsingToolNuGetRepack)' == ''">false</UsingToolNuGetRepack>
<UsingToolSymbolUploader Condition="'$(UsingToolSymbolUploader)' == ''">false</UsingToolSymbolUploader>

<!-- Deprecated features -->
<!--
Expand All @@ -64,7 +63,6 @@
<UsingToolVSSDK>false</UsingToolVSSDK>
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
<UsingToolVisualStudioIbcTraining>false</UsingToolVisualStudioIbcTraining>
<UsingToolSymbolUploader>false</UsingToolSymbolUploader>
</PropertyGroup>

<!--
Expand Down
78 changes: 7 additions & 71 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,12 @@
<AssetManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName)</AssetManifestFilePath>

<SymbolPackagesDir>$(ArtifactsTmpDir)SymbolPackages\</SymbolPackagesDir>

<PublishDependsOnTargets Condition="$(PublishToSymbolServer)">$(PublishDependsOnTargets);PublishSymbols</PublishDependsOnTargets>
<PublishDependsOnTargets Condition="$(DotNetPublishUsingPipelines)">$(PublishDependsOnTargets);PublishToAzureDevOpsArtifacts</PublishDependsOnTargets>

<PublishDependsOnTargets>BeforePublish;$(PublishDependsOnTargets)</PublishDependsOnTargets>
</PropertyGroup>

<Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets"/>
<Import Project="$(NuGetPackageRoot)microsoft.symboluploader.build.task\$(MicrosoftSymbolUploaderBuildTaskVersion)\build\PublishSymbols.targets" Condition="$(PublishToSymbolServer)"/>

<Target Name="Publish"
DependsOnTargets="$(PublishDependsOnTargets)" />
Expand Down Expand Up @@ -182,7 +179,7 @@
<!-- When we have <account>.visualstudio.com -->
<AzureDevOpsAccount Condition="$(CollectionUri.IndexOf('visualstudio.com')) >= 0">$(CollectionUri.Split('.')[0].Split('/')[2])</AzureDevOpsAccount>

<!-- Directory where pdbs pointed in `FilesToPublishToSymbolServer` are copied before publishing to AzDO artifacts. -->
<!-- Directory where pdbs pointed in `FilesToUploadToPdbArtifactsContainer` are copied before publishing to AzDO artifacts. -->
<PDBsToPublishTempLocation>$(ArtifactsTmpDir)PDBsToPublish/</PDBsToPublishTempLocation>
</PropertyGroup>

Expand Down Expand Up @@ -244,11 +241,11 @@

<!--
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.
symbol.exe doesn't support embedded PDBs, so let SymStore.targets do the conversion for now.
https://github.com/dotnet/symstore/issues/143
-->
<ItemGroup>
<FilesToPublishToSymbolServer Include="$(ArtifactsSymStoreDirectory)**\*.pdb"/>
<FilesToUploadToPdbArtifactsContainer Include="$(ArtifactsSymStoreDirectory)**\*.pdb"/>
</ItemGroup>

<!--
Expand All @@ -261,79 +258,18 @@

- It's possible that the user have PDBs outside the Arcade.SDK standard folder
(artifacts/SymStore/$Configuration) and we need to maintain that support. For that reason,
and the one mentioned above, we copy all files in `FilesToPublishToSymbolServer` to a temporary
and the one mentioned above, we copy all files in `FilesToUploadToPdbArtifactsContainer` to a temporary
folder before adding them to the AzDO artifact container.
-->
<Copy
SourceFiles="@(FilesToPublishToSymbolServer)"
DestinationFiles="@(FilesToPublishToSymbolServer->'$(PDBsToPublishTempLocation)%(RecursiveDir)%(Filename)%(Extension)')"
SourceFiles="@(FilesToUploadToPdbArtifactsContainer)"
DestinationFiles="@(FilesToUploadToPdbArtifactsContainer->'$(PDBsToPublishTempLocation)%(RecursiveDir)%(Filename)%(Extension)')"
/>

<Message
Text="##vso[artifact.upload containerfolder=PdbArtifacts;artifactname=PdbArtifacts]$(PDBsToPublishTempLocation)"
Importance="high"
Condition="'@(FilesToPublishToSymbolServer)' != ''"/>
</Target>

<Target Name="PublishSymbols">
<PropertyGroup>
<DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
<DryRun>false</DryRun>
</PropertyGroup>

<PropertyGroup Condition="'$(OfficialBuild)' != 'true'">
<DryRun>true</DryRun>
<DotNetSymbolServerTokenSymWeb>DryRunPTA</DotNetSymbolServerTokenSymWeb>
<DotNetSymbolServerTokenMsdl>DryRunPTA</DotNetSymbolServerTokenMsdl>
</PropertyGroup>

<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/core-eng/issues/3645
-->
<FilesToPublishToSymbolServer Include="$(ArtifactsSymStoreDirectory)**\*.pdb"/>

<!--
Publish Portable PDBs contained in symbol packages.
-->
<PackagesToPublishToSymbolServer Include="@(ExistingSymbolPackages);@(SymbolPackagesToGenerate)"/>
</ItemGroup>

<PropertyGroup>
<PublishToSymbolServer Condition="'@(FilesToPublishToSymbolServer)' == '' and '@(PackagesToPublishToSymbolServer)' == ''">false</PublishToSymbolServer>
</PropertyGroup>

<!-- Symbol Uploader: MSDL -->
<Message Importance="High" Text="Publishing symbol packages to MSDL ..." Condition="$(PublishToSymbolServer)" />
<PublishSymbols PackagesToPublish="@(PackagesToPublishToSymbolServer)"
FilesToPublish="@(FilesToPublishToSymbolServer)"
PersonalAccessToken="$(DotNetSymbolServerTokenMsdl)"
SymbolServerPath="https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection"
ExpirationInDays="$(DotNetSymbolExpirationInDays)"
VerboseLogging="true"
DryRun="$(DryRun)"
ConvertPortablePdbsToWindowsPdbs="false"
PdbConversionTreatAsWarning=""
Condition="$(PublishToSymbolServer)"/>

<!--
Symbol Uploader: SymWeb
Watson, VS insertion testings and the typical internal dev usage require SymWeb.
Currently we need to call the task twice (https://github.com/dotnet/core-eng/issues/3489).
-->
<Message Importance="High" Text="Publishing symbol packages to SymWeb ..." Condition="$(PublishToSymbolServer)" />
<PublishSymbols PackagesToPublish="@(PackagesToPublishToSymbolServer)"
FilesToPublish="@(FilesToPublishToSymbolServer)"
PersonalAccessToken="$(DotNetSymbolServerTokenSymWeb)"
SymbolServerPath="https://microsoft.artifacts.visualstudio.com/DefaultCollection"
ExpirationInDays="$(DotNetSymbolExpirationInDays)"
VerboseLogging="true"
DryRun="$(DryRun)"
ConvertPortablePdbsToWindowsPdbs="false"
PdbConversionTreatAsWarning=""
Condition="$(PublishToSymbolServer)"/>
Condition="'@(FilesToUploadToPdbArtifactsContainer)' != ''"/>
</Target>

<!-- Update sign infos that were using Microsoft400 to use the .NET-specific cert if UseDotNetCertificate is present.
Expand Down
Loading
Loading