Skip to content

Commit c528e8f

Browse files
committed
Fix build issues in CI
1 parent 523c916 commit c528e8f

8 files changed

+62
-49
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- These are what the analyzers are built against. They are overridden in full source build.
1313
It may be possible to generate SBRPs -->
1414
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*2.9.4*" />
15-
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
15+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.5*" />
1616
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Common/*3.3.1*" />
1717
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp/*3.3.1*" />
1818
<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>7f9ae67f86a5adc1d9bf2f22f4bf3ec05b6d7b68</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.23309.7">
198203
<Uri>https://github.com/dotnet/runtime</Uri>
199204
<Sha>37c0371ab3f7651d64a6dfe4c2e8677206fa34ee</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.23313.12">
339344
<Uri>https://github.com/dotnet/roslyn</Uri>
340-
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
345+
<Sha>28075742c870be732a3f20fcfc540a915bc51820</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.23313.12">
344349
<Uri>https://github.com/dotnet/roslyn</Uri>
345-
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
350+
<Sha>28075742c870be732a3f20fcfc540a915bc51820</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.23313.12">
348353
<Uri>https://github.com/dotnet/roslyn</Uri>
349-
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
354+
<Sha>28075742c870be732a3f20fcfc540a915bc51820</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.23313.12">
352357
<Uri>https://github.com/dotnet/roslyn</Uri>
353-
<Sha>65df6b1065bae316232a6c9907a8be995302fb5e</Sha>
358+
<Sha>28075742c870be732a3f20fcfc540a915bc51820</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.23312.10</MicrosoftEntityFrameworkCoreVersion>
145145
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-preview.6.23312.10</MicrosoftEntityFrameworkCoreDesignVersion>
146146
<!-- Packages from dotnet/roslyn -->
147-
<MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23313.4</MicrosoftCodeAnalysisCommonVersion>
148-
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23313.4</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
149-
<MicrosoftCodeAnalysisCSharpVersion>4.7.0-3.23313.4</MicrosoftCodeAnalysisCSharpVersion>
150-
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.7.0-3.23313.4</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
147+
<MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23313.12</MicrosoftCodeAnalysisCommonVersion>
148+
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23313.12</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
149+
<MicrosoftCodeAnalysisCSharpVersion>4.7.0-3.23313.12</MicrosoftCodeAnalysisCSharpVersion>
150+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.7.0-3.23313.12</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.2</NuGetPackagingVersion>
@@ -163,6 +163,8 @@
163163
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23305.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
164164
<!-- Packages from dotnet/source-build-reference-packages -->
165165
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23309.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
166+
<!-- Packages from dotnet/symreader -->
167+
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
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.7.0-3.23313.4</MicrosoftCodeAnalysisVersion_LatestVS>
243-
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23313.4</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
244-
<MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23313.4</MicrosoftCodeAnalysisCommonVersion>
245-
<MicrosoftCodeAnalysisCSharpVersion>4.7.0-3.23313.4</MicrosoftCodeAnalysisCSharpVersion>
246-
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.7.0-3.23313.4</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
244+
<MicrosoftCodeAnalysisVersion_LatestVS>4.7.0-3.23313.12</MicrosoftCodeAnalysisVersion_LatestVS>
245+
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23313.12</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
246+
<MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23313.12</MicrosoftCodeAnalysisCommonVersion>
247+
<MicrosoftCodeAnalysisCSharpVersion>4.7.0-3.23313.12</MicrosoftCodeAnalysisCSharpVersion>
248+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.7.0-3.23313.12</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>

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: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->
@@ -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>Use AddAuthorizationBuilder to register authorization services and construct policies</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/Identity/Core/src/IdentityApiEndpointRouteBuilderExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public static class IdentityApiEndpointRouteBuilderExtensions
2727
/// Call <see cref="EndpointRouteBuilderExtensions.MapGroup(IEndpointRouteBuilder, string)"/> to add a prefix to all the endpoints.
2828
/// </param>
2929
/// <returns>An <see cref="IEndpointConventionBuilder"/> to further customize the added endpoints.</returns>
30+
[System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("AOT", "IL3050", Justification = "This implementation invokes uses compile-time code gen to construct the RequestDelegate.")]
31+
[System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "This implementation invokes uses compile-time code gen to construct the RequestDelegate.")]
3032
public static IEndpointConventionBuilder MapIdentityApi<TUser>(this IEndpointRouteBuilder endpoints) where TUser : class, new()
3133
{
3234
ArgumentNullException.ThrowIfNull(endpoints);

src/SignalR/clients/csharp/Client.SourceGenerator/src/Microsoft.AspNetCore.SignalR.Client.SourceGenerator.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<IncludeBuildOutput>false</IncludeBuildOutput>
66
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
77
<IsShipping>false</IsShipping>
8+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
89
</PropertyGroup>
910

1011
<ItemGroup>

0 commit comments

Comments
 (0)