Update to .NET SDK 6.0.101 and Runtime 6.0.1

2022-01-28 08:44:07 -05:00 · 2022-01-28 08:44:07 -05:00 · ecf6e43a6b
commit ecf6e43a6b
parent 48eddbd9d7
13 changed files with 14546 additions and 113 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,4 @@
 /dotnet-arm64-prebuilts-2021-10-29.tar.gz
 /dotnet-s390x-prebuilts-2021-10-29.tar.gz
 /dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz
+/dotnet-v6.0.101.tar.gz
--- a/aspnetcore-39471-build-all-packages.patch
+++ b/aspnetcore-39471-build-all-packages.patch
@ -0,0 +1,29 @@
+From c5211f8557f2fb019416cf1f6c01142965270479 Mon Sep 17 00:00:00 2001
+From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
+Date: Sun, 16 Jan 2022 22:55:10 -0800
+Subject: [PATCH] Always build App.Ref and the targeting packs - set
+ `$(IsTargetingPackBuilding)` to `true` unconditionally - leave all _use_ of
+ `$(IsTargetingPackBuilding)`
+
+See https://github.com/dotnet/aspnetcore/issues/39471 for details and backporting.
+---
+ Directory.Build.props | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index e100d883e9..d71b308905 100644
+--- a/Directory.Build.props
+++ b/Directory.Build.props
+@@ -138,11 +138,7 @@
+     <TargetingPackName>Microsoft.AspNetCore.App.Ref</TargetingPackName>
+     <RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
+     <TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
+-
+-    <!-- This is used to produce targeting pack installers/packages once per major.minor. -->
+-    <IsTargetingPackBuilding
+-        Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '0' ">false</IsTargetingPackBuilding>
+-    <IsTargetingPackBuilding Condition=" '$(IsTargetingPackBuilding)' == '' ">true</IsTargetingPackBuilding>
+    <IsTargetingPackBuilding>true</IsTargetingPackBuilding>
+ 
+     <!--
+       Archives and installers using this prefix are intended for internal use only.
--- a/2
+++ b/2
@ -122,6 +122,8 @@ if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then
    pushd installer
    git checkout "${tag}"
    git submodule update --init --recursive
+    patch -p1 -i ../../installer-12736-no-sudo.patch
+    patch -p1 -i ../../installer-12852-fix-internal-urls.patch
    clean_dotnet_cache
    mkdir -p "../${unmodified_tarball_name}"
    ./build.sh /p:ArcadeBuildTarball=true /p:TarballDir="$(readlink -f ../"${unmodified_tarball_name}")"
--- a/dotnet6.0.spec
+++ b/dotnet6.0.spec
@ -20,10 +20,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}

-%global host_version 6.0.0
-%global runtime_version 6.0.0
+%global host_version 6.0.1
+%global runtime_version 6.0.1
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.100
+%global sdk_version 6.0.101
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')

@ -33,8 +33,7 @@
 %global sdk_rpm_version %{sdk_version}

 # upstream can update releases without revving the SDK version so these don't always match
-#%%global upstream_tag v%%{sdk_version}-SDK
-%global upstream_tag 9e8b04bbff820c93c142f99a507a46b976f5c14c
+%global upstream_tag v%{sdk_version}

 %if 0%{?fedora} || 0%{?rhel} < 8
 %global use_bundled_libunwind 0
@ -86,10 +85,10 @@ Source11:       dotnet.sh.in
 Patch100:       runtime-arm64-lld-fix.patch
 # Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315
 Patch101:       runtime-mono-remove-ilstrip.patch
-# https://github.com/dotnet/runtime/pull/61442
-Patch102:       runtime-61442-disable-werror.patch
 # https://github.com/dotnet/runtime/pull/62170
-Patch103:       runtime-62170-clang13.patch
+Patch102:       runtime-62170-clang13.patch
+# Extracted from https://github.com/dotnet/installer/pull/13009
+Patch103:       runtime-63653-build-all-packages.patch

 # https://github.com/dotnet/command-line-api/pull/1401
 Patch300:       command-line-api-use-work-tree-with-git-apply.patch
@ -123,15 +122,20 @@ Patch900:       roslyn-analyzers-no-apphost.patch
 Patch1000:      msbuild-no-systemsecurity.patch
 Patch1001:      msbuild-no-systemconfiguration.patch

+# Extracted from https://github.com/dotnet/installer/pull/13009
+Patch1100:      aspnetcore-39471-build-all-packages.patch
+
 # Disable telemetry by default; make it opt-in
 Patch1500:      sdk-telemetry-optout.patch
 # https://github.com/dotnet/sdk/pull/22373
 Patch1501:      sdk-22373-portablerid.patch
