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.

Sign up for GitHub

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

Do not generate symbol packages in outer source-build #13931

Merged
merged 3 commits into from
Aug 3, 2023
Merged

Do not generate symbol packages in outer source-build #13931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fbfe36
Improve duplicate asset error handling
mmitche Jul 19, 2023
5dd3cf0
Do not generate symbol packages during source-build publishing
mmitche Jul 31, 2023
29ce080
Allow for auto-generation during inner source build
mmitche Aug 1, 2023
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
5 changes: 4 additions & 1 deletion src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
<IsReleaseOnlyPackageVersion Condition ="('$(SkipPackagePublishingVersionChecks)' == 'true') or ('$(PreReleaseVersionLabel)' == '' and '$(AutoGenerateAssemblyVersion)' == 'true')">true</IsReleaseOnlyPackageVersion>

<!-- If `AutoGenerateSymbolPackages` is not set we default it to true. -->
<AutoGenerateSymbolPackages Condition="'$(AutoGenerateSymbolPackages)' == ''">true</AutoGenerateSymbolPackages>
<!-- Do not generate symbol packages if in outer source build mode, to avoid creating copies of the SB intermediates. -->
<AutoGenerateSymbolPackages Condition="'$(AutoGenerateSymbolPackages)' == '' and ('$(ArcadeBuildFromSource)' != 'true' || '$(ArcadeInnerBuildFromSource)' == 'true')">true</AutoGenerateSymbolPackages>

<AssetManifestOS Condition="'$(AssetManifestOS)' == ''">$(OS)</AssetManifestOS>

Expand Down Expand Up @@ -71,6 +72,8 @@
<PackagesToPublish Include="$(ArtifactsNonShippingPackagesDir)**/*.nupkg" IsShipping="false" />
<PackagesToPublish Remove="@(ExistingSymbolPackages)" />

<!-- Do not generate symbol packages when building from source. The generate package for the source build intermediate
will simply contain the same, non-symbol content. -->
<PackagesToPublish Update="@(PackagesToPublish)" Condition="'$(AutoGenerateSymbolPackages)' == 'true'">
<SymbolPackageToGenerate Condition="!Exists('%(RootDir)%(Directory)%(Filename).symbols.nupkg')">$(SymbolPackagesDir)%(Filename).symbols.nupkg</SymbolPackageToGenerate>
</PackagesToPublish>
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishToSymbolServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
using System.Net;
using System.Net.Http;
Expand Down Expand Up @@ -90,7 +91,7 @@ public async Task TemporarySymbolDirectoryDoesNotExists()
BuildEngine = buildEngine,
};
var path = TestInputs.GetFullPath("Symbol");
var buildAsset = new Dictionary<string, HashSet<Asset>>();
var buildAsset = new Dictionary<string, Asset>().AsReadOnly();
await task.HandleSymbolPublishingAsync(path, MsdlToken, SymWebToken, "", false, buildAsset, null, path);
Assert.True(task.Log.HasLoggedErrors);
}
Expand Down
Loading