Skip to content

[main] Source code updates from dotnet/dotnet #15827

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

Merged
merged 5 commits into from
May 14, 2025
Merged

[main] Source code updates from dotnet/dotnet #15827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a8082e
[VMR] Codeflow 48c22bf-48c22bf
dotnet-maestro[bot] May 13, 2025
2e5c6e4
Merging main into darc-main-d049cae9-c1d3-4d8e-8c4b-554f2a8bfc5b
dotnet-maestro[bot] May 13, 2025
ac9fda1
Update dependencies from https://github.com/dotnet/dotnet build 267776
dotnet-maestro[bot] May 13, 2025
ed82a7d
[VMR] Codeflow 80c4e4d-80c4e4d
dotnet-maestro[bot] May 14, 2025
7ca51d9
Update dependencies from https://github.com/dotnet/dotnet build 268047
dotnet-maestro[bot] May 14, 2025
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: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="025e4e597746eafc5a736195b66aeb321455d64c" BarId="267041" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="5d437e96e412b189af05abb84753996de9aa698f" BarId="268047" />
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
15 changes: 12 additions & 3 deletions 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 @@ -111,9 +111,16 @@
- VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg

These packages are always non-shipping, so only look there.

As these installer packages are inserted into VS as-is, .NET doesn't ship them
but must ensure that they're validated as though they were shipped by .NET (so they don't break when inserted into VS).
-->
<Artifact Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.$(TargetArchitecture).*.nupkg" IsShipping="false" Kind="Package" />
<Artifact Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg" IsShipping="false" Kind="Package" />
<VSRedistArtifact Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.$(TargetArchitecture).*.nupkg" IsShipping="false" Kind="Package" />
<VSRedistArtifact Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg" IsShipping="false" Kind="Package" />

<Artifact Include="@(VSRedistArtifact)">
<DotNetReleaseShipping Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">true</DotNetReleaseShipping>
</Artifact>

<!--
In the VMR, don't publish packages that didn't match the above conditions externally.
Expand Down Expand Up @@ -312,14 +319,16 @@
An item is a Package if Kind wasn't already set, and PublishFlatContainer is not set. -->
<Kind Condition="'%(ItemsToPushToBlobFeed.Kind)' == '' and '%(ItemsToPushToBlobFeed.PublishFlatContainer)' == 'true'">Blob</Kind>
<Kind Condition="'%(ItemsToPushToBlobFeed.Kind)' == '' and '%(ItemsToPushToBlobFeed.PublishFlatContainer)' != 'true'">Package</Kind>
<!-- DotNetReleaseShipping=true if IsShipping=true and ProducesDotNetReleaseShippingAssets=true-->
<DotNetReleaseShipping Condition="'%(ItemsToPushToBlobFeed.DotNetReleaseShipping)' == '' and '%(ItemsToPushToBlobFeed.IsShipping)' == 'true' and '$(ProducesDotNetReleaseShippingAssets)' == 'true'">true</DotNetReleaseShipping>
</ItemsToPushToBlobFeed>
</ItemGroup>

<!-- Note that the below ItemsToPushToBlobFeed metadata updates are in separate item groups to preserve previous information. -->
<ItemGroup>
<ItemsToPushToBlobFeed>
<ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.IsShipping)' != 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);NonShipping=true</ManifestArtifactData>
<ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.IsShipping)' == 'true' and '$(ProducesDotNetReleaseShippingAssets)' == 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);DotNetReleaseShipping=true</ManifestArtifactData>
<ManifestArtifactData Condition="'%(ItemsToPushToBlobFeed.DotNetReleaseShipping)' == 'true'">%(ItemsToPushToBlobFeed.ManifestArtifactData);DotNetReleaseShipping=true</ManifestArtifactData>
</ItemsToPushToBlobFeed>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
Integration with Microsoft.DotNet.Build.Tasks.Installers: Publish packages of the following formats as well.
These are arch-specific Visual Studio insertion packages. As they're Windows-only, they only include architecture in the name:
- VS.Redist.Common.*.$(TargetArchitecture).*.nupkg
- VS.Redist.Common.*.$(TargetArchitecture)-*.*.nupkg
- VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg

These packages are always non-shipping, so only look there.
-->
<ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.$(TargetArchitecture).*.nupkg" />
<ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.$(TargetArchitecture)-*.*.nupkg" />
<ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)**/VS.Redist.Common.*.*_$(TargetArchitecture).*.nupkg" />

<!-- Always sign all vsix packages and VS Build Packages. These may be arch specific or agnostic, but they likely won't have the RID included. -->
<ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
Expand Down
Loading