Skip to content

Commit 1f2d58b

Browse files
author
John Luo
authored
Merge branch 'main' into johluo/diagnostic-option3
2 parents fbd0d40 + 176d2ae commit 1f2d58b

File tree

436 files changed

+213329
-74740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

436 files changed

+213329
-74740
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ stages:
677677
parameters:
678678
condition: ne(variables['SkipTests'], 'true')
679679
jobName: MacOS_Test
680-
jobDisplayName: "Test: macOS 10.14"
680+
jobDisplayName: "Test: macOS 10.15"
681681
agentOs: macOS
682682
timeoutInMinutes: 240
683683
isTestingJob: true

‎AspNetCore.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,6 +1636,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logging.W3C.Sample", "src\M
16361636
EndProject
16371637
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport", "src\Razor\Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport\Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport.csproj", "{247E7B6F-FBA2-41A9-BA03-C7C4DF28091C}"
16381638
EndProject
1639+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpClientApp", "src\Servers\Kestrel\samples\HttpClientApp\HttpClientApp.csproj", "{514726D2-3D2E-44C1-B056-163E37DE3E8B}"
1640+
EndProject
16391641
Global
16401642
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16411643
Debug|Any CPU = Debug|Any CPU
@@ -7803,6 +7805,18 @@ Global
78037805
{247E7B6F-FBA2-41A9-BA03-C7C4DF28091C}.Release|x64.Build.0 = Release|Any CPU
78047806
{247E7B6F-FBA2-41A9-BA03-C7C4DF28091C}.Release|x86.ActiveCfg = Release|Any CPU
78057807
{247E7B6F-FBA2-41A9-BA03-C7C4DF28091C}.Release|x86.Build.0 = Release|Any CPU
7808+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7809+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
7810+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|x64.ActiveCfg = Debug|Any CPU
7811+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|x64.Build.0 = Debug|Any CPU
7812+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|x86.ActiveCfg = Debug|Any CPU
7813+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Debug|x86.Build.0 = Debug|Any CPU
7814+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
7815+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|Any CPU.Build.0 = Release|Any CPU
7816+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|x64.ActiveCfg = Release|Any CPU
7817+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|x64.Build.0 = Release|Any CPU
7818+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|x86.ActiveCfg = Release|Any CPU
7819+
{514726D2-3D2E-44C1-B056-163E37DE3E8B}.Release|x86.Build.0 = Release|Any CPU
78067820
EndGlobalSection
78077821
GlobalSection(SolutionProperties) = preSolution
78087822
HideSolutionNode = FALSE
@@ -8613,6 +8627,7 @@ Global
86138627
{F599EAA6-399F-4A91-9B1F-D311305B43D9} = {323C3EB6-1D15-4B3D-918D-699D7F64DED9}
86148628
{17459B97-1AA3-4154-83D3-C6BDC9FA3F85} = {022B4B80-E813-4256-8034-11A68146F4EF}
86158629
{247E7B6F-FBA2-41A9-BA03-C7C4DF28091C} = {B27FBAC2-ADA3-4A05-B232-64011B6B2DA3}
8630+
{514726D2-3D2E-44C1-B056-163E37DE3E8B} = {7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}
86168631
EndGlobalSection
86178632
GlobalSection(ExtensibilityGlobals) = postSolution
86188633
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<AnalysisMode>Default</AnalysisMode>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition=" '$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' == '17.0' ">
18+
<!-- See https://github.com/dotnet/roslyn/issues/54867 for more info. -->
19+
<PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionGreaterThanOrEquals('$(VisualStudioVersion)', '17.0'))">
1920
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
2021
<RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
2122
<RunAnalyzers>false</RunAnalyzers>

‎eng/Version.Details.xml

Lines changed: 148 additions & 148 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

‎eng/common/internal/Tools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
12
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<Project Sdk="Microsoft.NET.Sdk">
44
<PropertyGroup>
55
<TargetFramework>net472</TargetFramework>

‎eng/targets/CSharp.Common.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
'$(IsImplementationProject)' == 'true' OR
2121
'$(IsAnalyzersProject)' == true OR
2222
'$(IsSpecificationTestProject)' == 'true') ">enable</Nullable>
23-
23+
2424
<!-- Strip out non-public nullable annotations for src projects. This should help with size reduction -->
2525
<Features Condition="
2626
'$(IsImplementationProject)' == 'true' OR
@@ -36,7 +36,8 @@
3636

3737
<!-- Enable .NET code style analysis during build for src projects. -->
3838
<!-- Workaround bug where turning this on produces warnings in VS -->
39-
<EnforceCodeStyleInBuild Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' &lt; '17.0'">false</EnforceCodeStyleInBuild>
39+
<!-- See https://github.com/dotnet/roslyn/issues/54867 for more info. -->
40+
<EnforceCodeStyleInBuild Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionGreaterThanOrEquals('$(VisualStudioVersion)', '17.0'))">false</EnforceCodeStyleInBuild>
4041
<EnforceCodeStyleInBuild Condition="'$(EnforceCodeStyleInBuild)' == ''">true</EnforceCodeStyleInBuild>
4142
</PropertyGroup>
4243

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-rc.1.21376.4"
3+
"version": "6.0.100-rc.1.21401.2"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-rc.1.21376.4",
6+
"dotnet": "6.0.100-rc.1.21401.2",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.27",
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21373.11"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21379.2",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21379.2"
3434
}
3535
}

0 commit comments

Comments
 (0)