diff --git a/src/Vogen/Util.cs b/src/Vogen/Util.cs index 77c77ee64bc..2d0dcd9c45f 100644 --- a/src/Vogen/Util.cs +++ b/src/Vogen/Util.cs @@ -303,7 +303,14 @@ public static string GenerateGuidFactoryMethodIfNeeded(VoWorkItem item) { if (item.UnderlyingTypeFullName == "System.Guid" && item.Config.Customizations.HasFlag(Customizations.AddFactoryMethodForGuids)) { - return $"public static {item.VoTypeName} FromNewGuid() => From(global::System.Guid.NewGuid());"; + var g = $""" + public static {item.VoTypeName} FromNewGuid() => From(global::System.Guid.NewGuid()); + #if NET9_0_OR_GREATER + public static {item.VoTypeName} FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); + public static {item.VoTypeName} FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); + #endif + """; + return g; } return string.Empty; @@ -598,4 +605,4 @@ public static string SetStackTraceIfNeeded(VoWorkItem voWorkItem) => voWorkItem. public static string SetStackTraceToNullIfNeeded(VoWorkItem voWorkItem) => voWorkItem.Config.DisableStackTraceRecordingInDebug ? "" : "_stackTrace = null;"; -} \ No newline at end of file +} diff --git a/tests/ConsumerTests/ConsumerTests.csproj b/tests/ConsumerTests/ConsumerTests.csproj index 8f8a730a3a8..d57b78196b5 100644 --- a/tests/ConsumerTests/ConsumerTests.csproj +++ b/tests/ConsumerTests/ConsumerTests.csproj @@ -18,7 +18,7 @@ - net8.0 + net10.0 enable false true @@ -34,15 +34,34 @@ - - - - - - - - - + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + @@ -58,31 +77,6 @@ the NuGet dependency rather than a direct project dependency. Run the tests with `.\test.ps1` in the root folder.--> - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - true Generated diff --git a/tests/ConsumerTests/DeserializationValidationTests/IntDeserializationValidationTests.cs b/tests/ConsumerTests/DeserializationValidationTests/IntDeserializationValidationTests.cs index 7096b740aa0..57a9ae74396 100644 --- a/tests/ConsumerTests/DeserializationValidationTests/IntDeserializationValidationTests.cs +++ b/tests/ConsumerTests/DeserializationValidationTests/IntDeserializationValidationTests.cs @@ -12,7 +12,7 @@ namespace ConsumerTests.DeserializationValidationTests; public class IntDeserializationValidationTests { [Fact] - public async void Deserialization_dapper_should_not_bypass_validation_pass() + public async Task Deserialization_dapper_should_not_bypass_validation_pass() { using var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -23,7 +23,7 @@ public async void Deserialization_dapper_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_dapper_should_not_bypass_validation_fail() + public async Task Deserialization_dapper_should_not_bypass_validation_fail() { using var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -34,7 +34,7 @@ public async void Deserialization_dapper_should_not_bypass_validation_fail() } [Fact] - public async void Deserialization_efcore_should_not_bypass_validation_pass() + public async Task Deserialization_efcore_should_not_bypass_validation_pass() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -51,7 +51,7 @@ public async void Deserialization_efcore_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_efcore_should_not_bypass_validation_fail() + public async Task Deserialization_efcore_should_not_bypass_validation_fail() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -67,7 +67,7 @@ public async void Deserialization_efcore_should_not_bypass_validation_fail() } } [Fact] - public async void Deserialization_linqtodb_should_not_bypass_validation_pass() + public async Task Deserialization_linqtodb_should_not_bypass_validation_pass() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -80,7 +80,7 @@ public async void Deserialization_linqtodb_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_linqtodb_should_not_bypass_validation_fail() + public async Task Deserialization_linqtodb_should_not_bypass_validation_fail() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); diff --git a/tests/ConsumerTests/DeserializationValidationTests/StringDeserializationValidationTests.cs b/tests/ConsumerTests/DeserializationValidationTests/StringDeserializationValidationTests.cs index 6ece377444a..f55e2c0985d 100644 --- a/tests/ConsumerTests/DeserializationValidationTests/StringDeserializationValidationTests.cs +++ b/tests/ConsumerTests/DeserializationValidationTests/StringDeserializationValidationTests.cs @@ -12,7 +12,7 @@ namespace ConsumerTests.DeserializationValidationTests; public class StringDeserializationValidationTests { [Fact] - public async void Deserialization_dapper_should_not_bypass_validation_pass() + public async Task Deserialization_dapper_should_not_bypass_validation_pass() { using var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -45,7 +45,7 @@ public async Task Deserialization_dapper_should_bypass_validation_fail() } [Fact] - public async void Deserialization_efcore_should_not_bypass_validation_pass() + public async Task Deserialization_efcore_should_not_bypass_validation_pass() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -62,7 +62,7 @@ public async void Deserialization_efcore_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_efcore_should_not_bypass_validation_fail() + public async Task Deserialization_efcore_should_not_bypass_validation_fail() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -78,7 +78,7 @@ public async void Deserialization_efcore_should_not_bypass_validation_fail() } } [Fact] - public async void Deserialization_linqtodb_should_not_bypass_validation_pass() + public async Task Deserialization_linqtodb_should_not_bypass_validation_pass() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -91,7 +91,7 @@ public async void Deserialization_linqtodb_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_linqtodb_should_not_bypass_validation_fail() + public async Task Deserialization_linqtodb_should_not_bypass_validation_fail() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); diff --git a/tests/ConsumerTests/Generated/MessagePack.SourceGenerator/MessagePack.SourceGenerator.MessagePackGenerator/MessagePack.GeneratedMessagePackResolver.g.cs b/tests/ConsumerTests/Generated/MessagePack.SourceGenerator/MessagePack.SourceGenerator.MessagePackGenerator/MessagePack.GeneratedMessagePackResolver.g.cs new file mode 100644 index 00000000000..72bedb6409a --- /dev/null +++ b/tests/ConsumerTests/Generated/MessagePack.SourceGenerator/MessagePack.SourceGenerator.MessagePackGenerator/MessagePack.GeneratedMessagePackResolver.g.cs @@ -0,0 +1,63 @@ +// + +#pragma warning disable 618, 612, 414, 168, CS1591, SA1129, SA1309, SA1312, SA1403, SA1649 + +using MsgPack = global::MessagePack; + +[assembly: MsgPack::Internal.GeneratedAssemblyMessagePackResolverAttribute(typeof(MessagePack.GeneratedMessagePackResolver), 3, 1)] + +namespace MessagePack { + +/// A MessagePack resolver that uses generated formatters for types in this assembly. +partial class GeneratedMessagePackResolver : MsgPack::IFormatterResolver +{ + /// An instance of this resolver that only returns formatters specifically generated for types in this assembly. + public static readonly MsgPack::IFormatterResolver Instance = new GeneratedMessagePackResolver(); + + private GeneratedMessagePackResolver() + { + } + + public MsgPack::Formatters.IMessagePackFormatter GetFormatter() + { + return FormatterCache.Formatter; + } + + private static class FormatterCache + { + internal static readonly MsgPack::Formatters.IMessagePackFormatter Formatter; + + static FormatterCache() + { + var f = GeneratedMessagePackResolverGetFormatterHelper.GetFormatter(typeof(T)); + if (f != null) + { + Formatter = (MsgPack::Formatters.IMessagePackFormatter)f; + } + } + } + + private static class GeneratedMessagePackResolverGetFormatterHelper + { + private static readonly global::System.Collections.Generic.Dictionary closedTypeLookup = new global::System.Collections.Generic.Dictionary(1) + { + { typeof(global::MediumTests.SerializationAndConversionTests.ComplexSerializationTests_ServiceStackDotText.ComplexMessagePack), 0 }, + }; + + internal static object GetFormatter(global::System.Type t) + { + if (closedTypeLookup.TryGetValue(t, out int closedKey)) + { + switch (closedKey) + { + case 0: return new global::MessagePack.GeneratedMessagePackResolver.MediumTests.SerializationAndConversionTests.ComplexSerializationTests_ServiceStackDotText.ComplexMessagePackFormatter(); + default: return null; // unreachable + }; + } + + return null; + } + } +} + +} diff --git a/tests/ConsumerTests/GenericDeserializationValidationTests/IntDeserializationValidationTests.cs b/tests/ConsumerTests/GenericDeserializationValidationTests/IntDeserializationValidationTests.cs index bb8277be265..5e6839a20e9 100644 --- a/tests/ConsumerTests/GenericDeserializationValidationTests/IntDeserializationValidationTests.cs +++ b/tests/ConsumerTests/GenericDeserializationValidationTests/IntDeserializationValidationTests.cs @@ -12,7 +12,7 @@ namespace ConsumerTests.GenericDeserializationValidationTests; public class IntDeserializationValidationTests { [Fact] - public async void Deserialization_dapper_should_not_bypass_validation_pass() + public async Task Deserialization_dapper_should_not_bypass_validation_pass() { using var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -23,7 +23,7 @@ public async void Deserialization_dapper_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_dapper_should_not_bypass_validation_fail() + public async Task Deserialization_dapper_should_not_bypass_validation_fail() { using var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -34,7 +34,7 @@ public async void Deserialization_dapper_should_not_bypass_validation_fail() } [Fact] - public async void Deserialization_efcore_should_not_bypass_validation_pass() + public async Task Deserialization_efcore_should_not_bypass_validation_pass() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -51,7 +51,7 @@ public async void Deserialization_efcore_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_efcore_should_not_bypass_validation_fail() + public async Task Deserialization_efcore_should_not_bypass_validation_fail() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -67,7 +67,7 @@ public async void Deserialization_efcore_should_not_bypass_validation_fail() } } [Fact] - public async void Deserialization_linqtodb_should_not_bypass_validation_pass() + public async Task Deserialization_linqtodb_should_not_bypass_validation_pass() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -80,7 +80,7 @@ public async void Deserialization_linqtodb_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_linqtodb_should_not_bypass_validation_fail() + public async Task Deserialization_linqtodb_should_not_bypass_validation_fail() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); diff --git a/tests/ConsumerTests/GenericDeserializationValidationTests/StringDeserializationValidationTests.cs b/tests/ConsumerTests/GenericDeserializationValidationTests/StringDeserializationValidationTests.cs index 5bbfb00da6a..9820f24ab65 100644 --- a/tests/ConsumerTests/GenericDeserializationValidationTests/StringDeserializationValidationTests.cs +++ b/tests/ConsumerTests/GenericDeserializationValidationTests/StringDeserializationValidationTests.cs @@ -12,7 +12,7 @@ namespace ConsumerTests.GenericDeserializationValidationTests; public class StringDeserializationValidationTests { [Fact] - public async void Deserialization_dapper_should_not_bypass_validation_pass() + public async Task Deserialization_dapper_should_not_bypass_validation_pass() { using var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -45,7 +45,7 @@ public async Task Deserialization_dapper_should_bypass_validation_fail() } [Fact] - public async void Deserialization_efcore_should_not_bypass_validation_pass() + public async Task Deserialization_efcore_should_not_bypass_validation_pass() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -62,7 +62,7 @@ public async void Deserialization_efcore_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_efcore_should_not_bypass_validation_fail() + public async Task Deserialization_efcore_should_not_bypass_validation_fail() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -78,7 +78,7 @@ public async void Deserialization_efcore_should_not_bypass_validation_fail() } } [Fact] - public async void Deserialization_linqtodb_should_not_bypass_validation_pass() + public async Task Deserialization_linqtodb_should_not_bypass_validation_pass() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); @@ -91,7 +91,7 @@ public async void Deserialization_linqtodb_should_not_bypass_validation_pass() } [Fact] - public async void Deserialization_linqtodb_should_not_bypass_validation_fail() + public async Task Deserialization_linqtodb_should_not_bypass_validation_fail() { var connection = new SqliteConnection("DataSource=:memory:"); await connection.OpenAsync(); diff --git a/tests/ConsumerTests/VoAsDictionaryKeyTests/Guid.cs b/tests/ConsumerTests/VoAsDictionaryKeyTests/Guid.cs index 823cc817491..b648155a922 100644 --- a/tests/ConsumerTests/VoAsDictionaryKeyTests/Guid.cs +++ b/tests/ConsumerTests/VoAsDictionaryKeyTests/Guid.cs @@ -1,10 +1,12 @@ #nullable disable using System.Text.Json; +using System.Threading.Tasks; +using FluentAssertions.Extensions; namespace ConsumerTests.VoAsDictionaryKeyTests; -[ValueObject(typeof(Guid))] +[ValueObject(typeof(Guid), customizations: Customizations.AddFactoryMethodForGuids)] public partial class EmployeeTypeGuid { public static readonly EmployeeTypeGuid Manager = EmployeeTypeGuid.From(Guid.Parse("00000000-0000-0000-0000-000000000001")); @@ -13,6 +15,42 @@ public partial class EmployeeTypeGuid public class GuidTests { + [Fact] + public async Task Factory_for_V7_is_supported() + { + var g1 = EmployeeTypeGuid.FromNewVersion7Guid(); + await Task.Delay(100); + var g2 = EmployeeTypeGuid.FromNewVersion7Guid(); + await Task.Delay(100); + var g3 = EmployeeTypeGuid.FromNewVersion7Guid(); + + g1.Should().BeLessThan(g2); + g2.Should().BeLessThan(g3); + } + + [Fact] + public void Factory_for_V7_with_explicit_time_is_supported() + { + var latest = new DateTimeOffset(2025, 12, 20, 10, 05, 06, TimeSpan.Zero); + var g1 = EmployeeTypeGuid.FromNewVersion7Guid(latest); + var g2 = EmployeeTypeGuid.FromNewVersion7Guid(latest - 1.Seconds()); + var g3 = EmployeeTypeGuid.FromNewVersion7Guid(latest - 2.Seconds()); + + g2.Should().BeLessThan(g1); + g3.Should().BeLessThan(g2); + } + + [Fact] + public void Factory_for_standard_guid_is_supported() + { + var g1 = EmployeeTypeGuid.FromNewGuid(); + var g2 = EmployeeTypeGuid.FromNewGuid(); + var g3 = EmployeeTypeGuid.FromNewGuid(); + + g1.ToString().Should().NotBe(g2.ToString()); + g2.ToString().Should().NotBe(g3.ToString()); + } + [Fact] public void int_can_serialize_value_object_as_key_of_dictionary() { diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/0Rjlo8wVsY.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/0Rjlo8wVsY.verified.txt index c9d9927206f..63bc896f317 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/0Rjlo8wVsY.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/0Rjlo8wVsY.verified.txt @@ -179,6 +179,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif // only called internally when something has been deserialized into // its primitive type. private static MyVo __Deserialize(global::System.Guid value) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/LZDZ0jdOF6.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/LZDZ0jdOF6.verified.txt index a94225d4a8a..39271e4b6f0 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/LZDZ0jdOF6.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/LZDZ0jdOF6.verified.txt @@ -221,6 +221,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif public int CompareTo(MyVo other) { if (other is null) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/jXZ79bcjc9.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/jXZ79bcjc9.verified.txt index fa3f0b38adf..296892b2edb 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/jXZ79bcjc9.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/jXZ79bcjc9.verified.txt @@ -222,6 +222,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif public int CompareTo(MyVo other) { if (other is null) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/r69L6MTLWN.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/r69L6MTLWN.verified.txt index 4f5e62bbbe5..8bc8a64ab9c 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/r69L6MTLWN.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v4.8/r69L6MTLWN.verified.txt @@ -181,6 +181,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif // only called internally when something has been deserialized into // its primitive type. private static MyVo __Deserialize(global::System.Guid value) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/0Rjlo8wVsY.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/0Rjlo8wVsY.verified.txt index 56843043e65..e9eca040b2e 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/0Rjlo8wVsY.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/0Rjlo8wVsY.verified.txt @@ -179,6 +179,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif // only called internally when something has been deserialized into // its primitive type. private static MyVo __Deserialize(global::System.Guid value) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/LZDZ0jdOF6.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/LZDZ0jdOF6.verified.txt index 7e8e5cd694f..41147d962b3 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/LZDZ0jdOF6.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/LZDZ0jdOF6.verified.txt @@ -221,6 +221,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif public int CompareTo(MyVo other) { if (other is null) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/jXZ79bcjc9.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/jXZ79bcjc9.verified.txt index eabac3bab3f..96239c99ed4 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/jXZ79bcjc9.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/jXZ79bcjc9.verified.txt @@ -222,6 +222,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif public int CompareTo(MyVo other) { if (other is null) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/r69L6MTLWN.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/r69L6MTLWN.verified.txt index 2a269d907ee..c060523df00 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/r69L6MTLWN.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v8.0/r69L6MTLWN.verified.txt @@ -181,6 +181,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif // only called internally when something has been deserialized into // its primitive type. private static MyVo __Deserialize(global::System.Guid value) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/0Rjlo8wVsY.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/0Rjlo8wVsY.verified.txt index 5ea9450b609..56a711e6d49 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/0Rjlo8wVsY.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/0Rjlo8wVsY.verified.txt @@ -233,6 +233,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif // only called internally when something has been deserialized into // its primitive type. private static MyVo __Deserialize(global::System.Guid value) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/LZDZ0jdOF6.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/LZDZ0jdOF6.verified.txt index 519cdc51a2b..c983a9e8b4c 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/LZDZ0jdOF6.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/LZDZ0jdOF6.verified.txt @@ -268,6 +268,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif public int CompareTo(MyVo other) { if (other is null) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/jXZ79bcjc9.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/jXZ79bcjc9.verified.txt index 0a091fc7a8f..cc54cbc0948 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/jXZ79bcjc9.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/jXZ79bcjc9.verified.txt @@ -269,6 +269,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif public int CompareTo(MyVo other) { if (other is null) diff --git a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/r69L6MTLWN.verified.txt b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/r69L6MTLWN.verified.txt index dfd6f0a5726..fb3529e1d67 100644 --- a/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/r69L6MTLWN.verified.txt +++ b/tests/SnapshotTests/GeneralStuff/snapshots/snap-v9.0/r69L6MTLWN.verified.txt @@ -235,6 +235,10 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!; public static explicit operator MyVo(global::System.Guid value) => From(value); public static explicit operator global::System.Guid(MyVo value) => value.Value; public static MyVo FromNewGuid() => From(global::System.Guid.NewGuid()); +#if NET9_0_OR_GREATER +public static MyVo FromNewVersion7Guid() => From(global::System.Guid.CreateVersion7()); +public static MyVo FromNewVersion7Guid(global::System.DateTimeOffset d) => From(global::System.Guid.CreateVersion7(d)); +#endif // only called internally when something has been deserialized into // its primitive type. private static MyVo __Deserialize(global::System.Guid value)