From 6c46a2bbb7bf39ea6f3f45dfa14fbed537e640cb Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Thu, 30 Apr 2026 21:46:30 -0700 Subject: [PATCH 1/3] Skip SDK-dependent tests on Helix Add SkipOnHelixConditionAttribute to the ConditionalFact infrastructure in EFCore.Specification.Tests. Use it on Csproj_metadata_can_be_extracted and File_based_app_can_be_built since these tests require a full dotnet SDK which is not available on Helix agents. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Xunit/SkipOnHelixConditionAttribute.cs | 13 +++++++++++++ test/dotnet-ef.Tests/ProjectTest.cs | 7 +++++-- test/dotnet-ef.Tests/dotnet-ef.Tests.csproj | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 test/EFCore.Specification.Tests/TestUtilities/Xunit/SkipOnHelixConditionAttribute.cs diff --git a/test/EFCore.Specification.Tests/TestUtilities/Xunit/SkipOnHelixConditionAttribute.cs b/test/EFCore.Specification.Tests/TestUtilities/Xunit/SkipOnHelixConditionAttribute.cs new file mode 100644 index 00000000000..67303f24598 --- /dev/null +++ b/test/EFCore.Specification.Tests/TestUtilities/Xunit/SkipOnHelixConditionAttribute.cs @@ -0,0 +1,13 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + +[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)] +public sealed class SkipOnHelixConditionAttribute : Attribute, ITestCondition +{ + public ValueTask IsMetAsync() + => new(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is null); + + public string SkipReason { get; set; } = "Test does not run on Helix."; +} diff --git a/test/dotnet-ef.Tests/ProjectTest.cs b/test/dotnet-ef.Tests/ProjectTest.cs index b56ba370172..a2cb8cb86d6 100644 --- a/test/dotnet-ef.Tests/ProjectTest.cs +++ b/test/dotnet-ef.Tests/ProjectTest.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.DotNet.Cli.CommandLine; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; namespace Microsoft.EntityFrameworkCore.Tools; @@ -69,7 +70,8 @@ public void Returns_null_when_nothing_specified() Assert.Null(RootCommand.ResolveOption(primary, alias, configValue: null)); } - [Fact] + [ConditionalFact] + [SkipOnHelixCondition] public void Csproj_metadata_can_be_extracted() { var capturedOutput = WithCapturedOutput(() => @@ -113,7 +115,8 @@ public void Throws_for_missing_project_file() Assert.DoesNotContain(Reporter.ErrorPrefix, capturedOutput); } - [Fact] + [ConditionalFact] + [SkipOnHelixCondition] public void File_based_app_can_be_built() { var capturedOutput = WithCapturedOutput(() => diff --git a/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj b/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj index 40f283d294f..a9bffdcf1db 100644 --- a/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj +++ b/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj @@ -17,6 +17,7 @@ + From 922b688977939786b7869aa3abeee1a1c0fdff48 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Thu, 30 Apr 2026 21:52:19 -0700 Subject: [PATCH 2/3] Skip SDK-dependent tests on Helix with SkipOnHelixCondition Add SkipOnHelixConditionAttribute to the ConditionalFact infrastructure in EFCore.Specification.Tests. Replace all inline HELIX_WORKITEM_ROOT checks across 31 SqlServer type test files and 2 dotnet-ef tests with the new [SkipOnHelixCondition] attribute. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../SqlServerGeographyCollectionTypeTest.cs | 12 +++++------- .../SqlServerGeographyLineStringTypeTest.cs | 12 +++++------- .../SqlServerGeographyMultiLineStringTypeTest.cs | 12 +++++------- .../SqlServerGeographyMultiPointTypeTest.cs | 12 +++++------- .../SqlServerGeographyMultiPolygonTypeTest.cs | 12 +++++------- .../Geography/SqlServerGeographyPointTypeTest.cs | 12 +++++------- .../Geography/SqlServerGeographyPolygonTypeTest.cs | 12 +++++------- .../Geometry/SqlServerGeometryCollectionTypeTest.cs | 12 +++++------- .../Geometry/SqlServerGeometryLineStringTypeTest.cs | 12 +++++------- .../SqlServerGeometryMultiLineStringTypeTest.cs | 12 +++++------- .../Geometry/SqlServerGeometryMultiPointTypeTest.cs | 12 +++++------- .../SqlServerGeometryMultiPolygonTypeTest.cs | 12 +++++------- .../Types/Geometry/SqlServerGeometryPointTypeTest.cs | 12 +++++------- .../Geometry/SqlServerGeometryPolygonTypeTest.cs | 12 +++++------- .../Types/Miscellaneous/SqlServerBoolTypeTest.cs | 12 +++++------- .../Miscellaneous/SqlServerByteArrayTypeTest.cs | 12 +++++------- .../Types/Miscellaneous/SqlServerGuidTypeTest.cs | 12 +++++------- .../Types/Miscellaneous/SqlServerStringTypeTest.cs | 12 +++++------- .../Types/Numeric/SqlServerByteTypeTest.cs | 12 +++++------- .../Types/Numeric/SqlServerDecimalTypeTest.cs | 12 +++++------- .../Types/Numeric/SqlServerDoubleTypeTest.cs | 12 +++++------- .../Types/Numeric/SqlServerFloatTypeTest.cs | 12 +++++------- .../Types/Numeric/SqlServerIntTypeTest.cs | 12 +++++------- .../Types/Numeric/SqlServerLongTypeTest.cs | 12 +++++------- .../Types/Numeric/SqlServerShortTypeTest.cs | 12 +++++------- .../Types/Temporal/SqlServerDateOnlyTypeTest.cs | 12 +++++------- .../Types/Temporal/SqlServerDateTime2TypeTest.cs | 12 +++++------- .../Temporal/SqlServerDateTimeOffsetTypeTest.cs | 12 +++++------- .../Types/Temporal/SqlServerDateTimeTypeTest.cs | 12 +++++------- .../Types/Temporal/SqlServerTimeOnlyTypeTest.cs | 12 +++++------- .../Types/Temporal/SqlServerTimeSpanTypeTest.cs | 12 +++++------- test/dotnet-ef.Tests/ProjectTest.cs | 4 ++-- 32 files changed, 157 insertions(+), 219 deletions(-) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs index bd39833fb36..cce579af9e9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geography; public class SqlServerGeographyCollectionTypeTest(SqlServerGeographyCollectionTypeTest.GeographyCollectionTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs index 84f3a426f03..fcbe809051f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geography; public class SqlServerGeographyLineStringTypeTest( @@ -169,15 +171,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs index e81f7fef5ee..e71e103ace9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geography; public class SqlServerGeographyMultiLineStringTypeTest( @@ -173,15 +175,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs index 18625cd14f2..2efdabe4914 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geography; public class SqlServerGeographyMultiPointTypeTest(SqlServerGeographyMultiPointTypeTest.MultiPointTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs index f07b3326ee7..a3ebfd996ec 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geography; public class SqlServerGeographyMultiPolygonTypeTest( @@ -173,15 +175,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs index 591bd268852..85b24226a9d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geography; public class SqlServerGeographyPointTypeTest(SqlServerGeographyPointTypeTest.PointTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -167,15 +169,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs index e212a734215..1e343287b53 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geography; public class SqlServerGeographyPolygonTypeTest(SqlServerGeographyPolygonTypeTest.PolygonTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -167,15 +169,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs index 8f33d2fd69a..e4d0bd3ab53 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geometry; public class SqlServerGeometryCollectionTypeTest(SqlServerGeometryCollectionTypeTest.GeometryCollectionTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs index aa03597dce2..fef62d90f36 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geometry; public class SqlServerGeometryLineStringTypeTest( @@ -169,15 +171,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs index 1c14e65b325..8ed1ecefc17 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geometry; public class SqlServerGeometryMultiLineStringTypeTest( @@ -173,15 +175,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs index 73ad92f7866..984de934fbe 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geometry; public class SqlServerGeometryMultiPointTypeTest(SqlServerGeometryMultiPointTypeTest.MultiPointTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs index 6d469041f56..b62406ec735 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geometry; public class SqlServerGeometryMultiPolygonTypeTest( @@ -173,15 +175,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs index aca36803649..d17e0b6983a 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geometry; public class SqlServerGeometryPointTypeTest(SqlServerGeometryPointTypeTest.PointTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -167,15 +169,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPolygonTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPolygonTypeTest.cs index 5604bc978a6..31f1d1c3c8e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPolygonTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPolygonTypeTest.cs @@ -1,8 +1,10 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Geometry; public class SqlServerGeometryPolygonTypeTest(SqlServerGeometryPolygonTypeTest.PolygonTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -167,15 +169,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerBoolTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerBoolTypeTest.cs index 526afec5e4f..06853225f64 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerBoolTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerBoolTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Miscellaneous; public class SqlServerBoolTypeTest(SqlServerBoolTypeTest.BoolTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerByteArrayTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerByteArrayTypeTest.cs index a5abf44d4a9..5b617fc49e5 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerByteArrayTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerByteArrayTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Miscellaneous; public class SqlServerByteArrayTypeTest(SqlServerByteArrayTypeTest.ByteArrayTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -167,15 +169,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerGuidTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerGuidTypeTest.cs index 37cd7611ee0..138ed9121c2 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerGuidTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerGuidTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Miscellaneous; public class SqlServerGuidTypeTest(SqlServerGuidTypeTest.GuidTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -177,15 +179,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerStringTypeTest.cs index de7c4ad1a55..9713294fbd6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerStringTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Miscellaneous; public class SqlServerStringTypeTest(SqlServerStringTypeTest.StringTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerByteTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerByteTypeTest.cs index ae2af082c14..902000c16e2 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerByteTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerByteTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Numeric; public class SqlServerByteTypeTest(SqlServerByteTypeTest.ByteTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDecimalTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDecimalTypeTest.cs index 3191fc55837..19668f5baa5 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDecimalTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDecimalTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Numeric; public class SqlServerDecimalTypeTest(SqlServerDecimalTypeTest.DecimalTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDoubleTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDoubleTypeTest.cs index 4d701563294..b6119614b9d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDoubleTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDoubleTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Numeric; public class SqlServerDoubleTypeTest(SqlServerDoubleTypeTest.DoubleTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerFloatTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerFloatTypeTest.cs index 710f12b69a3..d5ef2d62387 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerFloatTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerFloatTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Numeric; public class SqlServerFloatTypeTest(SqlServerFloatTypeTest.FloatTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerIntTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerIntTypeTest.cs index 41f21ca407c..57d64e14f94 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerIntTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerIntTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Numeric; public class SqlServerIntTypeTest(SqlServerIntTypeTest.IntTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerLongTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerLongTypeTest.cs index e14e9de07f1..15f53324855 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerLongTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerLongTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Numeric; public class SqlServerLongTypeTest(SqlServerLongTypeTest.LongTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerShortTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerShortTypeTest.cs index 7c1d778ef74..712f4652248 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerShortTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerShortTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Numeric; public class SqlServerShortTypeTest(SqlServerShortTypeTest.ShortTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateOnlyTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateOnlyTypeTest.cs index 1f4d8c6850f..5cf8963e7a1 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateOnlyTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateOnlyTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Temporal; public class SqlServerDateOnlyTypeTest(SqlServerDateOnlyTypeTest.DateTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTime2TypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTime2TypeTest.cs index 780698d5c05..3eb320d0505 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTime2TypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTime2TypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Temporal; public class SqlServerDateTime2TypeTest(SqlServerDateTime2TypeTest.DateTime2TypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs index 8382454ca32..0cc7f355545 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Temporal; public class SqlServerDateTimeOffsetTypeTest( @@ -191,15 +193,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeTypeTest.cs index d3b4f2707ff..462f3fa8078 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Temporal; public class SqlServerDateTimeTypeTest(SqlServerDateTimeTypeTest.DateTimeTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeOnlyTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeOnlyTypeTest.cs index 3f74e450b67..2ebfa9a2b63 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeOnlyTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeOnlyTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Temporal; public class SqlServerTimeOnlyTypeTest(SqlServerTimeOnlyTypeTest.TimeOnlyTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeSpanTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeSpanTypeTest.cs index cbbf85edc4b..4383beff24b 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeSpanTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeSpanTypeTest.cs @@ -1,6 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; + namespace Microsoft.EntityFrameworkCore.Types.Temporal; public class SqlServerTimeSpanTypeTest(SqlServerTimeSpanTypeTest.TimeSpanTypeFixture fixture, ITestOutputHelper testOutputHelper) @@ -189,15 +191,11 @@ FROM [JsonTypeEntity] AS [j] } } + // TODO: Currently failing on Helix only, see #36746 [SqlServerCondition(SqlServerCondition.SupportsFunctions2022)] + [SkipOnHelixCondition] public override async Task ExecuteUpdate_within_json_to_nonjson_column() { - // TODO: Currently failing on Helix only, see #36746 - if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null) - { - return; - } - await base.ExecuteUpdate_within_json_to_nonjson_column(); if (Fixture.UsingJsonType) diff --git a/test/dotnet-ef.Tests/ProjectTest.cs b/test/dotnet-ef.Tests/ProjectTest.cs index a2cb8cb86d6..c6db3028d90 100644 --- a/test/dotnet-ef.Tests/ProjectTest.cs +++ b/test/dotnet-ef.Tests/ProjectTest.cs @@ -71,7 +71,7 @@ public void Returns_null_when_nothing_specified() } [ConditionalFact] - [SkipOnHelixCondition] + [SkipOnCiCondition] public void Csproj_metadata_can_be_extracted() { var capturedOutput = WithCapturedOutput(() => @@ -116,7 +116,7 @@ public void Throws_for_missing_project_file() } [ConditionalFact] - [SkipOnHelixCondition] + [SkipOnCiCondition] public void File_based_app_can_be_built() { var capturedOutput = WithCapturedOutput(() => From 004f490797f1544d469284fdcec4be593d9c50f0 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Thu, 30 Apr 2026 21:55:02 -0700 Subject: [PATCH 3/3] Rename 'Validate Job Results' to 'Job Results' in pipelines Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- azure-pipelines-internal-tests.yml | 2 +- azure-pipelines-public.yml | 2 +- .../Types/Geography/SqlServerGeographyCollectionTypeTest.cs | 2 +- .../Types/Geography/SqlServerGeographyLineStringTypeTest.cs | 2 +- .../Geography/SqlServerGeographyMultiLineStringTypeTest.cs | 2 +- .../Types/Geography/SqlServerGeographyMultiPointTypeTest.cs | 2 +- .../Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs | 2 +- .../Types/Geography/SqlServerGeographyPointTypeTest.cs | 2 +- .../Types/Geography/SqlServerGeographyPolygonTypeTest.cs | 2 +- .../Types/Geometry/SqlServerGeometryCollectionTypeTest.cs | 2 +- .../Types/Geometry/SqlServerGeometryLineStringTypeTest.cs | 2 +- .../Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs | 2 +- .../Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs | 2 +- .../Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs | 2 +- .../Types/Geometry/SqlServerGeometryPointTypeTest.cs | 2 +- .../Types/Geometry/SqlServerGeometryPolygonTypeTest.cs | 2 +- .../Types/Miscellaneous/SqlServerBoolTypeTest.cs | 2 +- .../Types/Miscellaneous/SqlServerByteArrayTypeTest.cs | 2 +- .../Types/Miscellaneous/SqlServerGuidTypeTest.cs | 2 +- .../Types/Miscellaneous/SqlServerStringTypeTest.cs | 2 +- .../Types/Numeric/SqlServerByteTypeTest.cs | 2 +- .../Types/Numeric/SqlServerDecimalTypeTest.cs | 2 +- .../Types/Numeric/SqlServerDoubleTypeTest.cs | 2 +- .../Types/Numeric/SqlServerFloatTypeTest.cs | 2 +- .../Types/Numeric/SqlServerIntTypeTest.cs | 2 +- .../Types/Numeric/SqlServerLongTypeTest.cs | 2 +- .../Types/Numeric/SqlServerShortTypeTest.cs | 2 +- .../Types/Temporal/SqlServerDateOnlyTypeTest.cs | 2 +- .../Types/Temporal/SqlServerDateTime2TypeTest.cs | 2 +- .../Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs | 2 +- .../Types/Temporal/SqlServerDateTimeTypeTest.cs | 2 +- .../Types/Temporal/SqlServerTimeOnlyTypeTest.cs | 2 +- .../Types/Temporal/SqlServerTimeSpanTypeTest.cs | 2 +- test/dotnet-ef.Tests/dotnet-ef.Tests.csproj | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/azure-pipelines-internal-tests.yml b/azure-pipelines-internal-tests.yml index e394e1b4261..39c0f5e5ab6 100644 --- a/azure-pipelines-internal-tests.yml +++ b/azure-pipelines-internal-tests.yml @@ -623,7 +623,7 @@ extends: condition: always() jobs: - job: Validate_Job_Results - displayName: Validate Job Results + displayName: Job Results pool: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals 1es-windows-2022 diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml index 29d3f5de66f..d27a357d791 100644 --- a/azure-pipelines-public.yml +++ b/azure-pipelines-public.yml @@ -442,7 +442,7 @@ stages: condition: always() jobs: - job: Validate_Job_Results - displayName: Validate Job Results + displayName: Job Results pool: name: $(DncEngPublicBuildPool) demands: ImageOverride -equals 1es-windows-2022-open diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs index cce579af9e9..86cb416e43d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs index fcbe809051f..753ed281d42 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs index e71e103ace9..f9a757de351 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs index 2efdabe4914..25c0fd0a10a 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs index a3ebfd996ec..2ebd05f2e6a 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs index 85b24226a9d..646d5df312d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs index 1e343287b53..45d71d38df2 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs index e4d0bd3ab53..af108e2aa79 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs index fef62d90f36..36cdba3fb28 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs index 8ed1ecefc17..5f3259d891e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs index 984de934fbe..9da4cf18f6c 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs index b62406ec735..2f389371410 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs index d17e0b6983a..d6fb1f6d0e0 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPolygonTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPolygonTypeTest.cs index 31f1d1c3c8e..ed29ee34bd3 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPolygonTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPolygonTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using NetTopologySuite.Geometries; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerBoolTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerBoolTypeTest.cs index 06853225f64..0b1639d0594 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerBoolTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerBoolTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerByteArrayTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerByteArrayTypeTest.cs index 5b617fc49e5..53307784625 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerByteArrayTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerByteArrayTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerGuidTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerGuidTypeTest.cs index 138ed9121c2..ebe283b8ddf 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerGuidTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerGuidTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerStringTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerStringTypeTest.cs index 9713294fbd6..2b6038f2c4c 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerStringTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Miscellaneous/SqlServerStringTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerByteTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerByteTypeTest.cs index 902000c16e2..23f9600ecd1 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerByteTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerByteTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDecimalTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDecimalTypeTest.cs index 19668f5baa5..04bbcece4a4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDecimalTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDecimalTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDoubleTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDoubleTypeTest.cs index b6119614b9d..8258ecabb73 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDoubleTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerDoubleTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerFloatTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerFloatTypeTest.cs index d5ef2d62387..1b833cbd865 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerFloatTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerFloatTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerIntTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerIntTypeTest.cs index 57d64e14f94..835ca7b7648 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerIntTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerIntTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerLongTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerLongTypeTest.cs index 15f53324855..0543c2e989e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerLongTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerLongTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerShortTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerShortTypeTest.cs index 712f4652248..8215d95aa1f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerShortTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Numeric/SqlServerShortTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateOnlyTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateOnlyTypeTest.cs index 5cf8963e7a1..1c5d197e357 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateOnlyTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateOnlyTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTime2TypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTime2TypeTest.cs index 3eb320d0505..abc152d3e93 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTime2TypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTime2TypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs index 0cc7f355545..6a9a6e91d31 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeOffsetTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeTypeTest.cs index 462f3fa8078..3ef69618f5e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerDateTimeTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeOnlyTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeOnlyTypeTest.cs index 2ebfa9a2b63..30cba7a5e77 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeOnlyTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeOnlyTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeSpanTypeTest.cs b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeSpanTypeTest.cs index 4383beff24b..9a33e4a43c8 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeSpanTypeTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Types/Temporal/SqlServerTimeSpanTypeTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; diff --git a/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj b/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj index a9bffdcf1db..0c09e89ce76 100644 --- a/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj +++ b/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj @@ -1,4 +1,4 @@ - + $(DefaultNetCoreTargetFramework)