Skip to content

Guid V7 support #872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SteveDunn merged 4 commits into from
Dec 20, 2025
Merged

Guid V7 support #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d115e0
first pass
SteveDunn Dec 19, 2025
0e8e353
Use interpolated string for factory method generation
SteveDunn Dec 20, 2025
9c23e6f
Implementation and update to .net 10
SteveDunn Dec 20, 2025
7b6922d
fix test
SteveDunn Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/Vogen/Util.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -598,4 +605,4 @@ public static string SetStackTraceIfNeeded(VoWorkItem voWorkItem) => voWorkItem.
public static string SetStackTraceToNullIfNeeded(VoWorkItem voWorkItem) => voWorkItem.Config.DisableStackTraceRecordingInDebug
? ""
: "_stackTrace = null;";
}
}
64 changes: 29 additions & 35 deletions tests/ConsumerTests/ConsumerTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</Target>

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -34,15 +34,34 @@
<Message Text="Please run \test.ps1 to build the latest local nuget package that these tests consume" Importance="high" />
</Target>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
<PackageReference Include="MessagePack" Version="2.5.187" />
<PackageReference Include="linq2db" Version="4.4.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="2.1.9" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="ServiceStack.Text" Version="8.2.2" />
<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.198" />
<PackageReference Include="linq2db" Version="5.4.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="2.1.11" />
<PackageReference Include="ServiceStack.Text" Version="10.0.4" />
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="10.0.1" />
<PackageReference Include="MongoDB.Analyzer" Version="1.5.0" />
<PackageReference Include="MongoDB.Bson" Version="2.30.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(UseLocallyBuiltPackage)' != ''">
Expand All @@ -58,31 +77,6 @@
the NuGet dependency rather than a direct project dependency.
Run the tests with `.\test.ps1` in the root folder.-->

<ItemGroup>

<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="MongoDB.Analyzer" Version="1.4.0" />
<PackageReference Include="MongoDB.Bson" Version="2.27.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
Expand Down
12 changes: 6 additions & 6 deletions tests/ConsumerTests/DeserializationValidationTests/IntDeserializationValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down
10 changes: 5 additions & 5 deletions tests/ConsumerTests/DeserializationValidationTests/StringDeserializationValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down
63 changes: 63 additions & 0 deletions ...gePack.SourceGenerator.MessagePackGenerator/MessagePack.GeneratedMessagePackResolver.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// <auto-generated />

#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 {

/// <summary>A MessagePack resolver that uses generated formatters for types in this assembly.</summary>
partial class GeneratedMessagePackResolver : MsgPack::IFormatterResolver
{
/// <summary>An instance of this resolver that only returns formatters specifically generated for types in this assembly.</summary>
public static readonly MsgPack::IFormatterResolver Instance = new GeneratedMessagePackResolver();

private GeneratedMessagePackResolver()
{
}

public MsgPack::Formatters.IMessagePackFormatter<T> GetFormatter<T>()
{
return FormatterCache<T>.Formatter;
}

private static class FormatterCache<T>
{
internal static readonly MsgPack::Formatters.IMessagePackFormatter<T> Formatter;

static FormatterCache()
{
var f = GeneratedMessagePackResolverGetFormatterHelper.GetFormatter(typeof(T));
if (f != null)
{
Formatter = (MsgPack::Formatters.IMessagePackFormatter<T>)f;
}
}
}

private static class GeneratedMessagePackResolverGetFormatterHelper
{
private static readonly global::System.Collections.Generic.Dictionary<global::System.Type, int> closedTypeLookup = new global::System.Collections.Generic.Dictionary<global::System.Type, int>(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;
}
}
}

}
12 changes: 6 additions & 6 deletions .../ConsumerTests/GenericDeserializationValidationTests/IntDeserializationValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down
10 changes: 5 additions & 5 deletions ...nsumerTests/GenericDeserializationValidationTests/StringDeserializationValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down
Loading