From 04b60dadc4c92a5111e0c92d68f6edc89a99f4b4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 17 May 2017 16:00:49 -0700 Subject: [PATCH 1/3] Updating the branding to rel/1.1.0 --- branchinfo.txt | 8 ++++---- build/Microsoft.DotNet.Cli.Monikers.props | 2 +- dir.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index ec5a72654..d138bff9b 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -2,8 +2,8 @@ # Any line that is not blank and does not start with '#' is interpreted as a variable to set # Each line is expected to be in the format "[Name]=[Value]". MAJOR_VERSION=1 -MINOR_VERSION=0 -PATCH_VERSION=4 +MINOR_VERSION=1 +PATCH_VERSION=0 RELEASE_SUFFIX=rc4 -CHANNEL=rel-1.0.1 -BRANCH_NAME=rel/1.0.1 +CHANNEL=rel-1.1.0 +BRANCH_NAME=rel/1.1.0 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index 197dcaa82..b7bd72b9e 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -1,7 +1,7 @@ - .NET Core SDK 1.0.4 + .NET Core SDK 1.1.0 Microsoft .NET Core 1.1.2 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver diff --git a/dir.props b/dir.props index 1ed8b03c9..9cfe93b1e 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,6 @@ true - 1.0.4 + 1.1.0 From f270ecd025886f7f9d539d038998c6fb51c58c7e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 17 May 2017 21:06:42 -0700 Subject: [PATCH 2/3] Pinning the stage0 to the last build out of rel/1.0.1 and adding a project to download 1.0 dependencies for test assets. --- run-build.ps1 | 4 ++-- run-build.sh | 4 ++-- tools/TestAssetsDependencies/TestAssetsDependencies.csproj | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100755 tools/TestAssetsDependencies/TestAssetsDependencies.csproj diff --git a/run-build.ps1 b/run-build.ps1 index 74edf1b42..46e4b5ed3 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -103,8 +103,8 @@ if ($LastExitCode -ne 0) # install the post-PJnistic stage0 $dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1" -Write-Host "$dotnetInstallPath -Channel ""rel-1.0.1"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""rel-1.0.1"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Write-Host "$dotnetInstallPath -Version ""1.0.4"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Invoke-Expression "$dotnetInstallPath -Version ""1.0.4"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index f44a6619a..fcce351df 100755 --- a/run-build.sh +++ b/run-build.sh @@ -164,8 +164,8 @@ if [ $? != 0 ]; then fi # now execute the script -echo "installing CLI: $dotnetInstallPath --channel \"rel-1.0.1\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\"" -$dotnetInstallPath --channel "rel-1.0.1" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" +echo "installing CLI: $dotnetInstallPath --version \"1.0.4\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\"" +$dotnetInstallPath --version "1.0.4" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" if [ $? != 0 ]; then echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2 exit $? diff --git a/tools/TestAssetsDependencies/TestAssetsDependencies.csproj b/tools/TestAssetsDependencies/TestAssetsDependencies.csproj new file mode 100755 index 000000000..26129c334 --- /dev/null +++ b/tools/TestAssetsDependencies/TestAssetsDependencies.csproj @@ -0,0 +1,7 @@ + + + + netcoreapp1.0 + + + From 2c24c622ec5586540f0f6f92f5e431203a24294d Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 17 May 2017 23:12:14 -0700 Subject: [PATCH 3/3] Trying to fix the opensuse42 test failure, where we tried to invoke a tool that target 1.0.4 where the 1.0 runtime is not available. --- .../dotnet-dependency-context-test.csproj | 2 +- build/package/dotnet-deb-tool-consumer.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj index aa4728ca9..663e061e2 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj @@ -17,7 +17,7 @@ - 1.0.4 + $(CLI_SharedFrameworkVersion) $(DependencyModelVersion) diff --git a/build/package/dotnet-deb-tool-consumer.csproj b/build/package/dotnet-deb-tool-consumer.csproj index 26b7aa79d..6b84531cb 100644 --- a/build/package/dotnet-deb-tool-consumer.csproj +++ b/build/package/dotnet-deb-tool-consumer.csproj @@ -3,6 +3,6 @@ netcoreapp1.1 - +