Skip to content

Commit

Permalink
Fixed rebase issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MackinnonBuck
MackinnonBuck committed Jul 22, 2020
1 parent 202bf61 commit 9d668c5
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 1,157 deletions.
101 changes: 93 additions & 8 deletions AspNetCore.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,21 +1429,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{FED4267E-E5E4-49C5-98DB-8B3F203596EE}"
EndProject
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}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "src\Components\test\testassets\BasicTestApp\BasicTestApp.csproj", "{46FB7E93-1294-4068-B80A-D4864F78277A}"
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}"
EndProject
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}"
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}"
EndProject
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}"
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}"
EndProject
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}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "src\Components\test\testassets\ComponentsApp.Server\ComponentsApp.Server.csproj", "{19974360-4A63-425A-94DB-C2C940A3A97A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LazyTestContentPackage", "src\Components\test\testassets\LazyTestContentPackage\LazyTestContentPackage.csproj", "{ADF9C126-F322-4E34-AFD3-E626A4487206}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{5FC3D1F1-F568-4881-896E-D9F8A6410EA4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContentPackage", "src\Components\test\testassets\TestContentPackage\TestContentPackage.csproj", "{3D3C7D9B-E356-4DC6-80B1-3F6D7F15EE31}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTestApp", "src\Components\test\testassets\BasicTestApp\BasicTestApp.csproj", "{B839D6A6-D841-4867-91AD-6F88692D9904}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.TestServer", "src\Components\test\testassets\TestServer\Components.TestServer.csproj", "{8A59AF88-4A82-46ED-977D-D909001F8107}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.App", "src\Components\test\testassets\ComponentsApp.App\ComponentsApp.App.csproj", "{ED20342B-00B7-43D3-9936-0E08FA133D9A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "src\Components\test\testassets\ComponentsApp.Server\ComponentsApp.Server.csproj", "{33DBA034-3867-4934-A84B-A7614B11C851}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LazyTestContentPackage", "src\Components\test\testassets\LazyTestContentPackage\LazyTestContentPackage.csproj", "{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContentPackage", "src\Components\test\testassets\TestContentPackage\TestContentPackage.csproj", "{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.TestServer", "src\Components\test\testassets\TestServer\Components.TestServer.csproj", "{85531045-E214-4235-A57A-C1A5752E4B10}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -6795,6 +6801,78 @@ Global
{175E5CD8-92D4-46BB-882E-3A930D3302D4}.Release|x64.Build.0 = Release|Any CPU
{175E5CD8-92D4-46BB-882E-3A930D3302D4}.Release|x86.ActiveCfg = Release|Any CPU
{175E5CD8-92D4-46BB-882E-3A930D3302D4}.Release|x86.Build.0 = Release|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|x64.ActiveCfg = Debug|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|x64.Build.0 = Debug|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|x86.ActiveCfg = Debug|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Debug|x86.Build.0 = Debug|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|Any CPU.Build.0 = Release|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|x64.ActiveCfg = Release|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|x64.Build.0 = Release|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|x86.ActiveCfg = Release|Any CPU
{B839D6A6-D841-4867-91AD-6F88692D9904}.Release|x86.Build.0 = Release|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|x64.ActiveCfg = Debug|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|x64.Build.0 = Debug|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|x86.ActiveCfg = Debug|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Debug|x86.Build.0 = Debug|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|Any CPU.Build.0 = Release|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|x64.ActiveCfg = Release|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|x64.Build.0 = Release|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|x86.ActiveCfg = Release|Any CPU
{ED20342B-00B7-43D3-9936-0E08FA133D9A}.Release|x86.Build.0 = Release|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|x64.ActiveCfg = Debug|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|x64.Build.0 = Debug|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|x86.ActiveCfg = Debug|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Debug|x86.Build.0 = Debug|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|Any CPU.Build.0 = Release|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|x64.ActiveCfg = Release|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|x64.Build.0 = Release|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|x86.ActiveCfg = Release|Any CPU
{33DBA034-3867-4934-A84B-A7614B11C851}.Release|x86.Build.0 = Release|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|x64.ActiveCfg = Debug|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|x64.Build.0 = Debug|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|x86.ActiveCfg = Debug|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Debug|x86.Build.0 = Debug|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|Any CPU.Build.0 = Release|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|x64.ActiveCfg = Release|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|x64.Build.0 = Release|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|x86.ActiveCfg = Release|Any CPU
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0}.Release|x86.Build.0 = Release|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|x64.ActiveCfg = Debug|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|x64.Build.0 = Debug|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|x86.ActiveCfg = Debug|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Debug|x86.Build.0 = Debug|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|Any CPU.Build.0 = Release|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|x64.ActiveCfg = Release|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|x64.Build.0 = Release|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|x86.ActiveCfg = Release|Any CPU
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A}.Release|x86.Build.0 = Release|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|x64.ActiveCfg = Debug|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|x64.Build.0 = Debug|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|x86.ActiveCfg = Debug|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Debug|x86.Build.0 = Debug|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|Any CPU.Build.0 = Release|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|x64.ActiveCfg = Release|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|x64.Build.0 = Release|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|x86.ActiveCfg = Release|Any CPU
{85531045-E214-4235-A57A-C1A5752E4B10}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -7515,6 +7593,13 @@ Global
{83371889-9A3E-4D16-AE77-EB4F83BC6374} = {FED4267E-E5E4-49C5-98DB-8B3F203596EE}
{525EBCB4-A870-470B-BC90-845306C337D1} = {FED4267E-E5E4-49C5-98DB-8B3F203596EE}
{175E5CD8-92D4-46BB-882E-3A930D3302D4} = {FED4267E-E5E4-49C5-98DB-8B3F203596EE}
{5FC3D1F1-F568-4881-896E-D9F8A6410EA4} = {0508E463-0269-40C9-B5C2-3B600FB2A28B}
{B839D6A6-D841-4867-91AD-6F88692D9904} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
{ED20342B-00B7-43D3-9936-0E08FA133D9A} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
{33DBA034-3867-4934-A84B-A7614B11C851} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
{1DB0FEEA-3F51-4D3E-9D06-0037C6EDD2F0} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
{FA11F99F-F9C9-4361-B2D0-C3D98F99674A} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
{85531045-E214-4235-A57A-C1A5752E4B10} = {5FC3D1F1-F568-4881-896E-D9F8A6410EA4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}
Expand Down
Loading

0 comments on commit 9d668c5

Please sign in to comment.