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

Merge remote-tracking branch 'origin/rel/2.0.0-preview2' into dev

This commit is contained in:
Pavel Krymets 2017-06-05 18:18:49 -07:00
parent f67292cf22 cde593c0e0
commit 671645648e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/repo.targets
View File

@ -56,6 +56,9 @@
<Error Text="Please specify the platform for the runtime package store via PACKAGE_CACHE_PLATFORM: {x64|x86}." Condition="'$(PACKAGE_CACHE_PLATFORM)' == ''"/>
<!-- Display dotnet info -->
<Exec Command="dotnet --info" />
<PropertyGroup>
<OutputZipSufix Condition="'$(OSPlatform)' == 'Windows'">win$(PACKAGE_CACHE_PLATFORM)</OutputZipSufix>
<OutputZipSufix Condition="'$(OSPlatform)' == 'Linux'">linux</OutputZipSufix>

8
tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj
View File

@ -14,9 +14,11 @@
<Target Name="CollectDeps">
<PropertyGroup>
<DestinationDepsFile>$(DepsOutputPath)\$(HostingStartupPackageName)\shared\Microsoft.NETCore.App\$(RuntimeFrameworkVersion)\$(HostingStartupPackageName).deps.json</DestinationDepsFile>
<CurrentRuntimeFrameworkVersion Condition="'$(CurrentRuntimeFrameworkVersion)' == ''">$(RuntimeFrameworkVersion)</CurrentRuntimeFrameworkVersion>
<DestinationDepsFile>$(DepsOutputPath)\$(HostingStartupPackageName)\shared\Microsoft.NETCore.App\$(CurrentRuntimeFrameworkVersion)\$(HostingStartupPackageName).deps.json</DestinationDepsFile>
</PropertyGroup>
<Copy SourceFiles="$(ProjectDepsFilePath)" DestinationFiles="$(DestinationDepsFile)" />
<Exec Command="dotnet run --framework netcoreapp2.0 $([System.IO.Path]::GetFullPath('$(DestinationDepsFile)'))" WorkingDirectory="../TrimDeps/"/>
<Copy SourceFiles="$(ProjectDepsFilePath)" DestinationFiles="$(DestinationDepsFile)" />
<Exec Command="dotnet run --framework netcoreapp2.0 $([System.IO.Path]::GetFullPath('$(DestinationDepsFile)'))" WorkingDirectory="../TrimDeps/"/>
</Target>
</Project>