diff --git a/build/artifacts.props b/build/artifacts.props index 64358ab186..5fcc2fada6 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -31,6 +31,7 @@ This can be done once #4246 is complete, and done in conjunction with converting + diff --git a/src/Components/Components.sln b/src/Components/Components.sln index 4eccfad4aa..b006b9944b 100644 --- a/src/Components/Components.sln +++ b/src/Components/Components.sln @@ -54,9 +54,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "blazor\samples\StandaloneApp\StandaloneApp.csproj", "{B241434A-1642-44CC-AE9A-2012B5C5BD02}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Build.Test", "test\Microsoft.AspNetCore.Components.Build.Test\Microsoft.AspNetCore.Components.Build.Test.csproj", "{709C7EBE-EB93-4F6D-9491-D714B0D2E898}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Build.Test", "blazor\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.AspNetCore.Components.Build", "src\Microsoft.AspNetCore.Components.Build\Microsoft.AspNetCore.Components.Build.csproj", "{8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.Build", "blazor\src\Microsoft.AspNetCore.Blazor.Build\Microsoft.AspNetCore.Blazor.Build.csproj", "{8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Browser.JS", "src\Microsoft.AspNetCore.Components.Browser.JS\Microsoft.AspNetCore.Components.Browser.JS.csproj", "{8A19B1CE-9B62-4440-93B3-152DDBB39D0A}" EndProject @@ -96,6 +96,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Browser", "src\Microsoft.AspNetCore.Components.Browser\Microsoft.AspNetCore.Components.Browser.csproj", "{E52F5005-26EA-4764-8ECF-41D324AAA6D9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Build", "src\Microsoft.AspNetCore.Components.Build\Microsoft.AspNetCore.Components.Build.csproj", "{ABDBB486-6F40-4EA0-8ED1-BF995F534F13}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -334,6 +336,14 @@ Global {E52F5005-26EA-4764-8ECF-41D324AAA6D9}.Release|Any CPU.Build.0 = Release|Any CPU {E52F5005-26EA-4764-8ECF-41D324AAA6D9}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {E52F5005-26EA-4764-8ECF-41D324AAA6D9}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.Release|Any CPU.Build.0 = Release|Any CPU + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -357,8 +367,8 @@ Global {F8996835-41F7-4663-91DF-3B5652ADC37D} = {4D367450-96E9-4C8C-8B56-EED8ADE3A20D} {7FD8C650-74B3-4153-AEA1-00F4F6AF393D} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {B241434A-1642-44CC-AE9A-2012B5C5BD02} = {C7B9207E-BF85-422D-9EBC-E243C399F619} - {709C7EBE-EB93-4F6D-9491-D714B0D2E898} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} - {8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815} = {B867E038-B3CE-43E3-9292-61568C46CDEB} + {709C7EBE-EB93-4F6D-9491-D714B0D2E898} = {32B33872-B599-4913-9F90-EDB5F9E24B18} + {8B3D0F1C-0E38-4E6D-BFF1-C4FDA0CD9815} = {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} {8A19B1CE-9B62-4440-93B3-152DDBB39D0A} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {8FD8636E-AFA5-434D-8857-06D02686741A} = {ADA3AE29-F6DE-49F6-8C7C-B321508CAE8E} {2838CB6F-D2C7-4C0A-A994-C72E56F16984} = {4AE0D35B-D97A-44D0-8392-C9240377DCCE} @@ -378,6 +388,7 @@ Global {A42AC30B-45E3-4907-99A9-9ABDA45973D7} = {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} {85813607-297F-4D39-92F7-89379FD80D70} = {32B33872-B599-4913-9F90-EDB5F9E24B18} {E52F5005-26EA-4764-8ECF-41D324AAA6D9} = {B867E038-B3CE-43E3-9292-61568C46CDEB} + {ABDBB486-6F40-4EA0-8ED1-BF995F534F13} = {B867E038-B3CE-43E3-9292-61568C46CDEB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {504DA352-6788-4DC0-8705-82167E72A4D3} diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props index 2a06c36124..42dc9caa9e 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -8,7 +8,7 @@ aspnetcore;components - $(MSBuildThisFileDirectory)src\Microsoft.AspNetCore.Components.Build\bin\$(Configuration)\netcoreapp3.0\ + $(MSBuildThisFileDirectory)blazor\src\Microsoft.AspNetCore.Blazor.Build\bin\$(Configuration)\netcoreapp3.0\ diff --git a/src/Components/NuGetPackageVerifier.json b/src/Components/NuGetPackageVerifier.json index 7c9631e4f8..13c842a076 100644 --- a/src/Components/NuGetPackageVerifier.json +++ b/src/Components/NuGetPackageVerifier.json @@ -4,7 +4,7 @@ "AdxVerificationCompositeRule" ], "packages": { - "Microsoft.AspNetCore.Components.Build": { + "Microsoft.AspNetCore.Blazor.Build": { "Exclusions": { "ASSEMBLY_COMPANY": { "tools/Mono.Cecil.dll": "External package", diff --git a/src/Components/README.md b/src/Components/README.md index 686dddf359..71a91b017f 100644 --- a/src/Components/README.md +++ b/src/Components/README.md @@ -145,7 +145,7 @@ You can browse https://dotnet.myget.org/gallery/blazor-dev to find the current v ```xml - + ``` diff --git a/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj b/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj index b59fcb2b3c..171caedbca 100644 --- a/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj +++ b/src/Components/blazor/benchmarks/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Components/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj index 07f6ccedb7..8ebc1dcf71 100644 --- a/src/Components/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj +++ b/src/Components/blazor/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Components/blazor/samples/MonoSanityClient/MonoSanityClient.csproj b/src/Components/blazor/samples/MonoSanityClient/MonoSanityClient.csproj index f05ca817b0..23b5d92471 100644 --- a/src/Components/blazor/samples/MonoSanityClient/MonoSanityClient.csproj +++ b/src/Components/blazor/samples/MonoSanityClient/MonoSanityClient.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj b/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj index b59fcb2b3c..171caedbca 100644 --- a/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj +++ b/src/Components/blazor/samples/StandaloneApp/StandaloneApp.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs similarity index 97% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs index 288f6f8f50..e749713c42 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/ResolveRuntimeDependenciesCommand.cs @@ -5,7 +5,7 @@ using System; using System.IO; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Components.Build.Cli.Commands +namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands { class ResolveRuntimeDependenciesCommand { diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/WriteBootJsonCommand.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/WriteBootJsonCommand.cs similarity index 97% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/WriteBootJsonCommand.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/WriteBootJsonCommand.cs index 7abee7ebe7..275f4e7575 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Commands/WriteBootJsonCommand.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Cli/Commands/WriteBootJsonCommand.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.CommandLineUtils; using System; using System.IO; -namespace Microsoft.AspNetCore.Components.Build.Cli.Commands +namespace Microsoft.AspNetCore.Blazor.Build.Cli.Commands { internal class WriteBootJsonCommand { diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Program.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs similarity index 82% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Program.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Cli/Program.cs index 59dd11cd80..1eac086fc7 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Cli/Program.cs +++ b/src/Components/blazor/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.AspNetCore.Components.Build.Cli.Commands; +using Microsoft.AspNetCore.Blazor.Build.Cli.Commands; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNetCore.Components.Build +namespace Microsoft.AspNetCore.Blazor.Build { static class Program { @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Components.Build { var app = new CommandLineApplication { - Name = "Microsoft.AspNetCore.Components.Build" + Name = "Microsoft.AspNetCore.Blazor.Build" }; app.HelpOption("-?|-h|--help"); diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/BootJsonWriter.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/BootJsonWriter.cs similarity index 98% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/Core/BootJsonWriter.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/BootJsonWriter.cs index d26e942bbf..50a09fa8b2 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/BootJsonWriter.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/BootJsonWriter.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Microsoft.AspNetCore.Components.Build +namespace Microsoft.AspNetCore.Blazor.Build { internal class BootJsonWriter { diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs similarity index 91% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs index 012ac016c4..97331537f2 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceInfo.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceInfo.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.AspNetCore.Components.Build +namespace Microsoft.AspNetCore.Blazor.Build { internal class EmbeddedResourceInfo { diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs similarity index 85% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs index 3fb349fafb..caf322ee15 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourceKind.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourceKind.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.AspNetCore.Components.Build +namespace Microsoft.AspNetCore.Blazor.Build { internal enum EmbeddedResourceKind { diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs similarity index 99% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs index 22fbdc2af9..21a28597e1 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/EmbeddedResources/EmbeddedResourcesProcessor.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Microsoft.AspNetCore.Components.Build +namespace Microsoft.AspNetCore.Blazor.Build { internal class EmbeddedResourcesProcessor { diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/RuntimeDependenciesResolver.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/RuntimeDependenciesResolver.cs similarity index 99% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/Core/RuntimeDependenciesResolver.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/RuntimeDependenciesResolver.cs index daa7e7f2be..18637753cc 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Core/RuntimeDependenciesResolver.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Core/RuntimeDependenciesResolver.cs @@ -8,7 +8,7 @@ using System.IO; using System.Linq; using Mono.Cecil; -namespace Microsoft.AspNetCore.Components.Build +namespace Microsoft.AspNetCore.Blazor.Build { internal class RuntimeDependenciesResolver { diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj new file mode 100644 index 0000000000..7d01b1095d --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj @@ -0,0 +1,78 @@ + + + + netcoreapp3.0 + Build mechanism for ASP.NET Core Blazor applications. + Exe + true + true + + + + + true + Microsoft.AspNetCore.Blazor.Build.nuspec + obj\publish\ + $(IntermediatePackDir)$(TargetFramework)/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + version=$(PackageVersion); + publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir))); + componentsversion=$(ComponentsPackageVersion); + razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion); + blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion); + repositorycommit=$(RepositoryCommit); + + + <_TargetFramework Include="$(TargetFramework)" /> + + + + + + + + + + + + + + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec new file mode 100644 index 0000000000..84e70c3a59 --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec @@ -0,0 +1,27 @@ + + + + Microsoft.AspNetCore.Blazor.Build + $version$ + Microsoft + © Microsoft Corporation. All rights reserved. + Build mechanism for ASP.NET Core Components. + aspnet components + https://go.microsoft.com/fwlink/?LinkID=288859 + https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt + https://asp.net/ + + true + + + + + + + + + + + + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Properties/AssemblyInfo.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..65917c9ab2 --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props new file mode 100644 index 0000000000..45c157f1fd --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props @@ -0,0 +1,59 @@ + + + + + + + + true + $(MSBuildThisFileDirectory)../../../src/Microsoft.AspNetCore.Components.Browser.JS/dist/blazor.*.js + + + + + + + + dotnet + <_BlazorCliLocation>$(MSBuildThisFileDirectory)../Microsoft.AspNetCore.Blazor.Cli/bin/$(Configuration)/netcoreapp3.0/dotnet-blazor.dll + exec "$(_BlazorCliLocation)" serve $(AdditionalRunArguments) + + + + + + + + + + + false + + true + TargetFramework + + + + + + true + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.props b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.props new file mode 100644 index 0000000000..0407d95f86 --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.targets b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.targets new file mode 100644 index 0000000000..35115b33b3 --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/build/netstandard1.0/Microsoft.AspNetCore.Blazor.Build.targets @@ -0,0 +1,3 @@ + + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/All.props b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/All.props new file mode 100644 index 0000000000..690a29fbab --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/All.props @@ -0,0 +1,16 @@ + + + + + $(DefaultWebContentItemExcludes);wwwroot\** + + + true + + + true + + + true + + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets new file mode 100644 index 0000000000..2f61b5e4df --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/All.targets @@ -0,0 +1,32 @@ + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + $(MSBuildThisFileDirectory)../tools/ + dotnet "$(BlazorToolsDir)Microsoft.AspNetCore.Blazor.Build.dll" + + + true + + + + + + + + $(AssemblyName).blazor.config + $(TargetDir)$(BlazorMetadataFileName) + + + + + + + + + + diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/Blazor.MonoRuntime.props b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.props similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/targets/Blazor.MonoRuntime.props rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.props diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/Blazor.MonoRuntime.targets b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/targets/Blazor.MonoRuntime.targets rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/BuiltInBclLinkerDescriptor.xml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/BuiltInBclLinkerDescriptor.xml similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/targets/BuiltInBclLinkerDescriptor.xml rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/BuiltInBclLinkerDescriptor.xml diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/Publish.targets b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Publish.targets similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/targets/Publish.targets rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Publish.targets diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/Standalone.Web.config b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Standalone.Web.config similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Build/targets/Standalone.Web.config rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/targets/Standalone.Web.config diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/BindRazorIntegrationTest.cs similarity index 99% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/BindRazorIntegrationTest.cs index 7bf9eecd1f..0f217f4e1e 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BindRazorIntegrationTest.cs +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/BindRazorIntegrationTest.cs @@ -2,11 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Components.Build.Test +namespace Microsoft.AspNetCore.Blazor.Build.Test { public class BindRazorIntegrationTest : RazorIntegrationTestBase { diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BootJsonWriterTest.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/BootJsonWriterTest.cs similarity index 97% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BootJsonWriterTest.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/BootJsonWriterTest.cs index 648f85cb24..3632a082b7 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/BootJsonWriterTest.cs +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/BootJsonWriterTest.cs @@ -7,7 +7,7 @@ using System; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Components.Build.Test +namespace Microsoft.AspNetCore.Blazor.Build.Test { public class BootJsonWriterTest { diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/ChildContentRazorIntegrationTest.cs similarity index 99% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/ChildContentRazorIntegrationTest.cs index 45dedb4014..1b371c815a 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ChildContentRazorIntegrationTest.cs +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/ChildContentRazorIntegrationTest.cs @@ -1,13 +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.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; using Microsoft.CodeAnalysis.CSharp; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Components.Build.Test +namespace Microsoft.AspNetCore.Blazor.Build.Test { public class ChildContentRazorIntegrationTest : RazorIntegrationTestBase { @@ -296,7 +297,7 @@ namespace Test @addTagHelper *, TestAssembly @{ RenderFragment template = (context) => @
@context.ToLowerInvariant()
; } - + "); // Act diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/ComponentRenderingRazorIntegrationTest.cs similarity index 99% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/ComponentRenderingRazorIntegrationTest.cs index 3a832e0ec9..0226c74ba4 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/ComponentRenderingRazorIntegrationTest.cs +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/ComponentRenderingRazorIntegrationTest.cs @@ -3,12 +3,13 @@ using System; using System.Linq; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Components.Build.Test +namespace Microsoft.AspNetCore.Blazor.Build.Test { public class ComponentRenderingRazorIntegrationTest : RazorIntegrationTestBase { @@ -72,7 +73,7 @@ namespace Test var component = CompileToComponent(@" @addTagHelper *, TestAssembly -() { 1, 2, })""> diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj similarity index 86% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj index 4fb6c952e0..733a46a277 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -34,11 +34,11 @@ - - + + - + diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/NotFoundProjectItem.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/NotFoundProjectItem.cs similarity index 100% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/NotFoundProjectItem.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/NotFoundProjectItem.cs diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/TestFile.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/TestFile.cs similarity index 100% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/TestFile.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/TestFile.cs diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/TestProject.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/TestProject.cs similarity index 100% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/TestProject.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/TestProject.cs diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/VirtualProjectFileSystem.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/VirtualProjectFileSystem.cs similarity index 100% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/VirtualProjectFileSystem.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/VirtualProjectFileSystem.cs diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/VirtualProjectItem.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/VirtualProjectItem.cs similarity index 100% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/VirtualProjectItem.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/Razor/VirtualProjectItem.cs diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorIntegrationTestBase.cs similarity index 99% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorIntegrationTestBase.cs index f27e8ec1f0..799f995cde 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RazorIntegrationTestBase.cs +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RazorIntegrationTestBase.cs @@ -10,6 +10,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; @@ -22,7 +23,7 @@ using Xunit; using Xunit.Abstractions; using Xunit.Sdk; -namespace Microsoft.AspNetCore.Components.Build.Test +namespace Microsoft.AspNetCore.Blazor.Build.Test { public class RazorIntegrationTestBase { diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RenderingRazorIntegrationTest.cs similarity index 99% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RenderingRazorIntegrationTest.cs index 7444841b96..4bb88a2eeb 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RenderingRazorIntegrationTest.cs +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RenderingRazorIntegrationTest.cs @@ -3,12 +3,13 @@ using System; using System.Collections.Generic; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Components.Build.Test +namespace Microsoft.AspNetCore.Blazor.Build.Test { // Integration tests for the end-to-end of successful Razor compilation of component definitions // Includes running the component code to verify the output. @@ -291,7 +292,7 @@ namespace Microsoft.AspNetCore.Components.Build.Test { // Arrange/Act var component = CompileToComponent(@" -@{ +@{ var myValue = ""Expression value""; } "); diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeDependenciesResolverTest.cs b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RuntimeDependenciesResolverTest.cs similarity index 99% rename from src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeDependenciesResolverTest.cs rename to src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RuntimeDependenciesResolverTest.cs index d44c586cc3..c594add472 100644 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/RuntimeDependenciesResolverTest.cs +++ b/src/Components/blazor/test/Microsoft.AspNetCore.Blazor.Build.Test/RuntimeDependenciesResolverTest.cs @@ -6,7 +6,7 @@ using System.IO; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Components.Build.Test +namespace Microsoft.AspNetCore.Blazor.Build.Test { public class RuntimeDependenciesResolverTest { diff --git a/src/Components/blazor/version.props b/src/Components/blazor/version.props index 5f84a3dab6..7d3d4d3b10 100644 --- a/src/Components/blazor/version.props +++ b/src/Components/blazor/version.props @@ -1,5 +1,7 @@ + $(PackageVersion) + diff --git a/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj b/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj index 2f23221fdf..9c1aa725fb 100644 --- a/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj +++ b/src/Components/samples/ComponentsApp.App/ComponentsApp.App.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/src/BootCommon.ts b/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/src/BootCommon.ts index ee17d8263b..1506f3b86b 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/src/BootCommon.ts +++ b/src/Components/src/Microsoft.AspNetCore.Components.Browser.JS/src/BootCommon.ts @@ -28,7 +28,7 @@ function loadResourceFromElement(element: HTMLElement) { }); } -// Keep in sync with BootJsonData in Microsoft.AspNetCore.Components.Build +// Keep in sync with BootJsonData in Microsoft.AspNetCore.Blazor.Build interface BootJsonData { main: string; entryPoint: string; diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj index 575361c53b..66366a61ac 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj @@ -1,10 +1,9 @@ - + netcoreapp3.0 - Build mechanism for ASP.NET Core Components. - Exe - true + Build mechanism for ASP.NET Core components. + Library true @@ -12,62 +11,15 @@ true Microsoft.AspNetCore.Components.Build.nuspec - obj\publish\ - $(IntermediatePackDir)$(TargetFramework)/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - false - version=$(PackageVersion); - publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir))); - razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion); - blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion); - repositorycommit=$(RepositoryCommit); + version=$(PackageVersion); + repositorycommit=$(RepositoryCommit); + - - <_TargetFramework Include="$(TargetFramework)" /> - - - - - - - - - - - - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec index 061cb6d862..a726fa529c 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.nuspec @@ -14,14 +14,11 @@ true - - - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Properties/AssemblyInfo.cs b/src/Components/src/Microsoft.AspNetCore.Components.Build/Properties/AssemblyInfo.cs deleted file mode 100644 index 106dba0b4e..0000000000 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props b/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props index c084a0e196..020867ab20 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props @@ -4,54 +4,13 @@ Importing this file is equivalent to having: ... except it's much more convenient when working in this repo, because it consumes the - Blazor.Build targets/exe directly without needing this project to be packed into a .nupkg. + Components.Build targets directly without needing this project to be packed into a .nupkg. This is only intended for use by other projects in this repo. --> - - true - $(MSBuildThisFileDirectory)../Microsoft.AspNetCore.Components.Browser.JS/dist/blazor.*.js - - - - - dotnet - <_BlazorCliLocation>$(MSBuildThisFileDirectory)../../blazor/src/Microsoft.AspNetCore.Blazor.Cli/bin/$(Configuration)/netcoreapp3.0/dotnet-blazor.dll - exec $(_BlazorCliLocation) serve $(AdditionalRunArguments) - - - - - - - - - - - false - - true - TargetFramework - - - - - - true - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/All.props b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/All.props index 690a29fbab..8c119d5413 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/All.props +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/All.props @@ -1,16 +1,2 @@ - - - - $(DefaultWebContentItemExcludes);wwwroot\** - - - true - - - true - - - true - diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/All.targets b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/All.targets index 481480df67..a721c81953 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/All.targets +++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/All.targets @@ -1,33 +1,5 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - $(MSBuildThisFileDirectory)../tools/ - dotnet "$(BlazorToolsDir)Microsoft.AspNetCore.Components.Build.dll" - - - true - - - - - - - $(AssemblyName).blazor.config - $(TargetDir)$(BlazorMetadataFileName) - - - - - - - - - diff --git a/src/Components/src/Microsoft.AspNetCore.Components/Properties/AssemblyInfo.cs b/src/Components/src/Microsoft.AspNetCore.Components/Properties/AssemblyInfo.cs index a772152523..fd02281f9b 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components/Properties/AssemblyInfo.cs +++ b/src/Components/src/Microsoft.AspNetCore.Components/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ using System.Runtime.CompilerServices; +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Browser.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Server.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj index 1d6a19d2cf..1778676aa5 100644 --- a/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj +++ b/src/Components/test/testapps/BasicTestApp/BasicTestApp.csproj @@ -7,8 +7,8 @@ --pathbase /subdir - - + + diff --git a/src/Components/test/testapps/TestContentPackage/TestContentPackage.csproj b/src/Components/test/testapps/TestContentPackage/TestContentPackage.csproj index 7740468e59..4816b5ee00 100644 --- a/src/Components/test/testapps/TestContentPackage/TestContentPackage.csproj +++ b/src/Components/test/testapps/TestContentPackage/TestContentPackage.csproj @@ -21,8 +21,8 @@ - - + +