Merge branch 'master' into feature/efcore-10

Author: niekschoemaker

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ env:
 
 jobs:
   ci:
-    runs-on: windows-2022
+    runs-on: windows-2025
     strategy:
       fail-fast: false
       matrix:
@@ -17,10 +17,10 @@ jobs:
     timeout-minutes: 120
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: .NET 10.0
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 10.0.x
 

build.ps1

@@ -20,17 +20,8 @@ function Clean() {
 }
 
 function Build() {
-	function b($target, $check=$True) {
-		dotnet msbuild /t:$target /p:Configuration=$Configuration /p:ContinuousIntegrationBuild=true "$baseDir\src\NETProvider.sln" /v:m /m
-		if ($check) {
-			Check-ExitCode
-		}
-	}
-	b 'Clean'
-	# this sometimes fails on CI
-	b 'Restore' $False
-	b 'Restore'
-	b 'Build'
+	dotnet clean "$baseDir\src\NETProvider.slnx" -c $Configuration -v m
+	dotnet build "$baseDir\src\NETProvider.slnx" -c $Configuration -p:ContinuousIntegrationBuild=true -v m
 }
 
 function Versions() {

src/NETProvider.sln

@@ -0,0 +1,32 @@
+<Solution>
+  <Folder Name="/EF6/">
+    <Project Path="EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj" />
+    <Project Path="EntityFramework.Firebird/EntityFramework.Firebird.csproj" />
+  </Folder>
+  <Folder Name="/EFCore/">
+    <Project Path="FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj" />
+    <Project Path="FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.Tests.csproj" />
+    <Project Path="FirebirdSql.EntityFrameworkCore.Firebird/FirebirdSql.EntityFrameworkCore.Firebird.csproj" />
+  </Folder>
+  <Folder Name="/Provider/">
+    <Project Path="FirebirdSql.Data.External/FirebirdSql.Data.External.shproj" />
+    <Project Path="FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj" />
+    <Project Path="FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj" />
+  </Folder>
+  <Folder Name="/Provider/Perf/">
+    <Project Path="Perf/Perf.csproj" />
+  </Folder>
+  <Folder Name="/Provider/Scratchpad/">
+    <Project Path="Scratchpad/Scratchpad.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Build.props" />
+    <File Path="Versions.props" />
+  </Folder>
+  <Folder Name="/TestsBase/">
+    <Project Path="FirebirdSql.Data.TestsBase/FirebirdSql.Data.TestsBase.shproj" />
+  </Folder>
+  <Properties Name="TextTemplating" Scope="PostLoad">
+    <Property Name="TextTemplating" Value="1" />
+  </Properties>
+</Solution>