+# https://github.com/dotnet/sdk/pull/21557
+Patch1502:      sdk-21557-man-pages.patch

 # https://github.com/dotnet/installer/pull/12516
 Patch1600:      installer-12516-portablerid.patch
-# https://github.com/dotnet/installer/pull/12622
-Patch1601:      installer-12622-fix-runtime-symbols.patch
+# https://github.com/dotnet/installer/pull/12736
+Patch1601:      installer-12736-no-sudo.patch


 %if 0%{?fedora} || 0%{?rhel} >= 8
@ -457,19 +461,21 @@ pushd src/msbuild.*

 popd

+pushd src/aspnetcore.*
+%patch1100 -p1
+popd
+
 pushd src/sdk.*
 %patch1500 -p1
 %patch1501 -p1
+%patch1502 -p1
 popd

 pushd src/installer.*
 %patch1600 -p1
+%patch1601 -p1
 popd

-# We need to apply the patch to the already-built tarball's
-# repos/runtime.common.targets, not to the installer's "source" copy.
-%patch1601 -p5
-
 # Disable package validation which breaks our build.
 # There's no need to run validation in RPM packages anyway.
 # See https://github.com/dotnet/runtime/pull/60881
@ -485,6 +491,7 @@ cat /etc/os-release
 %if %{without bootstrap}
 # We need to create a copy because we will mutate this
 cp -a %{_libdir}/dotnet previously-built-dotnet
+find previously-built-dotnet
 %endif

 %if 0%{?fedora} > 32 || 0%{?rhel} > 8
@ -550,9 +557,11 @@ tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}
 find %{buildroot}%{_libdir}/dotnet/ -type f -name 'testhost.x86' -delete
 find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete

-# Install managed symbols
-tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_id}-%{runtime_version}.tar.gz \
-    -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/
+# Install managed symbols: disabled because they don't contain sources
+# but point to the paths the sources would have been at in the build
+# servers. The end user experience is pretty bad atm.
+# tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_id}-%{runtime_version}.tar.gz \
+#    -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/

 # Fix executable permissions on files
 find %{buildroot}%{_libdir}/dotnet/ -type f -name 'apphost' -exec chmod +x {} \;
@ -664,6 +673,9 @@ export COMPlus_LTTng=0


 %changelog
+* Fri Jan 28 2022 Omair Majid <omajid@redhat.com> - 6.0.101-3
+- Update to .NET SDK 6.0.101 and Runtime 6.0.1
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.100-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

