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

Moving msbuild dependencies to msbuild 15.

Browse source
This commit is contained in:
Livar Cunha 2016-09-30 20:26:07 -07:00
parent 28bd507f40
commit 6242db9b14
4 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
<ItemGroup>
<PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
<FilesToMove Include="$(BinaryToCorehostifyRelDir)/csc.exe;$(BinaryToCorehostifyRelDir)/MSBuild.exe;" />
<FilesToMove Include="$(BinaryToCorehostifyRelDir)/csc.exe;" />
<BundledTools Include="csc;MSBuild;NuGet.CommandLine.XPlat;dotnet" />
<MSBuildImportsContent Include="$(MSBuildImportsDir)/**/*" />
</ItemGroup>
@ -216,12 +216,6 @@
<Copy SourceFiles="@(MSBuildTargetsToCopy)"
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
<!--
MSBuild's nupkg puts Microsoft.Common.props in an "Extensions" folder. Take that folder out of the hierarchy, since
the CLI sets $(MSBuildExtensionsPath) to be the $(SdkOutputDirectory).
-->
<Move SourceFiles="$(SdkOutputDirectory)/Extensions/15.0/Microsoft.Common.props"
DestinationFolder="$(SdkOutputDirectory)/15.0" />
<RemoveDir Directories="$(SdkOutputDirectory)/Extensions" />
<ItemGroup>
@ -239,15 +233,5 @@
DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
<Delete Files="@(PdbsToClean)" />
<!-- workaround for https://github.com/Microsoft/msbuild/issues/872 -->
<Copy SourceFiles="$(MSBuildTargetsDirectory)/MSBuild.exe"
DestinationFiles="$(SdkOutputDirectory)/MSBuild.exe" />
<Copy SourceFiles="$(RepoRoot)/resources/MSBuild.exe.config"
DestinationFiles="$(SdkOutputDirectory)/MSBuild.exe.config" />
<Copy SourceFiles="$(RepoRoot)/resources/MSBuild.exe.config"
DestinationFiles="$(MSBuildTargetsDirectory)/MSBuild.exe.config" />
</Target>
</Project>

2
src/dotnet/project.json
View file

@ -69,7 +69,7 @@
"exclude": "compile"
},
"Microsoft.Build": "0.1.0-preview-00043-160929",
"Microsoft.Build": "15.1.298-preview5",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933"
},

7
src/redist/project.json
View file

@ -19,12 +19,7 @@
"tool_nuget": "1.0.0-preview3-*",
"tool_msbuild": "1.0.0-preview3-*",
"MSBuild": "0.1.0-preview-00043-160929",
"Microsoft.Build.Framework": "0.1.0-preview-00043-160929",
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00043-160929",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00043-160929",
"Microsoft.Build.Targets": "0.1.0-preview-00043-160929",
"Microsoft.Build": "0.1.0-preview-00043-160929",
"Microsoft.Build.Runtime": "15.1.298-preview5",
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08",
"System.Runtime.Serialization.Xml": "4.1.1",
"NuGet.Build.Tasks": "3.6.0-rc-1954",

4
src/tool_msbuild/project.json
View file

@ -8,12 +8,10 @@
"type": "platform",
"version": "1.0.1"
},
"MSBuild": "0.1.0-preview-00043-160929",
"Microsoft.Build.Targets": "0.1.0-preview-00043-160929",
"Microsoft.Build.Runtime": "15.1.298-preview5",
"Microsoft.Net.Compilers.netcore": "2.0.0-beta6-60922-08",
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08",
"Microsoft.Cci": "4.0.0-rc3-24128-00",
"Microsoft.NuGet.Build.Tasks": "1.0.0-alpha-000004",
"Microsoft.Composition": "1.0.30"
},
"frameworks": {