huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure Microsoft.AspNetCore.Blazor.Build is packed in a post-publish form so it's cross-plat compatible

This commit is contained in:
Steve Sanderson 2018-02-27 20:22:19 +00:00
parent ccd4de4d8c
commit 9a17a343cc
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/aspnetci-build.ps1
View File

@ -1,5 +1,4 @@
Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1' -OutFile .\build\dotnet-install.ps1 Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1' -OutFile .\build\dotnet-install.ps1
.\build\dotnet-install.ps1 -channel Current -version 2.1.3 -InstallDir dotnetsdk .\build\dotnet-install.ps1 -channel Current -version 2.1.3 -InstallDir dotnetsdk
Get-Command dotnet | Format-List source
dotnet --version dotnet --version
dotnet pack Blazor.sln --configuration Release dotnet pack Blazor.sln --configuration Release

24
src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
View File

@ -1,18 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<OutDir>tools</OutDir> <OutDir>tools</OutDir> <!-- So we can use the tool from source within the repo without having to pack -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>
<Target Name="SetPackageProperties" BeforeTargets="_IntermediatePack"> <!-- Pack settings -->
<PropertyGroup>
<NoPackageAnalysis>true</NoPackageAnalysis>
<NuspecFile>Microsoft.AspNetCore.Blazor.Build.nuspec</NuspecFile>
<IntermediatePackDir>$(MSBuildProjectDirectory)/bin/$(Configuration)/publish/</IntermediatePackDir>
<PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir>
</PropertyGroup>
<!-- Executes /t:Publish for all target frameworks before packing-->
<Target Name="PublishAll" BeforeTargets="_IntermediatePack">
<PropertyGroup> <PropertyGroup>
<NoPackageAnalysis>true</NoPackageAnalysis> <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
<NuspecFile>Microsoft.AspNetCore.Blazor.Build.nuspec</NuspecFile> <NuspecProperties>version=$(PackageVersion);publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)))</NuspecProperties>
<NuspecProperties>version=$(PackageVersion)</NuspecProperties>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<_TargetFramework Include="$(TargetFrameworks)" />
</ItemGroup>
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" />
</Target> </Target>
<ItemGroup> <ItemGroup>

2
src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec
View File

@ -10,6 +10,6 @@
<file src="_._" target="lib/netstandard1.0/" /> <file src="_._" target="lib/netstandard1.0/" />
<file src="build\**" target="build" /> <file src="build\**" target="build" />
<file src="targets\**" target="targets" /> <file src="targets\**" target="targets" />
<file src="tools\**" target="tools" /> <file src="$publishdir$\netcoreapp2.0\**\*" target="tools/" />
</files> </files>
</package> </package>