Merge branch 'main' into merge/release/6.0-preview4-to-main

AJ-72 · Apr 21, 2021 · 926ad9b · 926ad9b
2 parents 93fd8ba + 228d8de
commit 926ad9b
Show file tree

Hide file tree

Showing 210 changed files with 4,866 additions and 3,543 deletions.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -772,10 +772,16 @@ stages:
     pool:
       vmImage: 'ubuntu-18.04'
     variables:
+      LC_ALL: 'en_US.UTF-8'
+      LANG: 'en_US.UTF-8'
+      LANGUAGE: 'en_US.UTF-8'
       DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
       # This isn't needed in the path because build does not need to _use_ global tools.
       DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
       DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
+      LC_ALL: 'en_US.UTF-8'
+      LANG: 'en_US.UTF-8'
+      LANGUAGE: 'en_US.UTF-8'
     steps:
     - script: |
         source eng/common/native/common-library.sh

diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
@@ -138,13 +138,22 @@ jobs:
     - DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     - TeamName: AspNetCore
+    - ${{ if eq(parameters.agentOs, 'Linux') }}:
+      - LC_ALL: 'en_US.UTF-8'
+      - LANG: 'en_US.UTF-8'
+      - LANGUAGE: 'en_US.UTF-8'
+    - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
+      - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64
     - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
       - _SignType: ''
     - ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:
       - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
         - _SignType: real
       - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
         - _SignType: test
+    - LC_ALL: 'en_US.UTF-8'
+    - LANG: 'en_US.UTF-8'
+    - LANGUAGE: 'en_US.UTF-8'
     steps:
     - ${{ if ne(parameters.agentOs, 'Windows') }}:
       - script: df -h

diff --git a/AspNetCore.sln b/AspNetCore.sln
@@ -1358,7 +1358,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "http2cat", "src\Servers\Kes
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Transport.Quic", "Transport.Quic", "{EE9D0952-6060-4723-B329-94A2950A6762}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic", "src\Servers\Kestrel\Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj", "{132D43A2-067A-4E24-A520-45B9F14DCB8E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Quic", "src\Servers\Kestrel\Transport.Quic\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj", "{132D43A2-067A-4E24-A520-45B9F14DCB8E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Http3SampleApp", "src\Servers\Kestrel\samples\Http3SampleApp\Http3SampleApp.csproj", "{2EC4E939-513F-44CD-A956-498966EAC929}"
 EndProject
@@ -1634,6 +1634,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpLo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpLogging.Sample", "src\Middleware\HttpLogging\samples\HttpLogging.Sample\HttpLogging.Sample.csproj", "{908B2263-B58B-4261-A125-B5F2DFF92799}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests", "src\Servers\Kestrel\Transport.Quic\test\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj", "{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -7753,6 +7755,18 @@ Global
 		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|x64.Build.0 = Release|Any CPU
 		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|x86.ActiveCfg = Release|Any CPU
 		{908B2263-B58B-4261-A125-B5F2DFF92799}.Release|x86.Build.0 = Release|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x64.Build.0 = Debug|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x64.ActiveCfg = Release|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x64.Build.0 = Release|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -8562,6 +8576,7 @@ Global
 		{FF413F1C-A998-4FA2-823F-52AC0916B35C} = {022B4B80-E813-4256-8034-11A68146F4EF}
 		{3A1EC883-EF9C-43E8-95E5-6B527428867B} = {022B4B80-E813-4256-8034-11A68146F4EF}
 		{908B2263-B58B-4261-A125-B5F2DFF92799} = {022B4B80-E813-4256-8034-11A68146F4EF}
+		{E3DAEBD3-CD36-493F-877F-460E8FFEAC52} = {EE9D0952-6060-4723-B329-94A2950A6762}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}