From 5c8d419b0cdc6e8595a71971767ed86f0d2aec33 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 31 Jan 2018 15:01:11 -0800 Subject: [PATCH 1/4] 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 | 100 +++++++++++++++++++-------------------- korebuild-lock.txt | 4 +- korebuild.json | 4 +- 5 files changed, 73 insertions(+), 75 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 6c59666f3a..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 - - /^(.*\/)?ci-.*$/ - - /^rel\/.*/ + - 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 da8e5db641..c98a0020f4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,64 +3,64 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview2-15684 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 + 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.2.1 2.3.2 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 - 2.1.0-preview1-28179 + 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 3.14.2 5.2.0-preview2-41113220915 2.0.0 2.1.0-preview1-26122-01 15.3.0 3.0.1 - 2.1.0-preview1-28179 + 2.1.0-preview1-28193 4.7.49 4.5.0-preview1-26119-06 0.8.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 1ae5d69845..851bfbf203 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15684 -commithash:308af8e3279892aad7f189ffbddd3ff9a60970d3 +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 ce7d3c7050f89266663c47f49ab47116905208c1 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 15 Feb 2018 10:46:54 -0800 Subject: [PATCH 2/4] Use ExperimentalPackageVersion --- build/dependencies.props | 102 +++++++++--------- ...ft.AspNet.Identity.AspNetCoreCompat.csproj | 6 +- version.props | 4 +- 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index c98a0020f4..d366c2b72a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,65 +4,65 @@ 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.2.1 2.3.2 - 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 3.14.2 5.2.0-preview2-41113220915 2.0.0 - 2.1.0-preview1-26122-01 + 2.1.0-preview1-26208-06 15.3.0 3.0.1 - 2.1.0-preview1-28193 + 2.1.0-preview1-28274 4.7.49 - 4.5.0-preview1-26119-06 + 4.5.0-preview1-26208-08 0.8.0 2.3.1 2.3.1 diff --git a/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj b/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj index 99d5703100..4910d07d2a 100644 --- a/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj +++ b/src/AspNetCoreCompat/Microsoft.AspNet.Identity.AspNetCoreCompat.csproj @@ -2,8 +2,10 @@ A compatibility layer for sharing identity databases between Microsoft.AspNet.Identity.EntityFramework and Microsoft.AspNetCore.Identity.EntityFrameworkCore. - $(ExperimentalProjectVersionPrefix) - false + $(ExperimentalVersionPrefix) + $(ExperimentalVersionSuffix) + false + $(ExperimentalPackageVersion) net461 $(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 08d0802648b1700562a824c09ce8a8e8ddd1e783 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Feb 2018 13:57:20 -0800 Subject: [PATCH 3/4] BuildNumber on ExperimentalVersionSuffix --- 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 997f3f5068e1be17c9472966339c0ae9fe6bf1ca Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Feb 2018 14:09:58 -0800 Subject: [PATCH 4/4] Duplicate logic for Experimental --- version.props | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/version.props b/version.props index 05cdc2c8d4..af807f0f09 100644 --- a/version.props +++ b/version.props @@ -1,14 +1,16 @@ 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)