diff --git a/Blazor.sln b/Blazor.sln index 3a8a5d95da..3d112f5a81 100644 --- a/Blazor.sln +++ b/Blazor.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27004.2005 +VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA}" EndProject @@ -26,8 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.E2ETest", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanityClient", "samples\MonoSanityClient\MonoSanityClient.csproj", "{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Browser", "src\Microsoft.Blazor.Browser\Microsoft.Blazor.Browser.csproj", "{58D2DF2E-4181-4B16-9C69-A3F3EDB89B28}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.DevHost", "src\Microsoft.Blazor.DevHost\Microsoft.Blazor.DevHost.csproj", "{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.BuildTools", "src\Microsoft.Blazor.BuildTools\Microsoft.Blazor.BuildTools.csproj", "{BB34336F-E68E-4411-9805-CAAA919F5EA1}" @@ -52,6 +50,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Build.Test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Build", "src\Microsoft.Blazor.Build\Microsoft.Blazor.Build.csproj", "{8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Browser.JS", "src\Microsoft.Blazor.Browser.JS\Microsoft.Blazor.Browser.JS.csproj", "{8A19B1CE-9B62-4440-93B3-152DDBB39D0A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -82,10 +82,6 @@ Global {06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}.Debug|Any CPU.Build.0 = Debug|Any CPU {06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}.Release|Any CPU.ActiveCfg = Release|Any CPU {06AAAE9E-96DE-4574-97DA-9C4C7D9FE990}.Release|Any CPU.Build.0 = Release|Any CPU - {58D2DF2E-4181-4B16-9C69-A3F3EDB89B28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58D2DF2E-4181-4B16-9C69-A3F3EDB89B28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58D2DF2E-4181-4B16-9C69-A3F3EDB89B28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58D2DF2E-4181-4B16-9C69-A3F3EDB89B28}.Release|Any CPU.Build.0 = Release|Any CPU {EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -126,6 +122,10 @@ Global {8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}.Debug|Any CPU.Build.0 = Debug|Any CPU {8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}.Release|Any CPU.ActiveCfg = Release|Any CPU {8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}.Release|Any CPU.Build.0 = Release|Any CPU + {8A19B1CE-9B62-4440-93B3-152DDBB39D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A19B1CE-9B62-4440-93B3-152DDBB39D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A19B1CE-9B62-4440-93B3-152DDBB39D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A19B1CE-9B62-4440-93B3-152DDBB39D0A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -138,7 +138,6 @@ Global {118484D3-3993-45CE-97C1-6F28A517529B} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {06AAAE9E-96DE-4574-97DA-9C4C7D9FE990} = {2A076721-6081-4517-8329-B9E5110D6DAC} - {58D2DF2E-4181-4B16-9C69-A3F3EDB89B28} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {EE690312-2353-4DD0-9250-EE5EDAC6D4F7} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {BB34336F-E68E-4411-9805-CAAA919F5EA1} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {4D367450-96E9-4C8C-8B56-EED8ADE3A20D} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA} @@ -151,6 +150,7 @@ Global {7F0BF3EA-6985-49F6-8070-0BBA41448BB0} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {709C7EBE-EB93-4F6D-9491-D714B0D2E898} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815} = {B867E038-B3CE-43E3-9292-61568C46CDEB} + {8A19B1CE-9B62-4440-93B3-152DDBB39D0A} = {B867E038-B3CE-43E3-9292-61568C46CDEB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {504DA352-6788-4DC0-8705-82167E72A4D3} diff --git a/src/Microsoft.Blazor.Browser/.gitignore b/src/Microsoft.Blazor.Browser.JS/.gitignore similarity index 100% rename from src/Microsoft.Blazor.Browser/.gitignore rename to src/Microsoft.Blazor.Browser.JS/.gitignore diff --git a/src/Microsoft.Blazor.Browser/BlazorBrowserFileProvider.cs b/src/Microsoft.Blazor.Browser.JS/BlazorBrowserFileProvider.cs similarity index 92% rename from src/Microsoft.Blazor.Browser/BlazorBrowserFileProvider.cs rename to src/Microsoft.Blazor.Browser.JS/BlazorBrowserFileProvider.cs index d1d65aef33..3054e42fd9 100644 --- a/src/Microsoft.Blazor.Browser/BlazorBrowserFileProvider.cs +++ b/src/Microsoft.Blazor.Browser.JS/BlazorBrowserFileProvider.cs @@ -4,7 +4,7 @@ using Microsoft.Blazor.Internal.Common.FileProviders; using Microsoft.Extensions.FileProviders; -namespace Microsoft.Blazor.Browser +namespace Microsoft.Blazor.Browser.JS { public static class BlazorBrowserFileProvider { diff --git a/src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj b/src/Microsoft.Blazor.Browser.JS/Microsoft.Blazor.Browser.JS.csproj similarity index 100% rename from src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj rename to src/Microsoft.Blazor.Browser.JS/Microsoft.Blazor.Browser.JS.csproj diff --git a/src/Microsoft.Blazor.Browser/package-lock.json b/src/Microsoft.Blazor.Browser.JS/package-lock.json similarity index 100% rename from src/Microsoft.Blazor.Browser/package-lock.json rename to src/Microsoft.Blazor.Browser.JS/package-lock.json diff --git a/src/Microsoft.Blazor.Browser/package.json b/src/Microsoft.Blazor.Browser.JS/package.json similarity index 100% rename from src/Microsoft.Blazor.Browser/package.json rename to src/Microsoft.Blazor.Browser.JS/package.json diff --git a/src/Microsoft.Blazor.Browser/src/Boot.ts b/src/Microsoft.Blazor.Browser.JS/src/Boot.ts similarity index 100% rename from src/Microsoft.Blazor.Browser/src/Boot.ts rename to src/Microsoft.Blazor.Browser.JS/src/Boot.ts diff --git a/src/Microsoft.Blazor.Browser/src/Environment.ts b/src/Microsoft.Blazor.Browser.JS/src/Environment.ts similarity index 100% rename from src/Microsoft.Blazor.Browser/src/Environment.ts rename to src/Microsoft.Blazor.Browser.JS/src/Environment.ts diff --git a/src/Microsoft.Blazor.Browser/src/Platform/DotNet.ts b/src/Microsoft.Blazor.Browser.JS/src/Platform/DotNet.ts similarity index 100% rename from src/Microsoft.Blazor.Browser/src/Platform/DotNet.ts rename to src/Microsoft.Blazor.Browser.JS/src/Platform/DotNet.ts diff --git a/src/Microsoft.Blazor.Browser/src/Platform/Mono/MonoPlatform.ts b/src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts similarity index 100% rename from src/Microsoft.Blazor.Browser/src/Platform/Mono/MonoPlatform.ts rename to src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts diff --git a/src/Microsoft.Blazor.Browser/src/Platform/Mono/MonoTypes.d.ts b/src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoTypes.d.ts similarity index 100% rename from src/Microsoft.Blazor.Browser/src/Platform/Mono/MonoTypes.d.ts rename to src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoTypes.d.ts diff --git a/src/Microsoft.Blazor.Browser/src/Platform/Platform.ts b/src/Microsoft.Blazor.Browser.JS/src/Platform/Platform.ts similarity index 100% rename from src/Microsoft.Blazor.Browser/src/Platform/Platform.ts rename to src/Microsoft.Blazor.Browser.JS/src/Platform/Platform.ts diff --git a/src/Microsoft.Blazor.Browser/tsconfig.json b/src/Microsoft.Blazor.Browser.JS/tsconfig.json similarity index 100% rename from src/Microsoft.Blazor.Browser/tsconfig.json rename to src/Microsoft.Blazor.Browser.JS/tsconfig.json diff --git a/src/Microsoft.Blazor.Browser/webpack.config.js b/src/Microsoft.Blazor.Browser.JS/webpack.config.js similarity index 100% rename from src/Microsoft.Blazor.Browser/webpack.config.js rename to src/Microsoft.Blazor.Browser.JS/webpack.config.js diff --git a/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs b/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs index 31b06d07c8..1cb5adb836 100644 --- a/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs +++ b/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.Blazor.Browser; +using Microsoft.Blazor.Browser.JS; using Microsoft.Blazor.Internal.Common.FileProviders; using Microsoft.Blazor.Mono; using Microsoft.Extensions.FileProviders; diff --git a/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj b/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj index 012600cd8e..47c9859584 100644 --- a/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj +++ b/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj @@ -20,7 +20,7 @@ - +