diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index db0290170ba1..42aacfa55f90 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -41,5 +41,9 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f23e51b3708..22e37a8c6955 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -341,26 +341,26 @@ - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + afa1eb6821f62183651ab017b2f5c3fbeb934904 - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + afa1eb6821f62183651ab017b2f5c3fbeb934904 - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + afa1eb6821f62183651ab017b2f5c3fbeb934904 - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + afa1eb6821f62183651ab017b2f5c3fbeb934904 - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + afa1eb6821f62183651ab017b2f5c3fbeb934904 diff --git a/eng/Versions.props b/eng/Versions.props index 02bb406d4207..beef43671ac0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,11 +148,11 @@ 9.0.0-preview.4.24217.1 9.0.0-preview.4.24217.1 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 + 4.11.0-1.24218.5 + 4.11.0-1.24218.5 + 4.11.0-1.24218.5 + 4.11.0-1.24218.5 + 4.11.0-1.24218.5 6.2.4 @@ -248,11 +248,11 @@ 3.3.1 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 + 4.11.0-1.24218.5 + 4.11.0-1.24218.5 + 4.11.0-1.24218.5 + 4.11.0-1.24218.5 + 4.11.0-1.24218.5 3.3.3 1.1.2-beta1.24121.1 1.1.2-beta1.24121.1 diff --git a/src/Http/Http.Extensions/gen/RequestDelegateGenerator.cs b/src/Http/Http.Extensions/gen/RequestDelegateGenerator.cs index 2303f56f349b..ac8bbdd3a175 100644 --- a/src/Http/Http.Extensions/gen/RequestDelegateGenerator.cs +++ b/src/Http/Http.Extensions/gen/RequestDelegateGenerator.cs @@ -54,7 +54,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context) .WithTrackingName(GeneratorSteps.EndpointsWithoutDiagnosicsStep); var interceptorDefinitions = endpoints - .GroupWith((endpoint) => endpoint.Location, EndpointDelegateComparer.Instance) + .GroupWith((endpoint) => endpoint.InterceptableLocation, EndpointDelegateComparer.Instance) .Select((endpointWithLocations, _) => { var endpoint = endpointWithLocations.Source; @@ -62,7 +62,9 @@ public void Initialize(IncrementalGeneratorInitializationContext context) using var codeWriter = new CodeWriter(stringWriter, baseIndent: 2); foreach (var location in endpointWithLocations.Elements) { - codeWriter.WriteLine($$"""[InterceptsLocation(@"{{location.File}}", {{location.LineNumber}}, {{location.CharacterNumber}})]"""); +#pragma warning disable RSEXPERIMENTAL002 // Experimental interceptable location API + codeWriter.WriteLine(location.GetInterceptsLocationAttributeSyntax()); +#pragma warning restore RSEXPERIMENTAL002 } codeWriter.WriteLine($"internal static RouteHandlerBuilder {endpoint.HttpMethod}{endpointWithLocations.Index}("); codeWriter.Indent++; diff --git a/src/Http/Http.Extensions/gen/RequestDelegateGeneratorSources.cs b/src/Http/Http.Extensions/gen/RequestDelegateGeneratorSources.cs index 938295bcc236..b3e629a5cdee 100644 --- a/src/Http/Http.Extensions/gen/RequestDelegateGeneratorSources.cs +++ b/src/Http/Http.Extensions/gen/RequestDelegateGeneratorSources.cs @@ -471,7 +471,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Endpoint.cs b/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Endpoint.cs index 4e205adf86b1..930515cf6837 100644 --- a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Endpoint.cs +++ b/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Endpoint.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.App.Analyzers.Infrastructure; using Microsoft.AspNetCore.Http.RequestDelegateGenerator.StaticRouteHandlerModel.Emitters; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Operations; @@ -19,6 +20,9 @@ public Endpoint(IInvocationOperation operation, WellKnownTypes wellKnownTypes, S { Operation = operation; Location = GetLocation(operation); +#pragma warning disable RSEXPERIMENTAL002 // Experimental interceptable location API + InterceptableLocation = semanticModel.GetInterceptableLocation((InvocationExpressionSyntax)operation.Syntax)!; +#pragma warning restore RSEXPERIMENTAL002 HttpMethod = GetHttpMethod(operation); EmitterContext = new EmitterContext(); @@ -98,10 +102,13 @@ parameter is not null && public List Diagnostics { get; } = new List(); public (string File, int LineNumber, int CharacterNumber) Location { get; } +#pragma warning disable RSEXPERIMENTAL002 // Experimental interceptable location API + public InterceptableLocation InterceptableLocation { get; } +#pragma warning restore RSEXPERIMENTAL002 public IInvocationOperation Operation { get; } public override bool Equals(object o) => - o is Endpoint other && Location == other.Location && SignatureEquals(this, other); + o is Endpoint other && InterceptableLocation == other.InterceptableLocation && SignatureEquals(this, other); public override int GetHashCode() => HashCode.Combine(Location, GetSignatureHashCode(this)); diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/HandlesEndpointsWithAndWithoutDiagnostics.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/HandlesEndpointsWithAndWithoutDiagnostics.generated.txt index c6080ebb724b..4ba6654a262e 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/HandlesEndpointsWithAndWithoutDiagnostics.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/HandlesEndpointsWithAndWithoutDiagnostics.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 9, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_NullableReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_NullableReturn.generated.txt index b7207090486c..81d768e52b43 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_NullableReturn.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_NullableReturn.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,8 +58,8 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] - [InterceptsLocation(@"TestMapActions.cs", 27, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -168,8 +168,8 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 29, 5)] - [InterceptsLocation(@"TestMapActions.cs", 30, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt index ddd072a97531..e584608eb59d 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_BindAsync_Snapshot.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -169,7 +169,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 27, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -266,7 +266,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 28, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet2( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -365,7 +365,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 29, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet3( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -462,7 +462,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 30, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet4( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -573,7 +573,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 31, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet5( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -670,7 +670,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 32, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet6( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -769,7 +769,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 33, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet7( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -866,7 +866,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 34, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet8( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -976,7 +976,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 35, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet9( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1072,7 +1072,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 36, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet10( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1170,7 +1170,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 37, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet11( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1266,7 +1266,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 38, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet12( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1377,7 +1377,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 39, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet13( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1474,7 +1474,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 40, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet14( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1584,7 +1584,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 41, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet15( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1680,7 +1680,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 42, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet16( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1791,7 +1791,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 43, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet17( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1888,7 +1888,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 44, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet18( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -1998,7 +1998,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 45, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet19( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt index d2dd86d97efb..c353cec04fe2 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitBodyParam_ComplexReturn_Snapshot.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] PostVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Post }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 27, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt index bc613729415b..43c52222ed32 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_ComplexTypeArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt index 84797133fa2d..561816f4614b 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_NullableStringArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt index b6676d247b0b..c364250c27de 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitHeader_StringArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt index d8af45f2f72a..59a8d8116b8c 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_ComplexTypeArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt index 19fff142b353..225d3564d15d 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_NullableStringArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt index eae2d352043f..215688d0e1e7 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitQuery_StringArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitServiceParam_SimpleReturn_Snapshot.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitServiceParam_SimpleReturn_Snapshot.generated.txt index 01ebcc756f88..ba54b0c4ad79 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitServiceParam_SimpleReturn_Snapshot.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitServiceParam_SimpleReturn_Snapshot.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 27, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -254,7 +254,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 28, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet2( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitSource_SimpleReturn_Snapshot.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitSource_SimpleReturn_Snapshot.generated.txt index 53b73e0b9c80..4c9760e42208 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitSource_SimpleReturn_Snapshot.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ExplicitSource_SimpleReturn_Snapshot.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -170,7 +170,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 27, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -282,7 +282,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 28, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet2( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -402,8 +402,8 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 29, 5)] - [InterceptsLocation(@"TestMapActions.cs", 30, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet3( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_ComplexTypeArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_ComplexTypeArrayParam.generated.txt index 11bb18fa442f..1f4f87e9afca 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_ComplexTypeArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_ComplexTypeArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt index 40169b4a0c6c..c059050111ec 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt index 40169b4a0c6c..c059050111ec 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt index 40169b4a0c6c..c059050111ec 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt index bb046dbb648d..5b5a107e475e 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt index 1213509d9ad8..779efb616d06 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] PostVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Post }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleSpecialTypeParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleSpecialTypeParam_StringReturn.generated.txt index ffbfa4c5c056..add8e79a859a 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleSpecialTypeParam_StringReturn.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleSpecialTypeParam_StringReturn.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleStringParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleStringParam_StringReturn.generated.txt index 3f81e20cda56..b76324c9d0f8 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleStringParam_StringReturn.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_MultipleStringParam_StringReturn.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_NoParam_StringReturn_WithFilter.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_NoParam_StringReturn_WithFilter.generated.txt index fd03833882fe..4ba6654a262e 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_NoParam_StringReturn_WithFilter.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_NoParam_StringReturn_WithFilter.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsString_Has_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsString_Has_Metadata.generated.txt index fd03833882fe..4ba6654a262e 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsString_Has_Metadata.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsString_Has_Metadata.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsTodo_Has_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsTodo_Has_Metadata.generated.txt index b72515bda258..f1a99f9eb04b 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsTodo_Has_Metadata.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsTodo_Has_Metadata.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsValidationProblemResult_Has_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsValidationProblemResult_Has_Metadata.generated.txt index 8538fbb64f53..8b8db99f0bac 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsValidationProblemResult_Has_Metadata.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsValidationProblemResult_Has_Metadata.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsVoid_Has_No_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsVoid_Has_No_Metadata.generated.txt index dcf82f5b2383..1929d8579ed9 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsVoid_Has_No_Metadata.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ReturnsVoid_Has_No_Metadata.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt index 77fdb23a6685..8a4e1c8411b1 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt index a0a7ef4ff87f..4c46221e27a9 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleNullableStringParam_WithEmptyQueryStringValueProvided_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleNullableStringParam_WithEmptyQueryStringValueProvided_StringReturn.generated.txt index 427a4583320a..d3a31800ab3f 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleNullableStringParam_WithEmptyQueryStringValueProvided_StringReturn.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_SingleNullableStringParam_WithEmptyQueryStringValueProvided_StringReturn.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt index ddf7b26a6f3e..9ce50bcba1fc 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] PostVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Post }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt index cd52ab5392d1..a4fc77ad1227 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Http.Generated { private static readonly JsonOptions FallbackJsonOptions = new(); - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapMethods0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt index cd52ab5392d1..a4fc77ad1227 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Http.Generated { private static readonly JsonOptions FallbackJsonOptions = new(); - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapMethods0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt index cd52ab5392d1..a4fc77ad1227 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Http.Generated { private static readonly JsonOptions FallbackJsonOptions = new(); - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapMethods0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt index cd52ab5392d1..a4fc77ad1227 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Http.Generated { private static readonly JsonOptions FallbackJsonOptions = new(); - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapMethods0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt index 399fb03f619d..598d3543f866 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] PostVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Post }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt index ddad6697ab20..1b03fbb80eab 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] PostVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Post }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_NoParam_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_NoParam_StringReturn.generated.txt index 3cc8a856676d..484aaefc7f3c 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_NoParam_StringReturn.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_NoParam_StringReturn.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,8 +58,8 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] - [InterceptsLocation(@"TestMapActions.cs", 27, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 28, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -244,7 +244,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 29, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet2( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_WithParams_StringReturn.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_WithParams_StringReturn.generated.txt index 18b22249af90..17fa1194e78a 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_WithParams_StringReturn.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/Multiple_MapAction_WithParams_StringReturn.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -153,7 +153,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 27, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -248,7 +248,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 28, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet2( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/RequestDelegateValidateGeneratedFormCode.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/RequestDelegateValidateGeneratedFormCode.generated.txt index 6189b82cdb7a..a093bce3d48c 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/RequestDelegateValidateGeneratedFormCode.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/RequestDelegateValidateGeneratedFormCode.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] PostVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Post }; - [InterceptsLocation(@"TestMapActions.cs", 30, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsDifferentInterceptorsFromSameLocation.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsDifferentInterceptorsFromSameLocation.generated.txt index 35d365b76b87..746ccff2f381 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsDifferentInterceptorsFromSameLocation.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsDifferentInterceptorsFromSameLocation.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -171,7 +171,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"OtherTestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsSameInterceptorsFromDifferentFiles.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsSameInterceptorsFromDifferentFiles.generated.txt index 38c5fef2af61..de4a2f087ea0 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsSameInterceptorsFromDifferentFiles.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/SupportsSameInterceptorsFromDifferentFiles.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -58,9 +58,9 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly JsonOptions FallbackJsonOptions = new(); private static readonly string[] GetVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Get }; - [InterceptsLocation(@"TestMapActions.cs", 26, 13)] - [InterceptsLocation(@"TestMapActions.cs", 26, 63)] - [InterceptsLocation(@"OtherTestMapActions.cs", 26, 13)] + %INTERCEPTSLOCATIONATTRIBUTE% + %INTERCEPTSLOCATIONATTRIBUTE% + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/VerifyAsParametersBaseline.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/VerifyAsParametersBaseline.generated.txt index cde03d3a2376..b26c613dc854 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/VerifyAsParametersBaseline.generated.txt +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/VerifyAsParametersBaseline.generated.txt @@ -14,7 +14,7 @@ namespace System.Runtime.CompilerServices [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] file sealed class InterceptsLocationAttribute : Attribute { - public InterceptsLocationAttribute(string filePath, int line, int column) + public InterceptsLocationAttribute(int version, string data) { } } @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Http.Generated private static readonly string[] PostVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Post }; private static readonly string[] PutVerb = new[] { global::Microsoft.AspNetCore.Http.HttpMethods.Put }; - [InterceptsLocation(@"TestMapActions.cs", 45, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet0( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -197,7 +197,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 46, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost1( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -326,7 +326,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 47, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPut2( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -426,7 +426,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 48, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPatch3( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -545,7 +545,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 49, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapGet4( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, @@ -659,7 +659,7 @@ namespace Microsoft.AspNetCore.Http.Generated castHandler.Method); } - [InterceptsLocation(@"TestMapActions.cs", 50, 5)] + %INTERCEPTSLOCATIONATTRIBUTE% internal static RouteHandlerBuilder MapPost5( this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string pattern, diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeIncrementalityTests.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeIncrementalityTests.cs index 7b3a05c73b26..59fdfb5b5383 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeIncrementalityTests.cs +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeIncrementalityTests.cs @@ -19,7 +19,12 @@ public async Task MapAction_SameReturnType_DoesNotTriggerUpdate() var (result, compilation) = await RunGeneratorAsync(source, updatedSource); var outputSteps = GetRunStepOutputs(result); - Assert.All(outputSteps, (value) => Assert.Equal(IncrementalStepRunReason.Cached, value.Reason)); + Assert.Collection(outputSteps, + // First source output for diagnostics is unchanged. + step => Assert.Equal(IncrementalStepRunReason.Unchanged, step.Reason), + // Interceptable location is different across compilations + step => Assert.Equal(IncrementalStepRunReason.Modified, step.Reason) + ); } [Fact] @@ -31,7 +36,12 @@ public async Task MapAction_DifferentRoutePattern_DoesNotTriggerUpdate() var (result, compilation) = await RunGeneratorAsync(source, updatedSource); var outputSteps = GetRunStepOutputs(result); - Assert.All(outputSteps, (value) => Assert.Equal(IncrementalStepRunReason.Cached, value.Reason)); + Assert.Collection(outputSteps, + // First source output for diagnostics is unchanged. + step => Assert.Equal(IncrementalStepRunReason.Unchanged, step.Reason), + // Interceptable location is different across compilations + step => Assert.Equal(IncrementalStepRunReason.Modified, step.Reason) + ); } [Fact] diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs index 8906f9125436..aefa72875046 100644 --- a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs +++ b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs @@ -9,6 +9,7 @@ using System.Runtime.CompilerServices; using System.Runtime.Loader; using System.Text; +using System.Text.RegularExpressions; using System.Text.Json; using System.Text.Json.Nodes; using Microsoft.AspNetCore.Builder; @@ -36,6 +37,7 @@ public abstract class RequestDelegateCreationTestBase : LoggedTest internal static readonly CSharpParseOptions ParseOptions = new CSharpParseOptions(LanguageVersion.Preview).WithFeatures(new[] { new KeyValuePair("InterceptorsPreviewNamespaces", "Microsoft.AspNetCore.Http.Generated") }); private static readonly Project _baseProject = CreateProject(); + private static readonly string _interceptsLocationAttributeRegex = @"\[global::System\.Runtime\.CompilerServices\.InterceptsLocationAttribute\(\d+, "".*""\)\]"; internal async Task<(GeneratorRunResult?, Compilation)> RunGeneratorAsync(string sources, params string[] updatedSources) { @@ -360,8 +362,9 @@ internal async Task VerifyAgainstBaselineUsingFile(Compilation compilation, [Cal if (RegenerateBaselines) { var newSource = generatedCode.ToString() - .Replace(RequestDelegateGeneratorSources.GeneratedCodeAttribute, "%GENERATEDCODEATTRIBUTE%") - + Environment.NewLine; + .Replace(RequestDelegateGeneratorSources.GeneratedCodeAttribute, "%GENERATEDCODEATTRIBUTE%"); + newSource = Regex.Replace(newSource, _interceptsLocationAttributeRegex, "%INTERCEPTSLOCATIONATTRIBUTE%"); + newSource += Environment.NewLine; await File.WriteAllTextAsync(baselineFilePath, newSource); Assert.Fail("RegenerateBaselines=true. Do not merge PRs with this set."); } @@ -387,6 +390,11 @@ private static bool CompareLines(string[] expectedLines, SourceText sourceText, { var expectedLine = expectedLines[index].Trim().ReplaceLineEndings(); var actualLine = textLine.ToString().Trim().ReplaceLineEndings(); + if (Regex.IsMatch(actualLine, _interceptsLocationAttributeRegex)) + { + index++; + continue; + } if (!expectedLine.Equals(actualLine, StringComparison.Ordinal)) { message = $"""