From 8b0ffb36c020f7edc5b0b667c3042a491241d567 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 2 Mar 2023 14:08:27 -0600
Subject: [PATCH] Port 8.0 Preview 2 source-build fixes to main (#15687)

---
 src/SourceBuild/content/eng/Versions.props    |  2 +-
 ...01-Patch-to-prevent-WPF-from-loading.patch | 23 +++++++++++++++
 ...1-Fix-for-item-based-msbuild-pattern.patch | 29 +++++++++++++++++++
 .../sdk/0001-Update-BroswerRefresh-TFM.patch  | 23 +++++++++++++++
 4 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch
 create mode 100644 src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch
 create mode 100644 src/SourceBuild/patches/sdk/0001-Update-BroswerRefresh-TFM.patch

diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
index 58aeb46aa..e466a9189 100644
--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@@ -25,6 +25,6 @@
       necessary, and this property is removed from the file.
     -->
     <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-8.0.100-5.centos.8-x64</PrivateSourceBuiltArtifactsPackageVersion>
-    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-8.0.100-6.centos.8-x64</PrivateSourceBuiltPrebuiltsPackageVersion>
+    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-8.0.100-8.centos.8-x64</PrivateSourceBuiltPrebuiltsPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch b/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch
new file mode 100644
index 000000000..29e3a2545
--- /dev/null
+++ b/src/SourceBuild/patches/roslyn/0001-Patch-to-prevent-WPF-from-loading.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Simons <msimons@microsoft.com>
+Date: Wed, 1 Mar 2023 00:59:46 +0000
+Subject: [PATCH] Patch to prevent WPF from loading
+
+Backport: https://github.com/dotnet/source-build/issues/3280
+---
+ src/Tools/IdeBenchmarks/IdeBenchmarks.csproj | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
+index cf0e1886b83..2ee6d355401 100644
+--- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
++++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj
+@@ -7,7 +7,7 @@
+     <TargetFramework>net472</TargetFramework>
+     <IsShipping>false</IsShipping>
+     <NoWarn>$(NoWarn),CA2007</NoWarn>
+-    <UseWpf>true</UseWpf>
++    <UseWpf Condition="'$(DotNetBuildFromSource)' != 'true'">true</UseWpf>
+   </PropertyGroup>
+   <ItemGroup>
+     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
diff --git a/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch b/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch
new file mode 100644
index 000000000..f5e666d76
--- /dev/null
+++ b/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Simons <msimons@microsoft.com>
+Date: Wed, 1 Mar 2023 00:08:32 +0000
+Subject: [PATCH] Fix for item-based msbuild pattern
+
+Backport: https://github.com/dotnet/runtime/issues/82795
+---
+ src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
+index 251336540b5..72a3537a5ce 100644
+--- a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
++++ b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
+@@ -346,7 +346,13 @@ Copyright (c) .NET Foundation. All rights reserved.
+                             _CreateR2RImages;
+                             _CreateR2RSymbols">
+ 
+-    <AllowEmptyTelemetry EventName="ReadyToRun" EventData="PublishReadyToRunUseCrossgen2=$(PublishReadyToRunUseCrossgen2);Crossgen2PackVersion=%(ResolvedCrossgen2Pack.NuGetPackageVersion);CompileListCount=@(_ReadyToRunCompileList->Count());FailedCount=@(_ReadyToRunCompilationFailures->Count())" />
++    <ItemGroup>
++       <_R2RCrossgenTelemetry Include="PublishReadyToRunUseCrossgen2" Value="$(PublishReadyToRunUseCrossgen2)" />
++       <_R2RCrossgenTelemetry Include="Crossgen2PackVersion" Value="%(ResolvedCrossgen2Pack.NuGetPackageVersion)" />
++       <_R2RCrossgenTelemetry Include="CompileListCount" Value="@(_ReadyToRunCompileList->Count())" />
++       <_R2RCrossgenTelemetry Include="FailedCount" Value="@(_ReadyToRunCompilationFailures->Count())" />
++    </ItemGroup>
++    <AllowEmptyTelemetry EventName="ReadyToRun" EventData="@(_R2RCrossgenTelemetry)" />
+ 
+     <NETSdkError Condition="'@(_ReadyToRunCompilationFailures)' != ''" ResourceName="ReadyToRunCompilationFailed" />
+ 
diff --git a/src/SourceBuild/patches/sdk/0001-Update-BroswerRefresh-TFM.patch b/src/SourceBuild/patches/sdk/0001-Update-BroswerRefresh-TFM.patch
new file mode 100644
index 000000000..f7c046b76
--- /dev/null
+++ b/src/SourceBuild/patches/sdk/0001-Update-BroswerRefresh-TFM.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Simons <msimons@microsoft.com>
+Date: Wed, 1 Mar 2023 01:12:26 +0000
+Subject: [PATCH] Update BroswerRefresh TFM
+
+Backport: https://github.com/dotnet/sdk/issues/30272
+---
+ .../Microsoft.AspNetCore.Watch.BrowserRefresh.csproj            | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
+index fc35c0ec3d..6e429eb963 100644
+--- a/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
++++ b/src/BuiltInTools/BrowserRefresh/Microsoft.AspNetCore.Watch.BrowserRefresh.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+     <!-- Intentionally pinned. This feature is supported in projects targeting 6.0 or newer.-->
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
+ 
+     <IsPackable>false</IsPackable>