diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 74bc09b88..816e8e41e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -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": { diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/project.json b/src/Microsoft.DotNet.ProjectJsonMigration/project.json index c04560752..b7bc89c5a 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/project.json +++ b/src/Microsoft.DotNet.ProjectJsonMigration/project.json @@ -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": { diff --git a/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs b/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs index 540902c16..e83ee63a4 100644 --- a/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs +++ b/src/dotnet/commands/dotnet-migrate/MigrateCommand.cs @@ -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 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}'"); diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 9e0e38fa0..1f3060e58 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -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" }, diff --git a/src/redist/project.json b/src/redist/project.json index 3cef6ff89..466443d59 100644 --- a/src/redist/project.json +++ b/src/redist/project.json @@ -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", diff --git a/src/tool_msbuild/project.json b/src/tool_msbuild/project.json index 4e4d7b24e..ad858c9c1 100644 --- a/src/tool_msbuild/project.json +++ b/src/tool_msbuild/project.json @@ -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", diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 889927988..31e0043b7 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -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": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 0999c187d..290c8d8fb 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -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" }, diff --git a/tools/MigrationDefaultsConstructor/project.json b/tools/MigrationDefaultsConstructor/project.json index 8c84527ed..7939e1abb 100755 --- a/tools/MigrationDefaultsConstructor/project.json +++ b/tools/MigrationDefaultsConstructor/project.json @@ -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"] }