Updating the msbuild version to one with the preserve compilation context fix.
This commit is contained in:
parent
9e49ec2723
commit
59ac685dcd
9 changed files with 13 additions and 11 deletions
|
@ -13,8 +13,8 @@
|
|||
"NuGet.Frameworks": "4.0.0-rc-2037",
|
||||
"NuGet.ProjectModel": "4.0.0-rc-2037",
|
||||
|
||||
"Microsoft.Build": "15.1.319-preview5",
|
||||
"Microsoft.Build.Utilities.Core": "15.1.319-preview5"
|
||||
"Microsoft.Build": "15.1.0-preview-000366-00",
|
||||
"Microsoft.Build.Utilities.Core": "15.1.0-preview-000366-00"
|
||||
},
|
||||
"frameworks": {
|
||||
"netstandard1.5": {
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
"Microsoft.DotNet.Cli.Utils": {
|
||||
"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"
|
||||
},
|
||||
"frameworks": {
|
||||
|
|
|
@ -11,6 +11,7 @@ using Microsoft.Build.Evaluation;
|
|||
using Microsoft.DotNet.Cli.Utils;
|
||||
using Microsoft.DotNet.ProjectJsonMigration;
|
||||
using Microsoft.DotNet.Internal.ProjectModel;
|
||||
using ProjectModel = Microsoft.DotNet.Internal.ProjectModel.Project;
|
||||
|
||||
namespace Microsoft.DotNet.Tools.Migrate
|
||||
{
|
||||
|
@ -193,7 +194,7 @@ namespace Microsoft.DotNet.Tools.Migrate
|
|||
{
|
||||
IEnumerable<string> projects = null;
|
||||
|
||||
if (projectArg.EndsWith(ProjectModel.Project.FileName, StringComparison.OrdinalIgnoreCase))
|
||||
if (projectArg.EndsWith(ProjectModel.FileName, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
projects = Enumerable.Repeat(projectArg, 1);
|
||||
}
|
||||
|
@ -207,7 +208,8 @@ namespace Microsoft.DotNet.Tools.Migrate
|
|||
}
|
||||
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())
|
||||
{
|
||||
throw new Exception($"No project.json file found in '{projectArg}'");
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
"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.DotNet.PlatformAbstractions": "1.0.1-beta-000933"
|
||||
},
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
"tool_nuget": "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",
|
||||
"System.Runtime.Serialization.Xml": "4.1.1",
|
||||
"NuGet.Build.Tasks": "4.0.0-rc-2037",
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
"type": "platform",
|
||||
"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.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08",
|
||||
"Microsoft.Cci": "4.0.0-rc3-24128-00",
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
"xunit": "2.2.0-beta3-build3330",
|
||||
"dotnet-test-xunit": "1.0.0-rc2-350904-49",
|
||||
"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": {
|
||||
"netcoreapp1.0": {
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
"dotnet": {
|
||||
"target": "project"
|
||||
},
|
||||
"Microsoft.Build": "15.1.319-preview5",
|
||||
"Microsoft.Build": "15.1.0-preview-000366-00",
|
||||
"xunit": "2.2.0-beta3-build3330",
|
||||
"dotnet-test-xunit": "1.0.0-rc2-350904-49"
|
||||
},
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
"dotnet": {
|
||||
"target": "project"
|
||||
},
|
||||
"Microsoft.Build.Runtime": "15.1.319-preview5"
|
||||
"Microsoft.Build.Runtime": "15.1.0-preview-000366-00"
|
||||
},
|
||||
"imports": ["dnxcore50", "portable-net45+win8"]
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue