From dad55487f082d787317950011f2ce14d96ce57a5 Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Mon, 25 Mar 2024 13:59:55 +0100
Subject: [PATCH] Publish Roslyn Framework Toolset package as part of SDK

---
 Directory.Packages.props            |  1 +
 eng/Publishing.props                | 15 ++++++++++++++-
 eng/SourceBuildPrebuiltBaseline.xml |  3 +++
 eng/Version.Details.xml             |  4 ++++
 eng/Versions.props                  |  1 +
 src/Layout/redist/redist.csproj     | 11 ++++++++++-
 6 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1d633fbe6ab2..a9aa59f77cd5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -42,6 +42,7 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftNETCoreAppRefPackageVersion)"/>
     <PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
+    <PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
     <PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
     <PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
     <PackageVersion Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 36949da27bd3..cbf045a840b9 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -60,7 +60,7 @@
   <!-- FSharp needs to push different packages to nuget.org depending on whether the SDK is preview or not,
        To achieve this, we find the FSharp compiler package, then the stable or non-stable FSharp.Core and Compiler service
        package contained within, depending on the stability switch of the SDK. The SDK then treats these packages as its own outputs,
-       whch means they get automatically pushed on release day. -->
+       which means they get automatically pushed on release day. -->
   <PropertyGroup>
     <PublishDependsOnTargets>$(PublishDependsOnTargets);_ResolvePublishFSharpNuGetPackages</PublishDependsOnTargets>
   </PropertyGroup>
@@ -77,6 +77,19 @@
     </ItemGroup>
   </Target>
 
+  <!-- Similarly to FSharp above, Roslyn needs to publish its Framework.Toolset package alongside SDK
+       so it can be picked up in BuildWithNetFrameworkHostedCompiler scenarios. -->
+  <PropertyGroup>
+    <PublishDependsOnTargets>$(PublishDependsOnTargets);_ResolvePublishRoslynNuGetPackages</PublishDependsOnTargets>
+  </PropertyGroup>
+    
+  <Target Name="_ResolvePublishRoslynNuGetPackages">
+    <ItemGroup>
+      <RoslynPackagesToPush Include="$(NuGetPackageRoot)\Microsoft.Net.Compilers.Toolset.Framework\$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)\*.nupkg" />
+      <ItemsToPushToBlobFeed Include="@(RoslynPackagesToPush)" IsShipping="true" />
+    </ItemGroup>
+  </Target>
+
   <!-- We use a separate target to publish this to blob storage so that we can push this to
        a relative path inside the blob storage. -->
   <Target Name="PublishToolsetAssets" DependsOnTargets="ReadToolsetVersion" BeforeTargets="Publish">
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 6f69b678faaa..f3dc4d6c8acf 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -38,6 +38,9 @@
 
     <!-- Transitive dependencies from roslyn -->
     <UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
+
+    <!-- Used only for publishing -->
+    <UsagePattern IdentityGlob="Microsoft.Net.Compilers.Toolset.Framework/*" />
   </IgnorePatterns>
 
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bfbb572899d5..6365cfd3f76b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -97,6 +97,10 @@
       <Sha>b2a0a985202805db6160e6c070ac828e9e3a8094</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.10.0-3.24169.3">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>b2a0a985202805db6160e6c070ac828e9e3a8094</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24169.3">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>b2a0a985202805db6160e6c070ac828e9e3a8094</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 6aeb726a7690..d9cddf60515f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -131,6 +131,7 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.24169.3</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.10.0-3.24169.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
     <MicrosoftCodeAnalysisPackageVersion>4.10.0-3.24169.3</MicrosoftCodeAnalysisPackageVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-3.24169.3</MicrosoftCodeAnalysisCSharpPackageVersion>
     <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.10.0-3.24169.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj
index 98656720694b..918380cebf2e 100644
--- a/src/Layout/redist/redist.csproj
+++ b/src/Layout/redist/redist.csproj
@@ -12,6 +12,8 @@
     <!-- Disable the fast up-to-date check as it relies on the redist.dll, which we delete as part of the build process in GereateLayout.targets. -->
     <!-- Property info: https://github.com/dotnet/project-system/blob/main/docs/up-to-date-check.md#disabling-the-up-to-date-check -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+    <!-- NETSDK1205: The Microsoft.Net.Compilers.Toolset.Framework package should not be set directly. -->
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1205</MSBuildWarningsAsMessages>
   </PropertyGroup>
 
   <Import Project="targets\BuildToolsetTasks.targets" />
@@ -40,6 +42,7 @@
     <PackageReference Include="Microsoft.FSharp.Compiler" ExcludeAssets="All" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" GeneratePathProperty="true" />
     <PackageDownload Include="Microsoft.Net.Compilers.Toolset" Version="[$(MicrosoftNetCompilersToolsetPackageVersion)]" />
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset.Framework" ExcludeAssets="All" GeneratePathProperty="true" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
 
     <!-- Lift up dependencies of dependencies to prevent build tasks from getting pinned to older versions -->
     <PackageReference Include="System.CodeDom" />
@@ -115,5 +118,11 @@
         <ItemsToPushToBlobFeed Include="$(PkgMicrosoft_FSharp_Compiler)\contentFiles\$(FSharpCorePath)\FSharp.Core.*.nupkg"/>
         <ItemsToPushToBlobFeed Include="$(PkgMicrosoft_FSharp_Compiler)\contentFiles\$(FSharpCorePath)\FSharp.Compiler.Service.*.nupkg" />
     </ItemGroup>
- </Target>
+  </Target>
+ 
+  <Target Name="_ResolvePublishRoslynNuGetPackages" AfterTargets="CoreCompile" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+    <ItemGroup>
+      <ItemsToPushToBlobFeed Include="$(PkgMicrosoft_Net_Compilers_Toolset_Framework)\*.nupkg" />
+    </ItemGroup>
+  </Target>
 </Project>