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

Move 14.1 to 15.0 now that MSBuild is version 15.0.

Browse source
This commit is contained in:
Eric Erhardt 2016-08-09 10:13:49 -05:00
parent 38d18eab4d
commit 2bea6bac83
6 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/Microsoft.DotNet.Cli.Compile.targets
View file

@ -210,6 +210,10 @@
<Copy SourceFiles="@(MSBuildTargetsToCopy)"
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
<!-- Temporary workaround for MSBuild placing their .props files in the old 14.1 directory -->
<Move SourceFiles="$(SdkOutputDirectory)/14.1/Microsoft.Common.props"
DestinationFolder="$(SdkOutputDirectory)/15.0" />
<ItemGroup>
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
</ItemGroup>

0
src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props → src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
View file

0
src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props → src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
View file

0
src/dotnet/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets → src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
View file

0
src/dotnet/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets → src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
View file

2
src/dotnet/project.json
View file

@ -27,7 +27,7 @@
},
"publishOptions": {
"include": [
"14.1/**",
"15.0/**",
"*.props",
"*.targets"
]