Skip to content

Commit 6596df7

Browse files
committed
cleanup
1 parent a1fbd8c commit 6596df7

File tree

2 files changed

+1
-53
lines changed

2 files changed

+1
-53
lines changed

src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/Microsoft.Extensions.Validation.GeneratorTests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828

2929
<ItemGroup>
3030
<HelixContent Include="$(MSBuildProjectDirectory)\snapshots\**" />
31-
<Compile Remove="snapshots\**\*" />
3231
</ItemGroup>
3332

34-
3533
</Project>

src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGeneratorTestBase.cs

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma warning disable ASP0029 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
2-
#nullable disable
32

43
// Licensed to the .NET Foundation under one or more agreements.
54
// The .NET Foundation licenses this file to you under the MIT license.
@@ -23,7 +22,6 @@
2322
using Microsoft.AspNetCore.Http.Features.Authentication;
2423
using Microsoft.CodeAnalysis;
2524
using Microsoft.CodeAnalysis.CSharp;
26-
using Microsoft.CodeAnalysis.Diagnostics;
2725
using Microsoft.CodeAnalysis.Emit;
2826
using Microsoft.CodeAnalysis.Text;
2927
using Microsoft.Extensions.DependencyInjection;
@@ -45,9 +43,6 @@ public partial class ValidationsGeneratorTestBase : LoggedTestBase
4543
.WithFeatures([new KeyValuePair<string, string>("InterceptorsNamespaces", "Microsoft.Extensions.Validation.Generated")]);
4644

4745
internal static Task Verify(string source, out Compilation compilation)
48-
=> Verify(source, out compilation, globalOptions: null);
49-
50-
internal static Task Verify(string source, out Compilation compilation, Dictionary<string, string> globalOptions)
5146
{
5247
var references = AppDomain.CurrentDomain.GetAssemblies()
5348
.Where(assembly => !assembly.IsDynamic && !string.IsNullOrWhiteSpace(assembly.Location))
@@ -82,21 +77,7 @@ internal static Task Verify(string source, out Compilation compilation, Dictiona
8277
references,
8378
new CSharpCompilationOptions(OutputKind.ConsoleApplication));
8479
var generator = new ValidationsGenerator();
85-
86-
// Create the driver with optional global options
87-
CSharpGeneratorDriver driver;
88-
if (globalOptions != null)
89-
{
90-
var analyzerConfig = new InMemoryAnalyzerConfigOptionsProvider(globalOptions);
91-
driver = CSharpGeneratorDriver.Create(
92-
generators: [generator.AsSourceGenerator()],
93-
parseOptions: ParseOptions,
94-
optionsProvider: analyzerConfig);
95-
}
96-
else
97-
{
98-
driver = CSharpGeneratorDriver.Create(generators: [generator.AsSourceGenerator()], parseOptions: ParseOptions);
99-
}
80+
var driver = CSharpGeneratorDriver.Create(generators: [generator.AsSourceGenerator()], parseOptions: ParseOptions);
10081
return Verifier
10182
.Verify(driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out compilation, out var diagnostics))
10283
.ScrubLinesWithReplace(line => InterceptsLocationRegex().Replace(line, "[InterceptsLocation]"))
@@ -622,35 +603,4 @@ public RequestBodyDetectionFeature(bool canHaveBody)
622603

623604
public bool CanHaveBody { get; }
624605
}
625-
626-
internal sealed class InMemoryAnalyzerConfigOptionsProvider : AnalyzerConfigOptionsProvider
627-
{
628-
private readonly InMemoryAnalyzerConfigOptions _globalOptions;
629-
630-
public InMemoryAnalyzerConfigOptionsProvider(Dictionary<string, string> globalOptions)
631-
{
632-
_globalOptions = new InMemoryAnalyzerConfigOptions(globalOptions);
633-
}
634-
635-
public override AnalyzerConfigOptions GlobalOptions => _globalOptions;
636-
637-
public override AnalyzerConfigOptions GetOptions(SyntaxTree tree) => _globalOptions;
638-
639-
public override AnalyzerConfigOptions GetOptions(AdditionalText textFile) => _globalOptions;
640-
}
641-
642-
internal sealed class InMemoryAnalyzerConfigOptions : AnalyzerConfigOptions
643-
{
644-
private readonly Dictionary<string, string> _options;
645-
646-
public InMemoryAnalyzerConfigOptions(Dictionary<string, string> options)
647-
{
648-
_options = options;
649-
}
650-
651-
public override bool TryGetValue(string key, out string value)
652-
{
653-
return _options.TryGetValue(key, out value!);
654-
}
655-
}
656606
}

0 commit comments

Comments
 (0)