diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e84198679..135fbbf1e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -198,6 +198,15 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) + Build_Rhel_7_2_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Never run tests on arm + _TestArg: '' + _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true' Build_Arm_Debug: _BuildConfig: Debug _DockerParameter: '' @@ -306,6 +315,17 @@ stages: # already published by Build_LinuxPortable_Release_x64 _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' _TestArg: $(_NonWindowsTestArg) + Build_Linux_Portable_Rpm_Release_Arm64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true' + # Never run tests on arm64 + _TestArg: '' Build_LinuxPortable_Release_x64: _BuildConfig: Release _DockerParameter: '' diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5c9b2f490..afd1c4e0a 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -46,11 +46,13 @@ $(CoreSetupRid) - $(Architecture) + $(InstallerTargetArchitecture) $(CoreSetupRid) $(Architecture) + $(OSName)-$(InstallerTargetArchitecture) + rhel.7-aarch64 x64 x86 diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 935684431..a82f068fc 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -91,9 +91,6 @@ $(MicrosoftNETCoreAppRefMajorMinorPatchVersion) - - $(NetStandardTargetingPackMajorMinorPatchVersion) - $(AspNetCoreRuntimeMajorMinorPatchVersion) @@ -109,9 +106,6 @@ $(NetCoreAppHostPackRpmPackageName) - - $(NetStandardTargetingPackRpmPackageName) - $(AspNetCoreSharedFxRpmPackageName) @@ -121,6 +115,10 @@ $(Version) + + amd64 + aarch64 + $(SdkBrandName) @@ -133,6 +131,27 @@ + + + + + + + + + + + + + + + + @@ -186,6 +205,12 @@ SkipUnchangedFiles="False" UseHardlinksIfPossible="False"/> + + $(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(SdkRPMInstallerFile) $(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(RepoRoot)/Documentation/manpages $(RepoRoot)/test/EndToEnd/EndToEnd.csproj diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 01f704c7d..a99a7e9da 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -39,8 +39,15 @@ Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid) - $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(Architecture) - $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(Architecture) + + $(Architecture) + aarch64 + + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(InstallerTargetArchitecture) + + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(InstallerTargetArchitecture) + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.2-$(InstallerTargetArchitecture) + diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index ed3ccbfeb..1a9d84999 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -14,7 +14,7 @@ "changelog_message": "Bootstrap loop package" }, "control": { - "architecture": "amd64" + "architecture": "%SDK_RPM_PACKAGE_ARCHITECTURE%" }, "copyright": ".NET Foundation and contributors", "license": { @@ -34,10 +34,7 @@ "package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%", "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%" }, - { - "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" - }, +%SDK_RPM_NETSTANDARD_TARGETINGPACK_DEPENDENCY% { "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"