[automated] Merge branch 'release/7.0.2xx' => 'main' (#15145)
This commit is contained in:
commit
a3f65fa667
3 changed files with 29 additions and 1 deletions
|
@ -23,6 +23,11 @@
|
|||
<Platform Condition="'$(Platform)' == ''">x64</Platform>
|
||||
|
||||
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
|
||||
|
||||
<SourceBuildUseMonoRuntime>false</SourceBuildUseMonoRuntime>
|
||||
<!-- These architectures are only supported with mono runtime -->
|
||||
<SourceBuildUseMonoRuntime Condition="'$(BuildArchitecture)' == 's390x'">true</SourceBuildUseMonoRuntime>
|
||||
<SourceBuildUseMonoRuntime Condition="'$(BuildArchitecture)' == 'ppc64le'">true</SourceBuildUseMonoRuntime>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- This repo's projects are entirely infrastructure and do not ship. -->
|
||||
|
|
|
@ -13,7 +13,7 @@ public class DotNetWatchTests : SmokeTests
|
|||
{
|
||||
public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { }
|
||||
|
||||
//[Fact] - Renable with https://github.com/dotnet/source-build/issues/3123
|
||||
// [Fact] - Renable with https://github.com/dotnet/source-build/issues/3195
|
||||
public void WatchTests()
|
||||
{
|
||||
string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests));
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Fri, 16 Dec 2022 03:31:02 +0000
|
||||
Subject: [PATCH] Exclude Analyzers from source-build
|
||||
|
||||
Backport: https://github.com/dotnet/razor/issues/8035
|
||||
---
|
||||
src/Compiler/Directory.Build.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Compiler/Directory.Build.props b/src/Compiler/Directory.Build.props
|
||||
index e69a99bf3..f70902a08 100644
|
||||
--- a/src/Compiler/Directory.Build.props
|
||||
+++ b/src/Compiler/Directory.Build.props
|
||||
@@ -37,7 +37,7 @@
|
||||
<WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
|
||||
</PropertyGroup>
|
||||
|
||||
- <ItemGroup>
|
||||
+ <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" NoWarn="NU1608" PrivateAssets="All" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" NoWarn="NU1608" PrivateAssets="All" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="All" />
|
Loading…
Add table
Reference in a new issue