diff --git a/Directory.Build.props b/Directory.Build.props index 4eeca53..309e8ce 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,18 +7,18 @@ - + false false false - + true - 7.0 + 8.0 All true - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Src/FluentAssertions.DataSets/FluentAssertions.DataSets.csproj b/Src/FluentAssertions.DataSets/FluentAssertions.DataSets.csproj index 9d5be77..4ccf387 100644 --- a/Src/FluentAssertions.DataSets/FluentAssertions.DataSets.csproj +++ b/Src/FluentAssertions.DataSets/FluentAssertions.DataSets.csproj @@ -2,7 +2,7 @@ - net47;net6.0 + net47;net8.0 True FluentAssertions.snk true diff --git a/Tests/FluentAssertions.DataSets.Specs/DataSetSpecs.cs b/Tests/FluentAssertions.DataSets.Specs/DataSetSpecs.cs index 1d33d9d..5f5d70f 100644 --- a/Tests/FluentAssertions.DataSets.Specs/DataSetSpecs.cs +++ b/Tests/FluentAssertions.DataSets.Specs/DataSetSpecs.cs @@ -377,7 +377,11 @@ public void When_data_set_prefix_does_not_match_but_the_corresponding_property_i dataSet1.Should().BeEquivalentTo(dataSet2, options => options.Excluding(dataSet => dataSet.Prefix)); } +#if NET8_0_OR_GREATER + [Fact(Skip = "SerializationFormat.Binary is not supported on .NET 8+")] +#else [Fact] +#endif public void When_data_set_remoting_format_does_not_match_and_the_corresponding_property_is_not_excluded_equivalence_test_should_fail() { @@ -403,7 +407,11 @@ public void "Expected dataSet1 to have RemotingFormat value of SerializationFormat.Binary*, but found *Xml* instead*"); } +#if NET8_0_OR_GREATER + [Fact(Skip = "SerializationFormat.Binary is not supported on .NET 8+")] +#else [Fact] +#endif public void When_data_set_remoting_format_does_not_match_but_the_corresponding_property_is_excluded_equivalence_test_should_succeed() { diff --git a/Tests/FluentAssertions.DataSets.Specs/DataTableSpecs.cs b/Tests/FluentAssertions.DataSets.Specs/DataTableSpecs.cs index 6a0da6e..ede0614 100644 --- a/Tests/FluentAssertions.DataSets.Specs/DataTableSpecs.cs +++ b/Tests/FluentAssertions.DataSets.Specs/DataTableSpecs.cs @@ -516,7 +516,11 @@ public void When_data_table_prefix_does_not_match_but_the_corresponding_property dataTable1.Should().BeEquivalentTo(dataTable2, options => options.Excluding(dataTable => dataTable.Prefix)); } +#if NET8_0_OR_GREATER + [Fact(Skip = "SerializationFormat.Binary is not supported on .NET 8+")] +#else [Fact] +#endif public void When_data_table_remoting_format_does_not_match_and_the_corresponding_property_is_not_excluded_equivalence_test_should_fail() { @@ -541,7 +545,11 @@ public void .WithMessage("Expected dataTable1 to have RemotingFormat value of *Binary*, but found *Xml* instead*"); } +#if NET8_0_OR_GREATER + [Fact(Skip = "SerializationFormat.Binary is not supported on .NET 8+")] +#else [Fact] +#endif public void When_data_table_remoting_format_does_not_match_but_the_corresponding_property_is_excluded_equivalence_test_should_succeed() { diff --git a/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj b/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj index 7758b8e..68f8310 100644 --- a/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj +++ b/Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj @@ -1,15 +1,15 @@  - net47;net6.0 + net47;net8.0 True ..\..\Src\FluentAssertions.DataSets\FluentAssertions.snk false - $(NoWarn),IDE0052,1573,1591,1712 + $(NoWarn),IDE0052,1573,1591,1712,SYSLIB0038 full - + all @@ -20,7 +20,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/FluentAssertions.DataSets.Specs/TypedDataSetSpecs.cs b/Tests/FluentAssertions.DataSets.Specs/TypedDataSetSpecs.cs index 78ca879..e190159 100644 --- a/Tests/FluentAssertions.DataSets.Specs/TypedDataSetSpecs.cs +++ b/Tests/FluentAssertions.DataSets.Specs/TypedDataSetSpecs.cs @@ -338,7 +338,11 @@ public void When_Prefix_does_not_match_and_property_is_excluded_it_should_succee dataSet1.Should().BeEquivalentTo(dataSet2, options => options.Excluding(dataSet => dataSet.Prefix)); } +#if NET8_0_OR_GREATER + [Fact(Skip = "SerializationFormat.Binary is not supported on .NET 8+")] +#else [Fact] +#endif public void When_RemotingFormat_does_not_match_and_property_is_not_excluded_it_should_fail() { // Arrange @@ -358,7 +362,11 @@ public void When_RemotingFormat_does_not_match_and_property_is_not_excluded_it_s action.Should().Throw(); } +#if NET8_0_OR_GREATER + [Fact(Skip = "SerializationFormat.Binary is not supported on .NET 8+")] +#else [Fact] +#endif public void When_RemotingFormat_does_not_match_and_property_is_excluded_it_should_succeed() { // Arrange diff --git a/Tests/FluentAssertions.DataSets.Specs/TypedDataTableSpecs.cs b/Tests/FluentAssertions.DataSets.Specs/TypedDataTableSpecs.cs index 27d89eb..10ff853 100644 --- a/Tests/FluentAssertions.DataSets.Specs/TypedDataTableSpecs.cs +++ b/Tests/FluentAssertions.DataSets.Specs/TypedDataTableSpecs.cs @@ -387,7 +387,11 @@ public void When_Prefix_does_not_match_and_property_is_excluded_it_should_succee dataTable1.Should().BeEquivalentTo(dataTable2, options => options.Excluding(dataTable => dataTable.Prefix)); } +#if NET8_0_OR_GREATER + [Fact(Skip = "SerializationFormat.Binary is not supported on .NET 8+")] +#else [Fact] +#endif public void When_RemotingFormat_does_not_match_and_property_is_not_excluded_it_should_fail() { // Arrange @@ -410,7 +414,11 @@ public void When_RemotingFormat_does_not_match_and_property_is_not_excluded_it_s action.Should().Throw(); } +#if NET8_0_OR_GREATER + [Fact(Skip = "SerializationFormat.Binary is not supported on .NET 8+")] +#else [Fact] +#endif public void When_RemotingFormat_does_not_match_and_property_is_excluded_it_should_succeed() { // Arrange