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

Merge branch 'rel/2.0.0-preview2' into dev

This commit is contained in:
John Luo 2017-06-12 12:25:13 -07:00
parent 41f211f3a7 512195247a
commit 0465f65ea0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/repo.targets
View File

@ -159,17 +159,16 @@
<Delete Files="$(ZipFileName)" />
</Target>
<Target Name="AddDiaSymReaderToPath" Condition="'$(OS)' == 'Windows_NT'">
<Target Name="AddDiaSymReaderToPath" Condition="'$(OS)' == 'Windows_NT'" DependsOnTargets="_AddDiaSymReaderFromCurrentSharedFramework;_AddDiaSymReaderFromDownloadedSharedFramework" />
<Target Name="_ResolveCurrentSharedFrameworkVersion">
<!-- Parse framework version -->
<Exec Command="powershell.exe $(ToolsDir)GetSharedFrameworkVersion.ps1" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="SharedFrameworkVersion" />
</Exec>
<MSBuild Projects="$(ProjectPath)" Targets="_AddDiaSymReaderFromCurrentSharedFramework" Properties="SharedFrameworkVersion=$(SharedFrameworkVersion)" Condition="'$(PACKAGE_CACHE_PLATFORM)' == 'x64'" />
<MSBuild Projects="$(ProjectPath)" Targets="_AddDiaSymReaderFromDownloadedSharedFramework" Properties="SharedFrameworkVersion=$(SharedFrameworkVersion)" Condition="'$(PACKAGE_CACHE_PLATFORM)' == 'x86'" />
</Target>
<Target Name="_AddDiaSymReaderFromCurrentSharedFramework">
<!-- Parse framework version -->
<Target Name="_AddDiaSymReaderFromCurrentSharedFramework" DependsOnTargets="_ResolveCurrentSharedFrameworkVersion" Condition="'$(PACKAGE_CACHE_PLATFORM)' == 'x64'">
<GetDotNetHost>
<Output TaskParameter="DotNetDirectory" PropertyName="DotnetHomeDirectory" />
</GetDotNetHost>
@ -183,7 +182,7 @@
<SetEnvironmentVariable Variable="PATH" Value="$(PATH);$(DiaSymReaderDirectory)" />
</Target>
<Target Name="_AddDiaSymReaderFromDownloadedSharedFramework">
<Target Name="_AddDiaSymReaderFromDownloadedSharedFramework" DependsOnTargets="_ResolveCurrentSharedFrameworkVersion" Condition="'$(PACKAGE_CACHE_PLATFORM)' == 'x86'">
<Exec Command="powershell.exe $(ToolsDir)InstallSharedFrameworkx86.ps1 $(SharedFrameworkVersion) $(BuildTempDirectory)"/>
<PropertyGroup>