From 1329dd7e470cdfd98a5d58c23d973c9c11d5e39e Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Mon, 14 Jul 2025 10:48:52 +1200 Subject: [PATCH 1/3] chore: Tidy up the source generator in tests and samples #skip-changelog --- samples/Directory.Build.props | 7 + .../Sentry.Samples.Android.csproj | 3 - .../Sentry.Samples.Ios.csproj | 3 - .../Sentry.Samples.MacCatalyst.csproj | 3 - .../CompilerServices/BuildProperties.cs | 2 +- ...torTests.RunResult_BadStrings.verified.txt | 389 +----------------- ...orTests.RunResult_Expect_None.verified.txt | 5 - ...sts.RunResult_Publish_AotTrue.verified.txt | 389 +----------------- ...eratorTests.RunResult_Success.verified.txt | 389 +----------------- .../BuildPropertySourceGeneratorTests.cs | 25 +- 10 files changed, 24 insertions(+), 1191 deletions(-) delete mode 100644 test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Expect_None.verified.txt diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index 828eba441b..9016a4f1b1 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -10,4 +10,11 @@ false + + + + + diff --git a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj index fdce591643..ace5748bae 100644 --- a/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj +++ b/samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj @@ -12,9 +12,6 @@ - diff --git a/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj b/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj index c3eaafab7c..e1cd4e8127 100644 --- a/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj +++ b/samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj @@ -44,9 +44,6 @@ - diff --git a/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj b/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj index 50b58f7aed..deacfb2b37 100644 --- a/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj +++ b/samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj @@ -44,9 +44,6 @@ - diff --git a/src/Sentry/CompilerServices/BuildProperties.cs b/src/Sentry/CompilerServices/BuildProperties.cs index d4cd7db07e..eaa370bc15 100644 --- a/src/Sentry/CompilerServices/BuildProperties.cs +++ b/src/Sentry/CompilerServices/BuildProperties.cs @@ -10,7 +10,7 @@ public static class BuildProperties /// /// The Build Variables generated from you csproj file and initialized by the Sentry Source Generated Module Initializer /// - public static IReadOnlyDictionary? Values { get; private set; } + internal static IReadOnlyDictionary? Values { get; set; } /// /// This is called by a Sentry Source-Generator module initializers to help us determine things like diff --git a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_BadStrings.verified.txt b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_BadStrings.verified.txt index de008ecfea..39d3e99d01 100644 --- a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_BadStrings.verified.txt +++ b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_BadStrings.verified.txt @@ -1,23 +1,4 @@ -{ - Generator: {}, - GeneratedSources: [ - { - SyntaxTree: { - FilePath: Sentry.SourceGenerators/Sentry.SourceGenerators.BuildPropertySourceGenerator/Sentry.Generated.BuildPropertyInitializer.g.cs, - Encoding: utf-8, - Length: 835, - HasCompilationUnitRoot: true, - Options: { - LanguageVersion: CSharp12, - Language: C#, - DocumentationMode: Parse, - Errors: null - } - }, - SourceText: { - Encoding: utf-8, - Source: -// +// // This code was generated by Sentry.SourceGenerators. // Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. // @@ -42,371 +23,3 @@ namespace Sentry.Generated } } #endif -, - Length: 835, - ChecksumAlgorithm: Sha1, - CanBeEmbedded: true, - Container: {}, - Lines: [ - { - End: 19, - EndIncludingLineBreak: 20, - Span: { - Length: 19 - }, - SpanIncludingLineBreak: { - Length: 20 - } - }, - { - LineNumber: 1, - Start: 20, - End: 74, - EndIncludingLineBreak: 75, - Span: { - Start: 20, - Length: 54 - }, - SpanIncludingLineBreak: { - Start: 20, - Length: 55 - } - }, - { - LineNumber: 2, - Start: 75, - End: 172, - EndIncludingLineBreak: 173, - Span: { - Start: 75, - Length: 97 - }, - SpanIncludingLineBreak: { - Start: 75, - Length: 98 - } - }, - { - LineNumber: 3, - Start: 173, - End: 193, - EndIncludingLineBreak: 194, - Span: { - Start: 173, - Length: 20 - }, - SpanIncludingLineBreak: { - Start: 173, - Length: 21 - } - }, - { - LineNumber: 4, - Start: 194, - End: 194, - EndIncludingLineBreak: 195, - Span: { - Start: 194 - }, - SpanIncludingLineBreak: { - Start: 194, - Length: 1 - } - }, - { - LineNumber: 5, - Start: 195, - End: 216, - EndIncludingLineBreak: 217, - Span: { - Start: 195, - Length: 21 - }, - SpanIncludingLineBreak: { - Start: 195, - Length: 22 - } - }, - { - LineNumber: 6, - Start: 217, - End: 217, - EndIncludingLineBreak: 218, - Span: { - Start: 217 - }, - SpanIncludingLineBreak: { - Start: 217, - Length: 1 - } - }, - { - LineNumber: 7, - Start: 218, - End: 234, - EndIncludingLineBreak: 235, - Span: { - Start: 218, - Length: 16 - }, - SpanIncludingLineBreak: { - Start: 218, - Length: 17 - } - }, - { - LineNumber: 8, - Start: 235, - End: 235, - EndIncludingLineBreak: 236, - Span: { - Start: 235 - }, - SpanIncludingLineBreak: { - Start: 235, - Length: 1 - } - }, - { - LineNumber: 9, - Start: 236, - End: 262, - EndIncludingLineBreak: 263, - Span: { - Start: 236, - Length: 26 - }, - SpanIncludingLineBreak: { - Start: 236, - Length: 27 - } - }, - { - LineNumber: 10, - Start: 263, - End: 264, - EndIncludingLineBreak: 265, - Span: { - Start: 263, - Length: 1 - }, - SpanIncludingLineBreak: { - Start: 263, - Length: 2 - } - }, - { - LineNumber: 11, - Start: 265, - End: 364, - EndIncludingLineBreak: 365, - Span: { - Start: 265, - Length: 99 - }, - SpanIncludingLineBreak: { - Start: 265, - Length: 100 - } - }, - { - LineNumber: 12, - Start: 365, - End: 415, - EndIncludingLineBreak: 416, - Span: { - Start: 365, - Length: 50 - }, - SpanIncludingLineBreak: { - Start: 365, - Length: 51 - } - }, - { - LineNumber: 13, - Start: 416, - End: 421, - EndIncludingLineBreak: 422, - Span: { - Start: 416, - Length: 5 - }, - SpanIncludingLineBreak: { - Start: 416, - Length: 6 - } - }, - { - LineNumber: 14, - Start: 422, - End: 498, - EndIncludingLineBreak: 499, - Span: { - Start: 422, - Length: 76 - }, - SpanIncludingLineBreak: { - Start: 422, - Length: 77 - } - }, - { - LineNumber: 15, - Start: 499, - End: 540, - EndIncludingLineBreak: 541, - Span: { - Start: 499, - Length: 41 - }, - SpanIncludingLineBreak: { - Start: 499, - Length: 42 - } - }, - { - LineNumber: 16, - Start: 541, - End: 550, - EndIncludingLineBreak: 551, - Span: { - Start: 541, - Length: 9 - }, - SpanIncludingLineBreak: { - Start: 541, - Length: 10 - } - }, - { - LineNumber: 17, - Start: 551, - End: 736, - EndIncludingLineBreak: 737, - Span: { - Start: 551, - Length: 185 - }, - SpanIncludingLineBreak: { - Start: 551, - Length: 186 - } - }, - { - LineNumber: 18, - Start: 737, - End: 750, - EndIncludingLineBreak: 751, - Span: { - Start: 737, - Length: 13 - }, - SpanIncludingLineBreak: { - Start: 737, - Length: 14 - } - }, - { - LineNumber: 19, - Start: 751, - End: 793, - EndIncludingLineBreak: 794, - Span: { - Start: 751, - Length: 42 - }, - SpanIncludingLineBreak: { - Start: 751, - Length: 43 - } - }, - { - LineNumber: 20, - Start: 794, - End: 809, - EndIncludingLineBreak: 810, - Span: { - Start: 794, - Length: 15 - }, - SpanIncludingLineBreak: { - Start: 794, - Length: 16 - } - }, - { - LineNumber: 21, - Start: 810, - End: 819, - EndIncludingLineBreak: 820, - Span: { - Start: 810, - Length: 9 - }, - SpanIncludingLineBreak: { - Start: 810, - Length: 10 - } - }, - { - LineNumber: 22, - Start: 820, - End: 825, - EndIncludingLineBreak: 826, - Span: { - Start: 820, - Length: 5 - }, - SpanIncludingLineBreak: { - Start: 820, - Length: 6 - } - }, - { - LineNumber: 23, - Start: 826, - End: 827, - EndIncludingLineBreak: 828, - Span: { - Start: 826, - Length: 1 - }, - SpanIncludingLineBreak: { - Start: 826, - Length: 2 - } - }, - { - LineNumber: 24, - Start: 828, - End: 834, - EndIncludingLineBreak: 835, - Span: { - Start: 828, - Length: 6 - }, - SpanIncludingLineBreak: { - Start: 828, - Length: 7 - } - }, - { - LineNumber: 25, - Start: 835, - End: 835, - EndIncludingLineBreak: 835, - Span: { - Start: 835 - }, - SpanIncludingLineBreak: { - Start: 835 - } - } - ] - }, - HintName: Sentry.Generated.BuildPropertyInitializer.g.cs - } - ], - Diagnostics: null -} \ No newline at end of file diff --git a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Expect_None.verified.txt b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Expect_None.verified.txt deleted file mode 100644 index f2b746dde0..0000000000 --- a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Expect_None.verified.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - Generator: {}, - GeneratedSources: null, - Diagnostics: null -} \ No newline at end of file diff --git a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Publish_AotTrue.verified.txt b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Publish_AotTrue.verified.txt index 1fc38316d4..3e1a639b1c 100644 --- a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Publish_AotTrue.verified.txt +++ b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Publish_AotTrue.verified.txt @@ -1,23 +1,4 @@ -{ - Generator: {}, - GeneratedSources: [ - { - SyntaxTree: { - FilePath: Sentry.SourceGenerators/Sentry.SourceGenerators.BuildPropertySourceGenerator/Sentry.Generated.BuildPropertyInitializer.g.cs, - Encoding: utf-8, - Length: 832, - HasCompilationUnitRoot: true, - Options: { - LanguageVersion: CSharp12, - Language: C#, - DocumentationMode: Parse, - Errors: null - } - }, - SourceText: { - Encoding: utf-8, - Source: -// +// // This code was generated by Sentry.SourceGenerators. // Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. // @@ -42,371 +23,3 @@ namespace Sentry.Generated } } #endif -, - Length: 832, - ChecksumAlgorithm: Sha1, - CanBeEmbedded: true, - Container: {}, - Lines: [ - { - End: 19, - EndIncludingLineBreak: 20, - Span: { - Length: 19 - }, - SpanIncludingLineBreak: { - Length: 20 - } - }, - { - LineNumber: 1, - Start: 20, - End: 74, - EndIncludingLineBreak: 75, - Span: { - Start: 20, - Length: 54 - }, - SpanIncludingLineBreak: { - Start: 20, - Length: 55 - } - }, - { - LineNumber: 2, - Start: 75, - End: 172, - EndIncludingLineBreak: 173, - Span: { - Start: 75, - Length: 97 - }, - SpanIncludingLineBreak: { - Start: 75, - Length: 98 - } - }, - { - LineNumber: 3, - Start: 173, - End: 193, - EndIncludingLineBreak: 194, - Span: { - Start: 173, - Length: 20 - }, - SpanIncludingLineBreak: { - Start: 173, - Length: 21 - } - }, - { - LineNumber: 4, - Start: 194, - End: 194, - EndIncludingLineBreak: 195, - Span: { - Start: 194 - }, - SpanIncludingLineBreak: { - Start: 194, - Length: 1 - } - }, - { - LineNumber: 5, - Start: 195, - End: 216, - EndIncludingLineBreak: 217, - Span: { - Start: 195, - Length: 21 - }, - SpanIncludingLineBreak: { - Start: 195, - Length: 22 - } - }, - { - LineNumber: 6, - Start: 217, - End: 217, - EndIncludingLineBreak: 218, - Span: { - Start: 217 - }, - SpanIncludingLineBreak: { - Start: 217, - Length: 1 - } - }, - { - LineNumber: 7, - Start: 218, - End: 234, - EndIncludingLineBreak: 235, - Span: { - Start: 218, - Length: 16 - }, - SpanIncludingLineBreak: { - Start: 218, - Length: 17 - } - }, - { - LineNumber: 8, - Start: 235, - End: 235, - EndIncludingLineBreak: 236, - Span: { - Start: 235 - }, - SpanIncludingLineBreak: { - Start: 235, - Length: 1 - } - }, - { - LineNumber: 9, - Start: 236, - End: 262, - EndIncludingLineBreak: 263, - Span: { - Start: 236, - Length: 26 - }, - SpanIncludingLineBreak: { - Start: 236, - Length: 27 - } - }, - { - LineNumber: 10, - Start: 263, - End: 264, - EndIncludingLineBreak: 265, - Span: { - Start: 263, - Length: 1 - }, - SpanIncludingLineBreak: { - Start: 263, - Length: 2 - } - }, - { - LineNumber: 11, - Start: 265, - End: 364, - EndIncludingLineBreak: 365, - Span: { - Start: 265, - Length: 99 - }, - SpanIncludingLineBreak: { - Start: 265, - Length: 100 - } - }, - { - LineNumber: 12, - Start: 365, - End: 415, - EndIncludingLineBreak: 416, - Span: { - Start: 365, - Length: 50 - }, - SpanIncludingLineBreak: { - Start: 365, - Length: 51 - } - }, - { - LineNumber: 13, - Start: 416, - End: 421, - EndIncludingLineBreak: 422, - Span: { - Start: 416, - Length: 5 - }, - SpanIncludingLineBreak: { - Start: 416, - Length: 6 - } - }, - { - LineNumber: 14, - Start: 422, - End: 498, - EndIncludingLineBreak: 499, - Span: { - Start: 422, - Length: 76 - }, - SpanIncludingLineBreak: { - Start: 422, - Length: 77 - } - }, - { - LineNumber: 15, - Start: 499, - End: 540, - EndIncludingLineBreak: 541, - Span: { - Start: 499, - Length: 41 - }, - SpanIncludingLineBreak: { - Start: 499, - Length: 42 - } - }, - { - LineNumber: 16, - Start: 541, - End: 550, - EndIncludingLineBreak: 551, - Span: { - Start: 541, - Length: 9 - }, - SpanIncludingLineBreak: { - Start: 541, - Length: 10 - } - }, - { - LineNumber: 17, - Start: 551, - End: 736, - EndIncludingLineBreak: 737, - Span: { - Start: 551, - Length: 185 - }, - SpanIncludingLineBreak: { - Start: 551, - Length: 186 - } - }, - { - LineNumber: 18, - Start: 737, - End: 750, - EndIncludingLineBreak: 751, - Span: { - Start: 737, - Length: 13 - }, - SpanIncludingLineBreak: { - Start: 737, - Length: 14 - } - }, - { - LineNumber: 19, - Start: 751, - End: 790, - EndIncludingLineBreak: 791, - Span: { - Start: 751, - Length: 39 - }, - SpanIncludingLineBreak: { - Start: 751, - Length: 40 - } - }, - { - LineNumber: 20, - Start: 791, - End: 806, - EndIncludingLineBreak: 807, - Span: { - Start: 791, - Length: 15 - }, - SpanIncludingLineBreak: { - Start: 791, - Length: 16 - } - }, - { - LineNumber: 21, - Start: 807, - End: 816, - EndIncludingLineBreak: 817, - Span: { - Start: 807, - Length: 9 - }, - SpanIncludingLineBreak: { - Start: 807, - Length: 10 - } - }, - { - LineNumber: 22, - Start: 817, - End: 822, - EndIncludingLineBreak: 823, - Span: { - Start: 817, - Length: 5 - }, - SpanIncludingLineBreak: { - Start: 817, - Length: 6 - } - }, - { - LineNumber: 23, - Start: 823, - End: 824, - EndIncludingLineBreak: 825, - Span: { - Start: 823, - Length: 1 - }, - SpanIncludingLineBreak: { - Start: 823, - Length: 2 - } - }, - { - LineNumber: 24, - Start: 825, - End: 831, - EndIncludingLineBreak: 832, - Span: { - Start: 825, - Length: 6 - }, - SpanIncludingLineBreak: { - Start: 825, - Length: 7 - } - }, - { - LineNumber: 25, - Start: 832, - End: 832, - EndIncludingLineBreak: 832, - Span: { - Start: 832 - }, - SpanIncludingLineBreak: { - Start: 832 - } - } - ] - }, - HintName: Sentry.Generated.BuildPropertyInitializer.g.cs - } - ], - Diagnostics: null -} \ No newline at end of file diff --git a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Success.verified.txt b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Success.verified.txt index d94a9ca576..57d19e53c9 100644 --- a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Success.verified.txt +++ b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.RunResult_Success.verified.txt @@ -1,23 +1,4 @@ -{ - Generator: {}, - GeneratedSources: [ - { - SyntaxTree: { - FilePath: Sentry.SourceGenerators/Sentry.SourceGenerators.BuildPropertySourceGenerator/Sentry.Generated.BuildPropertyInitializer.g.cs, - Encoding: utf-8, - Length: 833, - HasCompilationUnitRoot: true, - Options: { - LanguageVersion: CSharp12, - Language: C#, - DocumentationMode: Parse, - Errors: null - } - }, - SourceText: { - Encoding: utf-8, - Source: -// +// // This code was generated by Sentry.SourceGenerators. // Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. // @@ -42,371 +23,3 @@ namespace Sentry.Generated } } #endif -, - Length: 833, - ChecksumAlgorithm: Sha1, - CanBeEmbedded: true, - Container: {}, - Lines: [ - { - End: 19, - EndIncludingLineBreak: 20, - Span: { - Length: 19 - }, - SpanIncludingLineBreak: { - Length: 20 - } - }, - { - LineNumber: 1, - Start: 20, - End: 74, - EndIncludingLineBreak: 75, - Span: { - Start: 20, - Length: 54 - }, - SpanIncludingLineBreak: { - Start: 20, - Length: 55 - } - }, - { - LineNumber: 2, - Start: 75, - End: 172, - EndIncludingLineBreak: 173, - Span: { - Start: 75, - Length: 97 - }, - SpanIncludingLineBreak: { - Start: 75, - Length: 98 - } - }, - { - LineNumber: 3, - Start: 173, - End: 193, - EndIncludingLineBreak: 194, - Span: { - Start: 173, - Length: 20 - }, - SpanIncludingLineBreak: { - Start: 173, - Length: 21 - } - }, - { - LineNumber: 4, - Start: 194, - End: 194, - EndIncludingLineBreak: 195, - Span: { - Start: 194 - }, - SpanIncludingLineBreak: { - Start: 194, - Length: 1 - } - }, - { - LineNumber: 5, - Start: 195, - End: 216, - EndIncludingLineBreak: 217, - Span: { - Start: 195, - Length: 21 - }, - SpanIncludingLineBreak: { - Start: 195, - Length: 22 - } - }, - { - LineNumber: 6, - Start: 217, - End: 217, - EndIncludingLineBreak: 218, - Span: { - Start: 217 - }, - SpanIncludingLineBreak: { - Start: 217, - Length: 1 - } - }, - { - LineNumber: 7, - Start: 218, - End: 234, - EndIncludingLineBreak: 235, - Span: { - Start: 218, - Length: 16 - }, - SpanIncludingLineBreak: { - Start: 218, - Length: 17 - } - }, - { - LineNumber: 8, - Start: 235, - End: 235, - EndIncludingLineBreak: 236, - Span: { - Start: 235 - }, - SpanIncludingLineBreak: { - Start: 235, - Length: 1 - } - }, - { - LineNumber: 9, - Start: 236, - End: 262, - EndIncludingLineBreak: 263, - Span: { - Start: 236, - Length: 26 - }, - SpanIncludingLineBreak: { - Start: 236, - Length: 27 - } - }, - { - LineNumber: 10, - Start: 263, - End: 264, - EndIncludingLineBreak: 265, - Span: { - Start: 263, - Length: 1 - }, - SpanIncludingLineBreak: { - Start: 263, - Length: 2 - } - }, - { - LineNumber: 11, - Start: 265, - End: 364, - EndIncludingLineBreak: 365, - Span: { - Start: 265, - Length: 99 - }, - SpanIncludingLineBreak: { - Start: 265, - Length: 100 - } - }, - { - LineNumber: 12, - Start: 365, - End: 415, - EndIncludingLineBreak: 416, - Span: { - Start: 365, - Length: 50 - }, - SpanIncludingLineBreak: { - Start: 365, - Length: 51 - } - }, - { - LineNumber: 13, - Start: 416, - End: 421, - EndIncludingLineBreak: 422, - Span: { - Start: 416, - Length: 5 - }, - SpanIncludingLineBreak: { - Start: 416, - Length: 6 - } - }, - { - LineNumber: 14, - Start: 422, - End: 498, - EndIncludingLineBreak: 499, - Span: { - Start: 422, - Length: 76 - }, - SpanIncludingLineBreak: { - Start: 422, - Length: 77 - } - }, - { - LineNumber: 15, - Start: 499, - End: 540, - EndIncludingLineBreak: 541, - Span: { - Start: 499, - Length: 41 - }, - SpanIncludingLineBreak: { - Start: 499, - Length: 42 - } - }, - { - LineNumber: 16, - Start: 541, - End: 550, - EndIncludingLineBreak: 551, - Span: { - Start: 541, - Length: 9 - }, - SpanIncludingLineBreak: { - Start: 541, - Length: 10 - } - }, - { - LineNumber: 17, - Start: 551, - End: 736, - EndIncludingLineBreak: 737, - Span: { - Start: 551, - Length: 185 - }, - SpanIncludingLineBreak: { - Start: 551, - Length: 186 - } - }, - { - LineNumber: 18, - Start: 737, - End: 750, - EndIncludingLineBreak: 751, - Span: { - Start: 737, - Length: 13 - }, - SpanIncludingLineBreak: { - Start: 737, - Length: 14 - } - }, - { - LineNumber: 19, - Start: 751, - End: 791, - EndIncludingLineBreak: 792, - Span: { - Start: 751, - Length: 40 - }, - SpanIncludingLineBreak: { - Start: 751, - Length: 41 - } - }, - { - LineNumber: 20, - Start: 792, - End: 807, - EndIncludingLineBreak: 808, - Span: { - Start: 792, - Length: 15 - }, - SpanIncludingLineBreak: { - Start: 792, - Length: 16 - } - }, - { - LineNumber: 21, - Start: 808, - End: 817, - EndIncludingLineBreak: 818, - Span: { - Start: 808, - Length: 9 - }, - SpanIncludingLineBreak: { - Start: 808, - Length: 10 - } - }, - { - LineNumber: 22, - Start: 818, - End: 823, - EndIncludingLineBreak: 824, - Span: { - Start: 818, - Length: 5 - }, - SpanIncludingLineBreak: { - Start: 818, - Length: 6 - } - }, - { - LineNumber: 23, - Start: 824, - End: 825, - EndIncludingLineBreak: 826, - Span: { - Start: 824, - Length: 1 - }, - SpanIncludingLineBreak: { - Start: 824, - Length: 2 - } - }, - { - LineNumber: 24, - Start: 826, - End: 832, - EndIncludingLineBreak: 833, - Span: { - Start: 826, - Length: 6 - }, - SpanIncludingLineBreak: { - Start: 826, - Length: 7 - } - }, - { - LineNumber: 25, - Start: 833, - End: 833, - EndIncludingLineBreak: 833, - Span: { - Start: 833 - }, - SpanIncludingLineBreak: { - Start: 833 - } - } - ] - }, - HintName: Sentry.Generated.BuildPropertyInitializer.g.cs - } - ], - Diagnostics: null -} \ No newline at end of file diff --git a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.cs b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.cs index 89775ffc5c..3424d27a74 100644 --- a/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.cs +++ b/test/Sentry.SourceGenerators.Tests/BuildPropertySourceGeneratorTests.cs @@ -7,7 +7,7 @@ namespace Sentry.SourceGenerators.Tests; public class BuildPropertySourceGeneratorTests { - private static readonly string s_hintName = "Sentry.Generated.BuildPropertyInitializer.g.cs"; + private const string HintName = "Sentry.Generated.BuildPropertyInitializer.g.cs"; [SkippableFact] public Task RunResult_Success() @@ -18,8 +18,9 @@ public Task RunResult_Success() var result = driver.GetRunResult().Results.FirstOrDefault(); result.Exception.Should().BeNull(); result.GeneratedSources.Length.Should().Be(1); - result.GeneratedSources.First().HintName.Should().Be(s_hintName); - return Verify(result); + result.GeneratedSources.First().HintName.Should().Be(HintName); + var source = result.GeneratedSources.First().SourceText.ToString(); + return Verify(source); } [SkippableFact] @@ -32,8 +33,9 @@ public Task RunResult_BadStrings() var result = driver.GetRunResult().Results.FirstOrDefault(); result.Exception.Should().BeNull(); result.GeneratedSources.Length.Should().Be(1); - result.GeneratedSources.First().HintName.Should().Be(s_hintName); - return Verify(result); + result.GeneratedSources.First().HintName.Should().Be(HintName); + var source = result.GeneratedSources.First().SourceText.ToString(); + return Verify(source); } [SkippableFact] @@ -45,8 +47,9 @@ public Task RunResult_Publish_AotTrue() var result = driver.GetRunResult().Results.FirstOrDefault(); result.Exception.Should().BeNull(); result.GeneratedSources.Length.Should().Be(1); - result.GeneratedSources.First().HintName.Should().Be(s_hintName); - return Verify(result); + result.GeneratedSources.First().HintName.Should().Be(HintName); + var source = result.GeneratedSources.First().SourceText.ToString(); + return Verify(source); } [SkippableFact] @@ -76,7 +79,7 @@ public void RunResult_OutputType_Values(OutputKind outputKind, bool sourceGenExp var result = driver.GetRunResult().Results.FirstOrDefault(); result.Exception.Should().BeNull(); - var generated = result.GeneratedSources.Any(x => x.HintName.Equals(s_hintName)); + var generated = result.GeneratedSources.Any(x => x.HintName.Equals(HintName)); generated.Should().Be(sourceGenExpected); } @@ -92,12 +95,12 @@ public void RunResult_SentryDisableSourceGenerator_Values(string value, bool sou var result = driver.GetRunResult().Results.FirstOrDefault(); result.Exception.Should().BeNull(); - var generated = result.GeneratedSources.Any(x => x.HintName.Equals(s_hintName)); + var generated = result.GeneratedSources.Any(x => x.HintName.Equals(HintName)); generated.Should().Be(sourceGenExpected); } [SkippableFact] - public Task RunResult_Expect_None() + public void RunResult_Expect_None() { Skip.If(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)); @@ -105,8 +108,6 @@ public Task RunResult_Expect_None() var result = driver.GetRunResult().Results.FirstOrDefault(); result.Exception.Should().BeNull(); result.GeneratedSources.Length.Should().Be(0); - - return Verify(result); } private static GeneratorDriver BuildDriver(OutputKind outputKind, Assembly metadataAssembly, params IEnumerable<(string Key, string Value)> buildProperties) From fba54633bae9c2ba9969d909645648e6c09c45d4 Mon Sep 17 00:00:00 2001 From: James Crosswell Date: Mon, 14 Jul 2025 11:08:50 +1200 Subject: [PATCH 2/3] Verify tests --- test/Sentry.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt | 1 - test/Sentry.Tests/ApiApprovalTests.Run.DotNet9_0.verified.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/test/Sentry.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt b/test/Sentry.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt index c0dcfb5294..b3e2244f66 100644 --- a/test/Sentry.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt +++ b/test/Sentry.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt @@ -1302,7 +1302,6 @@ namespace Sentry.CompilerServices { public static class BuildProperties { - public static System.Collections.Generic.IReadOnlyDictionary? Values { get; } public static void Initialize(System.Collections.Generic.Dictionary properties) { } } } diff --git a/test/Sentry.Tests/ApiApprovalTests.Run.DotNet9_0.verified.txt b/test/Sentry.Tests/ApiApprovalTests.Run.DotNet9_0.verified.txt index c0dcfb5294..b3e2244f66 100644 --- a/test/Sentry.Tests/ApiApprovalTests.Run.DotNet9_0.verified.txt +++ b/test/Sentry.Tests/ApiApprovalTests.Run.DotNet9_0.verified.txt @@ -1302,7 +1302,6 @@ namespace Sentry.CompilerServices { public static class BuildProperties { - public static System.Collections.Generic.IReadOnlyDictionary? Values { get; } public static void Initialize(System.Collections.Generic.Dictionary properties) { } } } From 71edc17c2492aa139b01ce105ea70af659c9fd6e Mon Sep 17 00:00:00 2001 From: Sentry Github Bot Date: Mon, 14 Jul 2025 17:20:22 +1200 Subject: [PATCH 3/3] Update ApiApprovalTests.Run.Net4_8.verified.txt --- test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt b/test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt index 96a8dc926d..8b32fbc30f 100644 --- a/test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt +++ b/test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt @@ -1283,7 +1283,6 @@ namespace Sentry.CompilerServices { public static class BuildProperties { - public static System.Collections.Generic.IReadOnlyDictionary? Values { get; } public static void Initialize(System.Collections.Generic.Dictionary properties) { } } }