From e66b57623baf342aaf5f7af76f292f5a076ca21b Mon Sep 17 00:00:00 2001
From: Noah Gilson <noahgilson@microsoft.com>
Date: Thu, 18 Apr 2024 10:40:53 -0700
Subject: [PATCH 1/3] Stabilize branding

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 8a397962e..122dec008 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,7 +13,7 @@
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
     <!-- Enable to remove prerelease label. -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <!-- Calculate prerelease label -->
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>

From 872c0349abe8a1d2bf3dbffbb44bf7b3fb1991c0 Mon Sep 17 00:00:00 2001
From: Noah Gilson <noahgilson@microsoft.com>
Date: Thu, 18 Apr 2024 10:49:56 -0700
Subject: [PATCH 2/3] Use MSBuild Add Logic to add to the version feature
 automatically. We dont need to update the implicit versions as 29 and 18 are
 the newest At least per the releases when downloading the .NET SDK.

---
 eng/Versions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 122dec008..6a626b0a3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -25,8 +25,8 @@
     <VersionFeature21>30</VersionFeature21>
     <VersionFeature31>32</VersionFeature31>
     <VersionFeature50>17</VersionFeature50>
-    <VersionFeature60>29</VersionFeature60>
-    <VersionFeature70>18</VersionFeature70>
+    <VersionFeature60>$([MSBuild]::Add($(VersionFeature), 29))</VersionFeature60>
+    <VersionFeature70>$([MSBuild]::Add($(VersionFeature), 18))</VersionFeature70>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

From 0ab0b7ba476404c2ba9ad0ecb867339b75b41232 Mon Sep 17 00:00:00 2001
From: Noah Gilson <noahgilson@microsoft.com>
Date: Thu, 18 Apr 2024 10:55:02 -0700
Subject: [PATCH 3/3] Update ILLink https://github.com/dotnet/linker/pull/3217
 this fix has not been included in 8.0.xx which is not ideal!

You can see https://github.com/dotnet/sdk/blob/78a907eaec7496e7c09010b83fb126178c29c0bb/eng/Version.Details.xml#L126C12-L126C52
it is in 7.0, but somehow it didnt get ported to 8.0.
---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 6a626b0a3..04fd5cd0f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,7 +29,7 @@
     <VersionFeature70>$([MSBuild]::Add($(VersionFeature), 18))</VersionFeature70>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
-    <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
+    <_NET70ILLinkPackVersion>7.0.100-1.23401.1</_NET70ILLinkPackVersion>
   </PropertyGroup>
   <!-- Restore feeds -->
   <PropertyGroup Label="Restore feeds">