From 7fbca28188941277ce9ea061710df5976ec3823c Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Wed, 7 Jun 2017 15:52:24 -0700 Subject: [PATCH 1/4] Fix downgrade warning --- build/dependencies.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/dependencies.props b/build/dependencies.props index 7cd5e3e59e..20d39b56eb 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,6 +4,7 @@ 0.4.0-* 2.1.0-* 2.0.0-* + 2.0.0-* 2.0.0-* 15.3.0-* 2.3.0-beta2-* From 49206c14f0e4d96908681e638ca395082bd2465e Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Wed, 7 Jun 2017 16:20:11 -0700 Subject: [PATCH 2/4] Sort --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 20d39b56eb..1c5123f639 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,8 +3,8 @@ 2.0.0-preview2-* 0.4.0-* 2.1.0-* - 2.0.0-* 2.0.0-* + 2.0.0-* 2.0.0-* 15.3.0-* 2.3.0-beta2-* From 1d95b577c604f7292daf4a949e82702878386dd2 Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Thu, 8 Jun 2017 14:23:20 -0700 Subject: [PATCH 3/4] travis + appveyor --- .travis.yml | 1 + appveyor.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2a46104677..27c93bcd6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ branches: - release - dev - /^(.*\/)?ci-.*$/ + - /^rel\/.*/ 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 script: diff --git a/appveyor.yml b/appveyor.yml index 8bf4dbc95b..fc604dafd6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,7 @@ branches: - release - dev - /^(.*\/)?ci-.*$/ + - /^rel\/.*/ build_script: - ps: .\build.ps1 clone_depth: 1 From 4b1f5f24dad3e128764ab836b3d4f6ef2984a747 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 13 Jun 2017 15:34:28 -0700 Subject: [PATCH 4/4] Add netcoreapp2.0 runtime targets. - By default the netcoreapp2.0 runtime targets wil not be chosen. This is intended to ensure runtime targets do not fallback to net461 when targeting netcoreapp2.0. #142 --- .../Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj | 2 ++ .../lib/netcoreapp2.0/_._ | 0 2 files changed, 2 insertions(+) create mode 100644 src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj index c0b303a5f1..87b2c5c59e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj @@ -25,6 +25,8 @@ + + diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ new file mode 100644 index 0000000000..e69de29bb2