diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e905caccff84..1c7f4ffd199c 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -216,7 +216,7 @@ extends: buildArchitecture: arm64 runtimeIdentifier: linux-arm64 # Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official. - publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true + publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false officialBuildProperties: $(_officialBuildProperties) osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true runTests: false @@ -232,7 +232,7 @@ extends: buildArchitecture: arm64 runtimeIdentifier: linux-arm64 # Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official. - publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true + publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false officialBuildProperties: $(_officialBuildProperties) osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true runTests: false diff --git a/Directory.Build.props b/Directory.Build.props index 90c1bfc900da..b4866e8e9c81 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,11 +4,11 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) - $(BuildArchitecture) - $(BuildArchitecture) - $(BuildArchitecture) - $(BuildArchitecture) - x64 + $(BuildArchitecture) + $(BuildArchitecture) + $(BuildArchitecture) + $(BuildArchitecture) + x64 enable @@ -23,7 +23,7 @@ illumos linux - $(Rid.Substring(0, $(Rid.LastIndexOf('-')))) + $(TargetRid.Substring(0, $(TargetRid.LastIndexOf('-')))) $(HostOSName) diff --git a/eng/Badge.proj b/eng/Badge.proj index 2abf2838dfb2..7e3108caf761 100644 --- a/eng/Badge.proj +++ b/eng/Badge.proj @@ -8,8 +8,8 @@ - $(OSName.Replace('-', '_'))_$(Architecture) - linux_$(Architecture) + $(OSName.Replace('-', '_'))_$(TargetArchitecture) + linux_$(TargetArchitecture) $(ArtifactsShippingPackagesDir)$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg $(MSBuildThisFileDirectory)version_badge.svg diff --git a/eng/Build.props b/eng/Build.props index 16b9493481e0..ddffd9977d6c 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -4,7 +4,7 @@ they depend on assets from other verticals that are built in the first build pass. --> + '$(TargetArchitecture)' == 'x64'"> diff --git a/eng/Signing.props b/eng/Signing.props index 34d1d638c2b5..dc6029d29dcf 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -83,7 +83,7 @@ - + diff --git a/eng/pipelines/templates/jobs/sdk-build.yml b/eng/pipelines/templates/jobs/sdk-build.yml index 80a648437e3a..f8e00417e0de 100644 --- a/eng/pipelines/templates/jobs/sdk-build.yml +++ b/eng/pipelines/templates/jobs/sdk-build.yml @@ -17,7 +17,7 @@ parameters: testFullMSBuild: false runAoTTests: false ### MSBUILD ### - buildArchitecture: x64 + targetArchitecture: x64 publishArgument: '' signArgument: '' runTestsAsTool: false @@ -34,11 +34,11 @@ jobs: - template: /eng/common/${{ parameters.oneESCompat.templateFolderName }}/job/job.yml parameters: ${{ if eq(parameters.container, '') }}: - name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.buildArchitecture }} - displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.buildArchitecture }})' + name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.targetArchitecture }} + displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.targetArchitecture }})' ${{ else }}: - name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.buildArchitecture }}_${{ parameters.container }} - displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.buildArchitecture }}) [${{ parameters.container }}]' + name: ${{ parameters.categoryName }}_${{ parameters.pool.os }}_${{ parameters.targetArchitecture }}_${{ parameters.container }} + displayName: '${{ parameters.categoryName }}: ${{ parameters.pool.os }} (${{ parameters.targetArchitecture }}) [${{ parameters.container }}]' pool: ${{ parameters.pool }} container: ${{ parameters.container }} strategy: ${{ parameters.strategy }} @@ -82,7 +82,7 @@ jobs: ${{ parameters.publishArgument }} ${{ parameters.signArgument }} /p:EnableDefaultArtifacts=${{ parameters.enableDefaultArtifacts }} - /p:Architecture=${{ parameters.buildArchitecture }} + /p:TargetArchitecture=${{ parameters.targetArchitecture }} /p:RunTestsAsTool=${{ parameters.runTestsAsTool }} /p:PgoInstrument=${{ parameters.pgoInstrument }} ${{ parameters.runtimeSourceProperties }} @@ -104,10 +104,10 @@ jobs: ${{ parameters.publishArgument }} \ ${{ parameters.signArgument }} \ /p:EnableDefaultArtifacts=${{ parameters.enableDefaultArtifacts }} \ - /p:Architecture=${{ parameters.buildArchitecture }} \ + /p:TargetArchitecture=${{ parameters.targetArchitecture }} \ /p:RunTestsAsTool=${{ parameters.runTestsAsTool }} \ /p:PgoInstrument=${{ parameters.pgoInstrument }} \ - /p:Rid=${{ parameters.runtimeIdentifier }} \ + /p:TargetRid=${{ parameters.runtimeIdentifier }} \ ${{ parameters.osProperties }} \ ${{ parameters.runtimeSourceProperties }} \ ${{ parameters.officialBuildProperties }} \ @@ -128,7 +128,7 @@ jobs: -restore -test -ci -prepareMachine -nativeToolsOnMachine -configuration $(buildConfiguration) /p:Projects=\`"${{ replace(parameters.testProjects, ';', '`;') }}\`" - /p:Architecture=${{ parameters.buildArchitecture }} + /p:TargetArchitecture=${{ parameters.targetArchitecture }} ${{ parameters.runtimeSourceProperties }} /p:CustomHelixTargetQueue=${{ parameters.helixTargetQueue }} /bl:$(Build.SourcesDirectory)/artifacts/log/$(buildConfiguration)/${{ parameters.categoryName }}Tests.binlog @@ -148,8 +148,8 @@ jobs: -restore -test -ci -prepareMachine -configuration $(buildConfiguration) '/p:Projects="${{ parameters.testProjects }}"' - /p:Architecture=${{ parameters.buildArchitecture }} - /p:Rid=${{ parameters.runtimeIdentifier }} + /p:TargetArchitecture=${{ parameters.targetArchitecture }} + /p:TargetRid=${{ parameters.runtimeIdentifier }} ${{ parameters.osProperties }} ${{ parameters.runtimeSourceProperties }} /p:CustomHelixTargetQueue=${{ parameters.helixTargetQueue }}${{ parameters.helixTargetContainer }} @@ -171,7 +171,7 @@ jobs: testResultsFormat: xUnit testResultsFiles: artifacts/TestResults/$(buildConfiguration)/*.xml testRunTitle: $(System.PhaseName) - buildPlatform: ${{ parameters.buildArchitecture }} + buildPlatform: ${{ parameters.targetArchitecture }} buildConfiguration: $(buildConfiguration) continueOnError: true condition: always() diff --git a/eng/pipelines/templates/jobs/sdk-job-matrix.yml b/eng/pipelines/templates/jobs/sdk-job-matrix.yml index 716f3e1ca3d2..9242389e07b8 100644 --- a/eng/pipelines/templates/jobs/sdk-job-matrix.yml +++ b/eng/pipelines/templates/jobs/sdk-job-matrix.yml @@ -23,7 +23,7 @@ parameters: - categoryName: TestBuild osProperties: $(linuxOsPortableProperties) - categoryName: TestBuild - buildArchitecture: arm64 + targetArchitecture: arm64 runtimeIdentifier: linux-arm64 osProperties: $(linuxOsPortableProperties) # Don't run the tests on arm64. Only perform the build itself. diff --git a/src/Layout/Directory.Build.props b/src/Layout/Directory.Build.props index 323b4c7d84d8..26e7f9c05f9b 100644 --- a/src/Layout/Directory.Build.props +++ b/src/Layout/Directory.Build.props @@ -30,11 +30,11 @@ .exe - $(OSName)-$(Architecture) - $(Rid) + $(OSName)-$(TargetArchitecture) + $(TargetRid) $(OSName) - $(PortableOSName)-$(Architecture) + $(PortableOSName)-$(TargetArchitecture) $(PortableRid) @@ -43,9 +43,9 @@ true true @@ -55,18 +55,18 @@ true - true + true true $(HostRid) - $(OSName)-$(Architecture) + $(OSName)-$(TargetArchitecture) $(HostRid.Replace('mariner.2.0', 'cm.2')) $(NetRuntimeRid) $(ProductMonikerRid) - linux-$(Architecture) + linux-$(TargetArchitecture) diff --git a/src/Layout/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj b/src/Layout/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj index 394f8f34bc51..62e49d642ee6 100644 --- a/src/Layout/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj +++ b/src/Layout/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj @@ -7,7 +7,7 @@ verticals that are built in the first build pass. --> true true $(BeforePack);GenerateLayout MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption diff --git a/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj b/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj index 39df20eb6b53..4431ce8bd9d5 100644 --- a/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj +++ b/src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj @@ -2,7 +2,7 @@ net472 - true + true $(BeforePack);GenerateLayout Analyzers and generators from the runtime and SDK for VS insertion $(NoWarn);NU5100;NU5109;NU5123 diff --git a/src/Layout/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj b/src/Layout/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj index f89ba2414895..eb4cb5ca24d0 100644 --- a/src/Layout/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj +++ b/src/Layout/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj @@ -7,7 +7,7 @@ verticals that are built in the first build pass. --> true true $(BeforePack);GenerateLayout MSBuild extensions bundled with .NET Core SDK for internal Visual Studio build consumption diff --git a/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj b/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj index 7356667bc71d..97bac1637c41 100644 --- a/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj +++ b/src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj @@ -4,8 +4,8 @@ net472 true $(BeforePack);GenerateLayout - VS.Redist.Common.NetCore.SdkPlaceholder.$(Architecture).$(MajorMinorVersion) - .NET $(MajorMinorVersion) SDK ARP Placeholder ($(Architecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + VS.Redist.Common.NetCore.SdkPlaceholder.$(TargetArchitecture).$(MajorMinorVersion) + .NET $(MajorMinorVersion) SDK ARP Placeholder ($(TargetArchitecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption $(NoWarn);NU5100;NU5109;NU5123 true false diff --git a/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj b/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj index 2b303cbd0fc0..99aa4dc84a26 100644 --- a/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj +++ b/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj @@ -4,8 +4,8 @@ net472 true $(BeforePack);GenerateLayout - VS.Redist.Common.NetCore.Templates.$(Architecture).$(MajorMinorVersion) - .NET $(MajorMinorVersion) Templates ($(Architecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + VS.Redist.Common.NetCore.Templates.$(TargetArchitecture).$(MajorMinorVersion) + .NET $(MajorMinorVersion) Templates ($(TargetArchitecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption $(NoWarn);NU5100;NU5109;NU5123 true false diff --git a/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj b/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj index 10af7878e516..de6d7a117411 100644 --- a/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj +++ b/src/Layout/VS.Redist.Common.NetCore.Toolset/VS.Redist.Common.NetCore.Toolset.proj @@ -4,8 +4,8 @@ net472 true $(BeforePack);GenerateLayout - VS.Redist.Common.NetCore.Toolset.$(Architecture).$(MajorMinorVersion) - .NET $(MajorMinorVersion) SDK Toolset ($(Architecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + VS.Redist.Common.NetCore.Toolset.$(TargetArchitecture).$(MajorMinorVersion) + .NET $(MajorMinorVersion) SDK Toolset ($(TargetArchitecture)) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption $(NoWarn);NU5100;NU5109;NU5123 true false diff --git a/src/Layout/finalizer/finalizer.csproj b/src/Layout/finalizer/finalizer.csproj index 47330a6494a8..898182807d7b 100644 --- a/src/Layout/finalizer/finalizer.csproj +++ b/src/Layout/finalizer/finalizer.csproj @@ -11,7 +11,7 @@ Size false <_IsPublishing>true - $(ArtifactsBinDir)finalizer\win-$(Architecture)\$(Configuration)\bin + $(ArtifactsBinDir)finalizer\win-$(TargetArchitecture)\$(Configuration)\bin diff --git a/src/Layout/pkg/dotnet-sdk.proj b/src/Layout/pkg/dotnet-sdk.proj index d906f21cb186..7028b1ea582f 100644 --- a/src/Layout/pkg/dotnet-sdk.proj +++ b/src/Layout/pkg/dotnet-sdk.proj @@ -4,7 +4,7 @@ true true $(SdkTargetFramework) - $(Rid) + $(TargetRid) true true true @@ -24,7 +24,7 @@ All supported installer runtime identifiers should be specified here. New arcade infra is only used for Linux installers, at the moment. --> - linux-$(Architecture) + linux-$(TargetArchitecture) true @@ -116,7 +116,7 @@ - + diff --git a/src/Layout/redist/targets/BundledManifests.targets b/src/Layout/redist/targets/BundledManifests.targets index 057218e32e91..e6f9c1a61a11 100644 --- a/src/Layout/redist/targets/BundledManifests.targets +++ b/src/Layout/redist/targets/BundledManifests.targets @@ -25,7 +25,7 @@ - $(Architecture) + $(TargetArchitecture) diff --git a/src/Layout/redist/targets/Crossgen.targets b/src/Layout/redist/targets/Crossgen.targets index 85597153a6cb..ffd8a2045c7d 100644 --- a/src/Layout/redist/targets/Crossgen.targets +++ b/src/Layout/redist/targets/Crossgen.targets @@ -2,7 +2,7 @@ - true + true $(HostOSName)-$(BuildArchitecture) $(SharedFrameworkRid) @@ -150,7 +150,7 @@ @@ -67,7 +67,7 @@ diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 9b3af4d15c2d..45bb5ee44be7 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -20,21 +20,20 @@ - - - - - + + @@ -472,12 +471,6 @@ - - - - @@ -536,7 +529,6 @@ PublishSdks; PublishDotnetWatchToRedist; GenerateBundledVersions; - GenerateVersionFile; CopyKnownWorkloadManifestFile; LayoutAppHostTemplate; LayoutBundledTools; diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index 28d330e14f0f..9a29e9b0ba03 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -34,7 +34,7 @@ $(SdkPkgSourcesWindowsDirectory)\stablefileidforapphosttransform.xslt $(SdkPkgSourcesWindowsDirectory)\generatebundle.ps1 - $(ArtifactsBinDir)finalizer\win-$(Architecture)\$(Configuration)\bin\finalizer.exe + $(ArtifactsBinDir)finalizer\win-$(TargetArchitecture)\$(Configuration)\bin\finalizer.exe $(ArtifactsObjDir)LightCommandPackages @@ -114,7 +114,7 @@ '$(VersionMinor)' ^ '$(SdkInstallerUpgradeCode)' ^ '$(SdkDependencyKeyName)' ^ - '$(Architecture)' ^ + '$(TargetArchitecture)' ^ '$(SdkStableFileIdForApphostTransform)' ^ -InformationAction Continue" /> @@ -158,7 +158,7 @@ '$(VersionMinor)' ^ '$(SdkPlaceholderInstallerUpgradeCode)' ^ '$(SdkPlaceholderDependencyKeyName)' ^ - '$(Architecture)' ^ + '$(TargetArchitecture)' ^ -InformationAction Continue" /> @@ -195,7 +195,7 @@ '$(VersionMinor)' ^ '%(TemplatesMsiComponent.UpgradeCode)' ^ '%(TemplatesMsiComponent.DependencyKeyName)' ^ - '$(Architecture)' ^ + '$(TargetArchitecture)' ^ -InformationAction Continue" /> @@ -321,7 +321,7 @@ -WindowsDesktopVersion '$(MicrosoftWindowsDesktopAppRuntimePackageVersion)' ^ -UpgradeCode '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^ -DependencyKeyName '$(SdkDependencyKeyName)' ^ - -Architecture '$(Architecture)' ^ + -Architecture '$(TargetArchitecture)' ^ -DotNetRuntimeVersion '$(MicrosoftNETCoreAppRuntimePackageVersion)' ^ -AspNetCoreVersion '$(MicrosoftAspNetCoreAppRuntimePackageVersion)' ^ -SDKProductBandVersion '$(CliProductBandVersion)' ^ diff --git a/src/Layout/redist/targets/GeneratePKG.targets b/src/Layout/redist/targets/GeneratePKG.targets index 1c46e1895c6f..ee1913e4a8e1 100644 --- a/src/Layout/redist/targets/GeneratePKG.targets +++ b/src/Layout/redist/targets/GeneratePKG.targets @@ -5,14 +5,14 @@ $(IntermediateOutputPath)pkgs/$(Version) - com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.$(Architecture) - com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.$(Architecture) - com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppPackageVersion).component.osx.$(Architecture) - com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.$(Architecture) - com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.$(Architecture) - com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.$(Architecture) - com.microsoft.dotnet.dev.$(Version).component.osx.$(Architecture) - com.microsoft.dotnet.dev.$(Version).osx.$(Architecture) + com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.$(TargetArchitecture) + com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.$(TargetArchitecture) + com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppPackageVersion).component.osx.$(TargetArchitecture) + com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.$(TargetArchitecture) + com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.$(TargetArchitecture) + com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.$(TargetArchitecture) + com.microsoft.dotnet.dev.$(Version).component.osx.$(TargetArchitecture) + com.microsoft.dotnet.dev.$(Version).osx.$(TargetArchitecture) /usr/local/share/dotnet /usr/local/share/dotnet/x64 @@ -24,8 +24,8 @@ $(SdkPkgDestinationScriptsDirectory)/postinstall $(PkgIntermediateDirectory)/resources - $(SdkPkgSourcesOSXDirectory)/Distribution-Template - $(SdkPkgSourcesOSXDirectory)/Distribution-Template-x64 + $(SdkPkgSourcesOSXDirectory)/Distribution-Template + $(SdkPkgSourcesOSXDirectory)/Distribution-Template-x64 $(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml $(PkgIntermediateDirectory)/$(SdkComponentId).pkg @@ -89,11 +89,11 @@ $(HostFxrBrandName) - $(Architecture) + $(TargetArchitecture) - $(Architecture) - x86_64 + $(TargetArchitecture) + x86_64 diff --git a/src/Layout/redist/targets/RestoreLayout.targets b/src/Layout/redist/targets/RestoreLayout.targets index e88925140a45..498738e8cc75 100644 --- a/src/Layout/redist/targets/RestoreLayout.targets +++ b/src/Layout/redist/targets/RestoreLayout.targets @@ -4,8 +4,8 @@ -internal - $(Architecture) - aarch64 + $(TargetArchitecture) + aarch64 $(NetRuntimeRid) $(InstallerTargetArchitecture) @@ -18,8 +18,8 @@ $(MicrosoftWindowsDesktopAppRuntimePackageVersion) 3.0.0 - x64 - x86 + x64 + x86 dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -45,8 +45,8 @@ $(SharedFrameworkRid) $(AspNetCoreInstallerRid) - x64 - aarch64 + x64 + aarch64 aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension) @@ -160,7 +160,7 @@ + Condition="'$(IncludeAspNetCoreRuntime)' != 'false' and '$(InstallerExtension)' == '.pkg' And '$(SkipBuildingInstallers)' != 'true' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'osx-arm64')"> $(AspNetCoreSharedFxRootUrl) $(AspNetTargetingPackArchiveFileName) @@ -178,52 +178,52 @@ + Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64' or '$(TargetRid)' == 'osx-arm64')"> $(NetRuntimeRootUrl) $(DownloadedSharedFrameworkInstallerFileName) + Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64' or '$(TargetRid)' == 'osx-arm64')"> $(NetRuntimeRootUrl) $(DownloadedSharedHostInstallerFileName) + Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64' or '$(TargetRid)' == 'osx-arm64')"> $(NetRuntimeRootUrl) $(DownloadedHostFxrInstallerFileName) + Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64' or '$(TargetRid)' == 'osx-arm64')"> $(NetRuntimeRootUrl) $(DownloadedNetCoreAppTargetingPackInstallerFileName) + Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'osx-arm64')"> $(NetStandardTargetingPackRootUrl) $(DownloadedNetStandardTargetingPackInstallerFileName) + Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64' or '$(TargetRid)' == 'osx-arm64')"> $(NetRuntimeRootUrl) $(DownloadedNetCoreAppHostPackInstallerFileName) + Condition="'$(InstallerExtension)' == '.msi' and !$(TargetArchitecture.StartsWith('arm')) and ('$(DotNetBuild)' != 'true' or '$(GenerateSdkBundleOnly)' == 'true')"> $(NetRuntimeRootUrl) $(DownloadedAlternateNetCoreAppHostPackInstallerFileName) + Condition="'$(InstallerExtension)' == '.msi' And !$(TargetArchitecture.StartsWith('arm')) and ('$(DotNetBuild)' != 'true' or '$(GenerateSdkBundleOnly)' == 'true')"> $(NetRuntimeRootUrl) $(DownloadedArm64NetCoreAppHostPackInstallerFileName) @@ -237,13 +237,13 @@ + Condition="'$(InstallerExtension)' != '.pkg' And '$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64')"> $(AspNetCoreSharedFxRootUrl) $(DownloadedAspNetTargetingPackInstallerFileName) + Condition="'$(InstallerExtension)' != '.pkg' And '$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64')"> $(AspNetCoreSharedFxRootUrl) $(DownloadedAspNetCoreSharedFxInstallerFileName) @@ -251,7 +251,7 @@ + Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64' or '$(TargetRid)' == 'osx-arm64')"> $(WinFormsAndWpfSharedFxRootUrl) $(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName) diff --git a/src/Layout/redist/tools/tool_fsc.csproj b/src/Layout/redist/tools/tool_fsc.csproj index 876671a029f4..99e3907e017d 100644 --- a/src/Layout/redist/tools/tool_fsc.csproj +++ b/src/Layout/redist/tools/tool_fsc.csproj @@ -9,7 +9,7 @@ $(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc - $(Rid) + $(TargetRid) $(MibcRid.Replace('musl-', '')) $(MibcPath)/optimization.$(MibcRid).mibc.runtime/DotNet_FSharp.mibc $(MibcFile) diff --git a/src/Microsoft.Net.Sdk.AnalyzerRedirecting/Microsoft.Net.Sdk.AnalyzerRedirecting.csproj b/src/Microsoft.Net.Sdk.AnalyzerRedirecting/Microsoft.Net.Sdk.AnalyzerRedirecting.csproj index 97460c6c8530..3a584e6516f5 100644 --- a/src/Microsoft.Net.Sdk.AnalyzerRedirecting/Microsoft.Net.Sdk.AnalyzerRedirecting.csproj +++ b/src/Microsoft.Net.Sdk.AnalyzerRedirecting/Microsoft.Net.Sdk.AnalyzerRedirecting.csproj @@ -40,6 +40,6 @@ - + diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index 9e0f5727b3c9..9b63b2cec1b0 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -20,8 +20,8 @@ or from the Rid if supplied. --> $(BuildArgs) /p:OSName=$(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) $(BuildArgs) /p:PortableOSName=$(__PortableTargetOS) - $(BuildArgs) /p:Rid=$(TargetRid) - $(BuildArgs) /p:Architecture=$(TargetArchitecture) + $(BuildArgs) /p:TargetRid=$(TargetRid) + $(BuildArgs) /p:TargetArchitecture=$(TargetArchitecture) $(BuildArgs) /p:PortableBuild=true @@ -74,7 +74,6 @@ -