--- a/installer-12622-fix-runtime-symbols.patch
+++ b/installer-12622-fix-runtime-symbols.patch
@ -1,48 +0,0 @@
-From 7365824ddc6ed66152cfc50f4c8508368953099c Mon Sep 17 00:00:00 2001
-From: Omair Majid <omajid@redhat.com>
-Date: Tue, 9 Nov 2021 08:39:27 -0500
-Subject: [PATCH] Also publish non-portable RID runtime symbols tarball
-
-This fixes a regression in .NET 6 source-build compared to the .NET
-5 source-build.
-
-source-build wants to publish runtime symbols tarball for portable (eg,
-linux-x64) and non-portable (eg, fedora.33-x64) RIDs here after a build.
-Following .NET 5 conventions, I expected to see:
-
-    ./artifacts/x64/Release/runtime/dotnet-runtime-symbols-fedora.34-x64-6.0.0.tar.gz
-    ./artifacts/x64/Release/runtime/dotnet-runtime-symbols-linux-x64-6.0.0.tar.gz
-
-Unfortunately, only the portable RID (linux-x64) tarball is present
-after a full source-build in .NET 6.
-
-It turns out this is a bug in our build scripts. We try and copy
-binaries - including the symbol tarballs - after building each of
-runtime-portable and runtime. However, the target dependency is wrong:
-after `Build`, the intermediate package doesn't exist from the
-just-built repo.
-
-What ends up happening is that nothing is copied after building
-runtime-portable. However, after building runtime, the runtime-portable
-intermediate artifacts are found and copied over. So the end
-build has portable RID symbos, but not the non-portable ones.
-
-Fix that by changing the dependency of this target so it runs after
-intermediate packages are available.
---
- src/SourceBuild/tarball/content/repos/runtime.common.targets | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.targets b/src/SourceBuild/tarball/content/repos/runtime.common.targets
-index ca606b23d21..862b70dc832 100644
--- a/src/SourceBuild/tarball/content/repos/runtime.common.targets
-+++ b/src/SourceBuild/tarball/content/repos/runtime.common.targets
-@@ -23,7 +23,7 @@
-   </Target>
- 
-   <Target Name="CopyBinariesToBinFolder"
-          AfterTargets="Build"
-+          AfterTargets="ExtractIntermediatePackages"
-           Inputs="$(MSBuildProjectFullPath)"
-           Outputs="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete">
-     <ItemGroup>
--- a/installer-12736-no-sudo.patch
+++ b/installer-12736-no-sudo.patch
@ -0,0 +1,39 @@
+From f8e115fadf6e8b392fa007e78d9b77fc64590cdd Mon Sep 17 00:00:00 2001
+From: Daniel Plaisted <dsplaisted@gmail.com>
+Date: Mon, 29 Nov 2021 20:19:30 -0800
+Subject: [PATCH] Don't set ulimit
+
+1ES pools should now have ulimit set already now
+---
+ build.sh     | 4 +---
+ run-build.sh | 4 ----
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/build.sh b/build.sh
+index 594a355fafa..7ff647c4060 100755
+--- a/build.sh
+++ b/build.sh
+@@ -53,7 +53,5 @@ dockerbuild()
+ if [ ! -z "$BUILD_IN_DOCKER" ]; then
+     dockerbuild $args
+ else
+-    # Run under sudo so we can set ulimit
+-    # See https://github.com/dotnet/core-eng/issues/14808
+-    sudo -E $DIR/run-build.sh $args
+    $DIR/run-build.sh $args
+ fi
+diff --git a/run-build.sh b/run-build.sh
+index fe839eb8009..7b98aedc0be 100755
+--- a/run-build.sh
+++ b/run-build.sh
+@@ -25,10 +25,6 @@ CUSTOM_BUILD_ARGS=
+ # Set nuget package cache under the repo
+ [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages"
+ 
+-# Set max number of files open, helps avoid errors during NuGet restore
+-# See https://github.com/dotnet/core-eng/issues/14808
+-ulimit -n 16384
+-
+ args=( )
+ 
+ while [[ $# > 0 ]]; do
--- a/installer-12852-fix-internal-urls.patch
+++ b/installer-12852-fix-internal-urls.patch
@ -0,0 +1,129 @@
+From 4582256e7ad537e315c5aa8f16bf049350d2de41 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Thu, 16 Dec 2021 02:29:27 +0000
+Subject: [PATCH 1/2] Add logic to convert internal repo uris in
+ version.details.xml
+
+---
+ ...ourceBuildIntermediateNupkgDependencies.cs | 38 +++++++++++++++++++
+ .../tools/SourceBuildArcadeTarball.targets    |  4 +-
+ 2 files changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs
+index 59f7eb49919..1217d166aae 100644
+--- a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs
+++ b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs
+@@ -3,6 +3,7 @@
+ 
+ using Microsoft.Build.Framework;
+ using Microsoft.Build.Utilities;
+using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Xml.Linq;
+@@ -21,6 +22,11 @@ public class Tarball_ReadSourceBuildIntermediateNupkgDependencies : Task
+         [Required]
+         public string SourceBuildIntermediateNupkgPrefix { get; set; }
+ 
+        /// <summary>
+        /// Convert any internal repo references to the public GitHub repos.
+        /// </summary>
+        public bool ConvertInternalRepos { get; set; }
+
+         /// <summary>
+         /// The intermediate nupkg RID to use if any RID-specific intermediate nupkgs are required.
+         /// If this parameter isn't specified, RID-specific intermediate nupkgs can't be used and
+@@ -88,6 +94,11 @@ XName CreateQualifiedName(string plainName)
+                     string dependencyVersion = d.Attribute("Version")?.Value;
+ 
+                     string uri = d.Element(CreateQualifiedName("Uri"))?.Value;
+                    if (ConvertInternalRepos)
+                    {
+                        uri = ConvertInternalRepo(uri);
+                    }
+
+                     string sha = d.Element(CreateQualifiedName("Sha"))?.Value;
+                     string sourceBuildRepoName = sourceBuildElement.Attribute("RepoName")?.Value;
+ 
+@@ -137,5 +148,32 @@ XName CreateQualifiedName(string plainName)
+ 
+             return !Log.HasLoggedErrors;
+         }
+
+        private string ConvertInternalRepo(string uri)
+        {
+            if (uri.StartsWith("https://dev.azure.com", StringComparison.OrdinalIgnoreCase))
+            {
+                string[] repoParts = uri.Substring(uri.LastIndexOf('/')).Split('-', 2);
+
+                if (repoParts.Length != 2)
+                {
+                    Log.LogError($"Repo '{uri}' does not end with the expected <GH organization>-<GH repo> format");
+                    return null;
+                }
+
+                string org = repoParts[0];
+                string repo = repoParts[1];
+
+                // The internal Nuget.Client repo has suffix which needs to be accounted for.
+                if (uri.EndsWith("-Trusted", StringComparison.OrdinalIgnoreCase))
+                {
+                    repo = repo.Substring(0, repo.Length - 8);
+                }
+
+                uri = $"https://github.com/{org}/{repo}";
+            }
+
+            return uri;
+        }
+     }
+ }
+diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+index 1717371dc87..9a49c349924 100644
+--- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+@@ -19,6 +19,7 @@
+     <TarballSourceDir>$(TarballRootDir)src/</TarballSourceDir>
+     <TarballGitInfoDir>$(TarballRootDir)git-info/</TarballGitInfoDir>
+     <CloneVerbosity>quiet</CloneVerbosity> <!-- Support quiet and full -->
+    <ConvertInternalRepos Condition="'$(ConvertInternalRepos)' == '' and '$(VSS_NUGET_EXTERNAL_FEED_ENDPOINTS)' == '' ">true</ConvertInternalRepos>
+   </PropertyGroup>
+ 
+   <Target Name="CreateSourceTarball"
+@@ -203,7 +204,8 @@
+     <Tarball_ReadSourceBuildIntermediateNupkgDependencies
+       VersionDetailsXmlFile="$([MSBuild]::NormalizePath($(TarballVersionDetailsFile)))"
+       SourceBuildIntermediateNupkgPrefix="$(SourceBuildIntermediateNupkgPrefix)"
+-      SourceBuildIntermediateNupkgRid="$(SourceBuildIntermediateNupkgRid)">
+      SourceBuildIntermediateNupkgRid="$(SourceBuildIntermediateNupkgRid)"
+      ConvertInternalRepos="$(ConvertInternalRepos)">
+       <Output TaskParameter="Dependencies" ItemName="SourceBuildRepos" />
+     </Tarball_ReadSourceBuildIntermediateNupkgDependencies>
+ 
+
+From 6e467b43033aefd1af39ddcbf625ef30d5440e7f Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Thu, 16 Dec 2021 18:31:15 +0000
+Subject: [PATCH 2/2] code review updates
+
+---
+ .../Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs  | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs
+index 1217d166aae..9b6365dfccd 100644
+--- a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs
+++ b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs
+@@ -165,9 +165,10 @@ private string ConvertInternalRepo(string uri)
+                 string repo = repoParts[1];
+ 
+                 // The internal Nuget.Client repo has suffix which needs to be accounted for.
+-                if (uri.EndsWith("-Trusted", StringComparison.OrdinalIgnoreCase))
+                const string trustedSuffix = "-Trusted";
+                if (uri.EndsWith(trustedSuffix, StringComparison.OrdinalIgnoreCase))
+                 {
+-                    repo = repo.Substring(0, repo.Length - 8);
+                    repo = repo.Substring(0, repo.Length - trustedSuffix.Length);
+                 }
+ 
+                 uri = $"https://github.com/{org}/{repo}";
--- a/runtime-61442-disable-werror.patch
+++ b/runtime-61442-disable-werror.patch
@ -1,41 +0,0 @@
-From f41c06ba040adf1930156340c5b03d9864d8a1d4 Mon Sep 17 00:00:00 2001
-From: Omair Majid <omajid@redhat.com>
-Date: Wed, 10 Nov 2021 17:54:45 -0500
-Subject: [PATCH] The 6.0 branch is no longer pre-release
-
-This has limited affects, but it should have been set to false since 6.0
-is now stable/released.
-
-The one difference it makes is that -Werror is disabled when building
-native code.
---
- Directory.Build.props              | 2 +-
- eng/native/configureplatform.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Directory.Build.props b/Directory.Build.props
-index f19ea9208c2c..5cb87bb7c257 100644
--- a/Directory.Build.props
-+++ b/Directory.Build.props
-@@ -255,7 +255,7 @@
-     <PackageReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</PackageReleaseNotes>
-     <!-- Indicates this is not an officially supported release. Release branches should set this to false. -->
-     <!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
-    <IsPrerelease>true</IsPrerelease>
-+    <IsPrerelease>false</IsPrerelease>
-     <IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly>
-     <!-- Private packages should not be stable -->
-     <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsPrivateAssembly)">true</SuppressFinalPackageVersion>
-diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake
-index 519431772004..af1c88bce5b6 100644
--- a/eng/native/configureplatform.cmake
-+++ b/eng/native/configureplatform.cmake
-@@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake)
- 
- # If set, indicates that this is not an officially supported release
- # Keep in sync with IsPrerelease in Directory.Build.props
-set(PRERELEASE 1)
-+set(PRERELEASE 0)
- 
- #----------------------------------------
- # Detect and set platform variable names
--- a/runtime-63653-build-all-packages.patch
+++ b/runtime-63653-build-all-packages.patch
@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Santiago Fernandez Madero <safern@microsoft.com>
+Date: Tue, 11 Jan 2022 13:55:22 -0800
+Subject: [PATCH] [release/6.0] Build all packages when in source-build
+
+Originating PR:  https://github.com/dotnet/runtime/pull/63653
+---
+ eng/packaging.targets | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/eng/packaging.targets b/eng/packaging.targets
+index 6bcf86dc9f2..ee8e95167d9 100644
+--- a/eng/packaging.targets
+++ b/eng/packaging.targets
+@@ -34,6 +34,10 @@
+                                        '$(IsRIDSpecificProject)' != 'true' and
+                                        '$(PreReleaseVersionLabel)' == 'servicing' and
+                                        '$(GitHubRepositoryName)' != 'runtimelab'">false</GeneratePackageOnBuild>
+    <!-- When in source-build we need to generate all packages when building for all configurations even in servicing. -->
+    <GeneratePackageOnBuild Condition="!$(GeneratePackageOnBuild) and
+                                       '$(BuildAllConfigurations)' == 'true' and
+                                       '$(DotNetBuildFromSource)' == 'true'">true</GeneratePackageOnBuild>
+     <!-- Search for the documentation file in the intellisense package and otherwise pick up the generated one. -->
+     <LibIntellisenseDocumentationFilePath>$(XmlDocFileRoot)1033\$(AssemblyName).xml</LibIntellisenseDocumentationFilePath>
+     <UseIntellisenseDocumentationFile Condition="'$(UseIntellisenseDocumentationFile)' == '' and Exists('$(LibIntellisenseDocumentationFilePath)')">true</UseIntellisenseDocumentationFile>
+@@ -279,7 +283,7 @@
+   </Target>
+ 
+   <Target Name="ValidateServicingVersionIsPropertlySet"
+-          Condition="'$(PreReleaseVersionLabel)' == 'servicing'"
+          Condition="'$(PreReleaseVersionLabel)' == 'servicing' and '$(DotNetBuildFromSource)' != 'true'"
+           AfterTargets="GenerateNuspec">
+     <Error Condition="'$(ServicingVersion)' == '0'" Text="ServicingVersion is set to 0 and it should be an increment of the patch version from the last released package." />
+   </Target>
--- a/runtime-arm64-lld-fix.patch
+++ b/runtime-arm64-lld-fix.patch
@ -2,12 +2,17 @@ diff --git a/eng/native/init-compiler.sh b/eng/native/init-compiler.sh
 index 567d18da474..927b3071e92 100755
 --- a/eng/native/init-compiler.sh
 +++ b/eng/native/init-compiler.sh
