Merge branch 'dev' (release 6.4.0)

npgsql · Dec 4, 2019 · f7b5eec · f7b5eec
2 parents 36a9608 + c2099ef
commit f7b5eec
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,12 +1,20 @@
 <Project>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
+    <PackageReference Update="Npgsql" Version="4.1.2" />
+    <PackageReference Update="Npgsql.LegacyPostgis" Version="4.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <PackageReference Update="Npgsql" Version="4.0.10" />
     <PackageReference Update="Npgsql.LegacyPostgis" Version="4.0.10" />
-    <PackageReference Update="EntityFramework" Version="6.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="EntityFramework" Version="6.4.0" />
 
     <PackageReference Update="NUnit" Version="3.12.0" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Update="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="NLog" Version="4.6.7" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/EF6.PG.Tests/EF6.PG.Tests.csproj b/EF6.PG.Tests/EF6.PG.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>EntityFramework6.Npgsql.Tests</RootNamespace>
     <AssemblyName>EntityFramework6.Npgsql.Tests</AssemblyName>
   </PropertyGroup>

diff --git a/EF6.PG/EF6.PG.csproj b/EF6.PG/EF6.PG.csproj
@@ -5,9 +5,9 @@
     <Copyright>Copyright 2019 © The Npgsql Development Team</Copyright>
     <Company>Npgsql</Company>
     <PackageTags>npgsql postgresql postgres data database entity framework ef orm</PackageTags>
-    <VersionPrefix>6.3.0</VersionPrefix>
+    <VersionPrefix>6.4.0</VersionPrefix>
     <LangVersion>latest</LangVersion>
-    <TargetFrameworks>net45;netstandard21</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard21</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>CS1591</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -34,7 +34,7 @@
     <None Include="content/Web.config.transform" Pack="true" PackagePath="content/net45" />
     <None Include="postgresql.png" Pack="true" PackagePath="" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />

diff --git a/EF6.PG/Resources/NpgsqlSchema.ssdl b/EF6.PG/Resources/NpgsqlSchema.ssdl
@@ -57,7 +57,7 @@
         end as is_identity,
         false as is_generated,
 -- default value column
-        ad.adsrc as default_value
+        pg_get_expr(ad.adbin, ad.adrelid) as default_value
         from pg_attribute a
           join pg_class c
           on a.attrelid = c.oid
@@ -178,7 +178,7 @@
         end as is_identity,
         false as is_generated,
 -- default value column
-        ad.adsrc as default_value
+        pg_get_expr(ad.adbin, ad.adrelid) as default_value
         from pg_attribute a
           join pg_class c
           on a.attrelid = c.oid

diff --git a/EF6.PG/Resources/NpgsqlSchemaV3.ssdl b/EF6.PG/Resources/NpgsqlSchemaV3.ssdl
@@ -57,7 +57,7 @@
         end as is_identity,
         false as is_generated,
 -- default value column
-        ad.adsrc as default_value
+        pg_get_expr(ad.adbin, ad.adrelid) as default_value
         from pg_attribute a
           join pg_class c
           on a.attrelid = c.oid
@@ -178,7 +178,7 @@
         end as is_identity,
         false as is_generated,
 -- default value column
-        ad.adsrc as default_value
+        pg_get_expr(ad.adbin, ad.adrelid) as default_value
         from pg_attribute a
           join pg_class c
           on a.attrelid = c.oid

diff --git a/EntityFramework6.Npgsql.sln b/EntityFramework6.Npgsql.sln
@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -32,10 +31,6 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3EC85CBA-5B79-11E3-8104-0022198AB089} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
-		{4A0A42DE-C8B8-11E4-8EC9-005056A163A4} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {84B4C9EA-ED4F-4E87-8809-297958315622}
 	EndGlobalSection