Skip to content

Commit 9d668c5

Browse files
MackinnonBuckMackinnonBuck
committed
Fixed rebase issues.
1 parent 202bf61 commit 9d668c5

File tree

5 files changed

+98
-1157
lines changed

5 files changed

+98
-1157
lines changed

‎AspNetCore.sln

Lines changed: 93 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,21 +1429,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon
14291429
EndProject
14301430
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{FED4267E-E5E4-49C5-98DB-8B3F203596EE}"
14311431
EndProject
1432-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.NET.Sdk.BlazorWebAssembly", "src\Components\WebAssembly\Sdk\src\Microsoft.NET.Sdk.BlazorWebAssembly.csproj", "{6B2734BF-C61D-4889-ABBF-456A4075D59B}"
1433-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "src\Components\test\testassets\BasicTestApp\BasicTestApp.csproj", "{46FB7E93-1294-4068-B80A-D4864F78277A}"
1432+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.BlazorWebAssembly", "src\Components\WebAssembly\Sdk\src\Microsoft.NET.Sdk.BlazorWebAssembly.csproj", "{6B2734BF-C61D-4889-ABBF-456A4075D59B}"
14341433
EndProject
1435-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.NET.Sdk.BlazorWebAssembly.Tests", "src\Components\WebAssembly\Sdk\test\Microsoft.NET.Sdk.BlazorWebAssembly.Tests.csproj", "{83371889-9A3E-4D16-AE77-EB4F83BC6374}"
1434+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.BlazorWebAssembly.Tests", "src\Components\WebAssembly\Sdk\test\Microsoft.NET.Sdk.BlazorWebAssembly.Tests.csproj", "{83371889-9A3E-4D16-AE77-EB4F83BC6374}"
14361435
EndProject
1437-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests", "src\Components\WebAssembly\Sdk\integrationtests\Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests.csproj", "{525EBCB4-A870-470B-BC90-845306C337D1}"
1436+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests", "src\Components\WebAssembly\Sdk\integrationtests\Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests.csproj", "{525EBCB4-A870-470B-BC90-845306C337D1}"
14381437
EndProject
14391438
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.NET.Sdk.BlazorWebAssembly.Tools", "src\Components\WebAssembly\Sdk\tools\Microsoft.NET.Sdk.BlazorWebAssembly.Tools.csproj", "{175E5CD8-92D4-46BB-882E-3A930D3302D4}"
1440-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "src\Components\test\testassets\ComponentsApp.Server\ComponentsApp.Server.csproj", "{19974360-4A63-425A-94DB-C2C940A3A97A}"
14411439
EndProject
1442-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LazyTestContentPackage", "src\Components\test\testassets\LazyTestContentPackage\LazyTestContentPackage.csproj", "{ADF9C126-F322-4E34-AFD3-E626A4487206}"
1440+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{5FC3D1F1-F568-4881-896E-D9F8A6410EA4}"
14431441
EndProject
1444-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContentPackage", "src\Components\test\testassets\TestContentPackage\TestContentPackage.csproj", "{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}"
1442+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "src\Components\test\testassets\BasicTestApp\BasicTestApp.csproj", "{B839D6A6-D841-4867-91AD-6F88692D9904}"
14451443
EndProject
1446-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.TestServer", "src\Components\test\testassets\TestServer\Components.TestServer.csproj", "{8A59AF88-4A82-46ED-977D-D909001F8107}"
1444+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.App", "src\Components\test\testassets\ComponentsApp.App\ComponentsApp.App.csproj", "{ED20342B-00B7-43D3-9936-0E08FA133D9A}"
1445+
EndProject
1446+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "src\Components\test\testassets\ComponentsApp.Server\ComponentsApp.Server.csproj", "{33DBA034-3867-4934-A84B-A7614B11C851}"
1447+
EndProject
1448+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LazyTestContentPackage", "src\Components\test\testassets\LazyTestContentPackage\LazyTestContentPackage.csproj", "{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}"
1449+
EndProject
1450+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContentPackage", "src\Components\test\testassets\TestContentPackage\TestContentPackage.csproj", "{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}"
1451+
EndProject
1452+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.TestServer", "src\Components\test\testassets\TestServer\Components.TestServer.csproj", "{85531045-E214-4235-A57A-C1A5752E4B10}"
14471453
EndProject
14481454
Global
14491455
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -6795,6 +6801,78 @@ Global
67956801
{175E5CD8-92D4-46BB-882E-3A930D3302D4}.Release|x64.Build.0 = Release|Any CPU
67966802
{175E5CD8-92D4-46BB-882E-3A930D3302D4}.Release|x86.ActiveCfg = Release|Any CPU
67976803
{175E5CD8-92D4-46BB-882E-3A930D3302D4}.Release|x86.Build.0 = Release|Any CPU
6804+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6805+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|Any CPU.Build.0 = Debug|Any CPU
6806+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|x64.ActiveCfg = Debug|Any CPU
6807+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|x64.Build.0 = Debug|Any CPU
6808+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|x86.ActiveCfg = Debug|Any CPU
6809+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|x86.Build.0 = Debug|Any CPU
6810+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|Any CPU.ActiveCfg = Release|Any CPU
6811+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|Any CPU.Build.0 = Release|Any CPU
6812+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|x64.ActiveCfg = Release|Any CPU
6813+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|x64.Build.0 = Release|Any CPU
6814+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|x86.ActiveCfg = Release|Any CPU
6815+
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|x86.Build.0 = Release|Any CPU
6816+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6817+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
6818+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|x64.ActiveCfg = Debug|Any CPU
6819+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|x64.Build.0 = Debug|Any CPU
6820+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|x86.ActiveCfg = Debug|Any CPU
6821+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|x86.Build.0 = Debug|Any CPU
6822+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
6823+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|Any CPU.Build.0 = Release|Any CPU
6824+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|x64.ActiveCfg = Release|Any CPU
6825+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|x64.Build.0 = Release|Any CPU
6826+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|x86.ActiveCfg = Release|Any CPU
6827+
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|x86.Build.0 = Release|Any CPU
6828+
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6829+
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|Any CPU.Build.0 = Debug|Any CPU
6830+
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|x64.ActiveCfg = Debug|Any CPU
6831+
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|x64.Build.0 = Debug|Any CPU
6832+
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|x86.ActiveCfg = Debug|Any CPU
6833+
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|x86.Build.0 = Debug|Any CPU
6834+
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|Any CPU.ActiveCfg = Release|Any CPU
6835+
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|Any CPU.Build.0 = Release|Any CPU
6836+
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|x64.ActiveCfg = Release|Any CPU
6837+
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|x64.Build.0 = Release|Any CPU
6838+
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|x86.ActiveCfg = Release|Any CPU
6839+
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|x86.Build.0 = Release|Any CPU
6840+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6841+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
6842+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|x64.ActiveCfg = Debug|Any CPU
6843+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|x64.Build.0 = Debug|Any CPU
6844+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|x86.ActiveCfg = Debug|Any CPU
6845+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|x86.Build.0 = Debug|Any CPU
6846+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
6847+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|Any CPU.Build.0 = Release|Any CPU
6848+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|x64.ActiveCfg = Release|Any CPU
6849+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|x64.Build.0 = Release|Any CPU
6850+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|x86.ActiveCfg = Release|Any CPU
6851+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|x86.Build.0 = Release|Any CPU
6852+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6853+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|Any CPU.Build.0 = Debug|Any CPU
6854+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|x64.ActiveCfg = Debug|Any CPU
6855+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|x64.Build.0 = Debug|Any CPU
6856+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|x86.ActiveCfg = Debug|Any CPU
6857+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|x86.Build.0 = Debug|Any CPU
6858+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|Any CPU.ActiveCfg = Release|Any CPU
6859+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|Any CPU.Build.0 = Release|Any CPU
6860+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|x64.ActiveCfg = Release|Any CPU
6861+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|x64.Build.0 = Release|Any CPU
6862+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|x86.ActiveCfg = Release|Any CPU
6863+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|x86.Build.0 = Release|Any CPU
6864+
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6865+
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|Any CPU.Build.0 = Debug|Any CPU
6866+
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|x64.ActiveCfg = Debug|Any CPU
6867+
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|x64.Build.0 = Debug|Any CPU
6868+
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|x86.ActiveCfg = Debug|Any CPU
6869+
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|x86.Build.0 = Debug|Any CPU
6870+
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|Any CPU.ActiveCfg = Release|Any CPU
6871+
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|Any CPU.Build.0 = Release|Any CPU
6872+
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|x64.ActiveCfg = Release|Any CPU
6873+
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|x64.Build.0 = Release|Any CPU
6874+
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|x86.ActiveCfg = Release|Any CPU
6875+
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|x86.Build.0 = Release|Any CPU
67986876
EndGlobalSection
67996877
GlobalSection(SolutionProperties) = preSolution
68006878
HideSolutionNode = FALSE
@@ -7515,6 +7593,13 @@ Global
75157593
{83371889-9A3E-4D16-AE77-EB4F83BC6374} = {FED4267E-E5E4-49C5-98DB-8B3F203596EE}
75167594
{525EBCB4-A870-470B-BC90-845306C337D1} = {FED4267E-E5E4-49C5-98DB-8B3F203596EE}
75177595
{175E5CD8-92D4-46BB-882E-3A930D3302D4} = {FED4267E-E5E4-49C5-98DB-8B3F203596EE}
7596+
{5FC3D1F1-F568-4881-896E-D9F8A6410EA4} = {0508E463-0269-40C9-B5C2-3B600FB2A28B}
7597+
{B839D6A6-D841-4867-91AD-6F88692D9904} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
7598+
{ED20342B-00B7-43D3-9936-0E08FA133D9A} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
7599+
{33DBA034-3867-4934-A84B-A7614B11C851} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
7600+
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
7601+
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
7602+
{85531045-E214-4235-A57A-C1A5752E4B10} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
75187603
EndGlobalSection
75197604
GlobalSection(ExtensibilityGlobals) = postSolution
75207605
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

0 commit comments

Comments
 (0)