From 3ec8b7623627136fc8995dae6a3375ab129d4790 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 15 Mar 2017 19:05:25 -0700 Subject: [PATCH] Consolidate dependency versions into one file and remove workarounds --- build/dependencies.props | 8 +++++- .../ServerComparison.FunctionalTests.csproj | 19 +++++++------- .../ServerComparison.TestSites.csproj | 25 ++++++++----------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e704edaec0..6978b45585 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,6 +1,12 @@ - 1.6.1 + 1.2.0-* + 1.0.0 + 0.3.0-* + 1.0.0-* 4.3.0 + 1.6.1 + 15.0.0 + 2.2.0 diff --git a/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj b/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj index a0b3cbcddf..286ba87724 100644 --- a/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -5,7 +5,6 @@ netcoreapp1.1;net452 netcoreapp1.1 - win7-x64 @@ -13,15 +12,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj index 55f0685b4c..514bb30eab 100644 --- a/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/test/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -6,24 +6,19 @@ net452;netcoreapp1.1 netcoreapp1.1 win7-x86;win7-x64;win81-x86;win81-x64;win10-x86;win10-x64;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.15.04-x64;centos.7-x64;rhel.7.2-x64 - Exe - - - - - - - - - - - - - - + + + + + + + + + +