diff --git a/branchinfo.txt b/branchinfo.txt index ddd9d6c34..ec5a72654 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -3,7 +3,7 @@ # Each line is expected to be in the format "[Name]=[Value]". MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_VERSION=3 +PATCH_VERSION=4 RELEASE_SUFFIX=rc4 CHANNEL=rel-1.0.1 BRANCH_NAME=rel/1.0.1 diff --git a/build.proj b/build.proj index 2a1233295..fd7f7f235 100644 --- a/build.proj +++ b/build.proj @@ -19,12 +19,12 @@ release/1.1.0 Microsoft.NETCore.App - 1.1.1 + 1.1.2 1.1.0 1.1.0 - 1.1.1 - 1.1.1 + 1.1.2 + 1.1.2 .exe diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 01dd947ab..a34ceed0c 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -1,10 +1,10 @@ - 1.1.1 + 1.1.2 15.1.1012 2.0.0-rc5-61427-04 - 1.0.0-alpha-20170224-6 + 1.0.0-alpha-20170425-3 4.0.0-rtm-2283 1.0.0-alpha-20170130-3-281 15.0.0 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index eb993cb0f..197dcaa82 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -1,12 +1,12 @@ - .NET Core SDK 1.0.3 - Microsoft .NET Core 1.1.1 - Runtime + .NET Core SDK 1.0.4 + Microsoft .NET Core 1.1.2 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver - Microsoft .NET Core 1.0.4 - Runtime + Microsoft .NET Core 1.0.5 - Runtime Microsoft .NET Core 1.0.1 - Host Microsoft .NET Core 1.0.1 - Host FX Resolver diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 37c52ffd4..e15fc6e35 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -144,7 +144,7 @@ preview - 1.0.4 + 1.0.5 1.0.1 1.0.1 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 745b80f41..e1fafb957 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -17,7 +17,7 @@ 1.6.0 - 1.1.1 + 1.1.2 $(CLI_MSBuild_Version) diff --git a/dir.props b/dir.props index f4ab7be63..1ed8b03c9 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,6 @@ true - 1.0.3 + 1.0.4 diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 44ce24766..21612a2a0 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -308,7 +308,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 1.1.1"); + result.Args.Should().Contain("--fx-version 1.1.2"); } [Fact]