From de30243c11301e56d4f197a87ce836a31fe98812 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 15 Mar 2017 15:06:58 -0700 Subject: [PATCH] Unify dependency versions to one file and remove workarounds --- build/dependencies.props | 7 ++++++- samples/IISSample/IISSample.csproj | 12 +++++++----- ...oft.AspNetCore.Server.IISIntegration.csproj | 16 ++++++++-------- ...erver.IISIntegration.FunctionalTests.csproj | 18 +++++++++++------- ...pNetCore.Server.IISIntegration.Tests.csproj | 11 +++++++---- test/TestSites/TestSites.csproj | 17 ++++++++++------- 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e704edaec0..ecbe769d13 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,6 +1,11 @@ - 1.6.1 + 1.2.0-* + 0.3.0-* + 1.0.0-* 4.3.0 + 1.6.1 + 15.0.0 + 2.2.0 diff --git a/samples/IISSample/IISSample.csproj b/samples/IISSample/IISSample.csproj index d5540fd3ea..f6ddaf7cf2 100644 --- a/samples/IISSample/IISSample.csproj +++ b/samples/IISSample/IISSample.csproj @@ -1,16 +1,18 @@ + + netcoreapp1.1;net451 - - win7-x64 - Exe - - + + + + + diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index 892e9c0315..eebbca7bb9 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj index ad0bb50b1c..c435919a54 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests.csproj @@ -11,17 +11,21 @@ - - - - - - - + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj index 5edc9d12c2..53215c9b33 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj @@ -9,10 +9,13 @@ - - - - + + + + + + + diff --git a/test/TestSites/TestSites.csproj b/test/TestSites/TestSites.csproj index cf903760db..2dabde6b8f 100644 --- a/test/TestSites/TestSites.csproj +++ b/test/TestSites/TestSites.csproj @@ -9,13 +9,16 @@ - - - - - - - + + + + + + + + + +