mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Reset ToolsVersion to 14

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-08-27 21:10:23 -07:00
parent c8139a9790
commit 7993b438a0
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.proj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="build/Microsoft.DotNet.Cli.Monikers.props" />
<PropertyGroup>

5
build/Microsoft.DotNet.Cli.Package.targets
View file

@ -32,8 +32,9 @@
SharedFrameworkBrandName=$(SharedFrameworkBrandName);
SharedFrameworkName=$(SharedFrameworkName);
SharedFrameworkVersion=$(SharedFrameworkVersion);
ToolPath=$(Stage2Directory);">
<Output TaskParameter="GeneratedInstallers"
ToolPath=$(Stage2Directory);"
Targets="GenerateDebs">
<Output TaskParameter="TargetOutputs"
ItemName="GeneratedInstallers" />
</MSBuild>
</Target>

6
build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
DefaultTarget="GenerateDebs">
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLIBuildDll Condition=" '!Exists($(CLIBuildDll))' ">$([MSBuild]::Unescape($(CLIBuildDll)))</CLIBuildDll>
@ -17,7 +16,8 @@
DependsOnTargets="TestDebuild;
BuildSdkDeb;
TestSdkDeb;"
Condition=" '$(OSName)' == 'ubuntu' " />
Condition=" '$(OSName)' == 'ubuntu' "
Outputs="@(GeneratedInstallers)"/>
<Target Name="BuildSdkDeb"
Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)' == 'true' "

2
build/test/RunTest.proj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTarget="RunTest" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTarget="RunTest" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- workaround for https://github.com/Microsoft/msbuild/issues/885 -->
<PropertyGroup>