-@@ -108,7 +108,7 @@ if [[ -z "$CC" ]]; then
+@@ -108,11 +108,8 @@
 fi
 
 if [[ "$compiler" == "clang" ]]; then
 -    if command -v "lld$desired_version" > /dev/null; then
-+    if command -v lld || command -v "lld$desired_version" > /dev/null; then
-         # Only lld version >= 9 can be considered stable
-         if [[ "$majorVersion" -ge 9 ]]; then
-             LDFLAGS="-fuse-ld=lld"
+-        # Only lld version >= 9 can be considered stable
+-        if [[ "$majorVersion" -ge 9 ]]; then
+-            LDFLAGS="-fuse-ld=lld"
+-        fi
+    if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
+        LDFLAGS="-fuse-ld=lld"
+     fi
+ fi
+ 
--- a/sdk-21557-man-pages.patch
+++ b/sdk-21557-man-pages.patch
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz) = 3dc30bda8a04908412bddbe2fc93ac0ed433492437923ddc212076682ceba55ab8f9679efc54e6dff5d6d6822a7e75c622acf66a647958791215590099aa75e4
+SHA512 (dotnet-v6.0.101.tar.gz) = e42d85d4cf5769e38059ea4f546e20452f4975a2ba448f81999deffb8a4e517d098ef23b8576c4654ec7a3b5e35006a90e5bf5ae2808012d3ed068f9d0a7eb90
--- a/2
+++ b/2
@ -56,7 +56,7 @@ fi

 host_version="$runtime_version"

-tag=v${sdk_version}-SDK
+tag=v${sdk_version}

 if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
    echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball"