From beca39df8e1a01143ce54c64d5d5fa75854e8e96 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Mon, 13 Feb 2017 19:04:08 -0800 Subject: [PATCH] Handle projects that depend on bumped projects --- ...rkCore.Relational.Design.Specification.Tests.csproj | 2 +- .../Migrations/ModelSnapshotTest.cs | 2 +- .../TestUtilities/BuildSource.cs | 4 ++-- .../project.json | 2 +- ...FrameworkCore.Relational.Specification.Tests.csproj | 2 +- .../TestSqlLoggerFactory.cs | 10 +++++----- .../project.json | 2 +- .../DatabindingTestBase.cs | 2 +- .../TestModels/ConcurrencyModel/Team.cs | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests.csproj b/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests.csproj index 51d14c8cd75..34e107c9d99 100644 --- a/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests.csproj +++ b/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests.csproj @@ -10,7 +10,7 @@ Properties Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests - v4.5.1 + v4.5.2 512 1591 diff --git a/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/Migrations/ModelSnapshotTest.cs b/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/Migrations/ModelSnapshotTest.cs index d33a5f991e2..d1feb259f2e 100644 --- a/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/Migrations/ModelSnapshotTest.cs +++ b/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/Migrations/ModelSnapshotTest.cs @@ -1823,7 +1823,7 @@ public virtual void Do_not_generate_entity_type_builder_again_if_no_foreign_key_ protected virtual ICollection GetReferences() => new List { -#if NET451 +#if NET452 BuildReference.ByName("System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"), BuildReference.ByName("System.Linq.Expressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), BuildReference.ByName("System.Runtime, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), diff --git a/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/TestUtilities/BuildSource.cs b/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/TestUtilities/BuildSource.cs index ee3ed65ffa1..2a55b96e6a0 100644 --- a/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/TestUtilities/BuildSource.cs +++ b/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/TestUtilities/BuildSource.cs @@ -15,7 +15,7 @@ public class BuildSource { public ICollection References { get; } = new List { -#if NET451 +#if NET452 BuildReference.ByName("mscorlib") #else BuildReference.ByName("System.Runtime") @@ -96,7 +96,7 @@ public Assembly BuildInMemory() $"Build failed. Diagnostics: {string.Join(Environment.NewLine, result.Diagnostics)}"); } -#if NET451 +#if NET452 assembly = Assembly.Load(stream.ToArray()); #else assembly = (Assembly)typeof(Assembly).GetTypeInfo().GetDeclaredMethods("Load") diff --git a/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/project.json b/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/project.json index 363dc4ce01d..972c424d3e8 100644 --- a/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/project.json +++ b/src/Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests/project.json @@ -40,7 +40,7 @@ "System.Threading.Tasks.Parallel": "4.4.0-*" } }, - "net451": { + "net452": { "frameworkAssemblies": { "System.Collections.Concurrent": { "type": "build" diff --git a/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/Microsoft.EntityFrameworkCore.Relational.Specification.Tests.csproj b/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/Microsoft.EntityFrameworkCore.Relational.Specification.Tests.csproj index c3bbcf60be5..db7597b923d 100644 --- a/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/Microsoft.EntityFrameworkCore.Relational.Specification.Tests.csproj +++ b/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/Microsoft.EntityFrameworkCore.Relational.Specification.Tests.csproj @@ -10,7 +10,7 @@ Properties Microsoft.EntityFrameworkCore.Relational.Specification.Tests Microsoft.EntityFrameworkCore.Relational.Specification.Tests - v4.5.1 + v4.5.2 512 1591 diff --git a/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/TestSqlLoggerFactory.cs b/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/TestSqlLoggerFactory.cs index 76fcf2367ef..0036900d5c8 100644 --- a/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/TestSqlLoggerFactory.cs +++ b/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/TestSqlLoggerFactory.cs @@ -57,7 +57,7 @@ public static string Sql public static IReadOnlyList CommandLogData => Logger.SqlLoggerData._logData; -#if NET451 +#if NET452 [Serializable] #endif private class SqlLoggerData @@ -65,23 +65,23 @@ private class SqlLoggerData public string LogText => _log.ToString(); // ReSharper disable InconsistentNaming -#if NET451 +#if NET452 [NonSerialized] #endif public readonly IndentedStringBuilder _log = new IndentedStringBuilder(); public readonly List _sqlStatements = new List(); -#if NET451 +#if NET452 [NonSerialized] #endif public readonly List _logData = new List(); -#if NET451 +#if NET452 [NonSerialized] #endif public ITestOutputHelper _testOutputHelper; -#if NET451 +#if NET452 [NonSerialized] #endif public CancellationTokenSource _cancellationTokenSource; diff --git a/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/project.json b/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/project.json index ffb5c086d19..47051756223 100644 --- a/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/project.json +++ b/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/project.json @@ -26,6 +26,6 @@ }, "frameworks": { "netstandard1.3": {}, - "net451": {} + "net452": {} } } \ No newline at end of file diff --git a/src/Microsoft.EntityFrameworkCore.Specification.Tests/DatabindingTestBase.cs b/src/Microsoft.EntityFrameworkCore.Specification.Tests/DatabindingTestBase.cs index 05f11917c25..d4d3f0eae13 100644 --- a/src/Microsoft.EntityFrameworkCore.Specification.Tests/DatabindingTestBase.cs +++ b/src/Microsoft.EntityFrameworkCore.Specification.Tests/DatabindingTestBase.cs @@ -430,7 +430,7 @@ public void LocalView_is_initialized_with_entities_from_the_context() } } -#if NET451 +#if NET452 [Fact] public virtual void DbSet_Local_ToBindingList_contains_Unchanged_Modified_and_Added_entities_but_not_Deleted_entities() diff --git a/src/Microsoft.EntityFrameworkCore.Specification.Tests/TestModels/ConcurrencyModel/Team.cs b/src/Microsoft.EntityFrameworkCore.Specification.Tests/TestModels/ConcurrencyModel/Team.cs index d90bd984777..1acef819815 100644 --- a/src/Microsoft.EntityFrameworkCore.Specification.Tests/TestModels/ConcurrencyModel/Team.cs +++ b/src/Microsoft.EntityFrameworkCore.Specification.Tests/TestModels/ConcurrencyModel/Team.cs @@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Specification.Tests.TestModels.Concurren { public class Team { -#if NET451 +#if NET452 private readonly ObservableCollection _drivers = new ObservableCollectionListSource(); #else private readonly ObservableCollection _drivers = new ObservableCollection();