From f2676babd3b7780573c40800dd916c7ad9195285 Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Wed, 31 Jan 2018 10:41:28 -0800 Subject: [PATCH 1/6] Add support for REQUEST_METHOD server variable (#294) --- .../Internal/IISUrlRewrite/ServerVariables.cs | 2 ++ .../IISUrlRewrite/ServerVariableTests.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ServerVariables.cs b/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ServerVariables.cs index 6bfdc59156..35e6ce1237 100644 --- a/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ServerVariables.cs +++ b/src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ServerVariables.cs @@ -60,6 +60,8 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite return new RemotePortSegment(); case "REQUEST_FILENAME": return new RequestFileNameSegment(); + case "REQUEST_METHOD": + return new RequestMethodSegment(); case "REQUEST_URI": return new UrlSegment(uriMatchPart); default: diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/ServerVariableTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/ServerVariableTests.cs index b9acf1442c..b56a8c7854 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/ServerVariableTests.cs +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/ServerVariableTests.cs @@ -27,6 +27,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite [InlineData("REQUEST_FILENAME", "/foo", UriMatchPart.Path)] [InlineData("REQUEST_URI", "/foo", UriMatchPart.Path)] [InlineData("REQUEST_URI", "http://example.com/foo?bar=1", UriMatchPart.Full)] + [InlineData("REQUEST_METHOD", "GET", UriMatchPart.Full)] public void CheckServerVariableParsingAndApplication(string variable, string expected, UriMatchPart uriMatchPart) { // Arrange and Act @@ -40,6 +41,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite private RewriteContext CreateTestHttpContext() { var context = new DefaultHttpContext(); + context.Request.Method = HttpMethods.Get; context.Request.Scheme = "http"; context.Request.Host = new HostString("example.com"); context.Request.Path = PathString.FromUriComponent("/foo"); From 237ae410ffd57e1976f634b52cdf7e75623814a7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 31 Jan 2018 15:01:10 -0800 Subject: [PATCH 2/6] 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 | 15 +++++++-------- .travis.yml | 24 ++++++++++++------------ build/dependencies.props | 36 ++++++++++++++++++------------------ korebuild-lock.txt | 4 ++-- korebuild.json | 4 ++-- 5 files changed, 41 insertions(+), 42 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 46038786c9..4eea96ab69 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,18 +1,17 @@ init: - - git config --global core.autocrlf true +- git config --global core.autocrlf true branches: only: - - master - - release - - dev - - /^(.*\/)?ci-.*$/ + - 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 eeb63bfa9f..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-.*$/ + - 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 5f3752bc26..5abbb8d678 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,25 +3,25 @@ $(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-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.0.0 - 2.1.0-preview1-26115-03 - 2.1.0-preview1-28153 + 2.1.0-preview1-26122-01 + 2.1.0-preview1-28193 15.3.0 4.7.49 0.8.0 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 ade44786c934c1300dab85aa02efdd99fc0ea81c Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 15 Feb 2018 10:05:28 -0800 Subject: [PATCH 3/6] Use ExperimentalPackageVersion --- build/dependencies.props | 50 +++++++++---------- .../Microsoft.AspNetCore.Buffering.csproj | 6 ++- version.props | 4 +- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5abbb8d678..4556459ec0 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,31 +2,31 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - 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.0.0 - 2.1.0-preview1-26122-01 - 2.1.0-preview1-28193 - 15.3.0 - 4.7.49 - 0.8.0 - 2.3.1 - 2.3.1 + + 2.1.0-preview1-1010 + 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-26208-06 + 2.1.0-preview1-28274 + 15.3.0 + 4.7.49 + 0.8.0 + 2.3.1 + 2.3.1 diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj index 8b4cd9cefc..2ea53b2d92 100644 --- a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj +++ b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj @@ -1,8 +1,10 @@  - $(ExperimentalProjectVersionPrefix) - false + $(ExperimentalProjectVersionPrefix) + $(ExperimentalVersionSuffix) + false + $(ExperimentalPackageVersion) ASP.NET Core middleware for buffering response bodies. netstandard2.0 $(NoWarn);CS1591 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 d7957ed50cb6d58ee11f80731a3eff90c71139f6 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 15 Feb 2018 12:24:46 -0800 Subject: [PATCH 4/6] No more ExperimentalProjectVersionPrefix --- .../Microsoft.AspNetCore.Buffering.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj index 2ea53b2d92..953716c6c1 100644 --- a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj +++ b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj @@ -1,7 +1,7 @@  - $(ExperimentalProjectVersionPrefix) + $(ExperimentalVersionPrefix) $(ExperimentalVersionSuffix) false $(ExperimentalPackageVersion) From 30f7c7c3809b42eb09d25370983f187c71024e8e Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Feb 2018 13:43:22 -0800 Subject: [PATCH 5/6] 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 39167584eba2164e7be7aefec6d8e4670e51a0a6 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 16 Feb 2018 14:10:43 -0800 Subject: [PATCH 6/6] 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)