Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit dbcd830

Browse files
johnbeisnerjohnbeisner
authored
Creating and publishing 'symbols.nuget' to the blob feed. (#8712)
* Creating and publishing '*.symbols.nuget' to the blob feed. * Reverting 'generatenupkg' methodology. * Fixing formatting... * Overwrite should = 'false' * Second draft - Creating and publishing '*.symbols.nuget' to the blob feed. * Fixing a VS auto-update. * Removing the 'Microsoft.SymbolUploader.Build.Task' modifications; need to make a PR just for this. * Change "sdk.*.Microsoft.DotNet.SDK.*.symbols.nupkg" to "runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg"; removing the 'DotNetRestore' on the Symbols.csproj * Removing a 'todo' comment... * Putting back the 'dotnet restore' * Fixing a typo... * Logical separation of the 'nupkg' from the 'symbols.nupkg' enumeration; fixed 'swr' pattern. * Add "BLOBFEED_STORAGE_CONTAINER"
1 parent bcc4861 commit dbcd830

File tree

15 files changed

+110
-42
lines changed

15 files changed

+110
-42
lines changed

‎build/AzureInfo.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
<ChecksumCloudDropURL Condition="'$(ChecksumCloudDropURL)' == ''">https://$(ChecksumCloudDropAccountName).blob.core.windows.net/$(ChecksumContainerName)/index.json</ChecksumCloudDropURL>
3636

3737
<!-- Values related to the upload of NuPkgs to the blob feed -->
38+
<BlobFeedContainerName>$(BLOBFEED_STORAGE_CONTAINER)</BlobFeedContainerName>
39+
<BlobFeedContainerName Condition="'$(BlobFeedContainerName)' == ''">dotnet-core</BlobFeedContainerName>
3840
<BlobFeedExpectedURL>$(PB_PublishBlobFeedUrl)</BlobFeedExpectedURL>
39-
<BlobFeedExpectedURL Condition="'$(BlobFeedExpectedURL)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</BlobFeedExpectedURL>
41+
<BlobFeedExpectedURL Condition="'$(BlobFeedExpectedURL)' == ''">https://dotnetfeed.blob.core.windows.net/$(BlobFeedContainerName)/index.json</BlobFeedExpectedURL>
4042
<BlobFeedCloudDropAccessToken>$(PB_PublishBlobFeedKey)</BlobFeedCloudDropAccessToken>
4143
<BlobFeedCloudDropAccessToken Condition="'$(BlobFeedCloudDropAccessToken)' == ''">$(BLOBFEED_STORAGE_KEY)</BlobFeedCloudDropAccessToken>
4244
</PropertyGroup>

‎build/Branding.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@
2727
<HostMonikerRidForFileName Condition=" '$(IsDebianBaseDistro)' == 'true' ">$(Architecture)</HostMonikerRidForFileName>
2828

2929
<ArtifactNameSdk>dotnet-sdk-internal</ArtifactNameSdk>
30-
<ArtifactNameSdkSymbols>dotnet-sdk-symbols</ArtifactNameSdkSymbols>
3130
<ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>
3231
<ArtifactNameSdkLanguagePack>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack</ArtifactNameSdkLanguagePack>
3332

3433
<ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
3534
<ArtifactNameWithVersionMSBuildExtensions>dotnet-standard-support-vs2015-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionMSBuildExtensions>
36-
37-
<ArtifactNameWithVersionSdkSymbols>$(ArtifactNameSdkSymbols)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkSymbols>
3835
<ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
3936
<ArtifactNameWithVersionSdkLanguagePack>$(ArtifactNameSdkLanguagePack)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkLanguagePack>
4037
<DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid>

‎build/NugetConfigFile.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
2323
<add key="aspnetcore-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
2424
<add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
25-
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
2625
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
2726
<add key="symreader-native" value="https://dotnet.myget.org/f/symreader-native/api/v3/index.json" />
2827
<add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />

‎build/Package.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildThisFileDirectory)/package/Layout.targets" />
4+
<Import Project="$(MSBuildThisFileDirectory)/package/Symbols.targets" />
45
<Import Project="$(MSBuildThisFileDirectory)/package/Archive.targets" />
56
<Import Project="$(MSBuildThisFileDirectory)/package/Nupkg.targets" />
67
<Import Project="$(MSBuildThisFileDirectory)/package/Installer.DEB.proj" />
@@ -18,10 +19,11 @@
1819
Init;
1920
Layout;
2021
GenerateNugetPackages;
22+
GenerateSymbolsNugetPackages;
2123
GenerateArchives;
2224
GenerateInstallers" />
2325

