[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>
This commit is contained in:
parent
46f03f644c
commit
46ba3d49a8
5 changed files with 66 additions and 0 deletions
|
@ -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" />
|
||||
|
|
21
src/SourceBuild/tarball/content/repos/razor-compiler.proj
Normal file
21
src/SourceBuild/tarball/content/repos/razor-compiler.proj
Normal file
|
@ -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>
|
|
@ -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" />
|
||||
|
|
|
@ -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>
|
|
@ -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>
|
Loading…
Reference in a new issue