Skip to content

Commit 967e75b

Browse files
jennyf19jennyf19
committed
address merge conflicts
2 parents f1c632b + 85f7685 commit 967e75b

File tree

532 files changed

+11050
-13834
lines changed

Some content is hidden

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

532 files changed

+11050
-13834
lines changed

‎.github/fabricbot.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,7 +2491,7 @@
24912491
{
24922492
"name": "addMilestone",
24932493
"parameters": {
2494-
"milestoneName": "8.0-preview6"
2494+
"milestoneName": "8.0-preview7"
24952495
}
24962496
}
24972497
],
@@ -3304,7 +3304,7 @@
33043304
{
33053305
"name": "prTargetsBranch",
33063306
"parameters": {
3307-
"branchName": "release/8.0-preview5"
3307+
"branchName": "release/8.0-preview6"
33083308
}
33093309
}
33103310
]
@@ -3315,7 +3315,7 @@
33153315
"issues",
33163316
"project_card"
33173317
],
3318-
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-preview5 branch",
3318+
"taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-preview6 branch",
33193319
"actions": [
33203320
{
33213321
"name": "removeMilestone",
@@ -3324,7 +3324,7 @@
33243324
{
33253325
"name": "addMilestone",
33263326
"parameters": {
3327-
"milestoneName": "8.0-preview5"
3327+
"milestoneName": "8.0-preview6"
33283328
}
33293329
}
33303330
]

‎AspNetCore.sln

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,8 +1726,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestInfrastructure", "TestI
17261726
EndProject
17271727
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Templates.Mvc.Tests", "src\ProjectTemplates\test\Templates.Mvc.Tests\Templates.Mvc.Tests.csproj", "{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}"
17281728
EndProject
1729-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Templates.Blazor.Server.Tests", "src\ProjectTemplates\test\Templates.Blazor.Server.Tests\Templates.Blazor.Server.Tests.csproj", "{281BF9DB-7B8A-446B-9611-10A60903F125}"
1730-
EndProject
17311729
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "stress", "stress", "{A5946454-4788-4871-8F23-A9471D55F115}"
17321730
EndProject
17331731
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.CustomElements", "src\Components\CustomElements\src\Microsoft.AspNetCore.Components.CustomElements.csproj", "{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}"
@@ -1786,6 +1784,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen
17861784
EndProject
17871785
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.ApiEndpoints", "src\Identity\samples\IdentitySample.ApiEndpoints\IdentitySample.ApiEndpoints.csproj", "{37FC77EA-AC44-4D08-B002-8EFF415C424A}"
17881786
EndProject
1787+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Components.WasmMinimal", "src\Components\test\testassets\Components.WasmMinimal\Components.WasmMinimal.csproj", "{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}"
1788+
EndProject
17891789
Global
17901790
GlobalSection(SolutionConfigurationPlatforms) = preSolution
17911791
Debug|Any CPU = Debug|Any CPU
@@ -10403,22 +10403,6 @@ Global
1040310403
{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|x64.Build.0 = Release|Any CPU
1040410404
{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|x86.ActiveCfg = Release|Any CPU
1040510405
{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E}.Release|x86.Build.0 = Release|Any CPU
10406-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10407-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Debug|Any CPU.Build.0 = Debug|Any CPU
10408-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Debug|arm64.ActiveCfg = Debug|Any CPU
10409-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Debug|arm64.Build.0 = Debug|Any CPU
10410-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Debug|x64.ActiveCfg = Debug|Any CPU
10411-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Debug|x64.Build.0 = Debug|Any CPU
10412-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Debug|x86.ActiveCfg = Debug|Any CPU
10413-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Debug|x86.Build.0 = Debug|Any CPU
10414-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Release|Any CPU.ActiveCfg = Release|Any CPU
10415-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Release|Any CPU.Build.0 = Release|Any CPU
10416-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Release|arm64.ActiveCfg = Release|Any CPU
10417-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Release|arm64.Build.0 = Release|Any CPU
10418-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Release|x64.ActiveCfg = Release|Any CPU
10419-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Release|x64.Build.0 = Release|Any CPU
10420-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Release|x86.ActiveCfg = Release|Any CPU
10421-
{281BF9DB-7B8A-446B-9611-10A60903F125}.Release|x86.Build.0 = Release|Any CPU
1042210406
{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1042310407
{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
1042410408
{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -10739,6 +10723,22 @@ Global
1073910723
{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x64.Build.0 = Release|Any CPU
1074010724
{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x86.ActiveCfg = Release|Any CPU
1074110725
{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x86.Build.0 = Release|Any CPU
10726+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10727+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
10728+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|arm64.ActiveCfg = Debug|Any CPU
10729+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|arm64.Build.0 = Debug|Any CPU
10730+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|x64.ActiveCfg = Debug|Any CPU
10731+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|x64.Build.0 = Debug|Any CPU
10732+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|x86.ActiveCfg = Debug|Any CPU
10733+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Debug|x86.Build.0 = Debug|Any CPU
10734+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
10735+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|Any CPU.Build.0 = Release|Any CPU
10736+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|arm64.ActiveCfg = Release|Any CPU
10737+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|arm64.Build.0 = Release|Any CPU
10738+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|x64.ActiveCfg = Release|Any CPU
10739+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|x64.Build.0 = Release|Any CPU
10740+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|x86.ActiveCfg = Release|Any CPU
10741+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}.Release|x86.Build.0 = Release|Any CPU
1074210742
EndGlobalSection
1074310743
GlobalSection(SolutionProperties) = preSolution
1074410744
HideSolutionNode = FALSE
@@ -11591,7 +11591,6 @@ Global
1159111591
{89896261-C5DD-4901-BCA7-7A5F718BC008} = {AB4B9E75-719C-4589-B852-20FBFD727730}
1159211592
{F0FBA346-D8BC-4FAE-A4B2-85B33FA23055} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
1159311593
{AA7445F5-BD28-400C-8507-E2E0D3CF7D7E} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
11594-
{281BF9DB-7B8A-446B-9611-10A60903F125} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
1159511594
{A5946454-4788-4871-8F23-A9471D55F115} = {4FDDC525-4E60-4CAF-83A3-261C5B43721F}
1159611595
{76C3E22D-092B-4E8A-81F0-DCF071BFF4CD} = {0BB58FB6-8B66-4C6D-BA8A-DF3AFAF9AB8F}
1159711596
{0BB58FB6-8B66-4C6D-BA8A-DF3AFAF9AB8F} = {60D51C98-2CC0-40DF-B338-44154EFEE2FF}
@@ -11621,6 +11620,7 @@ Global
1162111620
{56291265-B7BF-4756-92AB-FC30F09381D1} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
1162211621
{66FA1041-5556-43A0-9CA3-F9937F085F6E} = {56291265-B7BF-4756-92AB-FC30F09381D1}
1162311622
{37FC77EA-AC44-4D08-B002-8EFF415C424A} = {64B2A28F-6D82-4F2B-B0BB-88DE5216DD2C}
11623+
{87D58D50-20D1-4091-88C5-8D88DCCC2DE3} = {6126DCE4-9692-4EE2-B240-C65743572995}
1162411624
EndGlobalSection
1162511625
GlobalSection(ExtensibilityGlobals) = postSolution
1162611626
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ and are generated based on the last package release.
6262
<LatestPackageReference Include="Microsoft.Extensions.Options.DataAnnotations" />
6363
<LatestPackageReference Include="Microsoft.Extensions.Options" />
6464
<LatestPackageReference Include="Microsoft.Extensions.Primitives" />
65+
<LatestPackageReference Include="Microsoft.Extensions.Telemetry.Testing" />
6566
<LatestPackageReference Include="Microsoft.Win32.Registry" />
6667
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
6768
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
77

88
<!-- These are used in-build for repo-tasks and should come from previously source built -->
9-
<UsagePattern IdentityGlob="NuGet.Common/*6.2.2*" />
10-
<UsagePattern IdentityGlob="NuGet.Configuration/*6.2.2*" />
11-
<UsagePattern IdentityGlob="NuGet.Frameworks/*6.2.2*" />
12-
<UsagePattern IdentityGlob="NuGet.Packaging/*6.2.2*" />
13-
<UsagePattern IdentityGlob="NuGet.Versioning/*6.2.2*" />
9+
<UsagePattern IdentityGlob="NuGet.Common/*6.2.4*" />
10+
<UsagePattern IdentityGlob="NuGet.Configuration/*6.2.4*" />
11+
<UsagePattern IdentityGlob="NuGet.Frameworks/*6.2.4*" />
12+
<UsagePattern IdentityGlob="NuGet.Packaging/*6.2.4*" />
13+
<UsagePattern IdentityGlob="NuGet.Versioning/*6.2.4*" />
1414

1515
<!-- These are what the analyzers are built against. They are overridden in full source build.
1616
It may be possible to generate SBRPs -->
@@ -29,5 +29,9 @@
2929
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
3030
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*8.0.*" />
3131
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
32+
33+
<!-- Transivite dependency of Microsoft.CodeAnalysis.ExternalAccess.AspNetCore -> Microsoft.CodeAnalysis.Features.
34+
In product build the dependency is bumped to latest, which also bumps the version of DiaSymReader -->
35+
<UsagePattern IdentityGlob="Microsoft.DiaSymReader/*1.4.0*" />
3236
</IgnorePatterns>
3337
</UsageData>

0 commit comments

Comments
 (0)