diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f0650276..76f5f96f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -10,7 +10,7 @@ "rollForward": true }, "nuget-license": { - "version": "4.0.17", + "version": "4.0.18", "commands": [ "nuget-license" ], @@ -59,4 +59,4 @@ "rollForward": true } } -} +} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 1990a67e..f61c25ab 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -42,7 +42,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -66,13 +66,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -128,7 +128,7 @@ - + all diff --git a/samples/Wolfgang.Etl.SqlBulkCopy.ShadowWorkloads/Wolfgang.Etl.SqlBulkCopy.ShadowWorkloads.csproj b/samples/Wolfgang.Etl.SqlBulkCopy.ShadowWorkloads/Wolfgang.Etl.SqlBulkCopy.ShadowWorkloads.csproj index a09d8ca8..c47ea309 100644 --- a/samples/Wolfgang.Etl.SqlBulkCopy.ShadowWorkloads/Wolfgang.Etl.SqlBulkCopy.ShadowWorkloads.csproj +++ b/samples/Wolfgang.Etl.SqlBulkCopy.ShadowWorkloads/Wolfgang.Etl.SqlBulkCopy.ShadowWorkloads.csproj @@ -14,7 +14,7 @@ - + - + diff --git a/src/Wolfgang.Etl.SqlBulkCopy/Wolfgang.Etl.SqlBulkCopy.csproj b/src/Wolfgang.Etl.SqlBulkCopy/Wolfgang.Etl.SqlBulkCopy.csproj index 295da15f..3b85b191 100644 --- a/src/Wolfgang.Etl.SqlBulkCopy/Wolfgang.Etl.SqlBulkCopy.csproj +++ b/src/Wolfgang.Etl.SqlBulkCopy/Wolfgang.Etl.SqlBulkCopy.csproj @@ -47,9 +47,9 @@ - - - + + + diff --git a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Fuzz/Wolfgang.Etl.SqlBulkCopy.Tests.Fuzz.csproj b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Fuzz/Wolfgang.Etl.SqlBulkCopy.Tests.Fuzz.csproj index 6edcb260..99a89150 100644 --- a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Fuzz/Wolfgang.Etl.SqlBulkCopy.Tests.Fuzz.csproj +++ b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Fuzz/Wolfgang.Etl.SqlBulkCopy.Tests.Fuzz.csproj @@ -27,7 +27,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Integration/Wolfgang.Etl.SqlBulkCopy.Tests.Integration.csproj b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Integration/Wolfgang.Etl.SqlBulkCopy.Tests.Integration.csproj index bcef15d9..07654736 100644 --- a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Integration/Wolfgang.Etl.SqlBulkCopy.Tests.Integration.csproj +++ b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Integration/Wolfgang.Etl.SqlBulkCopy.Tests.Integration.csproj @@ -21,7 +21,7 @@ all - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/SqlBulkCopyLoaderOptionsRecordTests.cs b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/SqlBulkCopyLoaderOptionsRecordTests.cs index 3896ec08..47e2970e 100644 --- a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/SqlBulkCopyLoaderOptionsRecordTests.cs +++ b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/SqlBulkCopyLoaderOptionsRecordTests.cs @@ -37,6 +37,15 @@ private static bool IsSqlConnectionConstructible() { return false; } + catch (PlatformNotSupportedException) + { + // Microsoft.Data.SqlClient ships lib/ assets for net462, net8.0, net9.0 and + // netstandard2.0 only. The net5.0-net7.0 legs therefore bind the netstandard2.0 + // asset, whose members throw PlatformNotSupportedException outright rather than + // failing in the SqlPerformanceCounters cctor. Same situation as the catch above - + // no real SqlConnection is available - so it skips for the same reason. + return false; + } } private static SqlConnection NewConnection() diff --git a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/SqlBulkCopyLoaderTests.cs b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/SqlBulkCopyLoaderTests.cs index 272f3059..bcf52432 100644 --- a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/SqlBulkCopyLoaderTests.cs +++ b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/SqlBulkCopyLoaderTests.cs @@ -34,6 +34,15 @@ private static bool IsSqlConnectionConstructible() { return false; } + catch (PlatformNotSupportedException) + { + // Microsoft.Data.SqlClient ships lib/ assets for net462, net8.0, net9.0 and + // netstandard2.0 only. The net5.0-net7.0 legs therefore bind the netstandard2.0 + // asset, whose members throw PlatformNotSupportedException outright rather than + // failing in the SqlPerformanceCounters cctor. Same situation as the catch above - + // no real SqlConnection is available - so it skips for the same reason. + return false; + } } private static void SkipUnlessSqlConnectionConstructible() diff --git a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/Wolfgang.Etl.SqlBulkCopy.Tests.Unit.csproj b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/Wolfgang.Etl.SqlBulkCopy.Tests.Unit.csproj index 94a85086..80cb53c4 100644 --- a/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/Wolfgang.Etl.SqlBulkCopy.Tests.Unit.csproj +++ b/tests/Wolfgang.Etl.SqlBulkCopy.Tests.Unit/Wolfgang.Etl.SqlBulkCopy.Tests.Unit.csproj @@ -33,7 +33,7 @@ Microsoft.Data.SqlClient 6.x is not functional on Linux (SqlPerformanceCounters depends on Windows-only PerformanceCounter), so those tests are scoped to the Windows stages. --> - + diff --git a/tools/GcProfileWorkload/GcProfileWorkload.csproj b/tools/GcProfileWorkload/GcProfileWorkload.csproj index 0ea04d73..e94b16b3 100644 --- a/tools/GcProfileWorkload/GcProfileWorkload.csproj +++ b/tools/GcProfileWorkload/GcProfileWorkload.csproj @@ -16,8 +16,23 @@ - - + + + + +