From 0aa164073dbbd553207c76e95e354b93e971f6a1 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 24 Jan 2018 15:48:38 -0800 Subject: [PATCH] Rename Microsoft.Blazor.* -> Microsoft.AspNetCore.Blazor.* everywhere --- Blazor.sln | 28 +++++++++---------- .../HostedInAspNet.Client.csproj | 8 +++--- samples/HostedInAspNet.Client/Program.cs | 8 +++--- .../HostedInAspNet.Server.csproj | 2 +- samples/MonoSanity/MonoSanity.csproj | 2 +- .../MonoSanityClient/MonoSanityClient.csproj | 6 ++-- samples/StandaloneApp/Program.cs | 2 +- samples/StandaloneApp/StandaloneApp.csproj | 10 +++---- .../.gitignore | 0 .../BlazorBrowserFileProvider.cs | 4 +-- ...osoft.AspNetCore.Blazor.Browser.JS.csproj} | 4 +-- .../package-lock.json | 0 .../package.json | 0 .../src/Boot.ts | 0 .../src/Environment.ts | 0 .../src/GlobalExports.ts | 0 .../src/Interop/InternalRegisteredFunction.ts | 0 .../src/Interop/InvokeWithJsonMarshalling.ts | 0 .../src/Interop/RegisteredFunction.ts | 0 .../src/Platform/DotNet.ts | 0 .../src/Platform/Mono/MonoPlatform.ts | 0 .../src/Platform/Mono/MonoTypes.d.ts | 0 .../src/Platform/Platform.ts | 0 .../src/Rendering/BrowserRenderer.ts | 4 +-- .../src/Rendering/RenderComponentArgs.ts | 0 .../src/Rendering/RenderTreeEdit.ts | 0 .../src/Rendering/RenderTreeNode.ts | 0 .../src/Rendering/Renderer.ts | 0 .../tsconfig.json | 0 .../webpack.config.js | 0 .../Interop/JavaScriptException.cs | 2 +- .../Interop/Json.cs | 4 +-- .../Interop/MiniJSON/MiniJSON.cs | 0 .../Interop/RegisteredFunction.cs | 2 +- .../Interop/WebAssembly.Runtime.cs | 0 ...icrosoft.AspNetCore.Blazor.Browser.csproj} | 2 +- .../Rendering/BrowserRenderer.cs | 10 +++---- .../BrowserRendererEventDispatcher.cs | 6 ++-- .../Rendering/BrowserRendererRegistry.cs | 2 +- .../.gitignore | 0 .../Cli/Commands/BuildCommand.cs | 4 +-- .../Cli/Commands/BuildRazorCommand.cs | 4 +-- .../Cli/Program.cs | 4 +-- .../Core/AppBuilder.cs | 4 +-- .../Core/FileSystem/ClientFileProvider.cs | 4 +-- .../FrameworkFiles/FrameworkFileProvider.cs | 8 +++--- .../ReferencedAssemblyFileProvider.cs | 4 +-- .../ReferencedAssemblyResolver.cs | 2 +- .../Core/FileSystem/IndexHtmlFileProvider.cs | 4 +-- .../Core/FileUtil.cs | 2 +- .../Engine/BlazorCodeDocItems.cs | 2 +- .../Engine/BlazorCodeTarget.cs | 2 +- .../Engine/BlazorIntermediateNodeWriter.cs | 4 +-- .../Engine/BlazorLoweringPhase.cs | 2 +- .../Engine/BlazorRazorEngine.cs | 4 +-- .../Engine/CodeWriterExtensions.cs | 2 +- .../Core/RazorCompilation/RazorCompiler.cs | 8 +++--- .../RazorCompilerDiagnostic.cs | 2 +- .../RazorCompilerException.cs | 2 +- .../Microsoft.AspNetCore.Blazor.Build.csproj} | 8 +++--- .../Microsoft.AspNetCore.Blazor.Build.nuspec} | 2 +- .../Properties/AssemblyInfo.cs | 3 ++ .../ReferenceFromSource.props | 4 +-- .../_._ | 0 ...Microsoft.AspNetCore.Blazor.Build.targets} | 0 .../targets/All.targets | 2 +- .../targets/RazorCompilation.targets | 0 .../.gitignore | 0 .../Commands/CheckNodeJsInstalledCommand.cs | 2 +- .../Cli/Program.cs | 4 +-- ...osoft.AspNetCore.Blazor.BuildTools.csproj} | 0 .../ReferenceFromSource.props | 4 +-- .../CompositeMountedFileProvider.cs | 2 +- .../EmbeddedResourceFileProvider.cs | 2 +- .../InMemoryDirectoryContents.cs | 2 +- .../FileProviders/InMemoryFileInfo.cs | 2 +- .../FileProviders/InMemoryFileProvider.cs | 2 +- ...Microsoft.AspNetCore.Blazor.Common.csproj} | 0 ...icrosoft.AspNetCore.Blazor.DevHost.csproj} | 4 +-- .../Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 3 ++ .../Server/Program.cs | 2 +- .../Server/Startup.cs | 2 +- .../Microsoft.AspNetCore.Blazor.Mono.csproj} | 2 +- .../MonoStaticFileProvider.cs | 4 +-- .../BlazorAppBuilderExtensions.cs | 2 +- .../BlazorConfig.cs | 2 +- ...Microsoft.AspNetCore.Blazor.Server.csproj} | 0 .../Properties/AssemblyInfo.cs | 3 ++ .../Components/BlazorComponent.cs | 4 +-- .../Components/IComponent.cs | 4 +-- .../Components/RazorToolingWorkaround.cs | 2 +- .../Microsoft.AspNetCore.Blazor.csproj} | 0 .../Properties/AssemblyInfo.cs | 3 ++ .../RenderTree/ArrayBuilder.cs | 2 +- .../RenderTree/ArrayRange.cs | 2 +- .../RenderTree/RenderTreeBuilder.cs | 6 ++-- .../RenderTree/RenderTreeDiff.cs | 2 +- .../RenderTree/RenderTreeDiffComputer.cs | 6 ++-- .../RenderTree/RenderTreeEdit.cs | 2 +- .../RenderTree/RenderTreeEditType.cs | 2 +- .../RenderTree/RenderTreeNode.cs | 4 +-- .../RenderTree/RenderTreeNodeType.cs | 2 +- .../RenderTree/UIEventArgs.cs | 2 +- .../RenderTree/UIEventHandler.cs | 2 +- .../Rendering/ComponentState.cs | 6 ++-- .../Rendering/Renderer.cs | 6 ++-- .../Rendering/WeakValueDictionary.cs | 2 +- .../Properties/AssemblyInfo.cs | 3 -- .../Properties/AssemblyInfo.cs | 3 -- .../Properties/AssemblyInfo.cs | 3 -- .../Properties/AssemblyInfo.cs | 3 -- src/anglesharp/AngleSharpBuilder/Program.cs | 4 +-- .../IndexHtmlFileProviderTest.cs | 4 +-- ...osoft.AspNetCore.Blazor.Build.Test.csproj} | 2 +- .../RazorCompilerTest.cs | 14 +++++----- .../ReferencedAssemblyFileProviderTest.cs | 10 +++---- .../CompositeMountedFileProviderTest.cs | 4 +-- .../InMemoryFileProviderTest.cs | 4 +-- ...soft.AspNetCore.Blazor.Common.Test.csproj} | 2 +- .../Infrastructure/BrowserFixture.cs | 2 +- .../Infrastructure/BrowserTestBase.cs | 2 +- .../ServerFixtures/AspNetEnvironment.cs | 2 +- .../ServerFixtures/AspNetSiteServerFixture.cs | 2 +- .../ServerFixtures/DevHostServerFixture.cs | 4 +-- .../ServerFixtures/ServerFixture.cs | 2 +- .../ServerFixtures/StaticSiteServerFixture.cs | 2 +- .../ServerFixtures/WebHostServerFixture.cs | 2 +- .../Infrastructure/ServerTestBase.cs | 4 +-- ...icrosoft.AspNetCore.Blazor.E2ETest.csproj} | 2 +- .../Tests/ComponentRenderingTest.cs | 8 +++--- .../Tests/HostedInAspNetTest.cs | 6 ++-- .../Tests/MonoSanityTest.cs | 6 ++-- .../Tests/StandaloneAppTest.cs | 6 ++-- ...rosoft.AspNetCore.Blazor.Mono.Test.csproj} | 2 +- .../MonoStaticFileProviderTest.cs | 2 +- .../Microsoft.AspNetCore.Blazor.Test.csproj} | 2 +- .../RenderTreeBuilderTest.cs | 10 +++---- .../RenderTreeDiffComputerTest.cs | 8 +++--- .../RendererTest.cs | 10 +++---- test/shared/AssertNode.cs | 6 ++-- .../testapps/BasicTestApp/BasicTestApp.csproj | 10 +++---- .../KeyPressEventComponent.cshtml | 2 +- test/testapps/BasicTestApp/Program.cs | 6 ++-- 144 files changed, 231 insertions(+), 231 deletions(-) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/.gitignore (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/BlazorBrowserFileProvider.cs (79%) rename src/{Microsoft.Blazor.Browser.JS/Microsoft.Blazor.Browser.JS.csproj => Microsoft.AspNetCore.Blazor.Browser.JS/Microsoft.AspNetCore.Blazor.Browser.JS.csproj} (87%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/package-lock.json (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/package.json (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Boot.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Environment.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/GlobalExports.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Interop/InternalRegisteredFunction.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Interop/InvokeWithJsonMarshalling.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Interop/RegisteredFunction.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Platform/DotNet.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Platform/Mono/MonoPlatform.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Platform/Mono/MonoTypes.d.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Platform/Platform.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Rendering/BrowserRenderer.ts (97%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Rendering/RenderComponentArgs.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Rendering/RenderTreeEdit.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Rendering/RenderTreeNode.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/src/Rendering/Renderer.ts (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/tsconfig.json (100%) rename src/{Microsoft.Blazor.Browser.JS => Microsoft.AspNetCore.Blazor.Browser.JS}/webpack.config.js (100%) rename src/{Microsoft.Blazor.Browser => Microsoft.AspNetCore.Blazor.Browser}/Interop/JavaScriptException.cs (86%) rename src/{Microsoft.Blazor.Browser => Microsoft.AspNetCore.Blazor.Browser}/Interop/Json.cs (98%) rename src/{Microsoft.Blazor.Browser => Microsoft.AspNetCore.Blazor.Browser}/Interop/MiniJSON/MiniJSON.cs (100%) rename src/{Microsoft.Blazor.Browser => Microsoft.AspNetCore.Blazor.Browser}/Interop/RegisteredFunction.cs (99%) rename src/{Microsoft.Blazor.Browser => Microsoft.AspNetCore.Blazor.Browser}/Interop/WebAssembly.Runtime.cs (100%) rename src/{Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj => Microsoft.AspNetCore.Blazor.Browser/Microsoft.AspNetCore.Blazor.Browser.csproj} (62%) rename src/{Microsoft.Blazor.Browser => Microsoft.AspNetCore.Blazor.Browser}/Rendering/BrowserRenderer.cs (93%) rename src/{Microsoft.Blazor.Browser => Microsoft.AspNetCore.Blazor.Browser}/Rendering/BrowserRendererEventDispatcher.cs (94%) rename src/{Microsoft.Blazor.Browser => Microsoft.AspNetCore.Blazor.Browser}/Rendering/BrowserRendererRegistry.cs (98%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/.gitignore (100%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Cli/Commands/BuildCommand.cs (93%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Cli/Commands/BuildRazorCommand.cs (96%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Cli/Program.cs (89%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/AppBuilder.cs (85%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/FileSystem/ClientFileProvider.cs (95%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs (85%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/FileSystem/FrameworkFiles/ReferencedAssemblyFileProvider.cs (95%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/FileSystem/FrameworkFiles/ReferencedAssemblyResolver.cs (97%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/FileSystem/IndexHtmlFileProvider.cs (95%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/FileUtil.cs (97%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/Engine/BlazorCodeDocItems.cs (82%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/Engine/BlazorCodeTarget.cs (91%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs (99%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/Engine/BlazorLoweringPhase.cs (96%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/Engine/BlazorRazorEngine.cs (92%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/Engine/CodeWriterExtensions.cs (99%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/RazorCompiler.cs (97%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/RazorCompilerDiagnostic.cs (94%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/Core/RazorCompilation/RazorCompilerException.cs (93%) rename src/{Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj => Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj} (76%) rename src/{Microsoft.Blazor.Build/Microsoft.Blazor.Build.nuspec => Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec} (91%) create mode 100644 src/Microsoft.AspNetCore.Blazor.Build/Properties/AssemblyInfo.cs rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/ReferenceFromSource.props (82%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/_._ (100%) rename src/{Microsoft.Blazor.Build/build/netstandard1.0/Microsoft.Blazor.Build.targets => Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.targets} (100%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/targets/All.targets (96%) rename src/{Microsoft.Blazor.Build => Microsoft.AspNetCore.Blazor.Build}/targets/RazorCompilation.targets (100%) rename src/{Microsoft.Blazor.BuildTools => Microsoft.AspNetCore.Blazor.BuildTools}/.gitignore (100%) rename src/{Microsoft.Blazor.BuildTools => Microsoft.AspNetCore.Blazor.BuildTools}/Cli/Commands/CheckNodeJsInstalledCommand.cs (98%) rename src/{Microsoft.Blazor.BuildTools => Microsoft.AspNetCore.Blazor.BuildTools}/Cli/Program.cs (87%) rename src/{Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.csproj => Microsoft.AspNetCore.Blazor.BuildTools/Microsoft.AspNetCore.Blazor.BuildTools.csproj} (100%) rename src/{Microsoft.Blazor.BuildTools => Microsoft.AspNetCore.Blazor.BuildTools}/ReferenceFromSource.props (68%) rename src/{Microsoft.Blazor.Common => Microsoft.AspNetCore.Blazor.Common}/FileProviders/CompositeMountedFileProvider.cs (97%) rename src/{Microsoft.Blazor.Common => Microsoft.AspNetCore.Blazor.Common}/FileProviders/EmbeddedResourceFileProvider.cs (95%) rename src/{Microsoft.Blazor.Common => Microsoft.AspNetCore.Blazor.Common}/FileProviders/InMemoryDirectoryContents.cs (95%) rename src/{Microsoft.Blazor.Common => Microsoft.AspNetCore.Blazor.Common}/FileProviders/InMemoryFileInfo.cs (97%) rename src/{Microsoft.Blazor.Common => Microsoft.AspNetCore.Blazor.Common}/FileProviders/InMemoryFileProvider.cs (98%) rename src/{Microsoft.Blazor.Common/Microsoft.Blazor.Common.csproj => Microsoft.AspNetCore.Blazor.Common/Microsoft.AspNetCore.Blazor.Common.csproj} (100%) rename src/{Microsoft.Blazor.DevHost/Microsoft.Blazor.DevHost.csproj => Microsoft.AspNetCore.Blazor.DevHost/Microsoft.AspNetCore.Blazor.DevHost.csproj} (60%) rename src/{Microsoft.Blazor.DevHost => Microsoft.AspNetCore.Blazor.DevHost}/Program.cs (95%) create mode 100644 src/Microsoft.AspNetCore.Blazor.DevHost/Properties/AssemblyInfo.cs rename src/{Microsoft.Blazor.DevHost => Microsoft.AspNetCore.Blazor.DevHost}/Server/Program.cs (92%) rename src/{Microsoft.Blazor.DevHost => Microsoft.AspNetCore.Blazor.DevHost}/Server/Startup.cs (97%) rename src/{Microsoft.Blazor.Mono/Microsoft.Blazor.Mono.csproj => Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.csproj} (91%) rename src/{Microsoft.Blazor.Mono => Microsoft.AspNetCore.Blazor.Mono}/MonoStaticFileProvider.cs (84%) rename src/{Microsoft.Blazor.Server => Microsoft.AspNetCore.Blazor.Server}/BlazorAppBuilderExtensions.cs (98%) rename src/{Microsoft.Blazor.Server => Microsoft.AspNetCore.Blazor.Server}/BlazorConfig.cs (96%) rename src/{Microsoft.Blazor.Server/Microsoft.Blazor.Server.csproj => Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj} (100%) create mode 100644 src/Microsoft.AspNetCore.Blazor.Server/Properties/AssemblyInfo.cs rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/Components/BlazorComponent.cs (96%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/Components/IComponent.cs (86%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/Components/RazorToolingWorkaround.cs (96%) rename src/{Microsoft.Blazor/Microsoft.Blazor.csproj => Microsoft.AspNetCore.Blazor/Microsoft.AspNetCore.Blazor.csproj} (100%) create mode 100644 src/Microsoft.AspNetCore.Blazor/Properties/AssemblyInfo.cs rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/ArrayBuilder.cs (98%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/ArrayRange.cs (96%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/RenderTreeBuilder.cs (98%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/RenderTreeDiff.cs (95%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/RenderTreeDiffComputer.cs (99%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/RenderTreeEdit.cs (98%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/RenderTreeEditType.cs (97%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/RenderTreeNode.cs (98%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/RenderTreeNodeType.cs (94%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/UIEventArgs.cs (95%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/RenderTree/UIEventHandler.cs (87%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/Rendering/ComponentState.cs (96%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/Rendering/Renderer.cs (97%) rename src/{Microsoft.Blazor => Microsoft.AspNetCore.Blazor}/Rendering/WeakValueDictionary.cs (97%) delete mode 100644 src/Microsoft.Blazor.Build/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.Blazor.DevHost/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.Blazor.Server/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.Blazor/Properties/AssemblyInfo.cs rename test/{Microsoft.Blazor.Build.Test => Microsoft.AspNetCore.Blazor.Build.Test}/IndexHtmlFileProviderTest.cs (97%) rename test/{Microsoft.Blazor.Build.Test/Microsoft.Blazor.Build.Test.csproj => Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj} (88%) rename test/{Microsoft.Blazor.Build.Test => Microsoft.AspNetCore.Blazor.Build.Test}/RazorCompilerTest.cs (97%) rename test/{Microsoft.Blazor.Build.Test => Microsoft.AspNetCore.Blazor.Build.Test}/ReferencedAssemblyFileProviderTest.cs (95%) rename test/{Microsoft.Blazor.Common.Test => Microsoft.AspNetCore.Blazor.Common.Test}/CompositeMountedFileProviderTest.cs (98%) rename test/{Microsoft.Blazor.Common.Test => Microsoft.AspNetCore.Blazor.Common.Test}/InMemoryFileProviderTest.cs (98%) rename test/{Microsoft.Blazor.Common.Test/Microsoft.Blazor.Common.Test.csproj => Microsoft.AspNetCore.Blazor.Common.Test/Microsoft.AspNetCore.Blazor.Common.Test.csproj} (78%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/BrowserFixture.cs (91%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/BrowserTestBase.cs (88%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/ServerFixtures/AspNetEnvironment.cs (77%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs (93%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/ServerFixtures/DevHostServerFixture.cs (81%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/ServerFixtures/ServerFixture.cs (97%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs (95%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/ServerFixtures/WebHostServerFixture.cs (91%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Infrastructure/ServerTestBase.cs (89%) rename test/{Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj => Microsoft.AspNetCore.Blazor.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj} (91%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Tests/ComponentRenderingTest.cs (95%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Tests/HostedInAspNetTest.cs (81%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Tests/MonoSanityTest.cs (96%) rename test/{Microsoft.Blazor.E2ETest => Microsoft.AspNetCore.Blazor.E2ETest}/Tests/StandaloneAppTest.cs (86%) rename test/{Microsoft.Blazor.Mono.Test/Microsoft.Blazor.Mono.Test.csproj => Microsoft.AspNetCore.Blazor.Mono.Test/Microsoft.AspNetCore.Blazor.Mono.Test.csproj} (82%) rename test/{Microsoft.Blazor.Mono.Test => Microsoft.AspNetCore.Blazor.Mono.Test}/MonoStaticFileProviderTest.cs (97%) rename test/{Microsoft.Blazor.Test/Microsoft.Blazor.Test.csproj => Microsoft.AspNetCore.Blazor.Test/Microsoft.AspNetCore.Blazor.Test.csproj} (84%) rename test/{Microsoft.Blazor.Test => Microsoft.AspNetCore.Blazor.Test}/RenderTreeBuilderTest.cs (98%) rename test/{Microsoft.Blazor.Test => Microsoft.AspNetCore.Blazor.Test}/RenderTreeDiffComputerTest.cs (99%) rename test/{Microsoft.Blazor.Test => Microsoft.AspNetCore.Blazor.Test}/RendererTest.cs (98%) diff --git a/Blazor.sln b/Blazor.sln index fb2d08ecfe..7d00eaf658 100644 --- a/Blazor.sln +++ b/Blazor.sln @@ -12,23 +12,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mono", "mono", "{7B5CAAB1-A src\mono\mono.targets = src\mono\mono.targets EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Mono", "src\Microsoft.Blazor.Mono\Microsoft.Blazor.Mono.csproj", "{39FEC72D-AF52-47A3-B63D-7BF0E4335248}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Mono", "src\Microsoft.AspNetCore.Blazor.Mono\Microsoft.AspNetCore.Blazor.Mono.csproj", "{39FEC72D-AF52-47A3-B63D-7BF0E4335248}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanity", "samples\MonoSanity\MonoSanity.csproj", "{7C53BB6B-5906-4753-B507-C9FCC2F7E5B7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Server", "src\Microsoft.Blazor.Server\Microsoft.Blazor.Server.csproj", "{5A694793-3257-4D37-BB74-4A41B3894685}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Server", "src\Microsoft.AspNetCore.Blazor.Server\Microsoft.AspNetCore.Blazor.Server.csproj", "{5A694793-3257-4D37-BB74-4A41B3894685}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Mono.Test", "test\Microsoft.Blazor.Mono.Test\Microsoft.Blazor.Mono.Test.csproj", "{118484D3-3993-45CE-97C1-6F28A517529B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Mono.Test", "test\Microsoft.AspNetCore.Blazor.Mono.Test\Microsoft.AspNetCore.Blazor.Mono.Test.csproj", "{118484D3-3993-45CE-97C1-6F28A517529B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.E2ETest", "test\Microsoft.Blazor.E2ETest\Microsoft.Blazor.E2ETest.csproj", "{5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.E2ETest", "test\Microsoft.AspNetCore.Blazor.E2ETest\Microsoft.AspNetCore.Blazor.E2ETest.csproj", "{5BC2A10D-B6CA-43AE-B73C-2A41AE1039F9}" 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.DevHost", "src\Microsoft.Blazor.DevHost\Microsoft.Blazor.DevHost.csproj", "{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.DevHost", "src\Microsoft.AspNetCore.Blazor.DevHost\Microsoft.AspNetCore.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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.BuildTools", "src\Microsoft.AspNetCore.Blazor.BuildTools\Microsoft.AspNetCore.Blazor.BuildTools.csproj", "{BB34336F-E68E-4411-9805-CAAA919F5EA1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostedInAspNet", "HostedInAspNet", "{4D367450-96E9-4C8C-8B56-EED8ADE3A20D}" EndProject @@ -36,25 +36,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Client", "sa EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Server", "samples\HostedInAspNet.Server\HostedInAspNet.Server.csproj", "{F8996835-41F7-4663-91DF-3B5652ADC37D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor", "src\Microsoft.Blazor\Microsoft.Blazor.csproj", "{7FD8C650-74B3-4153-AEA1-00F4F6AF393D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor", "src\Microsoft.AspNetCore.Blazor\Microsoft.AspNetCore.Blazor.csproj", "{7FD8C650-74B3-4153-AEA1-00F4F6AF393D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "samples\StandaloneApp\StandaloneApp.csproj", "{B241434A-1642-44CC-AE9A-2012B5C5BD02}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoSanity", "MonoSanity", "{2A076721-6081-4517-8329-B9E5110D6DAC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Common", "src\Microsoft.Blazor.Common\Microsoft.Blazor.Common.csproj", "{21EF76A4-63CC-455D-907C-F86C9E442CEC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Common", "src\Microsoft.AspNetCore.Blazor.Common\Microsoft.AspNetCore.Blazor.Common.csproj", "{21EF76A4-63CC-455D-907C-F86C9E442CEC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Common.Test", "test\Microsoft.Blazor.Common.Test\Microsoft.Blazor.Common.Test.csproj", "{7F0BF3EA-6985-49F6-8070-0BBA41448BB0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Common.Test", "test\Microsoft.AspNetCore.Blazor.Common.Test\Microsoft.AspNetCore.Blazor.Common.Test.csproj", "{7F0BF3EA-6985-49F6-8070-0BBA41448BB0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Build.Test", "test\Microsoft.Blazor.Build.Test\Microsoft.Blazor.Build.Test.csproj", "{709C7EBE-EB93-4F6D-9491-D714B0D2E898}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Build.Test", "test\Microsoft.AspNetCore.Blazor.Build.Test\Microsoft.AspNetCore.Blazor.Build.Test.csproj", "{709C7EBE-EB93-4F6D-9491-D714B0D2E898}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Build", "src\Microsoft.Blazor.Build\Microsoft.Blazor.Build.csproj", "{8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Build", "src\Microsoft.AspNetCore.Blazor.Build\Microsoft.AspNetCore.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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Browser.JS", "src\Microsoft.AspNetCore.Blazor.Browser.JS\Microsoft.AspNetCore.Blazor.Browser.JS.csproj", "{8A19B1CE-9B62-4440-93B3-152DDBB39D0A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Browser", "src\Microsoft.Blazor.Browser\Microsoft.Blazor.Browser.csproj", "{4874AFF4-335D-4037-8858-BBBB987C124B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Browser", "src\Microsoft.AspNetCore.Blazor.Browser\Microsoft.AspNetCore.Blazor.Browser.csproj", "{4874AFF4-335D-4037-8858-BBBB987C124B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Test", "test\Microsoft.Blazor.Test\Microsoft.Blazor.Test.csproj", "{8FD8636E-AFA5-434D-8857-06D02686741A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Test", "test\Microsoft.AspNetCore.Blazor.Test\Microsoft.AspNetCore.Blazor.Test.csproj", "{8FD8636E-AFA5-434D-8857-06D02686741A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testapps", "testapps", "{4AE0D35B-D97A-44D0-8392-C9240377DCCE}" EndProject diff --git a/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj index 8436207e11..ea6cb4f61a 100644 --- a/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj +++ b/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj @@ -9,11 +9,11 @@ netcoreapp2.0 - - + + - - + + diff --git a/samples/HostedInAspNet.Client/Program.cs b/samples/HostedInAspNet.Client/Program.cs index f1e4227acc..9feb4dceb6 100644 --- a/samples/HostedInAspNet.Client/Program.cs +++ b/samples/HostedInAspNet.Client/Program.cs @@ -1,10 +1,10 @@ // 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.Rendering; -using Microsoft.Blazor.Components; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Browser; +using Microsoft.AspNetCore.Blazor.Browser.Rendering; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.RenderTree; namespace HostedInAspNet.Client { diff --git a/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj index 4cc06e7c02..bec134f6ce 100644 --- a/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/MonoSanity/MonoSanity.csproj b/samples/MonoSanity/MonoSanity.csproj index 5fceb10e64..5f9d0ad148 100644 --- a/samples/MonoSanity/MonoSanity.csproj +++ b/samples/MonoSanity/MonoSanity.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/MonoSanityClient/MonoSanityClient.csproj b/samples/MonoSanityClient/MonoSanityClient.csproj index 2c544bf90c..cb23e16f7f 100644 --- a/samples/MonoSanityClient/MonoSanityClient.csproj +++ b/samples/MonoSanityClient/MonoSanityClient.csproj @@ -4,12 +4,12 @@ netcoreapp2.0 - - + + - + diff --git a/samples/StandaloneApp/Program.cs b/samples/StandaloneApp/Program.cs index e092cb8238..06d043f1fa 100644 --- a/samples/StandaloneApp/Program.cs +++ b/samples/StandaloneApp/Program.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.Rendering; +using Microsoft.AspNetCore.Blazor.Browser.Rendering; namespace StandaloneApp { diff --git a/samples/StandaloneApp/StandaloneApp.csproj b/samples/StandaloneApp/StandaloneApp.csproj index 40516dfe00..c8e3e420e7 100644 --- a/samples/StandaloneApp/StandaloneApp.csproj +++ b/samples/StandaloneApp/StandaloneApp.csproj @@ -4,15 +4,15 @@ netcoreapp2.0 - run --project ..\..\src\Microsoft.Blazor.DevHost serve + run --project ..\..\src\Microsoft.AspNetCore.Blazor.DevHost serve - - + + - - + + diff --git a/src/Microsoft.Blazor.Browser.JS/.gitignore b/src/Microsoft.AspNetCore.Blazor.Browser.JS/.gitignore similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/.gitignore rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/.gitignore diff --git a/src/Microsoft.Blazor.Browser.JS/BlazorBrowserFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Browser.JS/BlazorBrowserFileProvider.cs similarity index 79% rename from src/Microsoft.Blazor.Browser.JS/BlazorBrowserFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/BlazorBrowserFileProvider.cs index 3054e42fd9..b14d18d5c9 100644 --- a/src/Microsoft.Blazor.Browser.JS/BlazorBrowserFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Browser.JS/BlazorBrowserFileProvider.cs @@ -1,10 +1,10 @@ // 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.Internal.Common.FileProviders; +using Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders; using Microsoft.Extensions.FileProviders; -namespace Microsoft.Blazor.Browser.JS +namespace Microsoft.AspNetCore.Blazor.Browser.JS { public static class BlazorBrowserFileProvider { diff --git a/src/Microsoft.Blazor.Browser.JS/Microsoft.Blazor.Browser.JS.csproj b/src/Microsoft.AspNetCore.Blazor.Browser.JS/Microsoft.AspNetCore.Blazor.Browser.JS.csproj similarity index 87% rename from src/Microsoft.Blazor.Browser.JS/Microsoft.Blazor.Browser.JS.csproj rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/Microsoft.AspNetCore.Blazor.Browser.JS.csproj index 3418b3585f..b475b5b7d7 100644 --- a/src/Microsoft.Blazor.Browser.JS/Microsoft.Blazor.Browser.JS.csproj +++ b/src/Microsoft.AspNetCore.Blazor.Browser.JS/Microsoft.AspNetCore.Blazor.Browser.JS.csproj @@ -16,10 +16,10 @@ - + - + diff --git a/src/Microsoft.Blazor.Browser.JS/package-lock.json b/src/Microsoft.AspNetCore.Blazor.Browser.JS/package-lock.json similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/package-lock.json rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/package-lock.json diff --git a/src/Microsoft.Blazor.Browser.JS/package.json b/src/Microsoft.AspNetCore.Blazor.Browser.JS/package.json similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/package.json rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/package.json diff --git a/src/Microsoft.Blazor.Browser.JS/src/Boot.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Boot.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Boot.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Boot.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Environment.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Environment.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Environment.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Environment.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/GlobalExports.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/GlobalExports.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/GlobalExports.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/GlobalExports.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Interop/InternalRegisteredFunction.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Interop/InternalRegisteredFunction.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Interop/InternalRegisteredFunction.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Interop/InternalRegisteredFunction.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Interop/InvokeWithJsonMarshalling.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Interop/InvokeWithJsonMarshalling.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Interop/InvokeWithJsonMarshalling.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Interop/InvokeWithJsonMarshalling.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Interop/RegisteredFunction.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Interop/RegisteredFunction.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Interop/RegisteredFunction.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Interop/RegisteredFunction.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Platform/DotNet.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/DotNet.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Platform/DotNet.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/DotNet.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoTypes.d.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/Mono/MonoTypes.d.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Platform/Mono/MonoTypes.d.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/Mono/MonoTypes.d.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Platform/Platform.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/Platform.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Platform/Platform.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/Platform.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Rendering/BrowserRenderer.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/BrowserRenderer.ts similarity index 97% rename from src/Microsoft.Blazor.Browser.JS/src/Rendering/BrowserRenderer.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/BrowserRenderer.ts index 1367111671..b33b14ad14 100644 --- a/src/Microsoft.Blazor.Browser.JS/src/Rendering/BrowserRenderer.ts +++ b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/BrowserRenderer.ts @@ -150,7 +150,7 @@ export class BrowserRenderer { if (!renderComponentMethod) { renderComponentMethod = platform.findMethod( - 'Microsoft.Blazor.Browser', 'Microsoft.Blazor.Browser.Rendering', 'BrowserRendererEventDispatcher', 'RenderChildComponent' + 'Microsoft.AspNetCore.Blazor.Browser', 'Microsoft.AspNetCore.Blazor.Browser.Rendering', 'BrowserRendererEventDispatcher', 'RenderChildComponent' ); } @@ -239,7 +239,7 @@ function removeAttributeFromDOM(parent: Element, childIndex: number, attributeNa function raiseEvent(browserRendererId: number, componentId: number, renderTreeNodeIndex: number, eventInfoType: EventInfoType, eventInfo: any) { if (!raiseEventMethod) { raiseEventMethod = platform.findMethod( - 'Microsoft.Blazor.Browser', 'Microsoft.Blazor.Browser.Rendering', 'BrowserRendererEventDispatcher', 'DispatchEvent' + 'Microsoft.AspNetCore.Blazor.Browser', 'Microsoft.AspNetCore.Blazor.Browser.Rendering', 'BrowserRendererEventDispatcher', 'DispatchEvent' ); } diff --git a/src/Microsoft.Blazor.Browser.JS/src/Rendering/RenderComponentArgs.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/RenderComponentArgs.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Rendering/RenderComponentArgs.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/RenderComponentArgs.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Rendering/RenderTreeEdit.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/RenderTreeEdit.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Rendering/RenderTreeEdit.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/RenderTreeEdit.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Rendering/RenderTreeNode.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/RenderTreeNode.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Rendering/RenderTreeNode.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/RenderTreeNode.ts diff --git a/src/Microsoft.Blazor.Browser.JS/src/Rendering/Renderer.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/Renderer.ts similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/src/Rendering/Renderer.ts rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Rendering/Renderer.ts diff --git a/src/Microsoft.Blazor.Browser.JS/tsconfig.json b/src/Microsoft.AspNetCore.Blazor.Browser.JS/tsconfig.json similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/tsconfig.json rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/tsconfig.json diff --git a/src/Microsoft.Blazor.Browser.JS/webpack.config.js b/src/Microsoft.AspNetCore.Blazor.Browser.JS/webpack.config.js similarity index 100% rename from src/Microsoft.Blazor.Browser.JS/webpack.config.js rename to src/Microsoft.AspNetCore.Blazor.Browser.JS/webpack.config.js diff --git a/src/Microsoft.Blazor.Browser/Interop/JavaScriptException.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Interop/JavaScriptException.cs similarity index 86% rename from src/Microsoft.Blazor.Browser/Interop/JavaScriptException.cs rename to src/Microsoft.AspNetCore.Blazor.Browser/Interop/JavaScriptException.cs index d44be461e9..02fcf960d7 100644 --- a/src/Microsoft.Blazor.Browser/Interop/JavaScriptException.cs +++ b/src/Microsoft.AspNetCore.Blazor.Browser/Interop/JavaScriptException.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Blazor.Browser.Interop +namespace Microsoft.AspNetCore.Blazor.Browser.Interop { public class JavaScriptException : Exception { diff --git a/src/Microsoft.Blazor.Browser/Interop/Json.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Interop/Json.cs similarity index 98% rename from src/Microsoft.Blazor.Browser/Interop/Json.cs rename to src/Microsoft.AspNetCore.Blazor.Browser/Interop/Json.cs index 96e67eb373..c2d3a3998b 100644 --- a/src/Microsoft.Blazor.Browser/Interop/Json.cs +++ b/src/Microsoft.AspNetCore.Blazor.Browser/Interop/Json.cs @@ -5,11 +5,11 @@ using System; using System.Collections.Generic; using System.Reflection; -namespace Microsoft.Blazor.Browser.Interop +namespace Microsoft.AspNetCore.Blazor.Browser.Interop { /// /// Temporary internal JSON serialization library. - /// This will be removed when public JSON methods are added to Microsoft.Blazor + /// This will be removed when public JSON methods are added to Microsoft.AspNetCore.Blazor /// (which will be needed for HTTP support at least). /// internal static class Json diff --git a/src/Microsoft.Blazor.Browser/Interop/MiniJSON/MiniJSON.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Interop/MiniJSON/MiniJSON.cs similarity index 100% rename from src/Microsoft.Blazor.Browser/Interop/MiniJSON/MiniJSON.cs rename to src/Microsoft.AspNetCore.Blazor.Browser/Interop/MiniJSON/MiniJSON.cs diff --git a/src/Microsoft.Blazor.Browser/Interop/RegisteredFunction.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Interop/RegisteredFunction.cs similarity index 99% rename from src/Microsoft.Blazor.Browser/Interop/RegisteredFunction.cs rename to src/Microsoft.AspNetCore.Blazor.Browser/Interop/RegisteredFunction.cs index 07f188d8f2..5c6d1b42c6 100644 --- a/src/Microsoft.Blazor.Browser/Interop/RegisteredFunction.cs +++ b/src/Microsoft.AspNetCore.Blazor.Browser/Interop/RegisteredFunction.cs @@ -4,7 +4,7 @@ using System.Linq; using WebAssembly; -namespace Microsoft.Blazor.Browser.Interop +namespace Microsoft.AspNetCore.Blazor.Browser.Interop { /// /// Provides methods for invoking preregistered JavaScript functions from .NET code. diff --git a/src/Microsoft.Blazor.Browser/Interop/WebAssembly.Runtime.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Interop/WebAssembly.Runtime.cs similarity index 100% rename from src/Microsoft.Blazor.Browser/Interop/WebAssembly.Runtime.cs rename to src/Microsoft.AspNetCore.Blazor.Browser/Interop/WebAssembly.Runtime.cs diff --git a/src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj b/src/Microsoft.AspNetCore.Blazor.Browser/Microsoft.AspNetCore.Blazor.Browser.csproj similarity index 62% rename from src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj rename to src/Microsoft.AspNetCore.Blazor.Browser/Microsoft.AspNetCore.Blazor.Browser.csproj index adcc673aa8..e1da5ca8d4 100644 --- a/src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj +++ b/src/Microsoft.AspNetCore.Blazor.Browser/Microsoft.AspNetCore.Blazor.Browser.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Microsoft.Blazor.Browser/Rendering/BrowserRenderer.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRenderer.cs similarity index 93% rename from src/Microsoft.Blazor.Browser/Rendering/BrowserRenderer.cs rename to src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRenderer.cs index 39c00e6c3f..a5434c3e04 100644 --- a/src/Microsoft.Blazor.Browser/Rendering/BrowserRenderer.cs +++ b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRenderer.cs @@ -1,14 +1,14 @@ // 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.Interop; -using Microsoft.Blazor.Components; -using Microsoft.Blazor.Rendering; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Browser.Interop; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Blazor.RenderTree; using System; using System.Collections.Generic; -namespace Microsoft.Blazor.Browser.Rendering +namespace Microsoft.AspNetCore.Blazor.Browser.Rendering { /// /// Provides mechanisms for rendering instances in a diff --git a/src/Microsoft.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs similarity index 94% rename from src/Microsoft.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs rename to src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs index 20a92cc732..3fb6877aa8 100644 --- a/src/Microsoft.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs +++ b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs @@ -1,11 +1,11 @@ // 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.Interop; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Browser.Interop; +using Microsoft.AspNetCore.Blazor.RenderTree; using System; -namespace Microsoft.Blazor.Browser.Rendering +namespace Microsoft.AspNetCore.Blazor.Browser.Rendering { /// /// Provides mechanisms for dispatching events to components in a . diff --git a/src/Microsoft.Blazor.Browser/Rendering/BrowserRendererRegistry.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererRegistry.cs similarity index 98% rename from src/Microsoft.Blazor.Browser/Rendering/BrowserRendererRegistry.cs rename to src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererRegistry.cs index 0e784cd043..9efcb8403d 100644 --- a/src/Microsoft.Blazor.Browser/Rendering/BrowserRendererRegistry.cs +++ b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererRegistry.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.Blazor.Browser.Rendering +namespace Microsoft.AspNetCore.Blazor.Browser.Rendering { /// /// Provides mechanisms for locating instances diff --git a/src/Microsoft.Blazor.Build/.gitignore b/src/Microsoft.AspNetCore.Blazor.Build/.gitignore similarity index 100% rename from src/Microsoft.Blazor.Build/.gitignore rename to src/Microsoft.AspNetCore.Blazor.Build/.gitignore diff --git a/src/Microsoft.Blazor.Build/Cli/Commands/BuildCommand.cs b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildCommand.cs similarity index 93% rename from src/Microsoft.Blazor.Build/Cli/Commands/BuildCommand.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildCommand.cs index 76b8b95e4a..771611e332 100644 --- a/src/Microsoft.Blazor.Build/Cli/Commands/BuildCommand.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildCommand.cs @@ -1,11 +1,11 @@ // 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.Build.Core; +using Microsoft.AspNetCore.Blazor.Build.Core; using Microsoft.Extensions.CommandLineUtils; using System; -namespace Microsoft.Blazor.Build.Cli.Commands +namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands { internal class BuildCommand { diff --git a/src/Microsoft.Blazor.Build/Cli/Commands/BuildRazorCommand.cs b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildRazorCommand.cs similarity index 96% rename from src/Microsoft.Blazor.Build/Cli/Commands/BuildRazorCommand.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildRazorCommand.cs index 4a7451a7c2..467a5878e6 100644 --- a/src/Microsoft.Blazor.Build/Cli/Commands/BuildRazorCommand.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/BuildRazorCommand.cs @@ -1,14 +1,14 @@ // 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.Build.Core.RazorCompilation; +using Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation; using Microsoft.Extensions.CommandLineUtils; using System; using System.Collections.Generic; using System.IO; using System.Linq; -namespace Microsoft.Blazor.Build.Cli.Commands +namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands { internal class BuildRazorCommand { diff --git a/src/Microsoft.Blazor.Build/Cli/Program.cs b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs similarity index 89% rename from src/Microsoft.Blazor.Build/Cli/Program.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs index 5fb15fbd4f..1b6c894f9a 100644 --- a/src/Microsoft.Blazor.Build/Cli/Program.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs @@ -1,10 +1,10 @@ // 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.Build.Cli.Commands; +using Microsoft.AspNetCore.Blazor.Build.Cli.Commands; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.Blazor.Build +namespace Microsoft.AspNetCore.Blazor.Build { static class Program { diff --git a/src/Microsoft.Blazor.Build/Core/AppBuilder.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/AppBuilder.cs similarity index 85% rename from src/Microsoft.Blazor.Build/Core/AppBuilder.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/AppBuilder.cs index 756e77b57d..041e2648d0 100644 --- a/src/Microsoft.Blazor.Build/Core/AppBuilder.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/AppBuilder.cs @@ -1,10 +1,10 @@ // 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.Build.Core.FileSystem; +using Microsoft.AspNetCore.Blazor.Build.Core.FileSystem; using System.IO; -namespace Microsoft.Blazor.Build.Core +namespace Microsoft.AspNetCore.Blazor.Build.Core { internal static class AppBuilder { diff --git a/src/Microsoft.Blazor.Build/Core/FileSystem/ClientFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/ClientFileProvider.cs similarity index 95% rename from src/Microsoft.Blazor.Build/Core/FileSystem/ClientFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/ClientFileProvider.cs index 3234629d5f..7e8e9993b5 100644 --- a/src/Microsoft.Blazor.Build/Core/FileSystem/ClientFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/ClientFileProvider.cs @@ -1,12 +1,12 @@ // 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.Internal.Common.FileProviders; +using Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders; using Microsoft.Extensions.FileProviders; using System.Collections.Generic; using System.IO; -namespace Microsoft.Blazor.Build.Core.FileSystem +namespace Microsoft.AspNetCore.Blazor.Build.Core.FileSystem { internal class ClientFileProvider : CompositeMountedFileProvider { diff --git a/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs similarity index 85% rename from src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs index 1cb5adb836..f39b1d98b5 100644 --- a/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/FrameworkFileProvider.cs @@ -1,13 +1,13 @@ // 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.JS; -using Microsoft.Blazor.Internal.Common.FileProviders; -using Microsoft.Blazor.Mono; +using Microsoft.AspNetCore.Blazor.Browser.JS; +using Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders; +using Microsoft.AspNetCore.Blazor.Mono; using Microsoft.Extensions.FileProviders; using System.IO; -namespace Microsoft.Blazor.Build.Core.FileSystem +namespace Microsoft.AspNetCore.Blazor.Build.Core.FileSystem { internal class FrameworkFileProvider : CompositeMountedFileProvider { diff --git a/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyFileProvider.cs similarity index 95% rename from src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyFileProvider.cs index b3b17cc924..921fc2f8f6 100644 --- a/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyFileProvider.cs @@ -5,9 +5,9 @@ using System.IO; using System.Collections.Generic; using System.Linq; using Mono.Cecil; -using Microsoft.Blazor.Internal.Common.FileProviders; +using Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders; -namespace Microsoft.Blazor.Build.Core.FileSystem +namespace Microsoft.AspNetCore.Blazor.Build.Core.FileSystem { internal class ReferencedAssemblyFileProvider : InMemoryFileProvider { diff --git a/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyResolver.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyResolver.cs similarity index 97% rename from src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyResolver.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyResolver.cs index 1366eaa582..d745e50095 100644 --- a/src/Microsoft.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyResolver.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/FrameworkFiles/ReferencedAssemblyResolver.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.FileProviders; using System.IO; using System.Linq; -namespace Microsoft.Blazor.Build.Core.FileSystem +namespace Microsoft.AspNetCore.Blazor.Build.Core.FileSystem { internal class ReferencedAssemblyResolver { diff --git a/src/Microsoft.Blazor.Build/Core/FileSystem/IndexHtmlFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/IndexHtmlFileProvider.cs similarity index 95% rename from src/Microsoft.Blazor.Build/Core/FileSystem/IndexHtmlFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/IndexHtmlFileProvider.cs index b24c3e4012..83abfbe5fe 100644 --- a/src/Microsoft.Blazor.Build/Core/FileSystem/IndexHtmlFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileSystem/IndexHtmlFileProvider.cs @@ -1,14 +1,14 @@ // 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.Internal.Common.FileProviders; +using Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders; using System.IO; using System.Collections.Generic; using System.Text; using Microsoft.Extensions.FileProviders; using System.Linq; -namespace Microsoft.Blazor.Build.Core.FileSystem +namespace Microsoft.AspNetCore.Blazor.Build.Core.FileSystem { internal class IndexHtmlFileProvider : InMemoryFileProvider { diff --git a/src/Microsoft.Blazor.Build/Core/FileUtil.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileUtil.cs similarity index 97% rename from src/Microsoft.Blazor.Build/Core/FileUtil.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/FileUtil.cs index 6c176ee5bb..1f1bbf15f1 100644 --- a/src/Microsoft.Blazor.Build/Core/FileUtil.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/FileUtil.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.FileProviders; using System.IO; -namespace Microsoft.Blazor.Build.Core +namespace Microsoft.AspNetCore.Blazor.Build.Core { internal static class FileUtil { diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeDocItems.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeDocItems.cs similarity index 82% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeDocItems.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeDocItems.cs index 1eeb4b59ee..2bc73f342a 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeDocItems.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeDocItems.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. -namespace Microsoft.Blazor.Build.Core.RazorCompilation.Engine +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine { internal static class BlazorCodeDocItems { diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeTarget.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeTarget.cs similarity index 91% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeTarget.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeTarget.cs index cc3a49d8ba..38a0f5ae2e 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeTarget.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorCodeTarget.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using System; -namespace Microsoft.Blazor.Build.Core.RazorCompilation.Engine +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine { /// /// Directs a to use . diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs similarity index 99% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs index fac56d764a..cda515963f 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorIntermediateNodeWriter.cs @@ -6,13 +6,13 @@ using AngleSharp.Html; using AngleSharp.Parser.Html; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.RenderTree; using System; using System.Collections.Generic; using System.Linq; using System.Text; -namespace Microsoft.Blazor.Build.Core.RazorCompilation.Engine +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine { /// /// Generates the C# code corresponding to Razor source document contents. diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorLoweringPhase.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorLoweringPhase.cs similarity index 96% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorLoweringPhase.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorLoweringPhase.cs index 4d2d44f8f8..c4fda55e6f 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorLoweringPhase.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorLoweringPhase.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.AspNetCore.Razor.Language.Intermediate; using System; -namespace Microsoft.Blazor.Build.Core.RazorCompilation.Engine +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine { /// /// A phase that builds the C# document corresponding to diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorRazorEngine.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorRazorEngine.cs similarity index 92% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorRazorEngine.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorRazorEngine.cs index 41865e7522..1a8665700c 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/BlazorRazorEngine.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/BlazorRazorEngine.cs @@ -3,10 +3,10 @@ using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.Language.Extensions; -using Microsoft.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Components; using System.Linq; -namespace Microsoft.Blazor.Build.Core.RazorCompilation.Engine +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine { /// /// Wraps , configuring it to compile Blazor components. diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/CodeWriterExtensions.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/CodeWriterExtensions.cs similarity index 99% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/CodeWriterExtensions.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/CodeWriterExtensions.cs index e1c8e3c011..a077a05e58 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/Engine/CodeWriterExtensions.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/Engine/CodeWriterExtensions.cs @@ -12,7 +12,7 @@ using System.Linq; // Copied directly from https://github.com/aspnet/Razor/blob/ff40124594b58b17988d50841175430a4b73d1a9/src/Microsoft.AspNetCore.Razor.Language/CodeGeneration/CodeWriterExtensions.cs // (other than the namespace change) because it's internal -namespace Microsoft.Blazor.Build.Core.RazorCompilation.Engine +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine { internal static class CodeWriterExtensions { diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs similarity index 97% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs index 35a51632be..187cdfae6c 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs @@ -2,16 +2,16 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Razor.Language; -using Microsoft.Blazor.Build.Core.RazorCompilation.Engine; -using Microsoft.Blazor.Components; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation.Engine; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.RenderTree; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -namespace Microsoft.Blazor.Build.Core.RazorCompilation +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation { /// /// Provides facilities for transforming Razor files into Blazor component classes. diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompilerDiagnostic.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompilerDiagnostic.cs similarity index 94% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompilerDiagnostic.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompilerDiagnostic.cs index 10a18f645f..0e632d82cb 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompilerDiagnostic.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompilerDiagnostic.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. -namespace Microsoft.Blazor.Build.Core.RazorCompilation +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation { public class RazorCompilerDiagnostic { diff --git a/src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompilerException.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompilerException.cs similarity index 93% rename from src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompilerException.cs rename to src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompilerException.cs index 27508c5985..519f5df09f 100644 --- a/src/Microsoft.Blazor.Build/Core/RazorCompilation/RazorCompilerException.cs +++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompilerException.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Blazor.Build.Core.RazorCompilation +namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation { /// /// Represents a fatal error during the transformation of a Blazor component from diff --git a/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj similarity index 76% rename from src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj rename to src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj index 9b0714136a..6b14171c79 100644 --- a/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.csproj +++ b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj @@ -9,7 +9,7 @@ true - Microsoft.Blazor.BuildTools.nuspec + Microsoft.AspNetCore.Blazor.BuildTools.nuspec 0.0.1 version=$(PackageVersion) @@ -20,9 +20,9 @@ - - - + + + diff --git a/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.nuspec b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec similarity index 91% rename from src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.nuspec rename to src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec index b94ce0b908..b4b819f3e7 100644 --- a/src/Microsoft.Blazor.Build/Microsoft.Blazor.Build.nuspec +++ b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec @@ -1,7 +1,7 @@  - Microsoft.Blazor.Build + Microsoft.AspNetCore.Blazor.Build $version$ Microsoft Build mechanism for Blazor applications. diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Blazor.Build/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..5a796f0eba --- /dev/null +++ b/src/Microsoft.AspNetCore.Blazor.Build/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Test")] diff --git a/src/Microsoft.Blazor.Build/ReferenceFromSource.props b/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props similarity index 82% rename from src/Microsoft.Blazor.Build/ReferenceFromSource.props rename to src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props index 0af7a63959..a3d2a055f2 100644 --- a/src/Microsoft.Blazor.Build/ReferenceFromSource.props +++ b/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props @@ -1,7 +1,7 @@  - + diff --git a/src/Microsoft.Blazor.Build/_._ b/src/Microsoft.AspNetCore.Blazor.Build/_._ similarity index 100% rename from src/Microsoft.Blazor.Build/_._ rename to src/Microsoft.AspNetCore.Blazor.Build/_._ diff --git a/src/Microsoft.Blazor.Build/build/netstandard1.0/Microsoft.Blazor.Build.targets b/src/Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.targets similarity index 100% rename from src/Microsoft.Blazor.Build/build/netstandard1.0/Microsoft.Blazor.Build.targets rename to src/Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.targets diff --git a/src/Microsoft.Blazor.Build/targets/All.targets b/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets similarity index 96% rename from src/Microsoft.Blazor.Build/targets/All.targets rename to src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets index 5b01925fb9..ebebaedd43 100644 --- a/src/Microsoft.Blazor.Build/targets/All.targets +++ b/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets @@ -1,6 +1,6 @@ - dotnet $(MSBuildThisFileDirectory)..\tools\Microsoft.Blazor.Build.dll + dotnet $(MSBuildThisFileDirectory)..\tools\Microsoft.AspNetCore.Blazor.Build.dll diff --git a/src/Microsoft.Blazor.Build/targets/RazorCompilation.targets b/src/Microsoft.AspNetCore.Blazor.Build/targets/RazorCompilation.targets similarity index 100% rename from src/Microsoft.Blazor.Build/targets/RazorCompilation.targets rename to src/Microsoft.AspNetCore.Blazor.Build/targets/RazorCompilation.targets diff --git a/src/Microsoft.Blazor.BuildTools/.gitignore b/src/Microsoft.AspNetCore.Blazor.BuildTools/.gitignore similarity index 100% rename from src/Microsoft.Blazor.BuildTools/.gitignore rename to src/Microsoft.AspNetCore.Blazor.BuildTools/.gitignore diff --git a/src/Microsoft.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalledCommand.cs b/src/Microsoft.AspNetCore.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalledCommand.cs similarity index 98% rename from src/Microsoft.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalledCommand.cs rename to src/Microsoft.AspNetCore.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalledCommand.cs index cd613b3f1c..64247a901a 100644 --- a/src/Microsoft.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalledCommand.cs +++ b/src/Microsoft.AspNetCore.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalledCommand.cs @@ -6,7 +6,7 @@ using System; using System.Diagnostics; using System.Text.RegularExpressions; -namespace Microsoft.Blazor.BuildTools.Cli.Commands +namespace Microsoft.AspNetCore.Blazor.BuildTools.Cli.Commands { class CheckNodeJsInstalledCommand { diff --git a/src/Microsoft.Blazor.BuildTools/Cli/Program.cs b/src/Microsoft.AspNetCore.Blazor.BuildTools/Cli/Program.cs similarity index 87% rename from src/Microsoft.Blazor.BuildTools/Cli/Program.cs rename to src/Microsoft.AspNetCore.Blazor.BuildTools/Cli/Program.cs index 1b4c4fc449..cfd630096d 100644 --- a/src/Microsoft.Blazor.BuildTools/Cli/Program.cs +++ b/src/Microsoft.AspNetCore.Blazor.BuildTools/Cli/Program.cs @@ -1,10 +1,10 @@ // 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.BuildTools.Cli.Commands; +using Microsoft.AspNetCore.Blazor.BuildTools.Cli.Commands; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.Blazor.BuildTools +namespace Microsoft.AspNetCore.Blazor.BuildTools { static class Program { diff --git a/src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.csproj b/src/Microsoft.AspNetCore.Blazor.BuildTools/Microsoft.AspNetCore.Blazor.BuildTools.csproj similarity index 100% rename from src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.csproj rename to src/Microsoft.AspNetCore.Blazor.BuildTools/Microsoft.AspNetCore.Blazor.BuildTools.csproj diff --git a/src/Microsoft.Blazor.BuildTools/ReferenceFromSource.props b/src/Microsoft.AspNetCore.Blazor.BuildTools/ReferenceFromSource.props similarity index 68% rename from src/Microsoft.Blazor.BuildTools/ReferenceFromSource.props rename to src/Microsoft.AspNetCore.Blazor.BuildTools/ReferenceFromSource.props index ae585ebd5d..3b99aaf40e 100644 --- a/src/Microsoft.Blazor.BuildTools/ReferenceFromSource.props +++ b/src/Microsoft.AspNetCore.Blazor.BuildTools/ReferenceFromSource.props @@ -1,11 +1,11 @@  - dotnet $(MSBuildThisFileDirectory)tools\Microsoft.Blazor.BuildTools.dll + dotnet $(MSBuildThisFileDirectory)tools\Microsoft.AspNetCore.Blazor.BuildTools.dll - + diff --git a/src/Microsoft.Blazor.Common/FileProviders/CompositeMountedFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/CompositeMountedFileProvider.cs similarity index 97% rename from src/Microsoft.Blazor.Common/FileProviders/CompositeMountedFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Common/FileProviders/CompositeMountedFileProvider.cs index 7e24ac2586..808b951b29 100644 --- a/src/Microsoft.Blazor.Common/FileProviders/CompositeMountedFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/CompositeMountedFileProvider.cs @@ -7,7 +7,7 @@ using System.Linq; using System; using System.IO; -namespace Microsoft.Blazor.Internal.Common.FileProviders +namespace Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders { // This is like a CompositeFileProvider, except that: // (a) the child providers can be mounted at non-root locations diff --git a/src/Microsoft.Blazor.Common/FileProviders/EmbeddedResourceFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/EmbeddedResourceFileProvider.cs similarity index 95% rename from src/Microsoft.Blazor.Common/FileProviders/EmbeddedResourceFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Common/FileProviders/EmbeddedResourceFileProvider.cs index eb7baf78f5..8ca1198175 100644 --- a/src/Microsoft.Blazor.Common/FileProviders/EmbeddedResourceFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/EmbeddedResourceFileProvider.cs @@ -7,7 +7,7 @@ using System.IO; using System.Linq; using System.Reflection; -namespace Microsoft.Blazor.Internal.Common.FileProviders +namespace Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders { public class EmbeddedResourceFileProvider : InMemoryFileProvider { diff --git a/src/Microsoft.Blazor.Common/FileProviders/InMemoryDirectoryContents.cs b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryDirectoryContents.cs similarity index 95% rename from src/Microsoft.Blazor.Common/FileProviders/InMemoryDirectoryContents.cs rename to src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryDirectoryContents.cs index a482ccb314..fef7bc1aba 100644 --- a/src/Microsoft.Blazor.Common/FileProviders/InMemoryDirectoryContents.cs +++ b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryDirectoryContents.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Collections; using System; -namespace Microsoft.Blazor.Internal.Common.FileProviders +namespace Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders { internal class InMemoryDirectoryContents : IDirectoryContents { diff --git a/src/Microsoft.Blazor.Common/FileProviders/InMemoryFileInfo.cs b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryFileInfo.cs similarity index 97% rename from src/Microsoft.Blazor.Common/FileProviders/InMemoryFileInfo.cs rename to src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryFileInfo.cs index 28bd02936c..c5474f9a4d 100644 --- a/src/Microsoft.Blazor.Common/FileProviders/InMemoryFileInfo.cs +++ b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryFileInfo.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.FileProviders; using System.IO; using System; -namespace Microsoft.Blazor.Internal.Common.FileProviders +namespace Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders { internal class InMemoryFileInfo : IFileInfo { diff --git a/src/Microsoft.Blazor.Common/FileProviders/InMemoryFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryFileProvider.cs similarity index 98% rename from src/Microsoft.Blazor.Common/FileProviders/InMemoryFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryFileProvider.cs index 8a2b4736ac..56c62d6f85 100644 --- a/src/Microsoft.Blazor.Common/FileProviders/InMemoryFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Common/FileProviders/InMemoryFileProvider.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Microsoft.Blazor.Internal.Common.FileProviders +namespace Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders { public class InMemoryFileProvider : IFileProvider { diff --git a/src/Microsoft.Blazor.Common/Microsoft.Blazor.Common.csproj b/src/Microsoft.AspNetCore.Blazor.Common/Microsoft.AspNetCore.Blazor.Common.csproj similarity index 100% rename from src/Microsoft.Blazor.Common/Microsoft.Blazor.Common.csproj rename to src/Microsoft.AspNetCore.Blazor.Common/Microsoft.AspNetCore.Blazor.Common.csproj diff --git a/src/Microsoft.Blazor.DevHost/Microsoft.Blazor.DevHost.csproj b/src/Microsoft.AspNetCore.Blazor.DevHost/Microsoft.AspNetCore.Blazor.DevHost.csproj similarity index 60% rename from src/Microsoft.Blazor.DevHost/Microsoft.Blazor.DevHost.csproj rename to src/Microsoft.AspNetCore.Blazor.DevHost/Microsoft.AspNetCore.Blazor.DevHost.csproj index a2a967bd02..6ae0578988 100644 --- a/src/Microsoft.Blazor.DevHost/Microsoft.Blazor.DevHost.csproj +++ b/src/Microsoft.AspNetCore.Blazor.DevHost/Microsoft.AspNetCore.Blazor.DevHost.csproj @@ -3,7 +3,7 @@ netcoreapp2.0 Exe - Microsoft.Blazor.DevHost.Program + Microsoft.AspNetCore.Blazor.DevHost.Program @@ -11,6 +11,6 @@ - + diff --git a/src/Microsoft.Blazor.DevHost/Program.cs b/src/Microsoft.AspNetCore.Blazor.DevHost/Program.cs similarity index 95% rename from src/Microsoft.Blazor.DevHost/Program.cs rename to src/Microsoft.AspNetCore.Blazor.DevHost/Program.cs index bef5fac2c2..bb8b83299b 100644 --- a/src/Microsoft.Blazor.DevHost/Program.cs +++ b/src/Microsoft.AspNetCore.Blazor.DevHost/Program.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Hosting; using System; using System.Linq; -namespace Microsoft.Blazor.DevHost +namespace Microsoft.AspNetCore.Blazor.DevHost { internal class Program { diff --git a/src/Microsoft.AspNetCore.Blazor.DevHost/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Blazor.DevHost/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..d72c8260a5 --- /dev/null +++ b/src/Microsoft.AspNetCore.Blazor.DevHost/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.E2ETest")] diff --git a/src/Microsoft.Blazor.DevHost/Server/Program.cs b/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Program.cs similarity index 92% rename from src/Microsoft.Blazor.DevHost/Server/Program.cs rename to src/Microsoft.AspNetCore.Blazor.DevHost/Server/Program.cs index 5b5de413db..ad6df8cd0a 100644 --- a/src/Microsoft.Blazor.DevHost/Server/Program.cs +++ b/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Program.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; -namespace Microsoft.Blazor.DevHost.Server +namespace Microsoft.AspNetCore.Blazor.DevHost.Server { internal class Program { diff --git a/src/Microsoft.Blazor.DevHost/Server/Startup.cs b/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs similarity index 97% rename from src/Microsoft.Blazor.DevHost/Server/Startup.cs rename to src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs index 83e1d5b10b..440b5555c4 100644 --- a/src/Microsoft.Blazor.DevHost/Server/Startup.cs +++ b/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using System.IO; -namespace Microsoft.Blazor.DevHost.Server +namespace Microsoft.AspNetCore.Blazor.DevHost.Server { internal class Startup { diff --git a/src/Microsoft.Blazor.Mono/Microsoft.Blazor.Mono.csproj b/src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.csproj similarity index 91% rename from src/Microsoft.Blazor.Mono/Microsoft.Blazor.Mono.csproj rename to src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.csproj index 0f727a25aa..195849964d 100644 --- a/src/Microsoft.Blazor.Mono/Microsoft.Blazor.Mono.csproj +++ b/src/Microsoft.AspNetCore.Blazor.Mono/Microsoft.AspNetCore.Blazor.Mono.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Microsoft.Blazor.Mono/MonoStaticFileProvider.cs b/src/Microsoft.AspNetCore.Blazor.Mono/MonoStaticFileProvider.cs similarity index 84% rename from src/Microsoft.Blazor.Mono/MonoStaticFileProvider.cs rename to src/Microsoft.AspNetCore.Blazor.Mono/MonoStaticFileProvider.cs index 937bff0d06..daaabeb730 100644 --- a/src/Microsoft.Blazor.Mono/MonoStaticFileProvider.cs +++ b/src/Microsoft.AspNetCore.Blazor.Mono/MonoStaticFileProvider.cs @@ -1,10 +1,10 @@ // 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.Internal.Common.FileProviders; +using Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders; using Microsoft.Extensions.FileProviders; -namespace Microsoft.Blazor.Mono +namespace Microsoft.AspNetCore.Blazor.Mono { public static class MonoStaticFileProvider { diff --git a/src/Microsoft.Blazor.Server/BlazorAppBuilderExtensions.cs b/src/Microsoft.AspNetCore.Blazor.Server/BlazorAppBuilderExtensions.cs similarity index 98% rename from src/Microsoft.Blazor.Server/BlazorAppBuilderExtensions.cs rename to src/Microsoft.AspNetCore.Blazor.Server/BlazorAppBuilderExtensions.cs index 1e082f3616..985d0e5465 100644 --- a/src/Microsoft.Blazor.Server/BlazorAppBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Blazor.Server/BlazorAppBuilderExtensions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.StaticFiles; -using Microsoft.Blazor.Server; +using Microsoft.AspNetCore.Blazor.Server; using Microsoft.Extensions.FileProviders; using System.Collections.Generic; using System.IO; diff --git a/src/Microsoft.Blazor.Server/BlazorConfig.cs b/src/Microsoft.AspNetCore.Blazor.Server/BlazorConfig.cs similarity index 96% rename from src/Microsoft.Blazor.Server/BlazorConfig.cs rename to src/Microsoft.AspNetCore.Blazor.Server/BlazorConfig.cs index 1592437a8c..5e2dedc011 100644 --- a/src/Microsoft.Blazor.Server/BlazorConfig.cs +++ b/src/Microsoft.AspNetCore.Blazor.Server/BlazorConfig.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; -namespace Microsoft.Blazor.Server +namespace Microsoft.AspNetCore.Blazor.Server { internal class BlazorConfig { diff --git a/src/Microsoft.Blazor.Server/Microsoft.Blazor.Server.csproj b/src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj similarity index 100% rename from src/Microsoft.Blazor.Server/Microsoft.Blazor.Server.csproj rename to src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj diff --git a/src/Microsoft.AspNetCore.Blazor.Server/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Blazor.Server/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..77561bc49e --- /dev/null +++ b/src/Microsoft.AspNetCore.Blazor.Server/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.DevHost")] diff --git a/src/Microsoft.Blazor/Components/BlazorComponent.cs b/src/Microsoft.AspNetCore.Blazor/Components/BlazorComponent.cs similarity index 96% rename from src/Microsoft.Blazor/Components/BlazorComponent.cs rename to src/Microsoft.AspNetCore.Blazor/Components/BlazorComponent.cs index b78d445422..70bbb02f41 100644 --- a/src/Microsoft.Blazor/Components/BlazorComponent.cs +++ b/src/Microsoft.AspNetCore.Blazor/Components/BlazorComponent.cs @@ -1,11 +1,11 @@ // 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.RenderTree; +using Microsoft.AspNetCore.Blazor.RenderTree; using System; using System.Threading.Tasks; -namespace Microsoft.Blazor.Components +namespace Microsoft.AspNetCore.Blazor.Components { /// /// Optional base class for Blazor components. Alternatively, Blazor components may diff --git a/src/Microsoft.Blazor/Components/IComponent.cs b/src/Microsoft.AspNetCore.Blazor/Components/IComponent.cs similarity index 86% rename from src/Microsoft.Blazor/Components/IComponent.cs rename to src/Microsoft.AspNetCore.Blazor/Components/IComponent.cs index a0c089fba6..4b4e3c143b 100644 --- a/src/Microsoft.Blazor/Components/IComponent.cs +++ b/src/Microsoft.AspNetCore.Blazor/Components/IComponent.cs @@ -1,9 +1,9 @@ // 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.RenderTree; +using Microsoft.AspNetCore.Blazor.RenderTree; -namespace Microsoft.Blazor.Components +namespace Microsoft.AspNetCore.Blazor.Components { /// /// Represents a UI component. diff --git a/src/Microsoft.Blazor/Components/RazorToolingWorkaround.cs b/src/Microsoft.AspNetCore.Blazor/Components/RazorToolingWorkaround.cs similarity index 96% rename from src/Microsoft.Blazor/Components/RazorToolingWorkaround.cs rename to src/Microsoft.AspNetCore.Blazor/Components/RazorToolingWorkaround.cs index d5fa81ed21..db7b860b2c 100644 --- a/src/Microsoft.Blazor/Components/RazorToolingWorkaround.cs +++ b/src/Microsoft.AspNetCore.Blazor/Components/RazorToolingWorkaround.cs @@ -13,7 +13,7 @@ * Then this file can be removed entirely. */ -using Microsoft.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Components; using System; namespace Microsoft.AspNetCore.Mvc diff --git a/src/Microsoft.Blazor/Microsoft.Blazor.csproj b/src/Microsoft.AspNetCore.Blazor/Microsoft.AspNetCore.Blazor.csproj similarity index 100% rename from src/Microsoft.Blazor/Microsoft.Blazor.csproj rename to src/Microsoft.AspNetCore.Blazor/Microsoft.AspNetCore.Blazor.csproj diff --git a/src/Microsoft.AspNetCore.Blazor/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Blazor/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..fab4af4814 --- /dev/null +++ b/src/Microsoft.AspNetCore.Blazor/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Test")] diff --git a/src/Microsoft.Blazor/RenderTree/ArrayBuilder.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/ArrayBuilder.cs similarity index 98% rename from src/Microsoft.Blazor/RenderTree/ArrayBuilder.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/ArrayBuilder.cs index 9252ccf4a1..238334f56a 100644 --- a/src/Microsoft.Blazor/RenderTree/ArrayBuilder.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/ArrayBuilder.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Implements a list that uses an array of objects to store the elements. diff --git a/src/Microsoft.Blazor/RenderTree/ArrayRange.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/ArrayRange.cs similarity index 96% rename from src/Microsoft.Blazor/RenderTree/ArrayRange.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/ArrayRange.cs index 37e5e1351f..04d7ba4920 100644 --- a/src/Microsoft.Blazor/RenderTree/ArrayRange.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/ArrayRange.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Represents a range of elements in an array that are in use. diff --git a/src/Microsoft.Blazor/RenderTree/RenderTreeBuilder.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs similarity index 98% rename from src/Microsoft.Blazor/RenderTree/RenderTreeBuilder.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs index 2b2692be28..e9d36b6c81 100644 --- a/src/Microsoft.Blazor/RenderTree/RenderTreeBuilder.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeBuilder.cs @@ -1,12 +1,12 @@ // 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.Components; -using Microsoft.Blazor.Rendering; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Rendering; using System; using System.Collections.Generic; -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Provides methods for building a collection of entries. diff --git a/src/Microsoft.Blazor/RenderTree/RenderTreeDiff.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeDiff.cs similarity index 95% rename from src/Microsoft.Blazor/RenderTree/RenderTreeDiff.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeDiff.cs index 094c7a58e0..71c7fe957f 100644 --- a/src/Microsoft.Blazor/RenderTree/RenderTreeDiff.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeDiff.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Describes changes to a component's render tree between successive renders, diff --git a/src/Microsoft.Blazor/RenderTree/RenderTreeDiffComputer.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeDiffComputer.cs similarity index 99% rename from src/Microsoft.Blazor/RenderTree/RenderTreeDiffComputer.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeDiffComputer.cs index 8c0bcb5b36..7b7786bdfd 100644 --- a/src/Microsoft.Blazor/RenderTree/RenderTreeDiffComputer.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeDiffComputer.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Blazor.Components; -using Microsoft.Blazor.Rendering; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Rendering; -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { internal class RenderTreeDiffComputer { diff --git a/src/Microsoft.Blazor/RenderTree/RenderTreeEdit.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeEdit.cs similarity index 98% rename from src/Microsoft.Blazor/RenderTree/RenderTreeEdit.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeEdit.cs index 4e1ce2a7fa..6f1556a4af 100644 --- a/src/Microsoft.Blazor/RenderTree/RenderTreeEdit.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeEdit.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. -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Represents a single edit operation on a component's render tree. diff --git a/src/Microsoft.Blazor/RenderTree/RenderTreeEditType.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeEditType.cs similarity index 97% rename from src/Microsoft.Blazor/RenderTree/RenderTreeEditType.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeEditType.cs index 89d993bbb5..cfa5589079 100644 --- a/src/Microsoft.Blazor/RenderTree/RenderTreeEditType.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeEditType.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. -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Describes the type of a render tree edit operation. diff --git a/src/Microsoft.Blazor/RenderTree/RenderTreeNode.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeNode.cs similarity index 98% rename from src/Microsoft.Blazor/RenderTree/RenderTreeNode.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeNode.cs index 3f46f78dad..afa42cd9fd 100644 --- a/src/Microsoft.Blazor/RenderTree/RenderTreeNode.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeNode.cs @@ -1,10 +1,10 @@ // 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.Components; +using Microsoft.AspNetCore.Blazor.Components; using System; -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { // TODO: Consider coalescing properties of compatible types that don't need to be // used simultaneously. For example, 'ElementName' and 'AttributeName' could be replaced diff --git a/src/Microsoft.Blazor/RenderTree/RenderTreeNodeType.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeNodeType.cs similarity index 94% rename from src/Microsoft.Blazor/RenderTree/RenderTreeNodeType.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeNodeType.cs index e4545b123e..faec2139d6 100644 --- a/src/Microsoft.Blazor/RenderTree/RenderTreeNodeType.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/RenderTreeNodeType.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. -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Describes the type of a . diff --git a/src/Microsoft.Blazor/RenderTree/UIEventArgs.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventArgs.cs similarity index 95% rename from src/Microsoft.Blazor/RenderTree/UIEventArgs.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventArgs.cs index 849ce8730f..0c2635b327 100644 --- a/src/Microsoft.Blazor/RenderTree/UIEventArgs.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventArgs.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. -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Supplies information about an event that is being raised. diff --git a/src/Microsoft.Blazor/RenderTree/UIEventHandler.cs b/src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventHandler.cs similarity index 87% rename from src/Microsoft.Blazor/RenderTree/UIEventHandler.cs rename to src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventHandler.cs index 51d9a4acf5..88de0ec25f 100644 --- a/src/Microsoft.Blazor/RenderTree/UIEventHandler.cs +++ b/src/Microsoft.AspNetCore.Blazor/RenderTree/UIEventHandler.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. -namespace Microsoft.Blazor.RenderTree +namespace Microsoft.AspNetCore.Blazor.RenderTree { /// /// Handles an event raised for a . diff --git a/src/Microsoft.Blazor/Rendering/ComponentState.cs b/src/Microsoft.AspNetCore.Blazor/Rendering/ComponentState.cs similarity index 96% rename from src/Microsoft.Blazor/Rendering/ComponentState.cs rename to src/Microsoft.AspNetCore.Blazor/Rendering/ComponentState.cs index 84b27efce5..6473535727 100644 --- a/src/Microsoft.Blazor/Rendering/ComponentState.cs +++ b/src/Microsoft.AspNetCore.Blazor/Rendering/ComponentState.cs @@ -1,11 +1,11 @@ // 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.Components; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.RenderTree; using System; -namespace Microsoft.Blazor.Rendering +namespace Microsoft.AspNetCore.Blazor.Rendering { /// /// Tracks the rendering state associated with an instance diff --git a/src/Microsoft.Blazor/Rendering/Renderer.cs b/src/Microsoft.AspNetCore.Blazor/Rendering/Renderer.cs similarity index 97% rename from src/Microsoft.Blazor/Rendering/Renderer.cs rename to src/Microsoft.AspNetCore.Blazor/Rendering/Renderer.cs index 155f0aca12..70886ffae2 100644 --- a/src/Microsoft.Blazor/Rendering/Renderer.cs +++ b/src/Microsoft.AspNetCore.Blazor/Rendering/Renderer.cs @@ -1,12 +1,12 @@ // 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.Components; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.RenderTree; using System; using System.Runtime.CompilerServices; -namespace Microsoft.Blazor.Rendering +namespace Microsoft.AspNetCore.Blazor.Rendering { /// /// Provides mechanisms for rendering hierarchies of instances, diff --git a/src/Microsoft.Blazor/Rendering/WeakValueDictionary.cs b/src/Microsoft.AspNetCore.Blazor/Rendering/WeakValueDictionary.cs similarity index 97% rename from src/Microsoft.Blazor/Rendering/WeakValueDictionary.cs rename to src/Microsoft.AspNetCore.Blazor/Rendering/WeakValueDictionary.cs index 43303b2f2f..bbea21d247 100644 --- a/src/Microsoft.Blazor/Rendering/WeakValueDictionary.cs +++ b/src/Microsoft.AspNetCore.Blazor/Rendering/WeakValueDictionary.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Microsoft.Blazor.Rendering +namespace Microsoft.AspNetCore.Blazor.Rendering { internal class WeakValueDictionary where TValue : class { diff --git a/src/Microsoft.Blazor.Build/Properties/AssemblyInfo.cs b/src/Microsoft.Blazor.Build/Properties/AssemblyInfo.cs deleted file mode 100644 index 04a6cf1896..0000000000 --- a/src/Microsoft.Blazor.Build/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.Blazor.Build.Test")] diff --git a/src/Microsoft.Blazor.DevHost/Properties/AssemblyInfo.cs b/src/Microsoft.Blazor.DevHost/Properties/AssemblyInfo.cs deleted file mode 100644 index 1b7cb6a645..0000000000 --- a/src/Microsoft.Blazor.DevHost/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.Blazor.E2ETest")] diff --git a/src/Microsoft.Blazor.Server/Properties/AssemblyInfo.cs b/src/Microsoft.Blazor.Server/Properties/AssemblyInfo.cs deleted file mode 100644 index 026b371252..0000000000 --- a/src/Microsoft.Blazor.Server/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.Blazor.DevHost")] diff --git a/src/Microsoft.Blazor/Properties/AssemblyInfo.cs b/src/Microsoft.Blazor/Properties/AssemblyInfo.cs deleted file mode 100644 index 19ed5e7c8c..0000000000 --- a/src/Microsoft.Blazor/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.Blazor.Test")] diff --git a/src/anglesharp/AngleSharpBuilder/Program.cs b/src/anglesharp/AngleSharpBuilder/Program.cs index ad7a11e5f2..20c9ff52ba 100644 --- a/src/anglesharp/AngleSharpBuilder/Program.cs +++ b/src/anglesharp/AngleSharpBuilder/Program.cs @@ -15,7 +15,7 @@ namespace AngleSharpBuilder * AngleSharp does not expose HtmlTokenizer publicly. * * For now, we work around this by building a custom version of AngleSharp.dll that - * specifies [InternalsVisibleTo("Microsoft.Blazor.Build")]. Longer term we can ask + * specifies [InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build")]. Longer term we can ask * AngleSharp to expose HtmlTokenizer as a public API, and if that's not viable, possibly * replace AngleSharp with a different library for HTML tokenization. */ @@ -28,7 +28,7 @@ namespace AngleSharpBuilder var angleSharpAssembly = Assembly.GetAssembly(typeof(HtmlParser)); WriteWithInternalsVisibleTo( angleSharpAssembly, - "Microsoft.Blazor.Build", + "Microsoft.AspNetCore.Blazor.Build", outputDir); } diff --git a/test/Microsoft.Blazor.Build.Test/IndexHtmlFileProviderTest.cs b/test/Microsoft.AspNetCore.Blazor.Build.Test/IndexHtmlFileProviderTest.cs similarity index 97% rename from test/Microsoft.Blazor.Build.Test/IndexHtmlFileProviderTest.cs rename to test/Microsoft.AspNetCore.Blazor.Build.Test/IndexHtmlFileProviderTest.cs index d666e5462a..803f5c5aac 100644 --- a/test/Microsoft.Blazor.Build.Test/IndexHtmlFileProviderTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/IndexHtmlFileProviderTest.cs @@ -7,9 +7,9 @@ using System.Linq; using Xunit; using System; using AngleSharp.Parser.Html; -using Microsoft.Blazor.Build.Core.FileSystem; +using Microsoft.AspNetCore.Blazor.Build.Core.FileSystem; -namespace Microsoft.Blazor.Server.Test +namespace Microsoft.AspNetCore.Blazor.Server.Test { public class IndexHtmlFileProviderTest { diff --git a/test/Microsoft.Blazor.Build.Test/Microsoft.Blazor.Build.Test.csproj b/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj similarity index 88% rename from test/Microsoft.Blazor.Build.Test/Microsoft.Blazor.Build.Test.csproj rename to test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj index 7d91676b6f..cce46f7ba1 100644 --- a/test/Microsoft.Blazor.Build.Test/Microsoft.Blazor.Build.Test.csproj +++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj @@ -15,7 +15,7 @@ - + diff --git a/test/Microsoft.Blazor.Build.Test/RazorCompilerTest.cs b/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorCompilerTest.cs similarity index 97% rename from test/Microsoft.Blazor.Build.Test/RazorCompilerTest.cs rename to test/Microsoft.AspNetCore.Blazor.Build.Test/RazorCompilerTest.cs index 52a816f720..cc1ce0a06a 100644 --- a/test/Microsoft.Blazor.Build.Test/RazorCompilerTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorCompilerTest.cs @@ -1,11 +1,11 @@ // 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.Build.Core.RazorCompilation; -using Microsoft.Blazor.Components; -using Microsoft.Blazor.Rendering; -using Microsoft.Blazor.RenderTree; -using Microsoft.Blazor.Test.Shared; +using Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Test.Shared; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using System; @@ -16,7 +16,7 @@ using System.Reflection; using System.Text; using Xunit; -namespace Microsoft.Blazor.Build.Test +namespace Microsoft.AspNetCore.Blazor.Build.Test { public class RazorCompilerTest { @@ -240,7 +240,7 @@ namespace Microsoft.Blazor.Build.Test @functions { public bool HandlerWasCalled { get; set; } = false; - void MyHandleEvent(Microsoft.Blazor.RenderTree.UIEventArgs eventArgs) + void MyHandleEvent(Microsoft.AspNetCore.Blazor.RenderTree.UIEventArgs eventArgs) { HandlerWasCalled = true; } diff --git a/test/Microsoft.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs b/test/Microsoft.AspNetCore.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs similarity index 95% rename from test/Microsoft.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs rename to test/Microsoft.AspNetCore.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs index 61ebfbcf2b..f870877d84 100644 --- a/test/Microsoft.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs @@ -1,15 +1,15 @@ // 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.Build.Core.FileSystem; -using Microsoft.Blazor.Mono; +using Microsoft.AspNetCore.Blazor.Build.Core.FileSystem; +using Microsoft.AspNetCore.Blazor.Mono; using Mono.Cecil; using System; using System.IO; using System.Linq; using Xunit; -namespace Microsoft.Blazor.Server.Test +namespace Microsoft.AspNetCore.Blazor.Server.Test { public class ReferencedAssemblyFileProviderTest { @@ -70,8 +70,8 @@ namespace Microsoft.Blazor.Server.Test fewer assemblies from the server, and during publishing, illink would remove all the uncalled implementation code from mscorlib.dll anyway. */ - "/Microsoft.Blazor.Browser.dll", - "/Microsoft.Blazor.dll", + "/Microsoft.AspNetCore.Blazor.Browser.dll", + "/Microsoft.AspNetCore.Blazor.dll", "/Mono.Security.dll", "/mscorlib.dll", "/netstandard.dll", diff --git a/test/Microsoft.Blazor.Common.Test/CompositeMountedFileProviderTest.cs b/test/Microsoft.AspNetCore.Blazor.Common.Test/CompositeMountedFileProviderTest.cs similarity index 98% rename from test/Microsoft.Blazor.Common.Test/CompositeMountedFileProviderTest.cs rename to test/Microsoft.AspNetCore.Blazor.Common.Test/CompositeMountedFileProviderTest.cs index 18d10cd064..83a18773a0 100644 --- a/test/Microsoft.Blazor.Common.Test/CompositeMountedFileProviderTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Common.Test/CompositeMountedFileProviderTest.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.Internal.Common.FileProviders; +using Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders; using Microsoft.Extensions.FileProviders; using System; using System.IO; @@ -9,7 +9,7 @@ using System.Linq; using System.Text; using Xunit; -namespace Microsoft.Blazor.Common.Test +namespace Microsoft.AspNetCore.Blazor.Common.Test { public class CompositeMountedFileProviderTest { diff --git a/test/Microsoft.Blazor.Common.Test/InMemoryFileProviderTest.cs b/test/Microsoft.AspNetCore.Blazor.Common.Test/InMemoryFileProviderTest.cs similarity index 98% rename from test/Microsoft.Blazor.Common.Test/InMemoryFileProviderTest.cs rename to test/Microsoft.AspNetCore.Blazor.Common.Test/InMemoryFileProviderTest.cs index 85b558e65a..a29766733e 100644 --- a/test/Microsoft.Blazor.Common.Test/InMemoryFileProviderTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Common.Test/InMemoryFileProviderTest.cs @@ -1,13 +1,13 @@ // 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.Internal.Common.FileProviders; +using Microsoft.AspNetCore.Blazor.Internal.Common.FileProviders; using System; using System.IO; using System.Text; using Xunit; -namespace Microsoft.Blazor.Common.Test +namespace Microsoft.AspNetCore.Blazor.Common.Test { public class InMemoryFileProviderTest { diff --git a/test/Microsoft.Blazor.Common.Test/Microsoft.Blazor.Common.Test.csproj b/test/Microsoft.AspNetCore.Blazor.Common.Test/Microsoft.AspNetCore.Blazor.Common.Test.csproj similarity index 78% rename from test/Microsoft.Blazor.Common.Test/Microsoft.Blazor.Common.Test.csproj rename to test/Microsoft.AspNetCore.Blazor.Common.Test/Microsoft.AspNetCore.Blazor.Common.Test.csproj index 54c8296c49..15f57d1e87 100644 --- a/test/Microsoft.Blazor.Common.Test/Microsoft.Blazor.Common.Test.csproj +++ b/test/Microsoft.AspNetCore.Blazor.Common.Test/Microsoft.AspNetCore.Blazor.Common.Test.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserFixture.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/BrowserFixture.cs similarity index 91% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserFixture.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/BrowserFixture.cs index d742b72c73..3b819ecd1b 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserFixture.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/BrowserFixture.cs @@ -6,7 +6,7 @@ using OpenQA.Selenium.Chrome; using OpenQA.Selenium.Remote; using System; -namespace Microsoft.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure { public class BrowserFixture : IDisposable { diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserTestBase.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/BrowserTestBase.cs similarity index 88% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserTestBase.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/BrowserTestBase.cs index 34dbec336a..063f9cf47e 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/BrowserTestBase.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/BrowserTestBase.cs @@ -4,7 +4,7 @@ using OpenQA.Selenium; using Xunit; -namespace Microsoft.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure { public class BrowserTestBase : IClassFixture { diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs similarity index 77% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs index 300039d0d9..b3c854bf30 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetEnvironment.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. -namespace Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures { public enum AspNetEnvironment { diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs similarity index 93% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs index 9d1ed52ae8..5dc94b3241 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/AspNetSiteServerFixture.cs @@ -5,7 +5,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; -namespace Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures { public class AspNetSiteServerFixture : WebHostServerFixture { diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs similarity index 81% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs index 0c6b3344a2..eb5024c186 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs @@ -3,9 +3,9 @@ using System.IO; using Microsoft.AspNetCore.Hosting; -using DevHostServerProgram = Microsoft.Blazor.DevHost.Server.Program; +using DevHostServerProgram = Microsoft.AspNetCore.Blazor.DevHost.Server.Program; -namespace Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures { public class DevHostServerFixture : WebHostServerFixture { diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs similarity index 97% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs index b94d0ce0c2..3625bb5e24 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs @@ -6,7 +6,7 @@ using System.IO; using System.Linq; using System.Threading; -namespace Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures { public abstract class ServerFixture : IDisposable { diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs similarity index 95% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs index 92a1e841a2..6306f89319 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/StaticSiteServerFixture.cs @@ -6,7 +6,7 @@ using System.IO; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -namespace Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures { // Although this is not used for anything meaningful related to Blazor yet, it // will be used later when there's a mechanism for publishing standalone Blazor diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs similarity index 91% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs index 515108f6d3..6212bd610f 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerFixtures/WebHostServerFixture.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server.Features; using System.Linq; -namespace Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures { public abstract class WebHostServerFixture : ServerFixture { diff --git a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerTestBase.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerTestBase.cs similarity index 89% rename from test/Microsoft.Blazor.E2ETest/Infrastructure/ServerTestBase.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerTestBase.cs index 6ee56bc9c6..4ce3559026 100644 --- a/test/Microsoft.Blazor.E2ETest/Infrastructure/ServerTestBase.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Infrastructure/ServerTestBase.cs @@ -1,11 +1,11 @@ // 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.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; using System; using Xunit; -namespace Microsoft.Blazor.E2ETest.Infrastructure +namespace Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure { public abstract class ServerTestBase : BrowserTestBase, IClassFixture diff --git a/test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj b/test/Microsoft.AspNetCore.Blazor.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj similarity index 91% rename from test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj index ab42131656..c1fe37b21c 100644 --- a/test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Microsoft.AspNetCore.Blazor.E2ETest.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/Microsoft.Blazor.E2ETest/Tests/ComponentRenderingTest.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/ComponentRenderingTest.cs similarity index 95% rename from test/Microsoft.Blazor.E2ETest/Tests/ComponentRenderingTest.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/ComponentRenderingTest.cs index 878320c70a..40ce4d9d4d 100644 --- a/test/Microsoft.Blazor.E2ETest/Tests/ComponentRenderingTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/ComponentRenderingTest.cs @@ -4,14 +4,14 @@ using System; using System.Linq; using BasicTestApp; -using Microsoft.Blazor.Components; -using Microsoft.Blazor.E2ETest.Infrastructure; -using Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using Xunit; -namespace Microsoft.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests { public class ComponentRenderingTest : ServerTestBase> diff --git a/test/Microsoft.Blazor.E2ETest/Tests/HostedInAspNetTest.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/HostedInAspNetTest.cs similarity index 81% rename from test/Microsoft.Blazor.E2ETest/Tests/HostedInAspNetTest.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/HostedInAspNetTest.cs index 9804759ed7..a054891c64 100644 --- a/test/Microsoft.Blazor.E2ETest/Tests/HostedInAspNetTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/HostedInAspNetTest.cs @@ -1,11 +1,11 @@ // 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.E2ETest.Infrastructure; -using Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; using Xunit; -namespace Microsoft.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests { public class HostedInAspNetTest : ServerTestBase { diff --git a/test/Microsoft.Blazor.E2ETest/Tests/MonoSanityTest.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/MonoSanityTest.cs similarity index 96% rename from test/Microsoft.Blazor.E2ETest/Tests/MonoSanityTest.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/MonoSanityTest.cs index 408ea45e94..4b020dd0ab 100644 --- a/test/Microsoft.Blazor.E2ETest/Tests/MonoSanityTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/MonoSanityTest.cs @@ -1,12 +1,12 @@ // 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.E2ETest.Infrastructure; -using Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using Xunit; -namespace Microsoft.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests { public class MonoSanityTest : ServerTestBase { diff --git a/test/Microsoft.Blazor.E2ETest/Tests/StandaloneAppTest.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/StandaloneAppTest.cs similarity index 86% rename from test/Microsoft.Blazor.E2ETest/Tests/StandaloneAppTest.cs rename to test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/StandaloneAppTest.cs index b585748ad3..4cbbedb11d 100644 --- a/test/Microsoft.Blazor.E2ETest/Tests/StandaloneAppTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/StandaloneAppTest.cs @@ -1,14 +1,14 @@ // 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.E2ETest.Infrastructure; -using Microsoft.Blazor.E2ETest.Infrastructure.ServerFixtures; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; +using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; using Xunit; -namespace Microsoft.Blazor.E2ETest.Tests +namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests { public class StandaloneAppTest : ServerTestBase> diff --git a/test/Microsoft.Blazor.Mono.Test/Microsoft.Blazor.Mono.Test.csproj b/test/Microsoft.AspNetCore.Blazor.Mono.Test/Microsoft.AspNetCore.Blazor.Mono.Test.csproj similarity index 82% rename from test/Microsoft.Blazor.Mono.Test/Microsoft.Blazor.Mono.Test.csproj rename to test/Microsoft.AspNetCore.Blazor.Mono.Test/Microsoft.AspNetCore.Blazor.Mono.Test.csproj index 1013c08e6c..289374638f 100644 --- a/test/Microsoft.Blazor.Mono.Test/Microsoft.Blazor.Mono.Test.csproj +++ b/test/Microsoft.AspNetCore.Blazor.Mono.Test/Microsoft.AspNetCore.Blazor.Mono.Test.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/Microsoft.Blazor.Mono.Test/MonoStaticFileProviderTest.cs b/test/Microsoft.AspNetCore.Blazor.Mono.Test/MonoStaticFileProviderTest.cs similarity index 97% rename from test/Microsoft.Blazor.Mono.Test/MonoStaticFileProviderTest.cs rename to test/Microsoft.AspNetCore.Blazor.Mono.Test/MonoStaticFileProviderTest.cs index 025e5af6dc..22001b9f71 100644 --- a/test/Microsoft.Blazor.Mono.Test/MonoStaticFileProviderTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Mono.Test/MonoStaticFileProviderTest.cs @@ -4,7 +4,7 @@ using System.Linq; using Xunit; -namespace Microsoft.Blazor.Mono.Test +namespace Microsoft.AspNetCore.Blazor.Mono.Test { public class MonoStaticFileProviderTest { diff --git a/test/Microsoft.Blazor.Test/Microsoft.Blazor.Test.csproj b/test/Microsoft.AspNetCore.Blazor.Test/Microsoft.AspNetCore.Blazor.Test.csproj similarity index 84% rename from test/Microsoft.Blazor.Test/Microsoft.Blazor.Test.csproj rename to test/Microsoft.AspNetCore.Blazor.Test/Microsoft.AspNetCore.Blazor.Test.csproj index e2a7e23098..180994bd04 100644 --- a/test/Microsoft.Blazor.Test/Microsoft.Blazor.Test.csproj +++ b/test/Microsoft.AspNetCore.Blazor.Test/Microsoft.AspNetCore.Blazor.Test.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/Microsoft.Blazor.Test/RenderTreeBuilderTest.cs b/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs similarity index 98% rename from test/Microsoft.Blazor.Test/RenderTreeBuilderTest.cs rename to test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs index fa6346425c..170d2e5a92 100644 --- a/test/Microsoft.Blazor.Test/RenderTreeBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeBuilderTest.cs @@ -1,15 +1,15 @@ // 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.Components; -using Microsoft.Blazor.Rendering; -using Microsoft.Blazor.RenderTree; -using Microsoft.Blazor.Test.Shared; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Test.Shared; using System; using System.Linq; using Xunit; -namespace Microsoft.Blazor.Test +namespace Microsoft.AspNetCore.Blazor.Test { public class RenderTreeBuilderTest { diff --git a/test/Microsoft.Blazor.Test/RenderTreeDiffComputerTest.cs b/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffComputerTest.cs similarity index 99% rename from test/Microsoft.Blazor.Test/RenderTreeDiffComputerTest.cs rename to test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffComputerTest.cs index 4ba06a000f..f712fe5f9e 100644 --- a/test/Microsoft.Blazor.Test/RenderTreeDiffComputerTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Test/RenderTreeDiffComputerTest.cs @@ -1,15 +1,15 @@ // 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.Components; -using Microsoft.Blazor.Rendering; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Blazor.RenderTree; using System; using System.Collections.Generic; using System.Linq; using Xunit; -namespace Microsoft.Blazor.Test +namespace Microsoft.AspNetCore.Blazor.Test { public class RenderTreeDiffComputerTest { diff --git a/test/Microsoft.Blazor.Test/RendererTest.cs b/test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs similarity index 98% rename from test/Microsoft.Blazor.Test/RendererTest.cs rename to test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs index d748d6ba18..5f87243b2f 100644 --- a/test/Microsoft.Blazor.Test/RendererTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.Test/RendererTest.cs @@ -4,13 +4,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Blazor.Components; -using Microsoft.Blazor.Rendering; -using Microsoft.Blazor.RenderTree; -using Microsoft.Blazor.Test.Shared; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Rendering; +using Microsoft.AspNetCore.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Test.Shared; using Xunit; -namespace Microsoft.Blazor.Test +namespace Microsoft.AspNetCore.Blazor.Test { public class RendererTest { diff --git a/test/shared/AssertNode.cs b/test/shared/AssertNode.cs index 683889d82e..355389a9fd 100644 --- a/test/shared/AssertNode.cs +++ b/test/shared/AssertNode.cs @@ -1,11 +1,11 @@ // 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.Components; -using Microsoft.Blazor.RenderTree; +using Microsoft.AspNetCore.Blazor.Components; +using Microsoft.AspNetCore.Blazor.RenderTree; using Xunit; -namespace Microsoft.Blazor.Test.Shared +namespace Microsoft.AspNetCore.Blazor.Test.Shared { internal static class AssertNode { diff --git a/test/testapps/BasicTestApp/BasicTestApp.csproj b/test/testapps/BasicTestApp/BasicTestApp.csproj index c184de810c..78720cd71d 100644 --- a/test/testapps/BasicTestApp/BasicTestApp.csproj +++ b/test/testapps/BasicTestApp/BasicTestApp.csproj @@ -4,14 +4,14 @@ netcoreapp2.0 - run --project ..\..\..\src\Microsoft.Blazor.DevHost serve + run --project ..\..\..\src\Microsoft.AspNetCore.Blazor.DevHost serve - - + + - - + + diff --git a/test/testapps/BasicTestApp/KeyPressEventComponent.cshtml b/test/testapps/BasicTestApp/KeyPressEventComponent.cshtml index 1014bbcad6..f929f23651 100644 --- a/test/testapps/BasicTestApp/KeyPressEventComponent.cshtml +++ b/test/testapps/BasicTestApp/KeyPressEventComponent.cshtml @@ -1,5 +1,5 @@ @using System.Collections.Generic -@using Microsoft.Blazor.RenderTree +@using Microsoft.AspNetCore.Blazor.RenderTree Type here:
    @foreach (var key in keysPressed) diff --git a/test/testapps/BasicTestApp/Program.cs b/test/testapps/BasicTestApp/Program.cs index ee3ebc1a50..351a8bd491 100644 --- a/test/testapps/BasicTestApp/Program.cs +++ b/test/testapps/BasicTestApp/Program.cs @@ -1,9 +1,9 @@ // 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.Interop; -using Microsoft.Blazor.Browser.Rendering; -using Microsoft.Blazor.Components; +using Microsoft.AspNetCore.Blazor.Browser.Interop; +using Microsoft.AspNetCore.Blazor.Browser.Rendering; +using Microsoft.AspNetCore.Blazor.Components; using System; namespace BasicTestApp