Skip to content

Commit 5bbc5aa

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/aspnetcore (#16171)
[master] Update dependencies from dotnet/aspnetcore - Consume updated API from Razor compiler - Merge branch 'master' into darc-master-82d29652-11fc-4c5a-9bbc-d8e27ccae021
1 parent 723b2dc commit 5bbc5aa

File tree

4 files changed

+70
-63
lines changed

4 files changed

+70
-63
lines changed

‎eng/Version.Details.xml‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@
8282
<Uri>https://github.com/dotnet/roslyn</Uri>
8383
<Sha>db9617a4ca2c3ce91f59078d56c7aeb6c5d57e73</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.0-preview.3.21152.6">
85+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.0-preview.3.21153.10">
8686
<Uri>https://github.com/dotnet/aspnetcore</Uri>
87-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
87+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="6.0.0-preview.3.21152.6">
89+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="6.0.0-preview.3.21153.10">
9090
<Uri>https://github.com/dotnet/aspnetcore</Uri>
91-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
91+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
9292
</Dependency>
9393
<Dependency Name="NuGet.Build.Tasks" Version="5.9.0-preview.3.7027">
9494
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
@@ -138,57 +138,61 @@
138138
<Uri>https://github.com/dotnet/wpf</Uri>
139139
<Sha>c513fe4e410fa8101ff42e3e2ba79ef44b153634</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-preview.3.21152.6">
141+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-preview.3.21153.10">
142142
<Uri>https://github.com/dotnet/aspnetcore</Uri>
143-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
143+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-preview.3.21152.6">
145+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-preview.3.21153.10">
146146
<Uri>https://github.com/dotnet/aspnetcore</Uri>
147-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
147+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21152.6">
149+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21153.10">
150150
<Uri>https://github.com/dotnet/aspnetcore</Uri>
151-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
151+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
152152
</Dependency>
153-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21152.6">
153+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21153.10">
154154
<Uri>https://github.com/dotnet/aspnetcore</Uri>
155-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
155+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
156156
</Dependency>
157-
<Dependency Name="dotnet-dev-certs" Version="6.0.0-preview.3.21152.6">
157+
<Dependency Name="dotnet-dev-certs" Version="6.0.0-preview.3.21153.10">
158158
<Uri>https://github.com/dotnet/aspnetcore</Uri>
159-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
159+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
160160
</Dependency>
161-
<Dependency Name="dotnet-user-secrets" Version="6.0.0-preview.3.21152.6">
161+
<Dependency Name="dotnet-user-secrets" Version="6.0.0-preview.3.21153.10">
162162
<Uri>https://github.com/dotnet/aspnetcore</Uri>
163-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
163+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="6.0.0-preview.3.21152.6">
165+
<Dependency Name="dotnet-watch" Version="6.0.0-preview.2.21108.6">
166166
<Uri>https://github.com/dotnet/aspnetcore</Uri>
167-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
167+
<Sha>0d981a053fd45a73f52f93da2855d986c4cc7b62</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.0-preview.3.21152.6">
169+
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="6.0.0-preview.3.21153.10">
170170
<Uri>https://github.com/dotnet/aspnetcore</Uri>
171-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
171+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="6.0.0-preview.3.21152.6">
173+
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.0-preview.3.21153.10">
174174
<Uri>https://github.com/dotnet/aspnetcore</Uri>
175-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
175+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
176176
</Dependency>
177-
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="6.0.0-preview.3.21152.6">
177+
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="6.0.0-preview.3.21153.10">
178178
<Uri>https://github.com/dotnet/aspnetcore</Uri>
179-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
179+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
180180
</Dependency>
181-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-preview.3.21152.6">
181+
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="6.0.0-preview.3.21153.10">
182182
<Uri>https://github.com/dotnet/aspnetcore</Uri>
183-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
183+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
184184
</Dependency>
185-
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-preview.3.21152.6">
185+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-preview.3.21153.10">
186186
<Uri>https://github.com/dotnet/aspnetcore</Uri>
187-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
187+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
188188
</Dependency>
189-
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-preview.3.21152.6">
189+
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-preview.3.21153.10">
190190
<Uri>https://github.com/dotnet/aspnetcore</Uri>
191-
<Sha>262369301aa24bb7626e41b88cce915daeb7827a</Sha>
191+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
192+
</Dependency>
193+
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-preview.3.21153.10">
194+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
195+
<Sha>cecee1d7a2f94cd4be9e721fd92cbd10b332f7e9</Sha>
192196
</Dependency>
193197
<Dependency Name="Microsoft.Web.Xdt" Version="3.1.0" Pinned="true">
194198
<Uri>https://github.com/aspnet/xdt</Uri>

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@
117117
</PropertyGroup>
118118
<PropertyGroup>
119119
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
120-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.0-preview.3.21152.6</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
121-
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.0-preview.3.21152.6</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
122-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.0-preview.3.21152.6</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
123-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.0-preview.3.21152.6</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
124-
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.0-preview.3.21152.6</MicrosoftAspNetCoreAnalyzersPackageVersion>
125-
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.0-preview.3.21152.6</MicrosoftAspNetCoreTestHostPackageVersion>
126-
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-preview.3.21152.6</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
127-
<MicrosoftAspNetCoreRazorLanguageVersion>6.0.0-preview.3.21152.6</MicrosoftAspNetCoreRazorLanguageVersion>
128-
<MicrosoftCodeAnalysisRazorVersion>6.0.0-preview.3.21152.6</MicrosoftCodeAnalysisRazorVersion>
120+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.0-preview.3.21153.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
121+
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.0-preview.3.21153.10</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
122+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.0-preview.3.21153.10</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
123+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.0-preview.3.21153.10</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
124+
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.0-preview.3.21153.10</MicrosoftAspNetCoreAnalyzersPackageVersion>
125+
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.0-preview.3.21153.10</MicrosoftAspNetCoreTestHostPackageVersion>
126+
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-preview.3.21153.10</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
127+
<MicrosoftAspNetCoreRazorLanguageVersion>6.0.0-preview.3.21153.10</MicrosoftAspNetCoreRazorLanguageVersion>
128+
<MicrosoftCodeAnalysisRazorVersion>6.0.0-preview.3.21153.10</MicrosoftCodeAnalysisRazorVersion>
129129
</PropertyGroup>
130130
<PropertyGroup>
131131
<!-- Dependencies from https://github.com/dotnet/wpf -->

‎src/RazorSdk/SourceGenerators/RazorSourceGenerator.cs‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ private static IReadOnlyList<TagHelperDescriptor> ResolveTagHelperDescriptors(Ge
168168
tagHelperFeature.Compilation = GeneratorExecutionContext.Compilation.AddSyntaxTrees(results.Take(files.Count));
169169
ArrayPool<SyntaxTree>.Shared.Return(results);
170170

171-
var currentMetadataReference = GeneratorExecutionContext.Compilation.ToMetadataReference();
172-
tagHelperFeature.TargetReference = currentMetadataReference;
171+
var currentTargetAssembly = GeneratorExecutionContext.Compilation.Assembly;
172+
tagHelperFeature.TargetAssembly = currentTargetAssembly;
173173
var assemblyTagHelpers = tagHelperFeature.GetDescriptors();
174174

175175
var refTagHelpers = GetTagHelperDescriptorsFromReferences(GeneratorExecutionContext.Compilation, tagHelperFeature);
@@ -187,32 +187,35 @@ private static IReadOnlyList<TagHelperDescriptor> GetTagHelperDescriptorsFromRef
187187

188188
foreach (var reference in compilation.References)
189189
{
190-
var guid = reference.GetModuleVersionId(compilation);
191-
IReadOnlyList<TagHelperDescriptor> descriptors = default;
192-
193-
if (guid is Guid _guid)
190+
if (compilation.GetAssemblyOrModuleSymbol(reference) is IAssemblySymbol assembly)
194191
{
195-
if (!_tagHelperCache.TryGetValue(_guid, out descriptors))
192+
var guid = reference.GetModuleVersionId(compilation);
193+
IReadOnlyList<TagHelperDescriptor> descriptors = default;
194+
195+
if (guid is Guid _guid)
196196
{
197-
tagHelperFeature.TargetReference = reference;
198-
descriptors = tagHelperFeature.GetDescriptors();
199-
// Clear out the cache if it is growing too large. A
200-
// simple compilation can include around ~300 references
201-
// so give a little bit of buffer beyond this.
202-
if (_tagHelperCache.Count > 400)
197+
if (!_tagHelperCache.TryGetValue(_guid, out descriptors))
203198
{
204-
_tagHelperCache.Clear();
199+
tagHelperFeature.TargetAssembly = assembly;
200+
descriptors = tagHelperFeature.GetDescriptors();
201+
// Clear out the cache if it is growing too large. A
202+
// simple compilation can include around ~300 references
203+
// so give a little bit of buffer beyond this.
204+
if (_tagHelperCache.Count > 400)
205+
{
206+
_tagHelperCache.Clear();
207+
}
208+
_tagHelperCache[_guid] = descriptors;
205209
}
206-
_tagHelperCache[_guid] = descriptors;
207210
}
208-
}
209-
else
210-
{
211-
tagHelperFeature.TargetReference = reference;
212-
descriptors = tagHelperFeature.GetDescriptors();
213-
}
211+
else
212+
{
213+
tagHelperFeature.TargetAssembly = assembly;
214+
descriptors = tagHelperFeature.GetDescriptors();
215+
}
214216

215-
tagHelperDescriptors.AddRange(descriptors);
217+
tagHelperDescriptors.AddRange(descriptors);
218+
}
216219
}
217220

218221
return tagHelperDescriptors;

‎src/RazorSdk/SourceGenerators/StaticCompilationTagHelperFeature.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
2626

2727
var context = TagHelperDescriptorProviderContext.Create(results);
2828
context.SetCompilation(Compilation);
29-
context.Items.SetTargetMetadataReference(TargetReference);
29+
context.Items.SetTargetAssembly(TargetAssembly);
3030

3131
for (var i = 0; i < _providers.Length; i++)
3232
{
@@ -38,7 +38,7 @@ public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
3838

3939
public Compilation Compilation { get; set; }
4040

41-
public MetadataReference TargetReference { get; set; }
41+
public IAssemblySymbol TargetAssembly { get; set; }
4242

4343
protected override void OnInitialized()
4444
{

0 commit comments

Comments
 (0)