From 0e4442284daeb80dcea7b2a715abcdac90d3551a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 15 Mar 2017 12:43:29 -0700 Subject: [PATCH] Unify dependency versions to one file and remove workarounds --- build/dependencies.props | 6 +++++- .../HttpOverridesSample.csproj | 9 ++++++--- .../ResponseBufferingSample.csproj | 9 ++++++--- .../ResponseCompressionSample.csproj | 11 +++++++---- samples/RewriteSample/RewriteSample.csproj | 12 +++++++----- .../Microsoft.AspNetCore.Buffering.csproj | 4 ++-- .../Microsoft.AspNetCore.HttpOverrides.csproj | 6 +++--- ...rosoft.AspNetCore.ResponseCompression.csproj | 4 ++-- .../Microsoft.AspNetCore.Rewrite.csproj | 14 +++++++------- .../Microsoft.AspNetCore.Buffering.Tests.csproj | 11 +++++++---- ...rosoft.AspNetCore.HttpOverrides.Tests.csproj | 13 ++++++++----- ....AspNetCore.ResponseCompression.Tests.csproj | 17 ++++++++++------- .../Microsoft.AspNetCore.Rewrite.Tests.csproj | 13 ++++++++----- 13 files changed, 78 insertions(+), 51 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e704edaec0..c153f0e3f9 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,6 +1,10 @@ - 1.6.1 + 1.2.0-* 4.3.0 + 4.7.1 + 1.6.1 + 15.0.0 + 2.2.0 diff --git a/samples/HttpOverridesSample/HttpOverridesSample.csproj b/samples/HttpOverridesSample/HttpOverridesSample.csproj index c42b39140c..2cf83ecfad 100644 --- a/samples/HttpOverridesSample/HttpOverridesSample.csproj +++ b/samples/HttpOverridesSample/HttpOverridesSample.csproj @@ -1,14 +1,17 @@ + + net451;netcoreapp1.1 - win7-x64 - Exe - + + + + diff --git a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj index ad46ed87fe..90bf35c252 100644 --- a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj +++ b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj @@ -1,14 +1,17 @@ + + net451;netcoreapp1.1 - win7-x64 - Exe - + + + + diff --git a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj index a30cbd620c..7c668a7ced 100644 --- a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj +++ b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj @@ -1,9 +1,9 @@ + + net451;netcoreapp1.1 - win7-x64 - Exe @@ -12,8 +12,11 @@ - - + + + + + diff --git a/samples/RewriteSample/RewriteSample.csproj b/samples/RewriteSample/RewriteSample.csproj index 45959c138d..56e834d177 100644 --- a/samples/RewriteSample/RewriteSample.csproj +++ b/samples/RewriteSample/RewriteSample.csproj @@ -1,16 +1,18 @@ + + net451;netcoreapp1.1 - win7-x64 - true - Exe - - + + + + + diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj index 40aff99c24..81bf91be82 100644 --- a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj +++ b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj index 8441e6b677..7d8b86ce59 100644 --- a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj index 4fa5ea9444..f542b01c5b 100644 --- a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj index c2ed91e277..958f598489 100644 --- a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj +++ b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj @@ -15,13 +15,13 @@ - - - - - - - + + + + + + + diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj index d062668356..041439c9a9 100644 --- a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj +++ b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj @@ -9,10 +9,13 @@ - - - - + + + + + + + diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index f77f81033a..0cdff3e302 100644 --- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -9,11 +9,14 @@ - - - - - + + + + + + + + diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj index 1d0877be61..5240a9ea71 100644 --- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj +++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj @@ -13,13 +13,16 @@ - - - - - - - + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj b/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj index 3e5b6e7cf7..e29c1884e8 100644 --- a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj +++ b/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj @@ -9,11 +9,14 @@ - - - - - + + + + + + + +