Upgraded to .NET 9 (#140)

fluxera · Nov 14, 2024 · 7b4eb8a · 7b4eb8a
1 parent 71a00f5
commit 7b4eb8a
Show file tree

Hide file tree

Showing 26 changed files with 134 additions and 171 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1 +1 @@
-next-version: 8.6.0
+next-version: 9.0.0
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,9 +5,8 @@ trigger:
 
 variables:
   BuildConfiguration: Release
-  DotNetCoreVersionPreviousPrevious: 6.x
-  DotNetCoreVersionPrevious: 7.x
-  DotNetCoreVersionLatest: 8.x
+  DotNetCoreVersionPrevious: 8.x
+  DotNetCoreVersionLatest: 9.x
 
 parameters:
 - name: publishPackages
@@ -27,12 +26,6 @@ stages:
       persistCredentials: 'true'
       clean: true
     # Install the desired .NET SDK.  
-    - task: UseDotNet@2
-      displayName: 'Acquire .NET $(DotNetCoreVersionPreviousPrevious) SDK'
-      inputs:
-        packageType: 'sdk'
-        version: $(DotNetCoreVersionPreviousPrevious)
-        includePreviewVersions: false
     - task: UseDotNet@2
       displayName: 'Acquire .NET $(DotNetCoreVersionPrevious) SDK'
       inputs:

diff --git a/samples/Sample.API/Sample.API.csproj b/samples/Sample.API/Sample.API.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0</TargetFrameworks>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>disable</ImplicitUsings>
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fluxera.StronglyTypedId.SystemTextJson" Version="8.3.7" />
+    <PackageReference Include="Fluxera.StronglyTypedId.SystemTextJson" Version="9.0.0" />
   </ItemGroup>
 
 	<ItemGroup>

diff --git a/samples/Sample.Domain/Sample.Domain.csproj b/samples/Sample.Domain/Sample.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0</TargetFrameworks>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>
@@ -11,10 +11,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.ComponentModel.Annotations" Version="8.2.3" />
-		<PackageReference Include="Fluxera.StronglyTypedId" Version="8.3.7" />
+		<PackageReference Include="Fluxera.ComponentModel.Annotations" Version="9.0.0" />
+		<PackageReference Include="Fluxera.StronglyTypedId" Version="9.0.0" />
 		<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
-		<PackageReference Include="Fluxera.Utilities" Version="8.2.3" />
+		<PackageReference Include="Fluxera.Utilities" Version="9.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/samples/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj b/samples/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0</TargetFrameworks>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>disable</ImplicitUsings>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/samples/Sample.InMemory/Sample.InMemory.csproj b/samples/Sample.InMemory/Sample.InMemory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>

diff --git a/samples/Sample.LiteDB/Sample.LiteDB.csproj b/samples/Sample.LiteDB/Sample.LiteDB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0</TargetFrameworks>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>

diff --git a/samples/Sample.MongoDB/Sample.MongoDB.csproj b/samples/Sample.MongoDB/Sample.MongoDB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0</TargetFrameworks>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -16,8 +16,8 @@
 
 	<PropertyGroup>
 		<Authors>Matthias Gernand</Authors>
-		<RepositoryUrl>https://github.com/fluxera/Fluxera.Guard</RepositoryUrl>
-		<PackageProjectUrl>https://github.com/fluxera/Fluxera.Guard</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/fluxera/Fluxera.Repository</RepositoryUrl>
+		<PackageProjectUrl>https://github.com/fluxera/Fluxera.Repository</PackageProjectUrl>
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -28,17 +28,12 @@
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 	</PropertyGroup>
 
-	<Target Name="Update Version" BeforeTargets="Build" Condition="'$(TF_BUILD)' == 'true' and '$(TargetFramework)' == 'net6.0'">
-		<Message Text="Version = $(GITVERSION_FullSemVer)" Importance="High" />
-		<Message Text="##vso[build.updatebuildnumber]$(GITVERSION_FullSemVer)" Importance="High" />
-	</Target>
-
-	<Target Name="Update Version" BeforeTargets="Build" Condition="'$(TF_BUILD)' == 'true' and '$(TargetFramework)' == 'net7.0'">
+	<Target Name="Update Version" BeforeTargets="Build" Condition="'$(TF_BUILD)' == 'true' and '$(TargetFramework)' == 'net8.0'">
 		<Message Text="Version = $(GITVERSION_FullSemVer)" Importance="High" />
 		<Message Text="##vso[build.updatebuildnumber]$(GITVERSION_FullSemVer)" Importance="High" />
 	</Target>
 
-	<Target Name="Update Version" BeforeTargets="Build" Condition="'$(TF_BUILD)' == 'true' and '$(TargetFramework)' == 'net8.0'">
+	<Target Name="Update Version" BeforeTargets="Build" Condition="'$(TF_BUILD)' == 'true' and '$(TargetFramework)' == 'net9.0'">
 		<Message Text="Version = $(GITVERSION_FullSemVer)" Importance="High" />
 		<Message Text="##vso[build.updatebuildnumber]$(GITVERSION_FullSemVer)" Importance="High" />
 	</Target>

diff --git a/src/Fluxera.Repository.Abstractions/Fluxera.Repository.Abstractions.csproj b/src/Fluxera.Repository.Abstractions/Fluxera.Repository.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -28,18 +28,25 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Guards" Version="8.1.3" />
-		<PackageReference Include="Fluxera.Entity" Version="8.3.4" />
-		<PackageReference Include="Fluxera.Extensions.Validation.Abstractions" Version="8.3.4" />
-		<PackageReference Include="Fluxera.Linq.Expressions" Version="8.2.3" />
-		<PackageReference Include="Fluxera.Utilities" Version="8.2.3" />
-		<PackageReference Include="Fluxera.ValueObject" Version="8.2.4" />
-		<PackageReference Include="GitVersion.MsBuild" Version="6.0.4">
+		<PackageReference Include="Fluxera.Guards" Version="9.0.0" />
+		<PackageReference Include="Fluxera.Entity" Version="9.0.0" />
+		<PackageReference Include="Fluxera.Extensions.Validation.Abstractions" Version="9.0.1" />
+		<PackageReference Include="Fluxera.Linq.Expressions" Version="9.0.0" />
+		<PackageReference Include="Fluxera.Utilities" Version="9.0.0" />
+		<PackageReference Include="Fluxera.ValueObject" Version="9.0.0" />
+		<PackageReference Include="GitVersion.MsBuild" Version="6.0.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.2]" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/Fluxera.Repository.EntityFrameworkCore/Fluxera.Repository.EntityFrameworkCore.csproj b/src/Fluxera.Repository.EntityFrameworkCore/Fluxera.Repository.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -22,27 +22,23 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Enumeration.EntityFrameworkCore" Version="8.2.4" />
-		<PackageReference Include="Fluxera.Guards" Version="8.1.3" />
-		<PackageReference Include="Fluxera.StronglyTypedId.EntityFrameworkCore" Version="8.3.7" />
-		<PackageReference Include="Fluxera.ValueObject.EntityFrameworkCore" Version="8.2.4" />
-		<PackageReference Include="GitVersion.MsBuild" Version="6.0.4">
+		<PackageReference Include="Fluxera.Enumeration.EntityFrameworkCore" Version="9.0.0" />
+		<PackageReference Include="Fluxera.Guards" Version="9.0.0" />
+		<PackageReference Include="Fluxera.StronglyTypedId.EntityFrameworkCore" Version="9.0.0" />
+		<PackageReference Include="Fluxera.ValueObject.EntityFrameworkCore" Version="9.0.0" />
+		<PackageReference Include="GitVersion.MsBuild" Version="6.0.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.35]" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7.0.20]" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.11]" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Fluxera.Repository.InMemory/Fluxera.Repository.InMemory.csproj b/src/Fluxera.Repository.InMemory/Fluxera.Repository.InMemory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -22,7 +22,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="GitVersion.MsBuild" Version="6.0.4">
+		<PackageReference Include="GitVersion.MsBuild" Version="6.0.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

