Merge branch 'release/7.0.2xx' into merge/release/7.0.1xx-to-release/7.0.2xx
This commit is contained in:
Michael Simons
GitHub
commit
d9f4caa149
9 changed files with 150 additions and 105 deletions
|
|
@ -10,11 +10,10 @@
|
|||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-pub-dotnet-sdk-3f9beb1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-3f9beb17/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
|
|
|
|||
|
|
@ -1,46 +1,47 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-rtm.22478.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>ae2bcebe032a50af14ac0b05efcaa8477b049834</Sha>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>417429fc040af552532bb07aad29e5e8639b840f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rtm.22478.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>ae2bcebe032a50af14ac0b05efcaa8477b049834</Sha>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rtm.22519.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>417429fc040af552532bb07aad29e5e8639b840f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rtm.22478.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>ae2bcebe032a50af14ac0b05efcaa8477b049834</Sha>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rtm.22519.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>417429fc040af552532bb07aad29e5e8639b840f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-rtm.22478.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>ae2bcebe032a50af14ac0b05efcaa8477b049834</Sha>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>417429fc040af552532bb07aad29e5e8639b840f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22505.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
|
||||
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22518.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22505.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rtm.22505.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rtm.22518.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rtm.22505.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rtm.22505.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rtm.22505.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -48,9 +49,9 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rtm.22505.15" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
|
|
@ -98,60 +99,60 @@
|
|||
<Sha>bb3695688177f5f80eeb3c0498168612e31549d5</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rtm.22506.24">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>1015b43c834666023cfbd7fd933016dd2ef80745</Sha>
|
||||
<Sha>3f9beb17aec19fb589a86602e4452c2d0e3dde70</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rtm.22506.24">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22564.32">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>1015b43c834666023cfbd7fd933016dd2ef80745</Sha>
|
||||
<Sha>3f9beb17aec19fb589a86602e4452c2d0e3dde70</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rtm.22506.24">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22564.32">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>1015b43c834666023cfbd7fd933016dd2ef80745</Sha>
|
||||
<Sha>3f9beb17aec19fb589a86602e4452c2d0e3dde70</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rtm.22506.24">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22564.32">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>1015b43c834666023cfbd7fd933016dd2ef80745</Sha>
|
||||
<Sha>3f9beb17aec19fb589a86602e4452c2d0e3dde70</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-rtm.22476.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>993983be2ce14ca67f7ff09b8b04e9b8391b3339</Sha>
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-rtm.22518.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>e83409daa530605da4eb5f847c6740a520325d25</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-rtm.22476.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>a956caa0747c27f0b0776d845fafe0b05b2c7337</Sha>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-rtm.22518.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>636e2b7a00a434a354a126f510a56e16ce3c6bbc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.5-beta.22506.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.22563.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>f07ccb1bc4325861cb4306733f59b23f6d4344f7</Sha>
|
||||
<Sha>9f7329d4b4deab97603643eaa6607779d03568f1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.0-beta.22506.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22563.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>f07ccb1bc4325861cb4306733f59b23f6d4344f7</Sha>
|
||||
<Sha>9f7329d4b4deab97603643eaa6607779d03568f1</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-release-20221019-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221111-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>c02ece877c62577810f893c44279ce79af820112</Sha>
|
||||
<Sha>b61973970a544ea30d03ac35b6f5535adb64fd4c</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22471.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22558.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
<Sha>219e84c88def8276179f66282b2f7cb5f1d0d126</Sha>
|
||||
<Sha>22376ee081ea791b4c8bfa82509f8e45af4bc629</Sha>
|
||||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.4.0-3.22505.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-1.22559.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>6a0bbe19399f7da58f006b25c282c1cd5c5a96eb</Sha>
|
||||
<Sha>09bf1ae4c8671b48bbf4e28f2a2d926de037d068</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22506-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22564-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef</Sha>
|
||||
<Sha>d14b74d6f08ab7f2e17706359a38f8c22b569cb5</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.4.0-rc.117" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-rtm.22521.7</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rtm.22521.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.200-preview.22564.32</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22564.32</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.4.0-release-20221019-01</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.5.0-preview-20221111-01</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
|
||||
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
|
||||
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
|
||||
<RepoNoWarns>CS9057</RepoNoWarns>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@
|
|||
|
||||
<!-- This repo uses text-only template packages from the internal transport feed. -->
|
||||
<SetUpInternalTransportFeed>true</SetUpInternalTransportFeed>
|
||||
|
||||
<RepoNoWarns>CS9057</RepoNoWarns>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Mon, 26 Sep 2022 14:25:33 -0500
|
||||
Subject: Remove LLVM ObjWriter dependency in source-build
|
||||
|
||||
Backport PR: https://github.com/dotnet/runtime/pull/76206.
|
||||
|
||||
---
|
||||
src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
|
||||
index 8c4fce523906e..4fd1db03e8a48 100644
|
||||
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
|
||||
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
|
||||
@@ -48,12 +48,14 @@
|
||||
|
||||
<!-- CoreDisTools are used in debugging visualizers. -->
|
||||
<IncludeCoreDisTools Condition="'$(Configuration)' != 'Release' and '$(CrossHostArch)' == ''">true</IncludeCoreDisTools>
|
||||
+ <!-- source-build doesn't use ObjWriter for the ILCompiler. the end-user will end up pulling Microsoft-built bits for NativeAOT anyway. -->
|
||||
+ <IncludeObjWriter Condition="'$(DotNetBuildFromSource)' != 'true'">true</IncludeObjWriter>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(RepositoryEngineeringDir)coredistools.targets" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(IncludeCoreDisTools)' == 'true'" />
|
||||
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="runtime.$(ObjWriterRid).Microsoft.NETCore.Runtime.ObjWriter">
|
||||
+ <PackageReference Include="runtime.$(ObjWriterRid).Microsoft.NETCore.Runtime.ObjWriter" Condition="'$(IncludeObjWriter)' == 'true'">
|
||||
<Version>$(ObjWriterVersion)</Version>
|
||||
</PackageReference>
|
||||
|
||||
@@ -62,7 +64,7 @@
|
||||
<Version>$(NetStandardLibraryVersion)</Version>
|
||||
</PackageReference>
|
||||
|
||||
- <Content Include="$(NuGetPackageRoot)runtime.$(ObjWriterRid).microsoft.netcore.runtime.objwriter\$(ObjWriterVersion)\runtimes\$(ObjWriterRid)\native\$(LibPrefix)objwriter$(LibSuffix)">
|
||||
+ <Content Include="$(NuGetPackageRoot)runtime.$(ObjWriterRid).microsoft.netcore.runtime.objwriter\$(ObjWriterVersion)\runtimes\$(ObjWriterRid)\native\$(LibPrefix)objwriter$(LibSuffix)" Condition="'$(IncludeObjWriter)' == 'true'">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
<Visible>false</Visible>
|
||||
<Pack>false</Pack>
|
||||
Loading…
Reference in a new issue