Consolidate Directory.Build.targets

NetLah · Nov 19, 2024 · c88a660 · c88a660
1 parent df443a1
commit c88a660
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -30,19 +30,18 @@
     <EFCoreFrameworkVersion Condition="'$(NET_3_1_LESS_OR_STD)' == true">3.1.*</EFCoreFrameworkVersion>
     <EFCoreFrameworkVersion Condition="'$(NET_5_0)' == true">5.*</EFCoreFrameworkVersion>
     <EFCoreFrameworkVersion Condition="'$(NET_6_0)' == true Or '$(NET_7_0)' == true">7.*</EFCoreFrameworkVersion>
-    <EFCoreFrameworkVersion Condition="'$(NET_8_0)' == true">8.*</EFCoreFrameworkVersion>
-    <EFCoreFrameworkVersion Condition="'$(NET_9_0)' == true">9.*</EFCoreFrameworkVersion>
+    <EFCoreFrameworkVersion Condition="'$(NET_8_0_UP)' == true">9.*</EFCoreFrameworkVersion>
     <EFCoreFrameworkVersion Condition="'$(EFCoreFrameworkVersion)' == ''">$(LatestDevFrameworkVersion)</EFCoreFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(NpgsqlEFCoreFrameworkVersion)' == ''">
-    <NpgsqlEFCoreFrameworkVersion Condition="'$(NpgsqlEFCoreFrameworkVersion)' == '' And '$(NET_9_0)' == true">9.*-*</NpgsqlEFCoreFrameworkVersion>
+    <!--<NpgsqlEFCoreFrameworkVersion Condition="'$(NpgsqlEFCoreFrameworkVersion)' == '' And '$(NET_9_0)' == true">9.*-*</NpgsqlEFCoreFrameworkVersion>-->
     <NpgsqlEFCoreFrameworkVersion Condition="'$(NpgsqlEFCoreFrameworkVersion)' == ''">$(EFCoreFrameworkVersion)</NpgsqlEFCoreFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_3_1_LESS_OR_STD)' == true">4.*</NpgsqlVersion>
-    <NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_9_0_UP)' == true">8.*</NpgsqlVersion>
+    <!--<NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_8_0_UP)' == true">9.*</NpgsqlVersion>-->
     <NpgsqlVersion Condition="'$(NpgsqlVersion)' == ''">$(EFCoreFrameworkVersion)</NpgsqlVersion>
     <NuGetPackageVersion Condition="'$(NuGetPackageVersion)' == ''">6.*</NuGetPackageVersion>
     <SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == '' And '$(NET_5_0_LESS)' == true">6.*</SystemTextJsonVersion>
@@ -311,7 +310,7 @@
     <PackageReference Update="Npgsql" Version="$(NpgsqlVersion)" />
     <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEFCoreFrameworkVersion)" />
     <PackageReference Update="EFCore.NamingConventions" Version="$(EFCoreFrameworkVersion)" />
-    <PackageReference Update="Tec.EFCore.NamingConventions" Version="9.0.0-*" />
+    <PackageReference Update="Tec.EFCore.NamingConventions" Version="9.*-*" />
 
     <!--identityserver4 -->
     <PackageReference Update="IdentityModel" Version="7.*" />

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -32,7 +32,7 @@
 
   <PropertyGroup>
     <NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_3_1_LESS_OR_STD)' == true">4.1.2</NpgsqlVersion>
-    <NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_9_0_UP)' == true">8.0.2</NpgsqlVersion>
+    <!--<NpgsqlVersion Condition="'$(NpgsqlVersion)' == '' And '$(NET_9_0_UP)' == true">8.0.2</NpgsqlVersion>-->
     <SystemTextJsonVersion Condition="'$(NET_5_0_LESS_OR_STD)' == true">5.0.0</SystemTextJsonVersion>
     <SystemTextJsonVersion Condition="'$(NET_6_0)' == true">6.0.0</SystemTextJsonVersion>
     <SystemTextJsonVersion Condition="'$(NET_7_0)' == true">7.0.0</SystemTextJsonVersion>
@@ -46,12 +46,12 @@
     <PackageReference Update="NetLah.Abstractions" Version="1.0.0" />
     <PackageReference Update="NetLah.Extensions.ClockProvider" Version="1.0.0" />
     <PackageReference Update="NetLah.Extensions.CommandLineUtils" Version="0.1.0-a1.2" />
-    <PackageReference Update="NetLah.Extensions.Configuration" Version="1.0.0-rc3.2" />
+    <PackageReference Update="NetLah.Extensions.Configuration" Version="1.0.0-rc4" />
     <PackageReference Update="NetLah.Extensions.EventAggregator" Version="1.0.0-rc2" />
     <PackageReference Update="NetLah.Extensions.HttpOverrides" Version="1.0.0-rc2" />
-    <PackageReference Update="NetLah.Extensions.Logging.Reference" Version="1.0.0-rc3" />
-    <PackageReference Update="NetLah.Extensions.Logging.Serilog" Version="1.0.0-rc3" />
-    <PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.0.0-rc3" />
+    <PackageReference Update="NetLah.Extensions.Logging.Reference" Version="1.0.0-rc2" />
+    <PackageReference Update="NetLah.Extensions.Logging.Serilog" Version="1.0.0-rc2" />
+    <PackageReference Update="NetLah.Extensions.Logging.Serilog.AspNetCore" Version="1.0.0-rc2" />
     <PackageReference Update="NetLah.Extensions.SpaServices.Hosting" Version="1.0.0-rc3" />
     <PackageReference Update="Testing.Dynamic.Json" Version="1.0.0-rc3" />