Updated deps to .NET 8

PawelGerr · Nov 14, 2023 · 6b5ba6a · 6b5ba6a
1 parent 1d903f7
commit 6b5ba6a
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-dotnet@v2
         with:
           dotnet-version: 8.0.x
-          include-prerelease: true
+          include-prerelease: false
 
       - name: checkout repository
         uses: actions/checkout@v2

diff --git a/Thinktecture.EntityFrameworkCore.sln b/Thinktecture.EntityFrameworkCore.sln
@@ -26,6 +26,7 @@ ProjectSection(SolutionItems) = preProject
 	.gitignore = .gitignore
 	icon.png = icon.png
 	.github\workflows\main.yml = .github\workflows\main.yml
+	global.json = global.json
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.EntityFrameworkCore.SqlServer.Testing", "src\Thinktecture.EntityFrameworkCore.SqlServer.Testing\Thinktecture.EntityFrameworkCore.SqlServer.Testing.csproj", "{4A68E5B4-B0C9-4076-875A-C88AFAC5EB5F}"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,7 +20,7 @@ steps:
   inputs:
     packageType: sdk
     version: 8.0.x
-    includePreviewVersions: true
+    includePreviewVersions: false
     installationPath: $(Agent.ToolsDirectory)/dotnet
 
 - script: |

diff --git a/global.json b/global.json
@@ -2,6 +2,6 @@
   "sdk": {
     "version": "8.0.0",
     "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "allowPrerelease": false
   }
-}
+}
diff --git a/...tecture.EntityFrameworkCore.Benchmarks/Thinktecture.EntityFrameworkCore.Benchmarks.csproj b/...tecture.EntityFrameworkCore.Benchmarks/Thinktecture.EntityFrameworkCore.Benchmarks.csproj
@@ -12,8 +12,8 @@
    </ItemGroup>
 
    <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
    </ItemGroup>
 
    <ItemGroup>

diff --git a/...FrameworkCore.SqlServer.Samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples.csproj b/...FrameworkCore.SqlServer.Samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples.csproj
@@ -17,9 +17,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.2.23480.1" PrivateAssets="all" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />
-      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.2.23479.6" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" PrivateAssets="all" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/...EntityFrameworkCore.Sqlite.Samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples.csproj b/...EntityFrameworkCore.Sqlite.Samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples.csproj
@@ -13,9 +13,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.2.23480.1" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.2.23479.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...tecture.EntityFrameworkCore.Relational/Thinktecture.EntityFrameworkCore.Relational.csproj b/...tecture.EntityFrameworkCore.Relational/Thinktecture.EntityFrameworkCore.Relational.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-rc.2.23480.1" />
-      <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.0-rc.2.23480.2" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/...nktecture.EntityFrameworkCore.SqlServer/Thinktecture.EntityFrameworkCore.SqlServer.csproj b/...nktecture.EntityFrameworkCore.SqlServer/Thinktecture.EntityFrameworkCore.SqlServer.csproj
@@ -5,7 +5,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.2.23480.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Thinktecture.EntityFrameworkCore.Sqlite/Thinktecture.EntityFrameworkCore.Sqlite.csproj b/src/Thinktecture.EntityFrameworkCore.Sqlite/Thinktecture.EntityFrameworkCore.Sqlite.csproj
@@ -5,7 +5,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -10,12 +10,12 @@
 
    <ItemGroup>
       <PackageReference Include="FluentAssertions" Version="6.12.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
       <PackageReference Include="NSubstitute" Version="5.1.0" />
       <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
       <PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
-      <PackageReference Include="xunit" Version="2.5.1" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" PrivateAssets="all" />
+      <PackageReference Include="xunit" Version="2.6.1" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
    </ItemGroup>
 
    <ItemGroup>

diff --git a/...orkCore.BulkOperations.Tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests.csproj b/...orkCore.BulkOperations.Tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests.csproj
@@ -9,7 +9,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/...FrameworkCore/Migrations/DefaultSchemaRespectingMigrationAssemblyTests/CreateMigration.cs b/...FrameworkCore/Migrations/DefaultSchemaRespectingMigrationAssemblyTests/CreateMigration.cs
@@ -66,7 +66,7 @@ public void Should_create_migration_having_schema_aware_ctx()
       migration.Should().NotBeNull();
       migration.Should().BeOfType<MigrationWithoutSchema>();
 
-      createMigration.Should().BeEquivalentTo(migration);
+      createMigration.Should().BeEquivalentTo(migration, options => options.Excluding(m => m.TargetModel.ModelId));
    }
 
    [Fact]
@@ -98,7 +98,7 @@ public void Should_create_schema_unaware_migration_having_schema_unaware_ctx()
 
       var createMigration = SUT.CreateMigration(typeof(MigrationWithoutSchema).GetTypeInfo(), "DummyProvider");
 
-      createMigration.Should().BeEquivalentTo(migration);
+      createMigration.Should().BeEquivalentTo(migration, options => options.Excluding(m => m.TargetModel.ModelId));
    }
 
    [Fact]

diff --git a/...tityFrameworkCore.SqlServer.Tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests.csproj b/...tityFrameworkCore.SqlServer.Tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests.csproj
@@ -5,10 +5,10 @@
    </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.2.23480.1" PrivateAssets="all" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-rc.2.23479.6" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />
-      <PackageReference Include="Testcontainers.MsSql" Version="3.5.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" PrivateAssets="all" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+      <PackageReference Include="Testcontainers.MsSql" Version="3.6.0" />
    </ItemGroup>
 
    <ItemGroup>

diff --git a/...ure.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj b/...ure.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj
@@ -5,9 +5,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.2.23480.1" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-rc.2.23479.6" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
         <PackageReference Include="Xunit.Extensions.AssemblyFixture" Version="2.4.1" />
     </ItemGroup>
 

diff --git a/...cture.EntityFrameworkCore.TestHelpers/Thinktecture.EntityFrameworkCore.TestHelpers.csproj b/...cture.EntityFrameworkCore.TestHelpers/Thinktecture.EntityFrameworkCore.TestHelpers.csproj
@@ -6,7 +6,7 @@
    </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-rc.2.23480.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
    </ItemGroup>
 
 </Project>
diff --git a/...e.EntityFrameworkCore.Testing.Tests/Thinktecture.EntityFrameworkCore.Testing.Tests.csproj b/...e.EntityFrameworkCore.Testing.Tests/Thinktecture.EntityFrameworkCore.Testing.Tests.csproj
@@ -6,7 +6,7 @@
    </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
    </ItemGroup>
 
    <ItemGroup>