diff --git a/src/Fluxera.Repository.LiteDB/Fluxera.Repository.LiteDB.csproj b/src/Fluxera.Repository.LiteDB/Fluxera.Repository.LiteDB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -22,18 +22,18 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Enumeration.LiteDB" Version="8.2.4" />
-		<PackageReference Include="Fluxera.Spatial.LiteDB" Version="8.1.4" />
-		<PackageReference Include="Fluxera.StronglyTypedId.LiteDB" Version="8.3.7" />
-		<PackageReference Include="Fluxera.ValueObject.LiteDB" Version="8.2.4" />
-		<PackageReference Include="GitVersion.MsBuild" Version="6.0.4">
+		<PackageReference Include="Fluxera.Enumeration.LiteDB" Version="9.0.0" />
+		<PackageReference Include="Fluxera.Spatial.LiteDB" Version="9.0.0" />
+		<PackageReference Include="Fluxera.StronglyTypedId.LiteDB" Version="9.0.0" />
+		<PackageReference Include="Fluxera.ValueObject.LiteDB" Version="9.0.0" />
+		<PackageReference Include="GitVersion.MsBuild" Version="6.0.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
 		<PackageReference Include="LiteDB" Version="5.0.21" />
 		<PackageReference Include="LiteDB.Async" Version="0.1.8" />
-		<PackageReference Include="LiteDB.Queryable" Version="2.3.3" />
+		<PackageReference Include="LiteDB.Queryable" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Fluxera.Repository.MongoDB/Fluxera.Repository.MongoDB.csproj b/src/Fluxera.Repository.MongoDB/Fluxera.Repository.MongoDB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -26,18 +26,18 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.ComponentModel.Annotations" Version="8.2.3" />
-		<PackageReference Include="Fluxera.Enumeration.MongoDB" Version="8.2.4" />
-		<PackageReference Include="Fluxera.Spatial.MongoDB" Version="8.1.4" />
-		<PackageReference Include="Fluxera.StronglyTypedId.MongoDB" Version="8.3.7" />
-		<PackageReference Include="Fluxera.ValueObject.MongoDB" Version="8.2.4" />
-		<PackageReference Include="GitVersion.MsBuild" Version="6.0.4">
+		<PackageReference Include="Fluxera.ComponentModel.Annotations" Version="9.0.0" />
+		<PackageReference Include="Fluxera.Enumeration.MongoDB" Version="9.0.0" />
+		<PackageReference Include="Fluxera.Spatial.MongoDB" Version="9.0.0" />
+		<PackageReference Include="Fluxera.StronglyTypedId.MongoDB" Version="9.0.0" />
+		<PackageReference Include="Fluxera.ValueObject.MongoDB" Version="9.0.0" />
+		<PackageReference Include="GitVersion.MsBuild" Version="6.0.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
-		<PackageReference Include="MadEyeMatt.MongoDB.DbContext" Version="8.1.5" />
-		<PackageReference Include="MongoDB.Driver" Version="2.30.0" />
+		<PackageReference Include="MadEyeMatt.MongoDB.DbContext" Version="9.0.1" />
+		<PackageReference Include="MongoDB.Driver" Version="3.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>