From a543050c62a2aead30a0a0b626b63379ed9862d5 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 23 Aug 2016 13:44:07 -0500 Subject: [PATCH 1/3] Update the Sdk version to the latest build. --- TestAssets/TestProjects/MSBuildTestApp/project.json | 2 +- .../commands/dotnet-new/CSharp_MSBuild/project.json.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestAssets/TestProjects/MSBuildTestApp/project.json b/TestAssets/TestProjects/MSBuildTestApp/project.json index de055296f..45d66493f 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/project.json +++ b/TestAssets/TestProjects/MSBuildTestApp/project.json @@ -2,7 +2,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160811-3", + "Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160822-4", "Microsoft.NETCore.App": { "version": "1.0.0", "type": "platform" diff --git a/src/dotnet/commands/dotnet-new/CSharp_MSBuild/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_MSBuild/project.json.template index 0e553f9eb..39fbca098 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_MSBuild/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_MSBuild/project.json.template @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160811-3", + "Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160822-4", "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0" From c7029577301679c82c8f4a54b1ac673a0ac6cc47 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 24 Aug 2016 10:09:11 -0700 Subject: [PATCH 2/3] Update to new msbuild --- build_projects/dotnet-cli-build/project.json | 4 ++-- src/dotnet/project.json | 4 ++-- src/redist/project.json | 12 ++++++------ src/tool_msbuild/project.json | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 90aa1e96d..351cca9ee 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -21,8 +21,8 @@ "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.1", - "Microsoft.Build.Framework": "0.1.0-preview-00029-160805", - "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805", + "Microsoft.Build.Framework": "0.1.0-preview-00032-160824", + "Microsoft.Build.Utilities.Core": "0.1.0-preview-00032-160824", "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919" }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 4cf3dcd61..6679928aa 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -60,8 +60,8 @@ "exclude": "compile" }, - "Microsoft.Build": "0.1.0-preview-00029-160805", - "Microsoft.Build.Framework": "0.1.0-preview-00029-160805", + "Microsoft.Build": "0.1.0-preview-00032-160824", + "Microsoft.Build.Framework": "0.1.0-preview-00032-160824", "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919" }, diff --git a/src/redist/project.json b/src/redist/project.json index 14e78ac3d..3440d2dad 100644 --- a/src/redist/project.json +++ b/src/redist/project.json @@ -13,12 +13,12 @@ "tool_nuget": "1.0.0-featmsbuild-*", "tool_msbuild": "1.0.0-featmsbuild-*", - "MSBuild": "0.1.0-preview-00029-160805", - "Microsoft.Build.Framework": "0.1.0-preview-00029-160805", - "Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805", - "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805", - "Microsoft.Build.Targets": "0.1.0-preview-00029-160805", - "Microsoft.Build": "0.1.0-preview-00029-160805", + "MSBuild": "0.1.0-preview-00032-160824", + "Microsoft.Build.Framework": "0.1.0-preview-00032-160824", + "Microsoft.Build.Tasks.Core": "0.1.0-preview-00032-160824", + "Microsoft.Build.Utilities.Core": "0.1.0-preview-00032-160824", + "Microsoft.Build.Targets": "0.1.0-preview-00032-160824", + "Microsoft.Build": "0.1.0-preview-00032-160824", "NuGet.Build.Tasks": "3.6.0-beta.1.msbuild.1" }, "frameworks": { diff --git a/src/tool_msbuild/project.json b/src/tool_msbuild/project.json index aaccda9a0..467f0a898 100644 --- a/src/tool_msbuild/project.json +++ b/src/tool_msbuild/project.json @@ -8,12 +8,12 @@ "type": "platform", "version": "1.0.0" }, - "MSBuild": "0.1.0-preview-00029-160805", - "Microsoft.Build.Framework": "0.1.0-preview-00029-160805", - "Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805", - "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805", - "Microsoft.Build.Targets": "0.1.0-preview-00029-160805", - "Microsoft.Build": "0.1.0-preview-00029-160805", + "MSBuild": "0.1.0-preview-00032-160824", + "Microsoft.Build.Framework": "0.1.0-preview-00032-160824", + "Microsoft.Build.Tasks.Core": "0.1.0-preview-00032-160824", + "Microsoft.Build.Utilities.Core": "0.1.0-preview-00032-160824", + "Microsoft.Build.Targets": "0.1.0-preview-00032-160824", + "Microsoft.Build": "0.1.0-preview-00032-160824", "Microsoft.Net.Compilers.netcore": "1.3.0", "Microsoft.Net.Compilers.Targets.NetCore": "0.1.5-dev", "Microsoft.Cci": "4.0.0-rc3-24128-00", From 2accc15543a783061950615f8c6737b8911f909b Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 24 Aug 2016 10:29:53 -0700 Subject: [PATCH 3/3] Add missing msbuild dependency This is a workaround until the msbuild .nupkg manifests the dependency correctly --- src/redist/project.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/project.json b/src/redist/project.json index 3440d2dad..38d555a63 100644 --- a/src/redist/project.json +++ b/src/redist/project.json @@ -19,6 +19,7 @@ "Microsoft.Build.Utilities.Core": "0.1.0-preview-00032-160824", "Microsoft.Build.Targets": "0.1.0-preview-00032-160824", "Microsoft.Build": "0.1.0-preview-00032-160824", + "System.Runtime.Serialization.Xml": "4.1.0", "NuGet.Build.Tasks": "3.6.0-beta.1.msbuild.1" }, "frameworks": {