Skip to content

Commit e6ec23d

Browse files
ViktorHoferakoeplinger
ViktorHofer
and
akoeplinger
authored
Use TargetArchitecture and TargetRid properties (#47977)
Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 1654ef1 commit e6ec23d

File tree

26 files changed

+105
-114
lines changed

26 files changed

+105
-114
lines changed

Diff for: ‎.vsts-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ extends:
216216
buildArchitecture: arm64
217217
runtimeIdentifier: linux-arm64
218218
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
219-
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
219+
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
220220
officialBuildProperties: $(_officialBuildProperties)
221221
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
222222
runTests: false
@@ -232,7 +232,7 @@ extends:
232232
buildArchitecture: arm64
233233
runtimeIdentifier: linux-arm64
234234
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
235-
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
235+
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
236236
officialBuildProperties: $(_officialBuildProperties)
237237
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
238238
runTests: false

Diff for: ‎Directory.Build.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
<PropertyGroup>
66
<BuildArchitecture Condition="'$(BuildArchitecture)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
7-
<Architecture Condition="'$(Architecture)' == '' AND ('$(BuildArchitecture)' == 'arm64')">$(BuildArchitecture)</Architecture>
8-
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Architecture>
9-
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
10-
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</Architecture>
11-
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
7+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND ('$(BuildArchitecture)' == 'arm64')">$(BuildArchitecture)</TargetArchitecture>
8+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</TargetArchitecture>
9+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</TargetArchitecture>
10+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</TargetArchitecture>
11+
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
1212
<Nullable>enable</Nullable>
1313
</PropertyGroup>
1414

@@ -23,7 +23,7 @@
2323
<HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('ILLUMOS'))">illumos</HostOSName>
2424
<HostOSName Condition="'$(HostOSName)' == '' AND '$(IsLinux)' == 'true'">linux</HostOSName>
2525

26-
<OSName Condition="'$(OSName)' == '' AND $(Rid) != ''">$(Rid.Substring(0, $(Rid.LastIndexOf('-'))))</OSName>
26+
<OSName Condition="'$(OSName)' == '' AND $(TargetRid) != ''">$(TargetRid.Substring(0, $(TargetRid.LastIndexOf('-'))))</OSName>
2727
<OSName Condition="'$(OSName)' == ''">$(HostOSName)</OSName>
2828
</PropertyGroup>
2929

Diff for: ‎eng/Badge.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<Target Name="GenerateVersionBadge" AfterTargets="Build" Returns="$(VersionBadge)">
99
<PropertyGroup>
1010
<!-- Replace '-' with '_' for os names like 'linux-musl' -->
11-
<VersionBadgeMoniker>$(OSName.Replace('-', '_'))_$(Architecture)</VersionBadgeMoniker>
12-
<VersionBadgeMoniker Condition="'$(IsLinuxPortable)' == 'true'">linux_$(Architecture)</VersionBadgeMoniker>
11+
<VersionBadgeMoniker>$(OSName.Replace('-', '_'))_$(TargetArchitecture)</VersionBadgeMoniker>
12+
<VersionBadgeMoniker Condition="'$(IsLinuxPortable)' == 'true'">linux_$(TargetArchitecture)</VersionBadgeMoniker>
1313

1414
<VersionBadge>$(ArtifactsShippingPackagesDir)$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
1515
<VersionSvgTemplate>$(MSBuildThisFileDirectory)version_badge.svg</VersionSvgTemplate>

Diff for: ‎eng/Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
they depend on assets from other verticals that are built in the first build pass. -->
55
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
66
'$(OS)' == 'Windows_NT' and
7-
'$(Architecture)' == 'x64'">
7+
'$(TargetArchitecture)' == 'x64'">
88
<ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj" DotNetBuildPass="2" />
99
<ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj" DotNetBuildPass="2" />
1010
</ItemGroup>

Diff for: ‎eng/Signing.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</ItemGroup>
8484

