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

Updating the msbuild version to one with the preserve compilation context fix.

Browse source
This commit is contained in:
Livar Cunha 2016-10-27 21:43:01 -07:00 • committed by Livar Cunha
parent 9e49ec2723
commit 59ac685dcd
9 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -13,8 +13,8 @@
"NuGet.Frameworks": "4.0.0-rc-2037", "NuGet.Frameworks": "4.0.0-rc-2037",
"NuGet.ProjectModel": "4.0.0-rc-2037", "NuGet.ProjectModel": "4.0.0-rc-2037",
"Microsoft.Build": "15.1.319-preview5", "Microsoft.Build": "15.1.0-preview-000366-00",
"Microsoft.Build.Utilities.Core": "15.1.319-preview5" "Microsoft.Build.Utilities.Core": "15.1.0-preview-000366-00"
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.5": {

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

@ -11,7 +11,7 @@
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"target": "project" "target": "project"
}, },
"Microsoft.Build": "15.1.319-preview5", "Microsoft.Build": "15.1.0-preview-000366-00",
"Microsoft.CodeAnalysis.CSharp": "2.0.0-beta6-60922-08" "Microsoft.CodeAnalysis.CSharp": "2.0.0-beta6-60922-08"
}, },
"frameworks": { "frameworks": {

6
src/dotnet/commands/dotnet-migrate/MigrateCommand.cs
View file

@ -11,6 +11,7 @@ using Microsoft.Build.Evaluation;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.ProjectJsonMigration; using Microsoft.DotNet.ProjectJsonMigration;
using Microsoft.DotNet.Internal.ProjectModel; using Microsoft.DotNet.Internal.ProjectModel;
using ProjectModel = Microsoft.DotNet.Internal.ProjectModel.Project;
namespace Microsoft.DotNet.Tools.Migrate namespace Microsoft.DotNet.Tools.Migrate
{ {
@ -193,7 +194,7 @@ namespace Microsoft.DotNet.Tools.Migrate
{ {
IEnumerable<string> projects = null; IEnumerable<string> projects = null;
if (projectArg.EndsWith(ProjectModel.Project.FileName, StringComparison.OrdinalIgnoreCase)) if (projectArg.EndsWith(ProjectModel.FileName, StringComparison.OrdinalIgnoreCase))
{ {
projects = Enumerable.Repeat(projectArg, 1); projects = Enumerable.Repeat(projectArg, 1);
} }
@ -207,7 +208,8 @@ namespace Microsoft.DotNet.Tools.Migrate
} }
else if (Directory.Exists(projectArg)) else if (Directory.Exists(projectArg))
{ {
projects = Directory.EnumerateFiles(projectArg, ProjectModel.Project.FileName, SearchOption.AllDirectories); projects =
Directory.EnumerateFiles(projectArg, ProjectModel.FileName, SearchOption.AllDirectories);
if (!projects.Any()) if (!projects.Any())
{ {
throw new Exception($"No project.json file found in '{projectArg}'"); throw new Exception($"No project.json file found in '{projectArg}'");

2
src/dotnet/project.json
View file

@ -57,7 +57,7 @@
"exclude": "compile" "exclude": "compile"
}, },
"Microsoft.Build": "15.1.319-preview5", "Microsoft.Build": "15.1.0-preview-000366-00",
"Microsoft.CodeAnalysis.CSharp": "2.0.0-beta6-60922-08", "Microsoft.CodeAnalysis.CSharp": "2.0.0-beta6-60922-08",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933"
}, },

2
src/redist/project.json
View file

@ -19,7 +19,7 @@
"tool_nuget": "1.0.0-preview3-*", "tool_nuget": "1.0.0-preview3-*",
"tool_msbuild": "1.0.0-preview3-*", "tool_msbuild": "1.0.0-preview3-*",
"Microsoft.Build.Runtime": "15.1.319-preview5", "Microsoft.Build.Runtime": "15.1.0-preview-000366-00",
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08", "Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08",
"System.Runtime.Serialization.Xml": "4.1.1", "System.Runtime.Serialization.Xml": "4.1.1",
"NuGet.Build.Tasks": "4.0.0-rc-2037", "NuGet.Build.Tasks": "4.0.0-rc-2037",

2
src/tool_msbuild/project.json
View file

@ -8,7 +8,7 @@
"type": "platform", "type": "platform",
"version": "1.0.1" "version": "1.0.1"
}, },
"Microsoft.Build.Runtime": "15.1.319-preview5", "Microsoft.Build.Runtime": "15.1.0-preview-000366-00",
"Microsoft.Net.Compilers.netcore": "2.0.0-beta6-60922-08", "Microsoft.Net.Compilers.netcore": "2.0.0-beta6-60922-08",
"Microsoft.CodeAnalysis.Build.Tasks": "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.Cci": "4.0.0-rc3-24128-00",

2
test/Microsoft.DotNet.Cli.Utils.Tests/project.json
View file

@ -44,7 +44,7 @@
"xunit": "2.2.0-beta3-build3330", "xunit": "2.2.0-beta3-build3330",
"dotnet-test-xunit": "1.0.0-rc2-350904-49", "dotnet-test-xunit": "1.0.0-rc2-350904-49",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933", "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933",
"Microsoft.Build.Runtime": "15.1.319-preview5" "Microsoft.Build.Runtime": "15.1.0-preview-000366-00"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

2
test/dotnet-new.Tests/project.json
View file

@ -11,7 +11,7 @@
"dotnet": { "dotnet": {
"target": "project" "target": "project"
}, },
"Microsoft.Build": "15.1.319-preview5", "Microsoft.Build": "15.1.0-preview-000366-00",
"xunit": "2.2.0-beta3-build3330", "xunit": "2.2.0-beta3-build3330",
"dotnet-test-xunit": "1.0.0-rc2-350904-49" "dotnet-test-xunit": "1.0.0-rc2-350904-49"
}, },

2
tools/MigrationDefaultsConstructor/project.json
View file

@ -15,7 +15,7 @@
"dotnet": { "dotnet": {
"target": "project" "target": "project"
}, },
"Microsoft.Build.Runtime": "15.1.319-preview5" "Microsoft.Build.Runtime": "15.1.0-preview-000366-00"
}, },
"imports": ["dnxcore50", "portable-net45+win8"] "imports": ["dnxcore50", "portable-net45+win8"]
} }