From 3eca894deca3d72a5b0f8139caa624c7376301f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
<1175054+carlossanlop@users.noreply.github.com>
Date: Fri, 20 Oct 2023 16:22:43 -0700
Subject: [PATCH 1/3] [release/8.0] Stable branding for .NET 8 GA
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 189fb6671d44b..bb58d6b88e9e7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,7 +13,7 @@
- false
+ true
release
-$(PreReleaseVersionLabel)
-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)
From d14b1e81e19d44b6ab1ec7f672478a91607d0886 Mon Sep 17 00:00:00 2001
From: Larry Ewing
Date: Fri, 20 Oct 2023 21:40:23 -0500
Subject: [PATCH 2/3] Handle an empty bandPreleaseVersion
---
src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
index 62817719af0a1..21170ea215284 100644
--- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
+++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
@@ -301,8 +301,8 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v
string packagePreleaseVersion = bandVersionRegex().Match(version).Groups[1].Value;
string bandPreleaseVersion = bandVersionRegex().Match(bandVersion).Groups[1].Value;
- if (packagePreleaseVersion != bandPreleaseVersion && packagePreleaseVersion != "-dev" && packagePreleaseVersion != "-ci")
- bandVersion = bandVersion.Replace (bandPreleaseVersion, packagePreleaseVersion);
+ if (packagePreleaseVersion != bandPreleaseVersion && packagePreleaseVersion != "-dev" && packagePreleaseVersion != "-ci" && bandPreleaseVersion != "")
+ bandVersion = bandVersion.Replace(bandPreleaseVersion, packagePreleaseVersion);
PackageReference pkgRef = new(Name: $"{name}.Manifest-{bandVersion}",
Version: version,
From 1c9b5ee4cb7a45affb2b47bff7f9c2d7be26ac15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?=
Date: Mon, 23 Oct 2023 19:48:04 +0200
Subject: [PATCH 3/3] Override InformationalVersion for NativeAOT corelib too
---
src/coreclr/nativeaot/Directory.Build.props | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/coreclr/nativeaot/Directory.Build.props b/src/coreclr/nativeaot/Directory.Build.props
index ebfa725e4efd2..005d6ae997ada 100644
--- a/src/coreclr/nativeaot/Directory.Build.props
+++ b/src/coreclr/nativeaot/Directory.Build.props
@@ -25,6 +25,9 @@
false
v4.0.30319
+
+ $(ProductVersion)
+ $(ProductVersion)
$(NoWarn),0419,0649,CA2249,CA1830