Merge branch 'release/7.0.2xx'
This commit is contained in:
Jason Zhai
commit
0fb227f5d7
8 changed files with 152 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]
|
||||
public void WatchTests()
|
||||
{
|
||||
string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests));
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
trigger: none
|
||||
|
||||
jobs:
|
||||
- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
||||
parameters:
|
||||
architecture: x64
|
||||
excludeSdkContentTests: true
|
||||
matrix:
|
||||
Ubuntu2004-Offline:
|
||||
_BootstrapPrep: false
|
||||
_Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd
|
||||
_EnablePoison: false
|
||||
_ExcludeOmniSharpTests: false
|
||||
_RunOnline: false
|
||||
name: Build_Tarball_x64
|
||||
pool:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Fri, 11 Nov 2022 21:10:54 +0000
|
||||
Subject: [PATCH] ResolvePackageFileConflicts workaround
|
||||
|
||||
---
|
||||
.../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
|
||||
index 3b5d2ae950..f92fb421fe 100644
|
||||
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
|
||||
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
|
||||
@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||
<ItemGroup>
|
||||
<!-- These files end up in this item group as a result of setting CopyLocalLockFileAssemblies, but shouldn't be. -->
|
||||
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'apphost' OR '%(FileName)' == '$(LibPrefix)hostfxr' OR '%(FileName)' == '$(LibPrefix)hostpolicy' "/>
|
||||
+
|
||||
+ <!-- TODO: Workaround ResolvePackageFileConflicts picking up the wrong file versions when conflicts exist - https://github.com/dotnet/aspnetcore/issues/45033 -->
|
||||
+ <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Formats.Asn1' OR '%(FileName)' == 'System.Text.Encodings.Web' OR '%(FileName)' == 'System.Text.Json'"/>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Fri, 12 Aug 2022 23:02:54 +0000
|
||||
Subject: [PATCH] IDE0060 workaround
|
||||
|
||||
Backport: https://github.com/dotnet/roslyn-analyzers/issues/6228
|
||||
---
|
||||
src/Http/Routing/src/Matching/Ascii.cs | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/Http/Routing/src/Matching/Ascii.cs b/src/Http/Routing/src/Matching/Ascii.cs
|
||||
index 081af0bb07..393a9eb65f 100644
|
||||
--- a/src/Http/Routing/src/Matching/Ascii.cs
|
||||
+++ b/src/Http/Routing/src/Matching/Ascii.cs
|
||||
@@ -12,7 +12,6 @@ internal static class Ascii
|
||||
// and we know that the spans are the same length.
|
||||
//
|
||||
// Similar to https://github.com/dotnet/coreclr/blob/master/src/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs#L549
|
||||
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static bool AsciiIgnoreCaseEquals(ReadOnlySpan<char> a, ReadOnlySpan<char> b, int length)
|
||||
{
|
||||
// The caller should have checked the length. We enforce that here by THROWING if the
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Thu, 27 Oct 2022 02:47:08 +0000
|
||||
Subject: [PATCH] Address obsolete errors
|
||||
|
||||
Backport: https://github.com/dotnet/aspnetcore/pull/44734
|
||||
---
|
||||
src/Servers/Kestrel/Core/src/KestrelServerOptions.cs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
|
||||
index f31880e891..fc6322dd41 100644
|
||||
--- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
|
||||
+++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
|
||||
@@ -252,9 +252,6 @@ public class KestrelServerOptions
|
||||
writer.WritePropertyName(nameof(AllowResponseHeaderCompression));
|
||||
writer.WriteBooleanValue(AllowResponseHeaderCompression);
|
||||
|
||||
- writer.WritePropertyName(nameof(EnableAltSvc));
|
||||
- writer.WriteBooleanValue(EnableAltSvc);
|
||||
-
|
||||
writer.WritePropertyName(nameof(IsDevCertLoaded));
|
||||
writer.WriteBooleanValue(IsDevCertLoaded);
|
||||
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 15 Nov 2022 17:34:00 +0000
|
||||
Subject: [PATCH] Address Microsoft.Build.Locator prebuilt
|
||||
|
||||
Backport: https://github.com/dotnet/format/issues/1759
|
||||
---
|
||||
Directory.Packages.props | 2 +-
|
||||
eng/Versions.props | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Directory.Packages.props b/Directory.Packages.props
|
||||
index c4bf3cf..f7e85b2 100644
|
||||
--- a/Directory.Packages.props
|
||||
+++ b/Directory.Packages.props
|
||||
@@ -10,7 +10,7 @@
|
||||
<PackageVersion Include="BenchmarkDotNet.Annotations" Version="0.12.1" />
|
||||
<PackageVersion Include="BenchmarkDotNet" Version="0.12.1" />
|
||||
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
|
||||
+ <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
|
||||
<PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.2-beta1.22216.1" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index fcd583b..2933963 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -14,6 +14,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftBuildVersion>17.3.0-preview-22302-02</MicrosoftBuildVersion>
|
||||
+ <MicrosoftBuildLocatorVersion>1.5.5</MicrosoftBuildLocatorVersion>
|
||||
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisAnalyzersVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-rc.1.22426.10</MicrosoftExtensionsDependencyInjectionVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
|
|
@ -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…
Reference in a new issue