From 40a79a6ee5bf393c11a0c3607ea59b2fb8090a69 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 5 Aug 2018 19:09:57 +0000 Subject: [PATCH 1/4] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 22 +++++++++++----------- korebuild-lock.txt | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 04dc8d2c9d..c3de8ebeef 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,17 +3,17 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17102 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 + 2.2.0-preview1-20180731.1 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 2.0.9 2.1.2 2.2.0-preview1-26618-02 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 6b8da29e6b..c7af2292c7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17102 -commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 +version:2.2.0-preview1-20180731.1 +commithash:29fde58465439f4bb9df40830635ed758e063daf From c847d7259054516055ca9174eecf26d3a3da3c9f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 6 Aug 2018 20:32:14 +0000 Subject: [PATCH 2/4] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index c3de8ebeef..37e24688fd 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,16 +4,16 @@ 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 2.0.9 2.1.2 2.2.0-preview1-26618-02 From 49a17c072ab6bad36c67280a965a850a70342bd6 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 19:08:57 +0000 Subject: [PATCH 3/4] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 22 +++++++++++----------- korebuild-lock.txt | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 37e24688fd..e3915630b8 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,17 +3,17 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-20180807.2 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.0.9 2.1.2 2.2.0-preview1-26618-02 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c7af2292c7..3fbcc80189 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180731.1 -commithash:29fde58465439f4bb9df40830635ed758e063daf +version:2.2.0-preview1-20180807.2 +commithash:11495dbd236104434e08cb1152fcb58cf2a20923 From e85c36fa8cf3bf29dee1be72289031b418b408cd Mon Sep 17 00:00:00 2001 From: Christer van der Meeren Date: Mon, 20 Aug 2018 17:25:45 +0200 Subject: [PATCH 4/4] Clarify CORS policy result log messages (#177) Fixes https://github.com/aspnet/Home/issues/3419 --- .../Internal/CORSLoggerExtensions.cs | 4 ++-- .../CorsServiceTests.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.AspNetCore.Cors/Internal/CORSLoggerExtensions.cs b/src/Microsoft.AspNetCore.Cors/Internal/CORSLoggerExtensions.cs index 2cf30d7525..bfcc82a2e6 100644 --- a/src/Microsoft.AspNetCore.Cors/Internal/CORSLoggerExtensions.cs +++ b/src/Microsoft.AspNetCore.Cors/Internal/CORSLoggerExtensions.cs @@ -38,12 +38,12 @@ namespace Microsoft.AspNetCore.Cors.Internal _policySuccess = LoggerMessage.Define( LogLevel.Information, 4, - "Policy execution successful."); + "CORS policy execution successful."); _policyFailure = LoggerMessage.Define( LogLevel.Information, 5, - "Policy execution failed."); + "CORS policy execution failed."); _originNotAllowed = LoggerMessage.Define( LogLevel.Information, diff --git a/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs b/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs index 7f7fb2220f..ebef888ad2 100644 --- a/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs +++ b/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs @@ -261,7 +261,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure Method = "PUT", Headers = null, OriginLogMessage = "The request has an origin header: 'http://example.com'.", - PolicyLogMessage = "Policy execution failed.", + PolicyLogMessage = "CORS policy execution failed.", FailureReason = "Request origin http://example.com does not have permission to access the resource." } }, @@ -271,7 +271,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure Method = "DELETE", Headers = null, OriginLogMessage = "The request has an origin header: 'http://allowed.example.com'.", - PolicyLogMessage = "Policy execution failed.", + PolicyLogMessage = "CORS policy execution failed.", FailureReason = "Request method DELETE not allowed in CORS policy." } }, @@ -281,7 +281,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure Method = "PUT", Headers = new[] { "test" }, OriginLogMessage = "The request has an origin header: 'http://allowed.example.com'.", - PolicyLogMessage = "Policy execution failed.", + PolicyLogMessage = "CORS policy execution failed.", FailureReason = "Request header 'test' not allowed in CORS policy." } }, @@ -330,7 +330,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure var writeList = sink.Writes.ToList(); Assert.Equal("The request is a preflight request.", writeList[0].State.ToString()); Assert.Equal("The request has an origin header: 'http://allowed.example.com'.", writeList[1].State.ToString()); - Assert.Equal("Policy execution successful.", writeList[2].State.ToString()); + Assert.Equal("CORS policy execution successful.", writeList[2].State.ToString()); } [Fact] @@ -369,7 +369,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure var writeList = sink.Writes.ToList(); Assert.Equal("The request has an origin header: 'http://example.com'.", writeList[0].State.ToString()); - Assert.Equal("Policy execution failed.", writeList[1].State.ToString()); + Assert.Equal("CORS policy execution failed.", writeList[1].State.ToString()); Assert.Equal("Request origin http://example.com does not have permission to access the resource.", writeList[2].State.ToString()); } @@ -389,7 +389,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure var writeList = sink.Writes.ToList(); Assert.Equal("The request has an origin header: 'http://allowed.example.com'.", writeList[0].State.ToString()); - Assert.Equal("Policy execution successful.", writeList[1].State.ToString()); + Assert.Equal("CORS policy execution successful.", writeList[1].State.ToString()); } [Fact]