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

Update MSBuild to 0.1.0-preview-00034-160909.

Browse source
This commit is contained in:
Eric Erhardt 2016-09-12 10:31:51 -05:00
parent 7915a9c424
commit 0ecb3b7538
6 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -216,10 +216,13 @@
<Copy SourceFiles="@(MSBuildTargetsToCopy)" <Copy SourceFiles="@(MSBuildTargetsToCopy)"
DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" /> 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" 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" /> DestinationFolder="$(SdkOutputDirectory)/15.0" />
<RemoveDir Directories="$(SdkOutputDirectory)/14.1" /> <RemoveDir Directories="$(SdkOutputDirectory)/Extensions" />
<ItemGroup> <ItemGroup>
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" /> <FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />

3
build_projects/dotnet-cli-build/project.json
View file

@ -21,8 +21,7 @@
"System.Xml.XmlSerializer": "4.0.11", "System.Xml.XmlSerializer": "4.0.11",
"WindowsAzure.Storage": "6.2.2-preview", "WindowsAzure.Storage": "6.2.2-preview",
"NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.4", "NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.4",
"Microsoft.Build.Framework": "0.1.0-preview-00033-160829", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00034-160909",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00033-160829",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933"
}, },
"frameworks": { "frameworks": {

4
src/Microsoft.DotNet.ProjectJsonMigration/project.json
View file

@ -13,9 +13,7 @@
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },
"Microsoft.Build.Framework": "0.1.0-preview-00029-160805", "Microsoft.Build": "0.1.0-preview-00034-160909"
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805",
"Microsoft.Build": "0.1.0-preview-00029-160805",
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

3
src/dotnet/project.json
View file

@ -68,8 +68,7 @@
"exclude": "compile" "exclude": "compile"
}, },
"Microsoft.Build": "0.1.0-preview-00033-160829", "Microsoft.Build": "0.1.0-preview-00034-160909",
"Microsoft.Build.Framework": "0.1.0-preview-00033-160829",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933"
}, },

12
src/redist/project.json
View file

@ -13,12 +13,12 @@
"tool_nuget": "1.0.0-preview3-*", "tool_nuget": "1.0.0-preview3-*",
"tool_msbuild": "1.0.0-preview3-*", "tool_msbuild": "1.0.0-preview3-*",
"MSBuild": "0.1.0-preview-00033-160829", "MSBuild": "0.1.0-preview-00034-160909",
"Microsoft.Build.Framework": "0.1.0-preview-00033-160829", "Microsoft.Build.Framework": "0.1.0-preview-00034-160909",
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00033-160829", "Microsoft.Build.Tasks.Core": "0.1.0-preview-00034-160909",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00033-160829", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00034-160909",
"Microsoft.Build.Targets": "0.1.0-preview-00033-160829", "Microsoft.Build.Targets": "0.1.0-preview-00034-160909",
"Microsoft.Build": "0.1.0-preview-00033-160829", "Microsoft.Build": "0.1.0-preview-00034-160909",
"System.Runtime.Serialization.Xml": "4.1.0", "System.Runtime.Serialization.Xml": "4.1.0",
"NuGet.Build.Tasks": "3.6.0-beta.1.msbuild.4" "NuGet.Build.Tasks": "3.6.0-beta.1.msbuild.4"
}, },

8
src/tool_msbuild/project.json
View file

@ -8,12 +8,8 @@
"type": "platform", "type": "platform",
"version": "1.0.1" "version": "1.0.1"
}, },
"MSBuild": "0.1.0-preview-00033-160829", "MSBuild": "0.1.0-preview-00034-160909",
"Microsoft.Build.Framework": "0.1.0-preview-00033-160829", "Microsoft.Build.Targets": "0.1.0-preview-00034-160909",
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00033-160829",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00033-160829",
"Microsoft.Build.Targets": "0.1.0-preview-00033-160829",
"Microsoft.Build": "0.1.0-preview-00033-160829",
"Microsoft.Net.Compilers.netcore": "1.3.0", "Microsoft.Net.Compilers.netcore": "1.3.0",
"Microsoft.Net.Compilers.Targets.NetCore": "0.1.5-dev", "Microsoft.Net.Compilers.Targets.NetCore": "0.1.5-dev",
"Microsoft.Cci": "4.0.0-rc3-24128-00", "Microsoft.Cci": "4.0.0-rc3-24128-00",