diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a20a4473..4bc5af2b 100644 --- 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 index 38fcb74a..bf0e9e41 100644 --- 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 index dad66b5f..eaabf973 100644 --- 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 index dad2db5e..f6ba4b7d 100644 --- a/global.json +++ b/global.json @@ -2,6 +2,6 @@ "sdk": { "version": "8.0.0", "rollForward": "latestMajor", - "allowPrerelease": true + "allowPrerelease": false } -} \ No newline at end of file +} diff --git a/samples/Thinktecture.EntityFrameworkCore.Benchmarks/Thinktecture.EntityFrameworkCore.Benchmarks.csproj b/samples/Thinktecture.EntityFrameworkCore.Benchmarks/Thinktecture.EntityFrameworkCore.Benchmarks.csproj index 637fc41f..ecbfd8d3 100644 --- a/samples/Thinktecture.EntityFrameworkCore.Benchmarks/Thinktecture.EntityFrameworkCore.Benchmarks.csproj +++ b/samples/Thinktecture.EntityFrameworkCore.Benchmarks/Thinktecture.EntityFrameworkCore.Benchmarks.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples.csproj b/samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples.csproj index 7fdd7344..e2301954 100644 --- a/samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples.csproj +++ b/samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples.csproj b/samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples.csproj index 79d5698c..efb61eff 100644 --- a/samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples.csproj +++ b/samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/Thinktecture.EntityFrameworkCore.Relational/Thinktecture.EntityFrameworkCore.Relational.csproj b/src/Thinktecture.EntityFrameworkCore.Relational/Thinktecture.EntityFrameworkCore.Relational.csproj index dcbd7c2c..9237d303 100644 --- a/src/Thinktecture.EntityFrameworkCore.Relational/Thinktecture.EntityFrameworkCore.Relational.csproj +++ b/src/Thinktecture.EntityFrameworkCore.Relational/Thinktecture.EntityFrameworkCore.Relational.csproj @@ -1,8 +1,8 @@ - - + + diff --git a/src/Thinktecture.EntityFrameworkCore.SqlServer/Thinktecture.EntityFrameworkCore.SqlServer.csproj b/src/Thinktecture.EntityFrameworkCore.SqlServer/Thinktecture.EntityFrameworkCore.SqlServer.csproj index 2efa58d3..4e634b6a 100644 --- a/src/Thinktecture.EntityFrameworkCore.SqlServer/Thinktecture.EntityFrameworkCore.SqlServer.csproj +++ b/src/Thinktecture.EntityFrameworkCore.SqlServer/Thinktecture.EntityFrameworkCore.SqlServer.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Thinktecture.EntityFrameworkCore.Sqlite/Thinktecture.EntityFrameworkCore.Sqlite.csproj b/src/Thinktecture.EntityFrameworkCore.Sqlite/Thinktecture.EntityFrameworkCore.Sqlite.csproj index 0ea9746b..02603a11 100644 --- a/src/Thinktecture.EntityFrameworkCore.Sqlite/Thinktecture.EntityFrameworkCore.Sqlite.csproj +++ b/src/Thinktecture.EntityFrameworkCore.Sqlite/Thinktecture.EntityFrameworkCore.Sqlite.csproj @@ -5,7 +5,7 @@ - + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 6e149a37..034b814e 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -10,12 +10,12 @@ - + - - + + diff --git a/tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests.csproj index 0d9788ec..491a70e8 100644 --- a/tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests.csproj +++ b/tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/tests/Thinktecture.EntityFrameworkCore.Relational.Tests/EntityFrameworkCore/Migrations/DefaultSchemaRespectingMigrationAssemblyTests/CreateMigration.cs b/tests/Thinktecture.EntityFrameworkCore.Relational.Tests/EntityFrameworkCore/Migrations/DefaultSchemaRespectingMigrationAssemblyTests/CreateMigration.cs index fe312553..fb7bd595 100644 --- a/tests/Thinktecture.EntityFrameworkCore.Relational.Tests/EntityFrameworkCore/Migrations/DefaultSchemaRespectingMigrationAssemblyTests/CreateMigration.cs +++ b/tests/Thinktecture.EntityFrameworkCore.Relational.Tests/EntityFrameworkCore/Migrations/DefaultSchemaRespectingMigrationAssemblyTests/CreateMigration.cs @@ -66,7 +66,7 @@ public void Should_create_migration_having_schema_aware_ctx() migration.Should().NotBeNull(); migration.Should().BeOfType(); - 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/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests.csproj index 131b0b5b..17c5e6be 100644 --- a/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests.csproj +++ b/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests.csproj @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj index c9b73f08..f07360cd 100644 --- a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj +++ b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/tests/Thinktecture.EntityFrameworkCore.TestHelpers/Thinktecture.EntityFrameworkCore.TestHelpers.csproj b/tests/Thinktecture.EntityFrameworkCore.TestHelpers/Thinktecture.EntityFrameworkCore.TestHelpers.csproj index f552ba96..49d87d8b 100644 --- a/tests/Thinktecture.EntityFrameworkCore.TestHelpers/Thinktecture.EntityFrameworkCore.TestHelpers.csproj +++ b/tests/Thinktecture.EntityFrameworkCore.TestHelpers/Thinktecture.EntityFrameworkCore.TestHelpers.csproj @@ -6,7 +6,7 @@ - + diff --git a/tests/Thinktecture.EntityFrameworkCore.Testing.Tests/Thinktecture.EntityFrameworkCore.Testing.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.Testing.Tests/Thinktecture.EntityFrameworkCore.Testing.Tests.csproj index 1f9b5a39..4afa71f0 100644 --- a/tests/Thinktecture.EntityFrameworkCore.Testing.Tests/Thinktecture.EntityFrameworkCore.Testing.Tests.csproj +++ b/tests/Thinktecture.EntityFrameworkCore.Testing.Tests/Thinktecture.EntityFrameworkCore.Testing.Tests.csproj @@ -6,7 +6,7 @@ - +