From 783478bbb09f4cd5d7655f2d30233ac89cc687f1 Mon Sep 17 00:00:00 2001
From: Forgind <12969783+Forgind@users.noreply.github.com>
Date: Fri, 17 Mar 2023 16:21:23 -0700
Subject: [PATCH 1/6] Generate version for Roslyn packages (#15216)

Co-authored-by: Forgind <Forgind@users.noreply.github.com>
---
 src/redist/targets/GenerateBundledVersions.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 60d7ecde1..32d6a9ece 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -335,6 +335,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <NetCoreRoot Condition="'%24(NetCoreRoot)' == ''">%24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\'))</NetCoreRoot>
     <NetCoreTargetingPackRoot Condition="'%24(NetCoreTargetingPackRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs</NetCoreTargetingPackRoot>
 
+    <MicrosoftNetCompilersToolsetPackageVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetPackageVersion>
     <NETCoreAppMaximumVersion>$(_NETCoreAppTargetFrameworkVersion)</NETCoreAppMaximumVersion>
     <BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion>
     <BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion>

From debb3b2f361fed3a106f9e4477f94a0babe1aaef Mon Sep 17 00:00:00 2001
From: Forgind <12969783+Forgind@users.noreply.github.com>
Date: Fri, 17 Mar 2023 11:19:18 -0700
Subject: [PATCH 2/6] Add version property for Roslyn (#15843)

This will enable #15216 to use MicrosoftNetCompilersToolsetPackageVersion and have it automatically update using DARC.
---
 eng/Versions.props | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 2c2c858c5..7db5c83fd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -76,6 +76,10 @@
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <!-- Dependencies from https://github.com/dotnet/roslyn -->
+    <MicrosoftNetCompilersToolsetPackageVersion>4.6.0-2.23166.9</MicrosoftNetCompilersToolsetPackageVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/corefx -->
     <MicrosoftNETCorePlatformsPackageVersion>7.0.2</MicrosoftNETCorePlatformsPackageVersion>

From baad58f5b400f11c63048909fca28f713a24f457 Mon Sep 17 00:00:00 2001
From: Forgind <12969783+Forgind@users.noreply.github.com>
Date: Fri, 24 Mar 2023 16:42:13 -0700
Subject: [PATCH 3/6] Change property name (#15907)

This means the package version property won't collide with MicrosoftNetCompilersToolsetPackageVersion, which is already in use for another package, albeit the core version of the same package.
---
 src/redist/targets/GenerateBundledVersions.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 32d6a9ece..5fdd24175 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -335,7 +335,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <NetCoreRoot Condition="'%24(NetCoreRoot)' == ''">%24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\'))</NetCoreRoot>
     <NetCoreTargetingPackRoot Condition="'%24(NetCoreTargetingPackRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs</NetCoreTargetingPackRoot>
 
-    <MicrosoftNetCompilersToolsetPackageVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetFrameworkCompilersToolsetPackageVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetFrameworkCompilersToolsetPackageVersion>
     <NETCoreAppMaximumVersion>$(_NETCoreAppTargetFrameworkVersion)</NETCoreAppMaximumVersion>
     <BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion>
     <BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion>

From 1eb909edbc2a8124f920fbeaf9f491b953a749c9 Mon Sep 17 00:00:00 2001
From: Forgind <12969783+Forgind@users.noreply.github.com>
Date: Tue, 9 May 2023 15:34:51 -0700
Subject: [PATCH 4/6] Change property name (#16341)

Co-authored-by: Forgind <Forgind@users.noreply.github.com>
---
 src/redist/targets/GenerateBundledVersions.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 5fdd24175..ba7c4e305 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -335,7 +335,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <NetCoreRoot Condition="'%24(NetCoreRoot)' == ''">%24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\'))</NetCoreRoot>
     <NetCoreTargetingPackRoot Condition="'%24(NetCoreTargetingPackRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs</NetCoreTargetingPackRoot>
 
-    <MicrosoftNetFrameworkCompilersToolsetPackageVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetFrameworkCompilersToolsetPackageVersion>
+    <_NetFrameworkHostedCompilersVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</_NetFrameworkHostedCompilersVersion>
     <NETCoreAppMaximumVersion>$(_NETCoreAppTargetFrameworkVersion)</NETCoreAppMaximumVersion>
     <BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion>
     <BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion>

From 9ad370329019ab1e3964813dcb6d2b5740ee9002 Mon Sep 17 00:00:00 2001
From: Forgind <Forgind@users.noreply.github.com>
Date: Mon, 22 May 2023 13:19:04 -0700
Subject: [PATCH 5/6] Update roslyn version

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 7db5c83fd..69529c20a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -78,7 +78,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.6.0-2.23166.9</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.6.0-3.23259.8</MicrosoftNetCompilersToolsetPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/corefx -->

From 2b65ad96f0180f72e9a9a59cbbd5de79d4bb39ca Mon Sep 17 00:00:00 2001
From: Forgind <Forgind@users.noreply.github.com>
Date: Wed, 7 Jun 2023 10:24:50 -0700
Subject: [PATCH 6/6] Update roslyn version

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 69529c20a..f4ea106f6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -78,7 +78,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.6.0-3.23259.8</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.6.0-3.23210.15</MicrosoftNetCompilersToolsetPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/corefx -->