Skip to content

Commit d302371

Browse files
rojiroji
committed
Update to version 6.3.0
* Take dependency on EF6 6.3.0 GA * Take dependency on Npgsql 4.0.10. Also tested successfully with 4.1.1, but not taking dependency in order to preserve compatibility with .NET Framework 4.5. * Package snupkg * Nuget icon * Use transforms instead of Add-EFProvider (in install.ps1). See dotnet/ef6#953 * Various build cleanups, project renames, etc. Closes #137
1 parent 8180248 commit d302371

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+94
-39
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project>
22

33
<PropertyGroup>
4-
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
4+
<IncludeSymbols>true</IncludeSymbols>
5+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
56
</PropertyGroup>
67

78
<!-- Reference .NET Framework reference assemblies, allows building on environments without .NET Framework installed
89
(e.g. Linux). Gets ignored on non-framework TFMs. -->
910
<ItemGroup>
10-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
1112
</ItemGroup>
1213

1314
</Project>

‎Directory.Build.targets‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Update="Npgsql" Version="4.0.10" />
4+
<PackageReference Update="Npgsql.LegacyPostgis" Version="4.0.10" />
5+
<PackageReference Update="EntityFramework" Version="6.3.0" />
6+
7+
<PackageReference Update="NUnit" Version="3.12.0" />
8+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />
9+
<PackageReference Update="NUnit3TestAdapter" Version="3.15.1" />
10+
<PackageReference Update="NLog" Version="4.6.7" />
11+
</ItemGroup>
12+
</Project>

test/EntityFramework6.Npgsql.Tests/App.config renamed to EF6.PG.Tests/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3030
<dependentAssembly>
3131
<assemblyIdentity name="Npgsql" publicKeyToken="5d8b90d52f46fda7" culture="neutral" />
32-
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.7.0" />
32+
<bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
3333
</dependentAssembly>
3434
</assemblyBinding>
3535
</runtime>

‎EF6.PG.Tests/EF6.PG.Tests.csproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<LangVersion>latest</LangVersion>
4+
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
5+
<RootNamespace>EntityFramework6.Npgsql.Tests</RootNamespace>
6+
<AssemblyName>EntityFramework6.Npgsql.Tests</AssemblyName>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="EntityFramework" />
10+
<PackageReference Include="NUnit" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12+
<PackageReference Include="NUnit3TestAdapter" />
13+
<PackageReference Include="NLog" />
14+
<PackageReference Include="Npgsql.LegacyPostgis" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<ProjectReference Include="..\EF6.PG\EF6.PG.csproj" />
18+
</ItemGroup>
19+
</Project>

test/EntityFramework6.Npgsql.Tests/EntityFrameworkBasicTests.cs renamed to EF6.PG.Tests/EntityFrameworkBasicTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace EntityFramework6.Npgsql.Tests
1717
{
1818
public class EntityFrameworkBasicTests : EntityFrameworkTestBase
1919
{
20-
[Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/860")]
20+
[Test]
2121
public void InsertAndSelect()
2222
{
2323
var varbitVal = "10011";
@@ -457,7 +457,7 @@ public void DateFunctions()
457457

458458
//Hunting season is open Happy hunting on OrderBy,GroupBy,Min,Max,Skip,Take,ThenBy... and all posible combinations
459459

460-
[Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")]
460+
[Test]
461461
public void TestComplicatedQueries()
462462
{
463463
using (var context = new BloggingContext(ConnectionString))
@@ -517,7 +517,7 @@ public void TestComplicatedQueries()
517517
}
518518
}
519519

520-
[Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")]
520+
[Test]
521521
[MonoIgnore("Probably bug in mono. See https://github.com/npgsql/Npgsql/issues/289.")]
522522
public void TestComplicatedQueriesMonoFails()
523523
{
@@ -541,7 +541,7 @@ public void TestComplicatedQueriesMonoFails()
541541
}
542542
}
543543

544-
[Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")]
544+
[Test]
545545
public void TestComplicatedQueriesWithApply()
546546
{
547547
using (var conn = OpenConnection(ConnectionString))

test/EntityFramework6.Npgsql.Tests/EntityFrameworkMigrationTests.cs renamed to EF6.PG.Tests/EntityFrameworkMigrationTests.cs

File renamed without changes.

test/EntityFramework6.Npgsql.Tests/FullTextSearchTests.cs renamed to EF6.PG.Tests/FullTextSearchTests.cs

File renamed without changes.

test/EntityFramework6.Npgsql.Tests/NLogLoggingProvider.cs renamed to EF6.PG.Tests/NLogLoggingProvider.cs

File renamed without changes.

test/EntityFramework6.Npgsql.Tests/PatternMatchingTests.cs renamed to EF6.PG.Tests/PatternMatchingTests.cs

File renamed without changes.

test/EntityFramework6.Npgsql.Tests/Spatial/PostgisServiceTests.cs renamed to EF6.PG.Tests/Spatial/PostgisServiceTests.cs

File renamed without changes.

0 commit comments

Comments
 (0)