Skip to content

Commit d1412b1

Browse files
committed
Update RDG to use interceptors feature
1 parent 5384526 commit d1412b1

File tree

62 files changed

+7811
-8294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+7811
-8294
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- These are what the analyzers are built against. They are overridden in full source build.
1616
It may be possible to generate SBRPs -->
1717
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*2.9.4*" />
18-
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
18+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.5*" />
1919
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Common/*3.3.1*" />
2020
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp/*3.3.1*" />
2121
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp.Workspaces/*3.3.1*" />

eng/Version.Details.xml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,11 @@
194194
<Sha>06913fc4c3fcb0065ee390d135fb766870d2c38a</Sha>
195195
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
196196
</Dependency>
197+
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-23228-03">
198+
<Uri>https://github.com/dotnet/symreader</Uri>
199+
<Sha>27e584661980ee6d82c419a2a471ae505b7d122e</Sha>
200+
<SourceBuild RepoName="symreader" ManagedOnly="true" />
201+
</Dependency>
197202
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.6.23318.9">
198203
<Uri>https://github.com/dotnet/runtime</Uri>
199204
<Sha>815953a12c822847095a843d69c610a9f895ae3f</Sha>
@@ -335,22 +340,22 @@
335340
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
336341
</Dependency>
337342
<!-- Not updated automatically -->
338-
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.4.0-4.22520.2">
343+
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.7.0-3.23314.3">
339344
<Uri>https://github.com/dotnet/roslyn</Uri>
340-
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
345+
<Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
341346
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
342347
</Dependency>
343-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Version="4.4.0-4.22520.2">
348+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Version="4.7.0-3.23314.3">
344349
<Uri>https://github.com/dotnet/roslyn</Uri>
345-
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
350+
<Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
346351
</Dependency>
347-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-4.22520.2">
352+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-3.23314.3">
348353
<Uri>https://github.com/dotnet/roslyn</Uri>
349-
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
354+
<Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
350355
</Dependency>
351-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0-4.22520.2">
356+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3">
352357
<Uri>https://github.com/dotnet/roslyn</Uri>
353-
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
358+
<Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
354359
</Dependency>
355360
</ProductDependencies>
356361
<ToolsetDependencies>

eng/Versions.props

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@
144144
<MicrosoftEntityFrameworkCoreVersion>8.0.0-preview.6.23319.5</MicrosoftEntityFrameworkCoreVersion>
145145
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-preview.6.23319.5</MicrosoftEntityFrameworkCoreDesignVersion>
146146
<!-- Packages from dotnet/roslyn -->
147-
<MicrosoftCodeAnalysisCommonVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCommonVersion>
148-
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
149-
<MicrosoftCodeAnalysisCSharpVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCSharpVersion>
150-
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
147+
<MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCommonVersion>
148+
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
149+
<MicrosoftCodeAnalysisCSharpVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCSharpVersion>
150+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
151151
<!-- Packages from NuGet/Nuget.client -->
152152
<!-- If you update these versions, make sure to also update https://github.com/dotnet/aspnetcore/blob/main/eng/SourceBuildPrebuiltBaseline.xml -->
153153
<NuGetPackagingVersion>6.2.4</NuGetPackagingVersion>
@@ -163,6 +163,8 @@
163163
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23315.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
164164
<!-- Packages from dotnet/source-build-reference-packages -->
165165
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23316.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
166+
<!-- Packages from dotnet/symreader -->
167+
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
166168
<!-- Packages from dotnet/xdt -->
167169
<MicrosoftWebXdtVersion>7.0.0-preview.22423.2</MicrosoftWebXdtVersion>
168170
</PropertyGroup>
@@ -239,11 +241,11 @@
239241
<Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.3.1</Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>
240242
<!-- Pin the version of the M.CA dependencies that we utilize with a cutom version property $(MicrosoftCodeAnalysisVersion_LatestVS) to avoid automatically
241243
consuming the newest version of the packages when using the $(MicrosoftCodeAnalysisCSharpVersion) properties in source-build. -->
242-
<MicrosoftCodeAnalysisVersion_LatestVS>4.5.0</MicrosoftCodeAnalysisVersion_LatestVS>
243-
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
244-
<MicrosoftCodeAnalysisCommonVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCommonVersion>
245-
<MicrosoftCodeAnalysisCSharpVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCSharpVersion>
246-
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.4.0-4.22520.2</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
244+
<MicrosoftCodeAnalysisVersion_LatestVS>4.7.0-3.23314.3</MicrosoftCodeAnalysisVersion_LatestVS>
245+
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
246+
<MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCommonVersion>
247+
<MicrosoftCodeAnalysisCSharpVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCSharpVersion>
248+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
247249
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
248250
<MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>1.1.2-beta1.22531.1</MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>
249251
<MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>1.1.2-beta1.22531.1</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.6.23305.3"
3+
"version": "8.0.100-preview.6.23320.4"
44
},
55
"tools": {
6-
"dotnet": "8.0.100-preview.6.23305.3",
6+
"dotnet": "8.0.100-preview.6.23320.4",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

src/Framework/AspNetCoreAnalyzers/src/Analyzers/Microsoft.AspNetCore.App.Analyzers.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<Nullable>Enable</Nullable>
99
<RootNamespace>Microsoft.AspNetCore.Analyzers</RootNamespace>
1010
<SuppressNullableAttributesImport>true</SuppressNullableAttributesImport>
11+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
1112
</PropertyGroup>
1213

1314
<ItemGroup>

src/Framework/AspNetCoreAnalyzers/src/Analyzers/Resources.resx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
<value>Route handler has multiple parameters with the [FromBody] attribute or a parameter with an [AsParameters] attribute where the parameter type contains multiple members with [FromBody] attributes. Only one parameter can have a [FromBody] attribute.</value>
212212
</data>
213213
<data name="Analyzer_MultipleFromBody_Title" xml:space="preserve">
214-
<value>Route handler has multiple parameters with the [FromBody] attribute.</value>
214+
<value>Route handler has multiple parameters with the [FromBody] attribute</value>
215215
</data>
216216
<data name="Analyzer_DoNotUseModelBindingAttributesOnRouteHandlerParameters_Title" xml:space="preserve">
217217
<value>Do not use model binding attributes with route handlers</value>
@@ -289,10 +289,10 @@
289289
<value>Complex types referenced by route parameters must be parsable</value>
290290
</data>
291291
<data name="Analyzer_RouteParameterComplexTypeIsNotParsable_Message" xml:space="preserve">
292-
<value>Parameter '{0}' of type {1} should define a bool TryParse(string, IFormatProvider, out {1}) method, or implement IParsable&lt;{1}&gt;.</value>
292+
<value>Parameter '{0}' of type {1} should define a bool TryParse(string, IFormatProvider, out {1}) method, or implement IParsable&lt;{1}&gt;</value>
293293
</data>
294294
<data name="Analyzer_BindAsyncSignatureMustReturnValueTaskOfT_Title" xml:space="preserve">
295-
<value>When implementing BindAsync(...) method, the return type must be ValueTask&lt;T&gt;.</value>
295+
<value>When implementing BindAsync(...) method, the return type must be ValueTask&lt;T&gt;</value>
296296
</data>
297297
<data name="Analyzer_BindAsyncSignatureMustReturnValueTaskOfT_Message" xml:space="preserve">
298298
<value>Parameter '{0}' of type {1} has a BindAsync(...) method, but the return type is not ValueTask&lt;{1}&gt;. Consider implementing IBindableFromHttpContext&lt;{1}&gt; to enforce implementation.</value>
@@ -310,7 +310,7 @@
310310
<value>Route '{0}' conflicts with another action route. An HTTP request that matches multiple routes results in an ambiguous match error. Fix the conflict by changing the route's pattern, HTTP method, or route constraints.</value>
311311
</data>
312312
<data name="Analyzer_UseAddAuthorizationBuilder_Message" xml:space="preserve">
313-
<value>Use AddAuthorizationBuilder to register authorization services and construct policies.</value>
313+
<value>When implementing BindAsync(...) method, the return type must be ValueTask&lt;T&gt;</value>
314314
</data>
315315
<data name="Analyzer_UseAddAuthorizationBuilder_Title" xml:space="preserve">
316316
<value>Use AddAuthorizationBuilder</value>

src/Framework/AspNetCoreAnalyzers/test/Microsoft.AspNetCore.App.Analyzers.Test.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<RootNamespace>Microsoft.AspNetCore.Analyzers</RootNamespace>
7+
<!-- Disable analyzer warnings for analyzers in test project. -->
8+
<NoWarn>$(NoWarn);RS1036;RS2008</NoWarn>
79
</PropertyGroup>
810

911
<ItemGroup>

src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.RequestDelegateGenerator.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<Compile Include="$(SharedSourceRoot)RoslynUtils\SyntaxTreeExtensions.cs" LinkBase="Shared" />
3131
<Compile Include="$(SharedSourceRoot)RoslynUtils\ParsabilityHelper.cs" LinkBase="Shared" />
3232
<Compile Include="$(SharedSourceRoot)RoslynUtils\CodeWriter.cs" LinkBase="Shared" />
33+
<Compile Include="$(SharedSourceRoot)RoslynUtils\IncrementalValuesProviderExtensions.cs" LinkBase="Shared" />
3334
<Compile Include="$(SharedSourceRoot)Diagnostics\AnalyzerDebug.cs" LinkBase="Shared" />
3435
</ItemGroup>
3536

0 commit comments

Comments
 (0)