-
Notifications
You must be signed in to change notification settings - Fork 10.4k
Split .Components.Build into .Blazor.Build+.Components.Build #6538
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
SteveSandersonMS
merged 10 commits into
master
from
stevesa/rename-components-build-to-blazor-build
Jan 10, 2019
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
69f94e7
Move Components.Build to blazor/src/. No content changes yet.
SteveSandersonMS 2b13f0a
Rename Components.Build to Blazor.Build and update file paths
SteveSandersonMS cff94fb
Move Components.Build.Test files. No content changes yet.
SteveSandersonMS a78b4db
Update contents in Blazor.Test
SteveSandersonMS 9e3b99c
Fix names of props/targets files
SteveSandersonMS 50b102d
Add minimal Components.Build package that just imports Razor targets …
SteveSandersonMS 3726b8d
Make Blazor.Build depend on Components.Build and get Razor compilatio…
SteveSandersonMS 950d062
Fix version of reference from .Blazor.Build to .Components.Build
SteveSandersonMS 26f6b7b
Fix signing error on local builds
SteveSandersonMS f8b3bf4
Update artifacts.props
SteveSandersonMS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...spNetCore.Components.Build/Cli/Program.cs → ...ft.AspNetCore.Blazor.Build/Cli/Program.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...EmbeddedResources/EmbeddedResourceInfo.cs → ...EmbeddedResources/EmbeddedResourceInfo.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...EmbeddedResources/EmbeddedResourceKind.cs → ...EmbeddedResources/EmbeddedResourceKind.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
...nts/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.0</TargetFramework> | ||
| <Description>Build mechanism for ASP.NET Core Blazor applications.</Description> | ||
| <OutputType>Exe</OutputType> | ||
| <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> | ||
| <IsProductPackage>true</IsProductPackage> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Pack settings --> | ||
| <PropertyGroup> | ||
| <NoPackageAnalysis>true</NoPackageAnalysis> | ||
| <NuspecFile>Microsoft.AspNetCore.Blazor.Build.nuspec</NuspecFile> | ||
| <IntermediatePackDir>obj\publish\</IntermediatePackDir> | ||
| <PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- Assemblies built by this project --> | ||
| <SignedPackageFile Include="$(TargetFileName)" Certificate="$(AssemblySigningCertName)" /> | ||
| <SignedPackageFile Include="Microsoft.AspNetCore.Components.Browser.JS.dll" Certificate="$(AssemblySigningCertName)" /> | ||
| <SignedPackageFile Include="Microsoft.AspNetCore.Blazor.Build.exe" Certificate="$(AssemblySigningCertName)" /> | ||
|
|
||
| <!-- 3rd party assemblies we redistribute. --> | ||
| <SignedPackageFile Include="AngleSharp.dll" Certificate="$(AssemblySigning3rdPartyCertName)" /> | ||
| <SignedPackageFile Include="Mono.Cecil.dll" Certificate="$(AssemblySigning3rdPartyCertName)" /> | ||
| <SignedPackageFile Include="Mono.Cecil.Mdb.dll" Certificate="$(AssemblySigning3rdPartyCertName)" /> | ||
| <SignedPackageFile Include="Mono.Cecil.Pdb.dll" Certificate="$(AssemblySigning3rdPartyCertName)" /> | ||
| <SignedPackageFile Include="Mono.Cecil.Rocks.dll" Certificate="$(AssemblySigning3rdPartyCertName)" /> | ||
|
|
||
| <!-- Assemblies which should be signed by other build. --> | ||
| <ExcludePackageFileFromSigning Include="Microsoft.Extensions.CommandLineUtils.dll" /> | ||
| <ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Abstractions.dll" /> | ||
| <ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Composite.dll" /> | ||
| <ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Embedded.dll" /> | ||
| <ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileProviders.Physical.dll" /> | ||
| <ExcludePackageFileFromSigning Include="Microsoft.Extensions.FileSystemGlobbing.dll" /> | ||
| <ExcludePackageFileFromSigning Include="Microsoft.Extensions.Primitives.dll" /> | ||
| <ExcludePackageFileFromSigning Include="Microsoft.JSInterop.dll" /> | ||
| <ExcludePackageFileFromSigning Include="System.CodeDom.dll" /> | ||
| <ExcludePackageFileFromSigning Include="System.Runtime.CompilerServices.Unsafe.dll" /> | ||
| <ExcludePackageFileFromSigning Include="System.Text.Encoding.CodePages.dll" /> | ||
|
|
||
| <!-- JS files --> | ||
| <ExcludePackageFileFromSigning Include="blazor.server.js" /> | ||
| <ExcludePackageFileFromSigning Include="blazor.webassembly.js" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Executes /t:Publish for all target frameworks before packing--> | ||
| <Target Name="PublishAll" BeforeTargets="_IntermediatePack"> | ||
| <PropertyGroup> | ||
| <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies> | ||
| <NuspecProperties> | ||
| version=$(PackageVersion); | ||
| publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir))); | ||
| componentsversion=$(ComponentsPackageVersion); | ||
| razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion); | ||
| blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion); | ||
| repositorycommit=$(RepositoryCommit);</NuspecProperties> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <_TargetFramework Include="$(TargetFramework)" /> | ||
| </ItemGroup> | ||
| <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" /> | ||
| </Target> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Components.Browser.JS\Microsoft.AspNetCore.Components.Browser.JS.csproj" /> | ||
| <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Components\Microsoft.AspNetCore.Components.csproj" /> | ||
|
|
||
| <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(AspNetCorePackageVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCorePackageVersion)" /> | ||
| <PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" /> | ||
| <PackageReference Include="System.CodeDom" Version="4.4.0" /> | ||
| </ItemGroup> | ||
| </Project> |
27 changes: 27 additions & 0 deletions
27
...nts/blazor/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd"> | ||
| <metadata> | ||
| <id>Microsoft.AspNetCore.Blazor.Build</id> | ||
| <version>$version$</version> | ||
| <authors>Microsoft</authors> | ||
| <copyright>© Microsoft Corporation. All rights reserved.</copyright> | ||
| <description>Build mechanism for ASP.NET Core Components.</description> | ||
| <tags>aspnet components</tags> | ||
| <iconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</iconUrl> | ||
| <licenseUrl>https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt</licenseUrl> | ||
| <projectUrl>https://asp.net/</projectUrl> | ||
| <repository type="git" url="https://github.com/aspnet/aspnetcore" commit="$repositorycommit$" /> | ||
| <requireLicenseAcceptance>true</requireLicenseAcceptance> | ||
| <dependencies> | ||
| <dependency id="Microsoft.AspNetCore.Components.Build" version="$componentsversion$" include="all" /> | ||
| <dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" /> | ||
| </dependencies> | ||
| </metadata> | ||
| <files> | ||
| <file src="..\..\..\THIRD-PARTY-NOTICES.txt" /> | ||
| <file src="build\**" target="build" /> | ||
| <file src="targets\**" target="targets" /> | ||
| <file src="$publishdir$netcoreapp3.0\**\*" target="tools/" /> | ||
| <file src="..\..\..\src\Microsoft.AspNetCore.Components.Browser.JS\dist\blazor.*.js" target="tools/blazor" /> | ||
| </files> | ||
| </package> |
3 changes: 3 additions & 0 deletions
3
src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/Properties/AssemblyInfo.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| using System.Runtime.CompilerServices; | ||
|
|
||
| [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] |
59 changes: 59 additions & 0 deletions
59
src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| <Project> | ||
|
|
||
| <!-- | ||
| Importing this file is equivalent to having: | ||
| <PackageDependency Include="Microsoft.AspNetCore.Blazor.Build" /> | ||
| ... 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. | ||
|
|
||
| This is only intended for use by other projects in this repo. | ||
| --> | ||
|
|
||
| <Import Project="$(MSBuildThisFileDirectory)../../../src/Microsoft.AspNetCore.Components.Build/ReferenceFromSource.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <BlazorBuildReferenceFromSource>true</BlazorBuildReferenceFromSource> | ||
| <BlazorJsPath>$(MSBuildThisFileDirectory)../../../src/Microsoft.AspNetCore.Components.Browser.JS/dist/blazor.*.js</BlazorJsPath> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="$(MSBuildThisFileDirectory)targets/All.props" /> | ||
| <Import Project="$(MSBuildThisFileDirectory)targets/All.targets" /> | ||
|
|
||
| <!-- | ||
| Debugging support using dotnet-blazor serve. | ||
|
|
||
| A few things to note here: | ||
| - We have to use dotnet exec to avoid launching another process and confusing the debugger. | ||
| - Since we're doing dotnet exec, it won't automatically rebuild the CLI project. | ||
| - $(AdditionalRunArguments) needs to be defined before importing this file. | ||
| --> | ||
| <PropertyGroup> | ||
| <RunCommand>dotnet</RunCommand> | ||
| <_BlazorCliLocation>$(MSBuildThisFileDirectory)../Microsoft.AspNetCore.Blazor.Cli/bin/$(Configuration)/netcoreapp3.0/dotnet-blazor.dll</_BlazorCliLocation> | ||
| <RunArguments>exec "$(_BlazorCliLocation)" serve $(AdditionalRunArguments)</RunArguments> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- This is used as a P2P when building the repo. Normal Blazor projects will get this as a reference through the Blazor.Build package --> | ||
| <ItemGroup> | ||
| <!-- Ensures these projects are built before the consuming project, but without | ||
| adding a runtime dependency on the .dll (to be equivalent to a <PackageDependency> | ||
| given that the packed version of this project wouldn't add a .dll reference) --> | ||
| <ProjectReference Include="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.Blazor.Build.csproj"> | ||
| <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
| <!-- Optimization. Do not require framework compatibility between these projects. --> | ||
| <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties> | ||
| <UndefineProperties>TargetFramework</UndefineProperties> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- When referencing from source, we need to disable VS's fast up-to-date check, | ||
| because otherwise changing the underlying Blazor library code isn't enough | ||
| to make it rebuild the affected library apps. --> | ||
| <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck> | ||
| </PropertyGroup> | ||
| </Project> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this need to be in ship or just the components part?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're shipping all the Blazor.* packages (to NuGet) as well as the Components.* ones (some of which will be in shared framework).