From d1c5091589d5b0fc9878d597e6723cdf17873fd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Apr 2022 15:55:14 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1 --- NuGet.config | 4 ---- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 28408ac24..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf180107c..656e24ddd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - 60845bf36f0dd6dd310070548a58cb8ad3ab513c + bb35f199756a8b45dacb1025d72419f6ea5ff1a4 From e6afe7a97e7cdaf5531978cba171a47ed8e7fbf6 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 27 Apr 2022 14:57:58 -0700 Subject: [PATCH 02/10] Add a direct reference to a newer version of this package --- .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index fb083d8a5..04fed4562 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -7,5 +7,7 @@ + + \ No newline at end of file From 2d73d3d8bffdd63ed094b4a0b00c99bab52b2542 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 29 Apr 2022 12:50:28 -0500 Subject: [PATCH 03/10] Remove sha from source tarball repo dir names (#13726) --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- src/SourceBuild/tarball/content/repos/Directory.Build.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 76297fd3b..ff9296640 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -119,7 +119,7 @@ - $(SourceBuildRepoName).$(RepoSha)/ + $(SourceBuildRepoName)/ $(TarballSourceDir)$(SourceDir) $(TarballSourceDir)$(SourceDir)eng/ $(TarballRepoSourceEngDir)Version.Details.xml diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index e61a6e689..100183a09 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -11,7 +11,7 @@ $(RepositoryName) - $(SubmoduleDirectory)$(SourceDirectory).$(GitCommitHash)/ + $(SubmoduleDirectory)$(SourceDirectory)/ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 From 01764815debb74c7bb79162dbec21f0a22cf9e4f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 29 Apr 2022 14:37:32 -0500 Subject: [PATCH 04/10] Update smoke-test prereq artifact to include architecture (#13725) --- src/SourceBuild/tarball/content/build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 52c3341e0..5976d8446 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -189,7 +189,7 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz $(ResultingPrebuiltPackagesDir) From 5a1062a0059f376df49c70d66a07368e3da86352 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 May 2022 10:28:19 -0700 Subject: [PATCH 05/10] Update branding to 6.0.106 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ee8500d06..313775ae7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 604e870a20469a09d9dcb04dc99ab7c5cb792679 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 9 Mar 2022 13:54:57 -0300 Subject: [PATCH 06/10] Add Mariner 2.0 and Arm64 RHEL builds --- .vsts-ci.yml | 20 ++++++++++ src/redist/targets/GenerateLayout.targets | 4 +- src/redist/targets/GenerateRPMs.targets | 38 ++++++++++++++++--- .../targets/GetRuntimeInformation.targets | 11 +++++- .../targets/packaging/rpm/dotnet-config.json | 7 +--- 5 files changed, 66 insertions(+), 14 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e8e58caf9..4a1ca1503 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 5133c3a38..753c965d8 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -37,8 +37,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%" From 2e472083560f6655d9f19326248a48c0281153c7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 3 May 2022 18:56:39 -0500 Subject: [PATCH 07/10] Fix two broken path references (#13745) --- src/SourceBuild/tarball/content/prep.sh | 2 +- .../Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 56e00219f..e7fc6d550 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -108,7 +108,7 @@ if [ "$buildBootstrap" == "true" ]; then cp $SCRIPT_ROOT/scripts/bootstrap/buildBootstrapPreviouslySB.csproj $workingDir # Copy NuGet.config from the installer repo to have the right feeds - cp $SCRIPT_ROOT/src/installer.*/NuGet.config $workingDir + cp $SCRIPT_ROOT/src/installer/NuGet.config $workingDir # Get PackageVersions.props from existing prev-sb archive echo " Retrieving PackageVersions.props from existing archive" diff --git a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj index c00725cc7..daf090289 100644 --- a/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj +++ b/src/SourceBuild/tarball/content/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj @@ -13,7 +13,7 @@ 15.7.179 - + Configuration=netstandard_Debug Configuration=netstandard_Release {D68133BD-1E63-496E-9EDE-4FBDBF77B486} From a1dc2f68e4e5e81e4dde8d1dd7a0f25c08dbfc53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 May 2022 21:19:18 +0000 Subject: [PATCH 08/10] Update dependencies from https://github.com/dotnet/arcade build 20220504.3 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 656e24ddd..d1175a5ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + 5fdd5b6c08c6c39edf12001400a11786c03b3e35 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 313775ae7..feaa399e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22212.5 + 6.0.0-beta.22254.3 diff --git a/global.json b/global.json index b645142d3..c751a7b2d 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" } } From 831257f764d735ebf42f3628ccc42cc7f95de706 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 21:26:54 +0000 Subject: [PATCH 09/10] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220504.1 (#13758) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 656e24ddd..5024e6131 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - bb35f199756a8b45dacb1025d72419f6ea5ff1a4 + eba16eaac0a3f27f6e37c88313717776d4f38710 From 5631e9af9ece57ca36023157b974b6599964034d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 May 2022 23:25:36 +0000 Subject: [PATCH 10/10] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220504.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22254.1 -> To Version 6.0.0-servicing.22254.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5024e6131..0e7efd866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - eba16eaac0a3f27f6e37c88313717776d4f38710 + 6998584e7856a384d12fa7d0f898daec9be22c13