2426
<Target Name="GenerateInstallersAndCopyOutOfSandBox"
2527
DependsOnTargets="SandBoxPrepare;Layout;GenerateDebs;GenerateRpms;CopySandBoxPackageOut" />
2628

27-
</Project>
29+
</Project>

‎build/Publish.targets‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,17 @@
4343
Condition=" '$(PublishNativeInstallers)' == 'true' "/>
4444
<ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)"
4545
Condition=" '$(PublishArchives)' == 'true' "/>
46-
<ForPublishing Include="$(PackagesDirectory)/Microsoft*.nupkg"
47-
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
46+
<ForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg"
47+
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " />
48+
<ForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg"
49+
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " />
50+
<ForPublishing Include="$(PackagesDirectory)/runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg" />
4851
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).*.nupkg"
4952
Condition=" '$(OS)' == 'Windows_NT' "/>
5053
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.*.nupkg"
5154
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
55+
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr"
56+
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
5257
</ItemGroup>
5358

5459
<ItemGroup>

‎build/package/Installer.MSI.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174

175175
<Target Name="GenerateSdkMSBuildExtensionsNupkg"
176176
DependsOnTargets="Init;Layout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
177-
Condition=" '$(OS)' == 'Windows_NT'"
177+
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
178178
Inputs="$(MSBuildExtensionsLayoutDirectory)/**/*;
179179
$(SdkInstallerNuspecFile);
180180
$(SdkGenerateNupkgPowershellScript)"
@@ -188,7 +188,7 @@
188188

189189
<GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
190190
OutputFile="$(SdkMSBuildExtensionsSwrFile)"/>
191-
191+
192192
</Target>
193193

194194
<Target Name="TestSdkMsi"

‎build/package/Layout.targets‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<SdkSymbolsLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkSymbols)</SdkSymbolsLayoutOutputDirectory>
54
<CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
65
<SdkLanguagePackOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkLanguagePack)</SdkLanguagePackOutputDirectory>
76
<SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
@@ -12,7 +11,6 @@
1211
<!-- Set up Items with Layout Input Files -->
1312
<ItemGroup>
1413
<SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
15-
<SdkSymbolsLayoutInput Include="$(SymbolsDirectory)/sdk/**/*" />
1614
<CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
1715
<SdkLanguagePackInput Include="$(OutputDirectory)/sdk/**/$(SatelliteAssemblies)" />
1816

@@ -29,12 +27,6 @@
2927
Path2="%(SdkLayoutInput.Identity)" >
3028
<Output TaskParameter="RelativePath" ItemName="SdkRelativeOutputFiles" />
3129
</MakeRelative>
32-
<MakeRelative
33-
Condition="'$(SeparateSymbolsArchive)' != 'false'"
34-
Path1="$(SymbolsDirectory)/"
35-
Path2="%(SdkSymbolsLayoutInput.Identity)" >
36-
<Output TaskParameter="RelativePath" ItemName="SdkSymbolsRelativeOutputFiles" />
37-
</MakeRelative>
3830
<MakeRelative
3931
Path1="$(OutputDirectory)/"
4032
Path2="%(CombinedHostHostFxrFrameworkSdkInput.Identity)" >
@@ -71,13 +63,6 @@
7163
<Name>$(ArtifactNameSdk)</Name>
7264
</LayoutDefinition>
7365

