Skip to content

Commit

Permalink
Handle projects that depend on bumped projects
Browse files Browse the repository at this point in the history
  • Loading branch information
dougbu committed Feb 14, 2017
1 parent c3a25a9 commit beca39d
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests</RootNamespace>
<AssemblyName>Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NoWarn>1591</NoWarn>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1823,7 +1823,7 @@ public virtual void Do_not_generate_entity_type_builder_again_if_no_foreign_key_

protected virtual ICollection<BuildReference> GetReferences() => new List<BuildReference>
{
#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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class BuildSource
{
public ICollection<BuildReference> References { get; } = new List<BuildReference>
{
#if NET451
#if NET452
BuildReference.ByName("mscorlib")
#else
BuildReference.ByName("System.Runtime")
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"System.Threading.Tasks.Parallel": "4.4.0-*"
}
},
"net451": {
"net452": {
"frameworkAssemblies": {
"System.Collections.Concurrent": {
"type": "build"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.EntityFrameworkCore.Relational.Specification.Tests</RootNamespace>
<AssemblyName>Microsoft.EntityFrameworkCore.Relational.Specification.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NoWarn>1591</NoWarn>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,31 +57,31 @@ public static string Sql

public static IReadOnlyList<DbCommandLogData> CommandLogData => Logger.SqlLoggerData._logData;

#if NET451
#if NET452
[Serializable]
#endif
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<string> _sqlStatements = new List<string>();
#if NET451
#if NET452
[NonSerialized]
#endif
public readonly List<DbCommandLogData> _logData = new List<DbCommandLogData>();

#if NET451
#if NET452
[NonSerialized]
#endif
public ITestOutputHelper _testOutputHelper;

#if NET451
#if NET452
[NonSerialized]
#endif
public CancellationTokenSource _cancellationTokenSource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
},
"frameworks": {
"netstandard1.3": {},
"net451": {}
"net452": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Specification.Tests.TestModels.Concurren
{
public class Team
{
#if NET451
#if NET452
private readonly ObservableCollection<Driver> _drivers = new ObservableCollectionListSource<Driver>();
#else
private readonly ObservableCollection<Driver> _drivers = new ObservableCollection<Driver>();
Expand Down

0 comments on commit beca39d

Please sign in to comment.