From 46ba3d49a86ba601f323befa2aa53ab8fc1e411a Mon Sep 17 00:00:00 2001
From: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>
Date: Tue, 14 Jun 2022 14:58:21 -0700
Subject: [PATCH] [automated] Merge branch 'release/6.0.3xx' =>
 'release/6.0.4xx' (#13962)

* Update format of multiple /p parameters

* [release/6.0.3xx] Add razor-compiler to Source Build (#13652)

* Remove NuGet.Client source-build patches

Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
---
 .../tarball/content/repos/known-good.proj     |  1 +
 .../tarball/content/repos/razor-compiler.proj | 21 ++++++++++++++++++
 .../tarball/content/repos/sdk.proj            |  1 +
 ...lude-test-projects-from-source-build.patch | 21 ++++++++++++++++++
 ...get-Razor-Syntax-Genreator-to-net6.0.patch | 22 +++++++++++++++++++
 5 files changed, 66 insertions(+)
 create mode 100644 src/SourceBuild/tarball/content/repos/razor-compiler.proj
 create mode 100644 src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch
 create mode 100644 src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch

diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj
index eab516290..001a16c01 100644
--- a/src/SourceBuild/tarball/content/repos/known-good.proj
+++ b/src/SourceBuild/tarball/content/repos/known-good.proj
@@ -34,6 +34,7 @@
         <RepositoryReference Include="clicommandlineparser" />
         <RepositoryReference Include="command-line-api" />
         <RepositoryReference Include="diagnostics" />
+        <RepositoryReference Include="razor-compiler" />
         <RepositoryReference Include="roslyn" />
         <RepositoryReference Include="source-build" />
         <RepositoryReference Include="symreader" />
diff --git a/src/SourceBuild/tarball/content/repos/razor-compiler.proj b/src/SourceBuild/tarball/content/repos/razor-compiler.proj
new file mode 100644
index 000000000..f47d22c98
--- /dev/null
+++ b/src/SourceBuild/tarball/content/repos/razor-compiler.proj
@@ -0,0 +1,21 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
+
+    <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
+    <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
+    <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <RepositoryReference Include="arcade" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj
index 9a26cd695..613ed2e26 100644
--- a/src/SourceBuild/tarball/content/repos/sdk.proj
+++ b/src/SourceBuild/tarball/content/repos/sdk.proj
@@ -39,6 +39,7 @@
     <RepositoryReference Include="fsharp" />
     <RepositoryReference Include="format" />
     <RepositoryReference Include="deployment-tools" />
+    <RepositoryReference Include="razor-compiler" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch b/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch
new file mode 100644
index 000000000..dded6ec2f
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/razor-compiler/0001-Exclude-test-projects-from-source-build.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Wed, 13 Apr 2022 15:03:44 -0700
+Subject: [PATCH] Exclude test projects from source-build
+
+Backport PR: https://github.com/dotnet/razor-compiler/pull/226
+---
+ src/test/Directory.Build.props | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/test/Directory.Build.props b/src/test/Directory.Build.props
+index 95172906..047e4619 100644
+--- a/src/test/Directory.Build.props
++++ b/src/test/Directory.Build.props
+@@ -8,5 +8,6 @@
+     -->
+     <IsTestAssetProject>true</IsTestAssetProject>
+     <IsPackable>false</IsPackable>
++    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+   </PropertyGroup>
+ </Project>
diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch b/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch
new file mode 100644
index 000000000..e101f8041
--- /dev/null
+++ b/src/SourceBuild/tarball/patches/razor-compiler/0002-retarget-Razor-Syntax-Genreator-to-net6.0.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Thu, 14 Apr 2022 16:27:26 -0700
+Subject: [PATCH] retarget Razor Syntax Genreator to net6.0
+
+Backport PR: https://github.com/dotnet/razor-compiler/pull/226
+---
+ src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj b/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj
+index 924379ac..362f0e3b 100644
+--- a/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj
++++ b/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj
+@@ -3,6 +3,7 @@
+   <PropertyGroup>
+     <Description>Generates Razor syntax nodes from xml. For internal use only.</Description>
+     <TargetFramework>netcoreapp3.1</TargetFramework>
++    <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFramework>
+     <AssemblyName>dotnet-razorsyntaxgenerator</AssemblyName>
+     <PackageId>RazorSyntaxGenerator</PackageId>
+     <OutputType>Exe</OutputType>