From 93dbe3635d5405d96e0b44772a788ee7773c9934 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 31 Jan 2018 15:01:10 -0800 Subject: [PATCH 1/5] Update dependencies.props to 2.1.0-preview-28193, build tools to 2.1.0-preview1-1010 [ci skip] Scripted changes: - updated travis and appveyor.yml files to only build dev, ci, and release branches - updated dependencies.props - updated korebuild-lock.txt - updated korebuild.json to release/2.1 channel --- .appveyor.yml | 16 +++++------ .travis.yml | 24 ++++++++--------- build/dependencies.props | 58 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- korebuild.json | 4 +-- 5 files changed, 52 insertions(+), 54 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c7b6e34316..4eea96ab69 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,19 +1,17 @@ init: - - git config --global core.autocrlf true +- git config --global core.autocrlf true branches: only: - - master - - release - - dev - - /^(.*\/)?ci-.*$/ - - /^rel\/.*/ + - dev + - /^release\/.*$/ + - /^(.*\/)?ci-.*$/ build_script: - - ps: .\run.ps1 default-build +- ps: .\run.ps1 default-build clone_depth: 1 environment: global: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: off -deploy: off +test: 'off' +deploy: 'off' os: Visual Studio 2017 diff --git a/.travis.yml b/.travis.yml index fb3f3a84c2..64bdbb4441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,25 +3,25 @@ sudo: false dist: trusty env: global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - DOTNET_CLI_TELEMETRY_OPTOUT: 1 + - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + - DOTNET_CLI_TELEMETRY_OPTOUT: 1 mono: none os: - - linux - - osx +- linux +- osx osx_image: xcode8.2 addons: apt: packages: - - libunwind8 + - libunwind8 branches: only: - - master - - release - - dev - - /^rel\/.*/ - - /^(.*\/)?ci-.*$/ + - dev + - /^release\/.*$/ + - /^(.*\/)?ci-.*$/ before_install: - - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi +- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s + /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib + /usr/local/lib/; fi script: - - ./build.sh +- ./build.sh diff --git a/build/dependencies.props b/build/dependencies.props index 1f3e2912f4..491918e99f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,39 +3,39 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview1-15679 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 - 2.1.0-preview1-28153 + 2.1.0-preview1-1010 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 + 2.1.0-preview1-28193 2.0.0 - 2.1.0-preview1-26115-03 + 2.1.0-preview1-26122-01 15.3.0 4.7.49 10.0.1 - 4.5.0-preview1-26112-01 - 1.6.0-preview1-26112-01 + 4.5.0-preview1-26119-06 + 1.6.0-preview1-26119-06 2.3.1 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a474bc0e35..851bfbf203 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-15679 -commithash:5347461137cb45a77ddcc0b55b2478092de43338 +version:2.1.0-preview1-1010 +commithash:75ca924dfbd673c38841025b04c4dcd93b84f56d diff --git a/korebuild.json b/korebuild.json index bd5d51a51b..678d8bb948 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,4 +1,4 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev" + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json", + "channel": "release/2.1" } From f1e63e0f9e29ceb4af4b4ec4bcc1e7f8a15cc47d Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 15 Feb 2018 10:06:25 -0800 Subject: [PATCH 2/5] Use ExperimentalPackageVersion --- build/dependencies.props | 56 +++++++++---------- ...icrosoft.AspNetCore.Diagnostics.Elm.csproj | 6 +- version.props | 4 +- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 491918e99f..6dcf843e2b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,38 +4,38 @@ 2.1.0-preview1-1010 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 2.0.0 - 2.1.0-preview1-26122-01 + 2.1.0-preview1-26208-06 15.3.0 4.7.49 10.0.1 - 4.5.0-preview1-26119-06 - 1.6.0-preview1-26119-06 + 4.5.0-preview1-26208-08 + 1.6.0-preview1-26208-08 2.3.1 2.3.1 diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj index cf8074a8bb..89f6a43016 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj @@ -2,8 +2,10 @@ ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs. - $(ExperimentalProjectVersionPrefix) - false + $(ExperimentalProjectVersionPrefix) + $(ExperimentalVersionSuffix) + false + $(ExperimentalPackageVersion) netstandard2.0 $(NoWarn);CS1591 true diff --git a/version.props b/version.props index d1791a6a89..d01d5acfda 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,9 @@ 2.1.0 - 0.4.0 + 0.4.0 + alpha1 + $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final preview1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final From 00b032905966eba674a561cf8a83169875f80d9b Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 15 Feb 2018 16:00:08 -0800 Subject: [PATCH 3/5] No more ExperimentalProjectVersionPrefix --- .../Microsoft.AspNetCore.Diagnostics.Elm.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj index 89f6a43016..a636ddd88f 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj @@ -2,7 +2,7 @@ ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs. - $(ExperimentalProjectVersionPrefix) + $(ExperimentalVersionPrefix) $(ExperimentalVersionSuffix) false $(ExperimentalPackageVersion) From 10ae07774e166a01af131b575aae22896aff7ff8 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Feb 2018 12:49:48 -0800 Subject: [PATCH 4/5] Fix experimental projects --- version.props | 1 + 1 file changed, 1 insertion(+) diff --git a/version.props b/version.props index d01d5acfda..05cdc2c8d4 100644 --- a/version.props +++ b/version.props @@ -3,6 +3,7 @@ 2.1.0 0.4.0 alpha1 + $(ExperimentalVersionSuffix)-$(BuildNumber) $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final preview1 $(VersionPrefix) From 1fe383b973b5c5cf7e580a46991714327b9b6c80 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Feb 2018 14:11:16 -0800 Subject: [PATCH 5/5] Duplicate logic for Experimental --- version.props | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/version.props b/version.props index 05cdc2c8d4..7420e8ab26 100644 --- a/version.props +++ b/version.props @@ -1,14 +1,17 @@ 2.1.0 - 0.4.0 - alpha1 - $(ExperimentalVersionSuffix)-$(BuildNumber) - $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final preview1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 $(VersionSuffix)-$(BuildNumber) + + + 0.4.0 + alpha1 + $(ExperimentalVersionPrefix) + $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final + $(ExperimentalVersionSuffix)-$(BuildNumber)