8585
<!-- Only publish this file from win-x64 so that we don't end up with duplicates. -->
86-
<ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
86+
<ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(TargetArchitecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
8787
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" />
8888
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" />
8989
</ItemGroup>

Diff for: ‎eng/pipelines/templates/jobs/sdk-build.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parameters:
1717
testFullMSBuild: false
1818
runAoTTests: false
1919
### MSBUILD ###
20-
buildArchitecture: x64
20+
targetArchitecture: x64
2121
publishArgument: ''
2222
signArgument: ''
2323
runTestsAsTool: false
@@ -34,11 +34,11 @@ jobs:
3434
- template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml
3535
parameters:
3636
${{ if eq(parameters.container, '') }}:
37-
name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.buildArchitecture }}
38-
displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.buildArchitecture }})'
37+
name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.targetArchitecture }}
38+
displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.targetArchitecture }})'
3939
${{ else }}:
40-
name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.buildArchitecture }}_${{ parameters.container }}
41-
displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.buildArchitecture }}) [${{ parameters.container }}]'
40+
name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.targetArchitecture }}_${{ parameters.container }}
41+
displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.targetArchitecture }}) [${{ parameters.container }}]'
4242
pool: ${{ parameters.pool }}
4343
container: ${{ parameters.container }}
4444
strategy: ${{ parameters.strategy }}
@@ -82,7 +82,7 @@ jobs:
8282
${{ parameters.publishArgument }}
8383
${{ parameters.signArgument }}
8484
/p:EnableDefaultArtifacts=${{ parameters.enableDefaultArtifacts }}
85-
/p:Architecture=${{ parameters.buildArchitecture }}
85+
/p:TargetArchitecture=${{ parameters.targetArchitecture }}
8686
/p:RunTestsAsTool=${{ parameters.runTestsAsTool }}
8787
/p:PgoInstrument=${{ parameters.pgoInstrument }}
8888
${{ parameters.runtimeSourceProperties }}
@@ -104,10 +104,10 @@ jobs:
104104
${{ parameters.publishArgument }} \
105105
${{ parameters.signArgument }} \
106106
/p:EnableDefaultArtifacts=${{ parameters.enableDefaultArtifacts }} \
107-
/p:Architecture=${{ parameters.buildArchitecture }} \
107+
/p:TargetArchitecture=${{ parameters.targetArchitecture }} \
108108
/p:RunTestsAsTool=${{ parameters.runTestsAsTool }} \
109109
/p:PgoInstrument=${{ parameters.pgoInstrument }} \
110-
/p:Rid=${{ parameters.runtimeIdentifier }} \
110+
/p:TargetRid=${{ parameters.runtimeIdentifier }} \
111111
${{ parameters.osProperties }} \
112112
${{ parameters.runtimeSourceProperties }} \
113113
${{ parameters.officialBuildProperties }} \
@@ -128,7 +128,7 @@ jobs:
128128
-restore -test -ci -prepareMachine -nativeToolsOnMachine
129129
-configuration $(buildConfiguration)
130130
/p:Projects=\`"${{ replace(parameters.testProjects, ';', '`;') }}\`"
131-
/p:Architecture=${{ parameters.buildArchitecture }}
131+
/p:TargetArchitecture=${{ parameters.targetArchitecture }}
132132
${{ parameters.runtimeSourceProperties }}
133133
/p:CustomHelixTargetQueue=${{ parameters.helixTargetQueue }}
134134
/bl:$(Build.SourcesDirectory)/artifacts/log/$(buildConfiguration)/${{ parameters.categoryName }}Tests.binlog
@@ -148,8 +148,8 @@ jobs:
148148
-restore -test -ci -prepareMachine
149149
-configuration $(buildConfiguration)
150150
'/p:Projects="${{ parameters.testProjects }}"'
151-
/p:Architecture=${{ parameters.buildArchitecture }}
152-
/p:Rid=${{ parameters.runtimeIdentifier }}
151+
/p:TargetArchitecture=${{ parameters.targetArchitecture }}
152+
/p:TargetRid=${{ parameters.runtimeIdentifier }}
153153
${{ parameters.osProperties }}
154154
${{ parameters.runtimeSourceProperties }}
155155
/p:CustomHelixTargetQueue=${{ parameters.helixTargetQueue }}${{ parameters.helixTargetContainer }}
@@ -171,7 +171,7 @@ jobs:
171171
testResultsFormat: xUnit
172172
testResultsFiles: artifacts/TestResults/$(buildConfiguration)/*.xml
173173
testRunTitle: $(System.PhaseName)
174-
buildPlatform: ${{ parameters.buildArchitecture }}
174+
buildPlatform: ${{ parameters.targetArchitecture }}
175175
buildConfiguration: $(buildConfiguration)
176176
continueOnError: true
177177
condition: always()

Diff for: ‎eng/pipelines/templates/jobs/sdk-job-matrix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ parameters:
2323
- categoryName: TestBuild
2424
osProperties: $(linuxOsPortableProperties)
2525
- categoryName: TestBuild
26-
buildArchitecture: arm64
26+
targetArchitecture: arm64
2727
runtimeIdentifier: linux-arm64
2828
osProperties: $(linuxOsPortableProperties)
2929
# Don't run the tests on arm64. Only perform the build itself.

Diff for: ‎src/Layout/Directory.Build.props

+9-9
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
<ExeExtension>.exe</ExeExtension>
3131
<ExeExtension Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))"></ExeExtension>
3232

33-
<Rid>$(OSName)-$(Architecture)</Rid>
34-
<ProductMonikerRid>$(Rid)</ProductMonikerRid>
33+
<TargetRid Condition="'$(TargetRid)' == ''">$(OSName)-$(TargetArchitecture)</TargetRid>
34+
<ProductMonikerRid>$(TargetRid)</ProductMonikerRid>
3535

3636
<PortableOSName Condition="'$(PortableOSName)' == ''">$(OSName)</PortableOSName>
37-
<PortableRid>$(PortableOSName)-$(Architecture)</PortableRid>
37+
<PortableRid>$(PortableOSName)-$(TargetArchitecture)</PortableRid>
3838
<PortableProductMonikerRid>$(PortableRid)</PortableProductMonikerRid>
3939
</PropertyGroup>
4040

@@ -43,9 +43,9 @@
4343
<SkipBuildingInstallers Condition="'$(PgoInstrument)' == 'true'">true</SkipBuildingInstallers>
4444
<SkipBuildingInstallers Condition="
4545
(
46-
$(Rid.StartsWith('freebsd')) or
47-
$(Rid.StartsWith('illumos')) or
48-
$(Rid.StartsWith('linux-musl'))
46+
$(TargetRid.StartsWith('freebsd')) or
47+
$(TargetRid.StartsWith('illumos')) or
48+
$(TargetRid.StartsWith('linux-musl'))
4949
)">true</SkipBuildingInstallers>
5050
</PropertyGroup>
5151

@@ -55,18 +55,18 @@
5555
<BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true'">true</BundleNativeAotCompiler>
5656

5757
<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
58-
<UsePortableLinuxSharedFramework Condition="'$(UsePortableLinuxSharedFramework)' == '' and '$(IsLinux)' == 'true' and !$(Rid.StartsWith('linux-musl'))">true</UsePortableLinuxSharedFramework>
58+
<UsePortableLinuxSharedFramework Condition="'$(UsePortableLinuxSharedFramework)' == '' and '$(IsLinux)' == 'true' and !$(TargetRid.StartsWith('linux-musl'))">true</UsePortableLinuxSharedFramework>
5959
<HighEntropyVA>true</HighEntropyVA>
6060
</PropertyGroup>
6161

6262
<PropertyGroup>
6363
<NetRuntimeRid Condition="'$(NetRuntimeRid)' == ''">$(HostRid)</NetRuntimeRid>
64-
<NetRuntimeRid Condition="('$(OSName)' == 'win' or '$(OSName)' == 'osx' or '$(OSName)' == 'freebsd' or '$(OSName)' == 'illumos' or '$(OSName)' == 'solaris') and '$(DotNetBuildSourceOnly)' != 'true'">$(OSName)-$(Architecture)</NetRuntimeRid>
64+
<NetRuntimeRid Condition="('$(OSName)' == 'win' or '$(OSName)' == 'osx' or '$(OSName)' == 'freebsd' or '$(OSName)' == 'illumos' or '$(OSName)' == 'solaris') and '$(DotNetBuildSourceOnly)' != 'true'">$(OSName)-$(TargetArchitecture)</NetRuntimeRid>
6565
<NetRuntimeRid Condition="'$(DotNetBuild)' != 'true' and $(NetRuntimeRid.StartsWith('mariner.2.0'))">$(HostRid.Replace('mariner.2.0', 'cm.2'))</NetRuntimeRid>
6666

6767
<SharedFrameworkRid>$(NetRuntimeRid)</SharedFrameworkRid>
6868
<SharedFrameworkRid Condition="$(ProductMonikerRid.StartsWith('linux-musl'))">$(ProductMonikerRid)</SharedFrameworkRid>
69-
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-$(Architecture)</SharedFrameworkRid>
69+
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-$(TargetArchitecture)</SharedFrameworkRid>
7070
</PropertyGroup>
7171

7272
<PropertyGroup>

Diff for: ‎src/Layout/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
verticals that are built in the first build pass. -->
88
<ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' != '2'">true</ExcludeFromDotNetBuild>
99
<IsPackable Condition="'$(OS)' == 'Windows_NT' and
10-
'$(Architecture)' == 'x64' and
10+
'$(TargetArchitecture)' == 'x64' and
1111
'$(PgoInstrument)' != 'true'">true</IsPackable>
1212
<BeforePack>$(BeforePack);GenerateLayout</BeforePack>
1313
<PackageDescription>MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption</PackageDescription>

Diff for: ‎src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
5-
<IsPackable Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'">true</IsPackable>
5+
<IsPackable Condition="'$(OS)' == 'Windows_NT' and '$(TargetArchitecture)' == 'x64' and '$(PgoInstrument)' != 'true'">true</IsPackable>
66
<BeforePack>$(BeforePack);GenerateLayout</BeforePack>
77
<PackageDescription>Analyzers and generators from the runtime and SDK for VS insertion</PackageDescription>
88
<NoWarn>$(NoWarn);NU5100;NU5109;NU5123</NoWarn>

Diff for: ‎src/Layout/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
verticals that are built in the first build pass. -->
88
<ExcludeFromDotNetBuild Condition="'$(DotNetBuildPass)' != '2'">true</ExcludeFromDotNetBuild>
99
<IsPackable Condition="'$(OS)' == 'Windows_NT' and
10-
'$(Architecture)' == 'x64' and
10+
'$(TargetArchitecture)' == 'x64' and
1111
'$(PgoInstrument)' != 'true'">true</IsPackable>
1212
<BeforePack>$(BeforePack);GenerateLayout</BeforePack>
1313
<PackageDescription>MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption</PackageDescription>

Diff for: ‎src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>net472</TargetFramework>
55
<IsPackable Condition="'$(OS)' == 'Windows_NT' and '$(SkipBuildingInstallers)' != 'true'">true</IsPackable>
66
<BeforePack>$(BeforePack);GenerateLayout</BeforePack>
7-
<PackageId>VS.Redist.Common.NetCore.SdkPlaceholder.$(Architecture).$(MajorMinorVersion)</PackageId>
8-
<PackageDescription>.NET $(MajorMinorVersion) SDK ARP Placeholder ($(Architecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</PackageDescription>
7+
<PackageId>VS.Redist.Common.NetCore.SdkPlaceholder.$(TargetArchitecture).$(MajorMinorVersion)</PackageId>
8+
<PackageDescription>.NET $(MajorMinorVersion) SDK ARP Placeholder ($(TargetArchitecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</PackageDescription>
99
<NoWarn>$(NoWarn);NU5100;NU5109;NU5123</NoWarn>
1010
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1111
<IsShippingPackage>false</IsShippingPackage>

Diff for: ‎src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>net472</TargetFramework>
55
<IsPackable Condition="'$(OS)' == 'Windows_NT' and '$(SkipBuildingInstallers)' != 'true'">true</IsPackable>
66
<BeforePack>$(BeforePack);GenerateLayout</BeforePack>
7-
<PackageId>VS.Redist.Common.NetCore.Templates.$(Architecture).$(MajorMinorVersion)</PackageId>
8-
<PackageDescription>.NET $(MajorMinorVersion) Templates ($(Architecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</PackageDescription>
7+
<PackageId>VS.Redist.Common.NetCore.Templates.$(TargetArchitecture).$(MajorMinorVersion)</PackageId>
8+
<PackageDescription>.NET $(MajorMinorVersion) Templates ($(TargetArchitecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</PackageDescription>
99
<NoWarn>$(NoWarn);NU5100;NU5109;NU5123</NoWarn>
1010
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1111
<IsShippingPackage>false</IsShippingPackage>

Diff for: ‎src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>net472</TargetFramework>
55
<IsPackable Condition="'$(OS)' == 'Windows_NT' and '$(SkipBuildingInstallers)' != 'true'">true</IsPackable>
66
<BeforePack>$(BeforePack);GenerateLayout</BeforePack>
7-
<PackageId>VS.Redist.Common.NetCore.Toolset.$(Architecture).$(MajorMinorVersion)</PackageId>
8-
<PackageDescription>.NET $(MajorMinorVersion) SDK Toolset ($(Architecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</PackageDescription>
7+
<PackageId>VS.Redist.Common.NetCore.Toolset.$(TargetArchitecture).$(MajorMinorVersion)</PackageId>
8+
<PackageDescription>.NET $(MajorMinorVersion) SDK Toolset ($(TargetArchitecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</PackageDescription>
99
<NoWarn>$(NoWarn);NU5100;NU5109;NU5123</NoWarn>
1010
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1111
<IsShippingPackage>false</IsShippingPackage>

Diff for: ‎src/Layout/finalizer/finalizer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<OptimizationPreference>Size</OptimizationPreference>
1212
<StackTraceSupport>false</StackTraceSupport>
1313
<_IsPublishing>true</_IsPublishing>
14-
<PublishDir>$(ArtifactsBinDir)finalizer\win-$(Architecture)\$(Configuration)\bin</PublishDir>
14+
<PublishDir>$(ArtifactsBinDir)finalizer\win-$(TargetArchitecture)\$(Configuration)\bin</PublishDir>
1515
</PropertyGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)