diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bbb41a19d1..e2931bb2a0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj index 142907fdb90..0f407fdebab 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj @@ -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). --> - - + + + + + true + Blob Package + + true @@ -319,7 +328,7 @@ %(ItemsToPushToBlobFeed.ManifestArtifactData);NonShipping=true - %(ItemsToPushToBlobFeed.ManifestArtifactData);DotNetReleaseShipping=true + %(ItemsToPushToBlobFeed.ManifestArtifactData);DotNetReleaseShipping=true diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props index 98c08e71350..ee62c8cf6fc 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props @@ -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. --> - +