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

Merge pull request #4451 from livarcocc/update_msbuild

Browse source 
Updating msbuild to 15.1.319-preview5
This commit is contained in:
Livar 2016-10-19 15:50:02 -07:00 committed by GitHub
commit 4b0c2f5ebe
10 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs
View file

@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Cli.Utils
{ {
var msBuildExePath = _environment.GetEnvironmentVariable(Constants.MSBUILD_EXE_PATH); var msBuildExePath = _environment.GetEnvironmentVariable(Constants.MSBUILD_EXE_PATH);
msBuildExePath = string.IsNullOrEmpty(msBuildExePath) ? msBuildExePath = string.IsNullOrEmpty(msBuildExePath) ?
Path.Combine(AppContext.BaseDirectory, "MSBuild.exe") : Path.Combine(AppContext.BaseDirectory, "MSBuild.dll") :
msBuildExePath; msBuildExePath;
Reporter.Verbose.WriteLine($"projetfactory: MSBUILD_EXE_PATH = {msBuildExePath}"); Reporter.Verbose.WriteLine($"projetfactory: MSBUILD_EXE_PATH = {msBuildExePath}");

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

@ -15,8 +15,8 @@
"NuGet.Frameworks": "3.6.0-rc-1984", "NuGet.Frameworks": "3.6.0-rc-1984",
"NuGet.ProjectModel": "3.6.0-rc-1984", "NuGet.ProjectModel": "3.6.0-rc-1984",
"Microsoft.Build": "15.1.316-preview5", "Microsoft.Build": "15.1.319-preview5",
"Microsoft.Build.Utilities.Core": "15.1.316-preview5" "Microsoft.Build.Utilities.Core": "15.1.319-preview5"
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.5": {

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

@ -14,7 +14,7 @@
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },
"Microsoft.Build": "15.1.316-preview5" "Microsoft.Build": "15.1.319-preview5"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

2
src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs
View file

@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Tools.MSBuild
{ {
public class MSBuildForwardingApp public class MSBuildForwardingApp
{ {
private const string s_msbuildExeName = "MSBuild.exe"; private const string s_msbuildExeName = "MSBuild.dll";
private readonly ForwardingApp _forwardingApp; private readonly ForwardingApp _forwardingApp;
public MSBuildForwardingApp(IEnumerable<string> argsToForward) public MSBuildForwardingApp(IEnumerable<string> argsToForward)

2
src/dotnet/project.json
View file

@ -69,7 +69,7 @@
"exclude": "compile" "exclude": "compile"
}, },
"Microsoft.Build": "15.1.316-preview5", "Microsoft.Build": "15.1.319-preview5",
"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.316-preview5", "Microsoft.Build.Runtime": "15.1.319-preview5",
"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": "3.6.0-rc-1984", "NuGet.Build.Tasks": "3.6.0-rc-1984",

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.316-preview5", "Microsoft.Build.Runtime": "15.1.319-preview5",
"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/GivenAProjectDependencyCommandResolverBeingUsedWithMSBuild.cs
View file

@ -42,7 +42,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
Environment.SetEnvironmentVariable( Environment.SetEnvironmentVariable(
Constants.MSBUILD_EXE_PATH, Constants.MSBUILD_EXE_PATH,
Path.Combine(_repoDirectoriesProvider.Stage2Sdk, "MSBuild.exe")); Path.Combine(_repoDirectoriesProvider.Stage2Sdk, "MSBuild.dll"));
} }
[Fact] [Fact]

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

@ -47,7 +47,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.316-preview5" "Microsoft.Build.Runtime": "15.1.319-preview5"
}, },
"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": "0.1.0-preview-00034-160909", "Microsoft.Build": "15.1.319-preview5",
"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"
}, },