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

Commit 382c18c

Browse files
authored
NonSuffix ProdCon CLI builds should drop to a NonSuffix folder (#9998)
* If ProdCon/Orchestrated = true; then 'FullNugetVersion' = 'NugetVersion' - therefore, the SDK drop folder will have the non-suffix version if the actual version is non-suffix; plus manifests so ProdCon/Orchestrated can find the assets. The VS.Redist.Common.Net.Core.SDK*NuPkgs should not ship.
1 parent 4cc726e commit 382c18c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

build/Publish.targets

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,13 @@
4949
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " />
5050
<ForPublishing Include="$(PackagesDirectory)/runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg" />
5151
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).*.nupkg"
52-
Condition=" '$(OS)' == 'Windows_NT' "/>
52+
Condition=" '$(OS)' == 'Windows_NT' ">
53+
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
54+
</ForPublishing>
5355
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.*.nupkg"
54-
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
56+
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' ">
57+
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
58+
</ForPublishing>
5559
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr"
5660
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
5761
<ForPublishing Include="$(PackagesDirectory)/nuGetPackagesArchive.lzma"

build/Version.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,8 @@
2222

2323
<SdkVersion>$(NugetVersion)</SdkVersion>
2424
<SdkNugetVersion>$(NugetVersion)</SdkNugetVersion>
25+
26+
<FullNugetVersion Condition=" '$(IsNotOrchestratedPublish)' == 'false' ">$(NugetVersion)</FullNugetVersion>
27+
2528
</PropertyGroup>
2629
</Project>

0 commit comments

Comments
 (0)