Skip to content

Commit 160e5b9

Browse files
author
John Luo
committed
Extension consolidation fixes
1 parent 2b9d830 commit 160e5b9

32 files changed

+267
-334
lines changed

‎AspNetCore.sln

Lines changed: 103 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,14 +1539,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{E83B0BCC-A8E
15391539
EndProject
15401540
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostingStartup", "src\SiteExtensions\Sdk\HostingStartup\HostingStartup.csproj", "{5D6F99C5-D292-4459-B8BD-8E4AD42E1B21}"
15411541
EndProject
1542-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IgnitorSample", "src\Components\Samples\IgnitorSample\IgnitorSample.csproj", "{CAFD1885-B87B-4A7A-8BE6-86B0C238C2B1}"
1542+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgnitorSample", "src\Components\Samples\IgnitorSample\IgnitorSample.csproj", "{CAFD1885-B87B-4A7A-8BE6-86B0C238C2B1}"
15431543
EndProject
15441544
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Tests.Utils", "src\SignalR\common\testassets\Tests.Utils\Microsoft.AspNetCore.SignalR.Tests.Utils.csproj", "{C1CDD339-B51B-42BE-99F2-F39A4EC0D404}"
15451545
EndProject
15461546
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{BB3D6EDD-AE71-4D25-B61B-7EBF7A1BA1D1}"
15471547
EndProject
15481548
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Analyzer.Testing", "src\Analyzers\Microsoft.AspNetCore.Analyzer.Testing\src\Microsoft.AspNetCore.Analyzer.Testing.csproj", "{399EF81E-C3B5-4D86-8BF1-DC7926252A63}"
15491549
EndProject
1550+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caching", "Caching", "{0F39820F-F4A5-41C6-9809-D79B68F032EF}"
1551+
EndProject
1552+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpClientFactory", "HttpClientFactory", "{8DFA596B-BD00-404E-9445-BCFAC65BDC34}"
1553+
EndProject
1554+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http.Polly", "src\HttpClientFactory\Polly\src\Microsoft.Extensions.Http.Polly.csproj", "{4FB95E16-918B-49C1-9F65-49D07CDE072C}"
1555+
EndProject
1556+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http.Polly.Tests", "src\HttpClientFactory\Polly\test\Microsoft.Extensions.Http.Polly.Tests.csproj", "{8001580F-B702-404B-A0FD-13538DDB9672}"
1557+
EndProject
1558+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SqlServer", "SqlServer", "{43ED0D49-E29A-4B12-8D10-531E006038E5}"
1559+
EndProject
1560+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StackExchangeRedis", "StackExchangeRedis", "{A7B8F295-AD6E-42C1-A215-17337033EBE9}"
1561+
EndProject
1562+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.SqlServer", "src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj", "{A19F94D3-0C6A-429D-811A-7A750AAD122A}"
1563+
EndProject
1564+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.SqlServer.Tests", "src\Caching\SqlServer\test\Microsoft.Extensions.Caching.SqlServer.Tests.csproj", "{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}"
1565+
EndProject
1566+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.StackExchangeRedis", "src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj", "{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}"
1567+
EndProject
1568+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.StackExchangeRedis.Tests", "src\Caching\StackExchangeRedis\test\Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj", "{14DBB385-A1B1-49B2-A737-4DF90E127E5A}"
1569+
EndProject
15501570
Global
15511571
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15521572
Debug|Any CPU = Debug|Any CPU
@@ -4437,42 +4457,6 @@ Global
44374457
{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|x64.Build.0 = Release|Any CPU
44384458
{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|x86.ActiveCfg = Release|Any CPU
44394459
{8A745E35-8098-4EB4-AC55-587B9F0DC4BE}.Release|x86.Build.0 = Release|Any CPU
4440-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Debug|Any CPU.ActiveCfg = Debug|x64
4441-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Debug|Any CPU.Build.0 = Debug|x64
4442-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Debug|x64.ActiveCfg = Debug|x64
4443-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Debug|x64.Build.0 = Debug|x64
4444-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Debug|x86.ActiveCfg = Debug|x86
4445-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Debug|x86.Build.0 = Debug|x86
4446-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Release|Any CPU.ActiveCfg = Release|x64
4447-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Release|Any CPU.Build.0 = Release|x64
4448-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Release|x64.ActiveCfg = Release|x64
4449-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Release|x64.Build.0 = Release|x64
4450-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Release|x86.ActiveCfg = Release|x86
4451-
{4BCF2228-159D-4547-8D54-CDD2252D076A}.Release|x86.Build.0 = Release|x86
4452-
{A7802482-55BA-4D95-BE79-8A601131F527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4453-
{A7802482-55BA-4D95-BE79-8A601131F527}.Debug|Any CPU.Build.0 = Debug|Any CPU
4454-
{A7802482-55BA-4D95-BE79-8A601131F527}.Debug|x64.ActiveCfg = Debug|Any CPU
4455-
{A7802482-55BA-4D95-BE79-8A601131F527}.Debug|x64.Build.0 = Debug|Any CPU
4456-
{A7802482-55BA-4D95-BE79-8A601131F527}.Debug|x86.ActiveCfg = Debug|Any CPU
4457-
{A7802482-55BA-4D95-BE79-8A601131F527}.Debug|x86.Build.0 = Debug|Any CPU
4458-
{A7802482-55BA-4D95-BE79-8A601131F527}.Release|Any CPU.ActiveCfg = Release|Any CPU
4459-
{A7802482-55BA-4D95-BE79-8A601131F527}.Release|Any CPU.Build.0 = Release|Any CPU
4460-
{A7802482-55BA-4D95-BE79-8A601131F527}.Release|x64.ActiveCfg = Release|Any CPU
4461-
{A7802482-55BA-4D95-BE79-8A601131F527}.Release|x64.Build.0 = Release|Any CPU
4462-
{A7802482-55BA-4D95-BE79-8A601131F527}.Release|x86.ActiveCfg = Release|Any CPU
4463-
{A7802482-55BA-4D95-BE79-8A601131F527}.Release|x86.Build.0 = Release|Any CPU
4464-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4465-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
4466-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Debug|x64.ActiveCfg = Debug|Any CPU
4467-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Debug|x64.Build.0 = Debug|Any CPU
4468-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Debug|x86.ActiveCfg = Debug|Any CPU
4469-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Debug|x86.Build.0 = Debug|Any CPU
4470-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
4471-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Release|Any CPU.Build.0 = Release|Any CPU
4472-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Release|x64.ActiveCfg = Release|Any CPU
4473-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Release|x64.Build.0 = Release|Any CPU
4474-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Release|x86.ActiveCfg = Release|Any CPU
4475-
{81947277-035F-41F6-A1D4-8EA362CB46D2}.Release|x86.Build.0 = Release|Any CPU
44764460
{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44774461
{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|Any CPU.Build.0 = Debug|Any CPU
44784462
{F5C54062-B19C-4291-A816-F1B5A167369A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -7447,6 +7431,78 @@ Global
74477431
{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|x64.Build.0 = Release|Any CPU
74487432
{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|x86.ActiveCfg = Release|Any CPU
74497433
{399EF81E-C3B5-4D86-8BF1-DC7926252A63}.Release|x86.Build.0 = Release|Any CPU
7434+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7435+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|Any CPU.Build.0 = Debug|Any CPU
7436+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|x64.ActiveCfg = Debug|Any CPU
7437+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|x64.Build.0 = Debug|Any CPU
7438+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|x86.ActiveCfg = Debug|Any CPU
7439+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Debug|x86.Build.0 = Debug|Any CPU
7440+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|Any CPU.ActiveCfg = Release|Any CPU
7441+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|Any CPU.Build.0 = Release|Any CPU
7442+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|x64.ActiveCfg = Release|Any CPU
7443+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|x64.Build.0 = Release|Any CPU
7444+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|x86.ActiveCfg = Release|Any CPU
7445+
{4FB95E16-918B-49C1-9F65-49D07CDE072C}.Release|x86.Build.0 = Release|Any CPU
7446+
{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7447+
{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|Any CPU.Build.0 = Debug|Any CPU
7448+
{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|x64.ActiveCfg = Debug|Any CPU
7449+
{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|x64.Build.0 = Debug|Any CPU
7450+
{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|x86.ActiveCfg = Debug|Any CPU
7451+
{8001580F-B702-404B-A0FD-13538DDB9672}.Debug|x86.Build.0 = Debug|Any CPU
7452+
{8001580F-B702-404B-A0FD-13538DDB9672}.Release|Any CPU.ActiveCfg = Release|Any CPU
7453+
{8001580F-B702-404B-A0FD-13538DDB9672}.Release|Any CPU.Build.0 = Release|Any CPU
7454+
{8001580F-B702-404B-A0FD-13538DDB9672}.Release|x64.ActiveCfg = Release|Any CPU
7455+
{8001580F-B702-404B-A0FD-13538DDB9672}.Release|x64.Build.0 = Release|Any CPU
7456+
{8001580F-B702-404B-A0FD-13538DDB9672}.Release|x86.ActiveCfg = Release|Any CPU
7457+
{8001580F-B702-404B-A0FD-13538DDB9672}.Release|x86.Build.0 = Release|Any CPU
7458+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7459+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|Any CPU.Build.0 = Debug|Any CPU
7460+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|x64.ActiveCfg = Debug|Any CPU
7461+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|x64.Build.0 = Debug|Any CPU
7462+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|x86.ActiveCfg = Debug|Any CPU
7463+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Debug|x86.Build.0 = Debug|Any CPU
7464+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|Any CPU.ActiveCfg = Release|Any CPU
7465+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|Any CPU.Build.0 = Release|Any CPU
7466+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|x64.ActiveCfg = Release|Any CPU
7467+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|x64.Build.0 = Release|Any CPU
7468+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|x86.ActiveCfg = Release|Any CPU
7469+
{A19F94D3-0C6A-429D-811A-7A750AAD122A}.Release|x86.Build.0 = Release|Any CPU
7470+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7471+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
7472+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|x64.ActiveCfg = Debug|Any CPU
7473+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|x64.Build.0 = Debug|Any CPU
7474+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|x86.ActiveCfg = Debug|Any CPU
7475+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Debug|x86.Build.0 = Debug|Any CPU
7476+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
7477+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|Any CPU.Build.0 = Release|Any CPU
7478+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|x64.ActiveCfg = Release|Any CPU
7479+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|x64.Build.0 = Release|Any CPU
7480+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|x86.ActiveCfg = Release|Any CPU
7481+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7}.Release|x86.Build.0 = Release|Any CPU
7482+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7483+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|Any CPU.Build.0 = Debug|Any CPU
7484+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|x64.ActiveCfg = Debug|Any CPU
7485+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|x64.Build.0 = Debug|Any CPU
7486+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|x86.ActiveCfg = Debug|Any CPU
7487+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Debug|x86.Build.0 = Debug|Any CPU
7488+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|Any CPU.ActiveCfg = Release|Any CPU
7489+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|Any CPU.Build.0 = Release|Any CPU
7490+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|x64.ActiveCfg = Release|Any CPU
7491+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|x64.Build.0 = Release|Any CPU
7492+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|x86.ActiveCfg = Release|Any CPU
7493+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D}.Release|x86.Build.0 = Release|Any CPU
7494+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7495+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
7496+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|x64.ActiveCfg = Debug|Any CPU
7497+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|x64.Build.0 = Debug|Any CPU
7498+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|x86.ActiveCfg = Debug|Any CPU
7499+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Debug|x86.Build.0 = Debug|Any CPU
7500+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
7501+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|Any CPU.Build.0 = Release|Any CPU
7502+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|x64.ActiveCfg = Release|Any CPU
7503+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|x64.Build.0 = Release|Any CPU
7504+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|x86.ActiveCfg = Release|Any CPU
7505+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A}.Release|x86.Build.0 = Release|Any CPU
74507506
EndGlobalSection
74517507
GlobalSection(SolutionProperties) = preSolution
74527508
HideSolutionNode = FALSE
@@ -7879,12 +7935,6 @@ Global
78797935
{EE65018D-FA12-461D-B2C5-44CA6E385530} = {E5963C9F-20A6-4385-B364-814D2581FADF}
78807936
{A8E1962B-688E-44B3-81F3-BBB9891534CE} = {EE65018D-FA12-461D-B2C5-44CA6E385530}
78817937
{8A745E35-8098-4EB4-AC55-587B9F0DC4BE} = {EE65018D-FA12-461D-B2C5-44CA6E385530}
7882-
{884AED21-7931-42A3-B08A-E58F7B0D6E7F} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
7883-
{8DA88110-5A13-41A9-9F9D-674D921EB442} = {884AED21-7931-42A3-B08A-E58F7B0D6E7F}
7884-
{4BCF2228-159D-4547-8D54-CDD2252D076A} = {8DA88110-5A13-41A9-9F9D-674D921EB442}
7885-
{2D347127-3B13-47B1-84EC-770A9C1E11B0} = {884AED21-7931-42A3-B08A-E58F7B0D6E7F}
7886-
{A7802482-55BA-4D95-BE79-8A601131F527} = {2D347127-3B13-47B1-84EC-770A9C1E11B0}
7887-
{81947277-035F-41F6-A1D4-8EA362CB46D2} = {2D347127-3B13-47B1-84EC-770A9C1E11B0}
78887938
{8C4006DF-FF48-46B6-A124-10B1EEAA266E} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
78897939
{F5C54062-B19C-4291-A816-F1B5A167369A} = {8C4006DF-FF48-46B6-A124-10B1EEAA266E}
78907940
{056535BC-3E30-49E2-BE3B-630C62E641A5} = {1A0EFF9F-E699-4303-AE50-BFAF9804EEB6}
@@ -8226,6 +8276,16 @@ Global
82268276
{C1CDD339-B51B-42BE-99F2-F39A4EC0D404} = {BB3D6EDD-AE71-4D25-B61B-7EBF7A1BA1D1}
82278277
{BB3D6EDD-AE71-4D25-B61B-7EBF7A1BA1D1} = {1A304CA0-7795-4684-88E5-E66402966927}
82288278
{399EF81E-C3B5-4D86-8BF1-DC7926252A63} = {05A169C7-4F20-4516-B10A-B13C5649D346}
8279+
{0F39820F-F4A5-41C6-9809-D79B68F032EF} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
8280+
{8DFA596B-BD00-404E-9445-BCFAC65BDC34} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
8281+
{4FB95E16-918B-49C1-9F65-49D07CDE072C} = {8DFA596B-BD00-404E-9445-BCFAC65BDC34}
8282+
{8001580F-B702-404B-A0FD-13538DDB9672} = {8DFA596B-BD00-404E-9445-BCFAC65BDC34}
8283+
{43ED0D49-E29A-4B12-8D10-531E006038E5} = {0F39820F-F4A5-41C6-9809-D79B68F032EF}
8284+
{A7B8F295-AD6E-42C1-A215-17337033EBE9} = {0F39820F-F4A5-41C6-9809-D79B68F032EF}
8285+
{A19F94D3-0C6A-429D-811A-7A750AAD122A} = {43ED0D49-E29A-4B12-8D10-531E006038E5}
8286+
{20CA28CC-FCDB-49F3-8452-5036E0BADCA7} = {43ED0D49-E29A-4B12-8D10-531E006038E5}
8287+
{3CC4AA4E-F7E6-4BAE-B2B7-BCEC9509F68D} = {A7B8F295-AD6E-42C1-A215-17337033EBE9}
8288+
{14DBB385-A1B1-49B2-A737-4DF90E127E5A} = {A7B8F295-AD6E-42C1-A215-17337033EBE9}
82298289
EndGlobalSection
82308290
GlobalSection(ExtensibilityGlobals) = postSolution
82318291
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎eng/Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,14 @@
143143
$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj;
144144
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
145145
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
146+
$(RepoRoot)src\Caching\**\*.*proj;
146147
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
147148
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;
148149
$(RepoRoot)src\DataProtection\**\*.*proj;
149150
$(RepoRoot)src\Antiforgery\**\*.*proj;
150151
$(RepoRoot)src\Hosting\**\*.*proj;
151152
$(RepoRoot)src\Http\**\*.*proj;
153+
$(RepoRoot)src\HttpClientFactory\**\*.*proj;
152154
$(RepoRoot)src\Html\**\*.*proj;
153155
$(RepoRoot)src\Identity\**\*.*proj;
154156
$(RepoRoot)src\Servers\**\*.csproj;
@@ -185,12 +187,14 @@
185187
$(RepoRoot)**\obj\**\*;"
186188
Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " />
187189
<DotNetProjects Include="
190+
$(RepoRoot)src\Caching\**\src\*.csproj;
188191
$(RepoRoot)src\DefaultBuilder\**\src\*.csproj;
189192
$(RepoRoot)src\Features\JsonPatch\**\src\*.csproj;
190193
$(RepoRoot)src\DataProtection\**\src\*.csproj;
191194
$(RepoRoot)src\Antiforgery\**\src\*.csproj;
192195
$(RepoRoot)src\Hosting\**\src\*.csproj;
193196
$(RepoRoot)src\Http\**\src\*.csproj;
197+
$(RepoRoot)src\HttpClientFactory\**\src\*.csproj;
194198
$(RepoRoot)src\Html\**\src\*.csproj;
195199
$(RepoRoot)src\Identity\**\src\*.csproj;
196200
$(RepoRoot)src\Servers\**\src\*.csproj;

‎eng/Dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ and are generated based on the last package release.
173173
<LatestPackageReference Include="Newtonsoft.Json.Bson" />
174174
<LatestPackageReference Include="NSwag.ApiDescription.Client" />
175175
<LatestPackageReference Include="NuGet.Versioning" />
176+
<LatestPackageReference Include="Polly" />
177+
<LatestPackageReference Include="Polly.Extensions.Http" />
176178
<LatestPackageReference Include="Selenium.Support" />
177179
<LatestPackageReference Include="Selenium.WebDriver" />
178180
<LatestPackageReference Include="Selenium.WebDriver.ChromeDriver" />

‎eng/ProjectReferences.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
-->
66
<Project>
77
<ItemGroup>
8+
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" />
9+
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
810
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" />
911
<ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch" ProjectPath="$(RepoRoot)src\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj" />
1012
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />
@@ -32,6 +34,7 @@
3234
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Routing.Abstractions" ProjectPath="$(RepoRoot)src\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj" />
3335
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Routing" ProjectPath="$(RepoRoot)src\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj" />
3436
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebUtilities" ProjectPath="$(RepoRoot)src\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj" />
37+
<ProjectReferenceProvider Include="Microsoft.Extensions.Http.Polly" ProjectPath="$(RepoRoot)src\HttpClientFactory\Polly\src\Microsoft.Extensions.Http.Polly.csproj" />
3538
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepoRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
3639
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" ProjectPath="$(RepoRoot)src\Identity\ApiAuthorization.IdentityServer\src\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj" />
3740
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity" ProjectPath="$(RepoRoot)src\Identity\Core\src\Microsoft.AspNetCore.Identity.csproj" />

0 commit comments

Comments
 (0)