74-
<LayoutDefinition Include="SdkSymbols" Condition="'$(SeparateSymbolsArchive)' != 'false'">
75-
<InputFiles>@(SdkSymbolsLayoutInput)</InputFiles>
76-
<OutputFiles>@(SdkSymbolsRelativeOutputFiles -> '$(SdkSymbolsLayoutOutputDirectory)/%(Identity)')</OutputFiles>
77-
<NameWithVersion>$(ArtifactNameWithVersionSdkSymbols)</NameWithVersion>
78-
<Name>$(ArtifactNameSdkSymbols)</Name>
79-
</LayoutDefinition>
80-
8166
<LayoutDefinition Include="CombinedHostHostFxrFrameworkSdk">
8267
<InputFiles>@(CombinedHostHostFxrFrameworkSdkInput)</InputFiles>
8368
<OutputFiles>@(CombinedHostHostFxrFrameworkSdkRelativeOutputFiles -> '$(CombinedHostHostFxrFrameworkSdkOutputDirectory)/%(Identity)')</OutputFiles>

‎build/package/Nupkg.targets‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<PackagingBuildBasePath>$(CompilationDirectory)/forPackaging</PackagingBuildBasePath>
55
</PropertyGroup>
@@ -10,10 +10,12 @@
1010
<ProjectsToPack Include="$(SrcDirectory)/Microsoft.DotNet.Cli.Utils" >
1111
<ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
1212
<Version>$(SdkNugetVersion)</Version>
13+
<IncludeSymbols>False</IncludeSymbols>
1314
</ProjectsToPack>
1415
<ProjectsToPack Include="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver" >
1516
<ProjectName>Microsoft.DotNet.MSBuildSdkResolver</ProjectName>
1617
<Version>$(SdkNugetVersion)</Version>
18+
<IncludeSymbols>True</IncludeSymbols>
1719
</ProjectsToPack>
1820
</ItemGroup>
1921
</Target>
@@ -22,6 +24,7 @@
2224
DependsOnTargets="Init; SetupProjectsToPack">
2325

2426
<DotNetPack NoBuild="True"
27+
IncludeSymbols="%(ProjectsToPack.IncludeSymbols)"
2528
Output="$(PackagesDirectory)"
2629
ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj"
2730
ToolPath="$(PreviousStageDirectory)"

‎build/package/Symbols.csproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Project="$(MSBuildThisFileDirectory)/Symbols.targets" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>netcoreapp1.0</TargetFramework>
6+
<EnableDefaultItems>false</EnableDefaultItems>
7+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
8+
<IncludeBuildOutput>false</IncludeBuildOutput>
9+
10+
<PackageId>$(SymbolsNupkgPackageId)</PackageId>
11+
<PackageVersion>$(SdkVersion)</PackageVersion>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<Content Include="$(SymbolsDirectory)\**\*.*" Pack="true" PackagePath="%(RecursiveDir)%(Filename)%(Extension)"/>
16+
</ItemGroup>
17+
</Project>

‎build/package/Symbols.targets‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SymbolsProjectFileName>$(MSBuildThisFileDirectory)/Symbols.csproj</SymbolsProjectFileName>
5+
<SymbolsNupkgPackageId>runtime.$(ProductMonikerRid).Microsoft.DotNet.SDK</SymbolsNupkgPackageId>
6+
</PropertyGroup>
7+
8+
<Target Name="GenerateSymbolsNugetPackages"
9+
DependsOnTargets="RestoreSymbolsProject;GenerateSymbolsNuget">
10+
</Target>
11+
12+
<Target Name="GenerateSymbolsNuget"
13+
DependsOnTargets="RestoreSymbolsProject">
14+
<DotNetPack NoBuild="True"
15+
IncludeSymbols="False"
16+
Output="$(PackagesDirectory)"
17+
ProjectPath="&quot;$(SymbolsProjectFileName)&quot;"
18+
ToolPath="$(PreviousStageDirectory)" />
19+
20+
<Move SourceFiles="$(PackagesDirectory)\$(SymbolsNupkgPackageId).$(SdkVersion).nupkg" DestinationFiles="$(PackagesDirectory)\$(SymbolsNupkgPackageId).$(SdkVersion).symbols.nupkg" />
21+
</Target>
22+
23+
<Target Name="RestoreSymbolsProject"
24+
DependsOnTargets="Init; SetupProjectsToPack">
25+
<DotNetRestore ProjectPath="&quot;$(SymbolsProjectFileName)&quot;"
26+
ToolPath="$(PreviousStageDirectory)" />
27+
</Target>
28+
29+
</Project>

0 commit comments

Comments
 (0)