Skip to content

Commit 231e921

Browse files
rainersigwalddotnet-maestro[bot]ViktorHofer
authored
Remove TaskWithAssemblyResolveHooks (dotnet#37913)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 1f9c139 commit 231e921

File tree

15 files changed

+43
-98
lines changed

15 files changed

+43
-98
lines changed

‎eng/Version.Details.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -79,34 +79,34 @@
7979
<Sha>eda92c290b08a2be0fcb8e79ac07ebc94dffb2a3</Sha>
8080
<SourceBuild RepoName="format" ManagedOnly="true" />
8181
</Dependency>
82-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.24053.1">
82+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-1.24061.4">
8383
<Uri>https://github.com/dotnet/roslyn</Uri>
84-
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
84+
<Sha>514b5364881b9a36a2630ab7c0160f8e642fc1b3</Sha>
8585
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8686
</Dependency>
87-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.9.0-3.24053.1">
87+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-1.24061.4">
8888
<Uri>https://github.com/dotnet/roslyn</Uri>
89-
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
89+
<Sha>514b5364881b9a36a2630ab7c0160f8e642fc1b3</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.9.0-3.24053.1">
91+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-1.24061.4">
9292
<Uri>https://github.com/dotnet/roslyn</Uri>
93-
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
93+
<Sha>514b5364881b9a36a2630ab7c0160f8e642fc1b3</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.9.0-3.24053.1">
95+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0-1.24061.4">
9696
<Uri>https://github.com/dotnet/roslyn</Uri>
97-
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
97+
<Sha>514b5364881b9a36a2630ab7c0160f8e642fc1b3</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.9.0-3.24053.1">
99+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0-1.24061.4">
100100
<Uri>https://github.com/dotnet/roslyn</Uri>
101-
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
101+
<Sha>514b5364881b9a36a2630ab7c0160f8e642fc1b3</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.0-3.24053.1">
103+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0-1.24061.4">
104104
<Uri>https://github.com/dotnet/roslyn</Uri>
105-
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
105+
<Sha>514b5364881b9a36a2630ab7c0160f8e642fc1b3</Sha>
106106
</Dependency>
107-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.9.0-3.24053.1">
107+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0-1.24061.4">
108108
<Uri>https://github.com/dotnet/roslyn</Uri>
109-
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
109+
<Sha>514b5364881b9a36a2630ab7c0160f8e642fc1b3</Sha>
110110
</Dependency>
111111
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-alpha.1.24061.8">
112112
<Uri>https://github.com/dotnet/aspnetcore</Uri>

‎eng/Versions.props

+9-9
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
3232
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
3333
<StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
34-
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
34+
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
36-
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
36+
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
3737
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.24061.26</SystemSecurityCryptographyProtectedDataPackageVersion>
3838
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3939
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
@@ -137,13 +137,13 @@
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/dotnet/roslyn -->
140-
<MicrosoftNetCompilersToolsetPackageVersion>4.9.0-3.24053.1</MicrosoftNetCompilersToolsetPackageVersion>
141-
<MicrosoftCodeAnalysisPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisPackageVersion>
142-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisCSharpPackageVersion>
143-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
144-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
145-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
146-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
140+
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-1.24061.4</MicrosoftNetCompilersToolsetPackageVersion>
141+
<MicrosoftCodeAnalysisPackageVersion>4.10.0-1.24061.4</MicrosoftCodeAnalysisPackageVersion>
142+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.10.0-1.24061.4</MicrosoftCodeAnalysisCSharpPackageVersion>
143+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.10.0-1.24061.4</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
144+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.10.0-1.24061.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
145+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-1.24061.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
146+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.10.0-1.24061.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
147147
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
148148
</PropertyGroup>
149149
<PropertyGroup>

‎src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
<ProjectReference Include="..\Microsoft.DotNet.PackageValidation\Microsoft.DotNet.PackageValidation.csproj" />
3838
<ProjectReference Include="..\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj" />
3939
<!-- We carry NuGet as part of the package in case the package is used with an older SDKs or with full framework MSBuild. -->
40-
<PackageReference Include="NuGet.Packaging" PrivateAssets="All" Publish="true"/>
40+
<PackageReference Include="NuGet.Packaging" PrivateAssets="All" Publish="true" />
41+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" ExcludeAssets="Runtime" PrivateAssets="all" />
4142
</ItemGroup>
4243

4344
<ItemGroup>

‎src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" ExcludeAssets="Runtime" PrivateAssets="all" />
15+
1416
<ProjectReference Include="..\..\Microsoft.DotNet.ApiSymbolExtensions\Microsoft.DotNet.ApiSymbolExtensions.csproj" />
1517
</ItemGroup>
1618

‎src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
55
</PropertyGroup>
66

7-
<!-- Exclude files that depend on Microsoft.Build.Framework and Microsoft.Build.Utilities.Core. These will be included by users of this package. -->
7+
<!-- Exclude files that depend on Microsoft.Build.Framework and Microsoft.Build.Utilities.Core. These should be manually included by other projects. -->
88
<PropertyGroup>
99
<DefaultItemExcludes>$(DefaultItemExcludes);Logging\MSBuildLog.cs</DefaultItemExcludes>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" ExcludeAssets="Runtime" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" ExcludeAssets="Runtime" PrivateAssets="all" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<ExpectedDependencies Include="Microsoft.Deployment.DotNet.Releases, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
142142
<ExpectedDependencies Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
143143
<ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
144-
<ExpectedDependencies Include="System.Collections.Immutable, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
144+
<ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
145145
<ExpectedDependencies Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
146146
<ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
147147
<ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

‎src/Tasks/Common/ConflictResolution/ResolvePackageFileConflicts.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Microsoft.NET.Build.Tasks.ConflictResolution
1313
{
14-
public class ResolvePackageFileConflicts : TaskWithAssemblyResolveHooks
14+
public class ResolvePackageFileConflicts : TaskBase
1515
{
1616
private HashSet<ITaskItem> referenceConflicts = new();
1717
private HashSet<ITaskItem> analyzerConflicts = new();

‎src/Tasks/Common/TaskWithAssemblyResolveHooks.cs

-58
This file was deleted.

‎src/Tasks/Microsoft.NET.Build.Tasks/CreateComHost.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.NET.Build.Tasks
88
{
9-
public class CreateComHost : TaskWithAssemblyResolveHooks
9+
public class CreateComHost : TaskBase
1010
{
1111
[Required]
1212
public string ComHostSourcePath { get; set; }

‎src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.NET.Build.Tasks
88
{
9-
public class GenerateBundle : TaskWithAssemblyResolveHooks
9+
public class GenerateBundle : TaskBase
1010
{
1111
[Required]
1212
public ITaskItem[] FilesToBundle { get; set; }

‎src/Tasks/Microsoft.NET.Build.Tasks/GenerateClsidMap.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.NET.Build.Tasks
1010
{
11-
public class GenerateClsidMap : TaskWithAssemblyResolveHooks
11+
public class GenerateClsidMap : TaskBase
1212
{
1313
[Required]
1414
public string IntermediateAssembly { get; set; }

‎src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Microsoft.NET.Build.Tasks
1414
/// <summary>
1515
/// Generates the $(project).deps.json file.
1616
/// </summary>
17-
public class GenerateDepsFile : TaskWithAssemblyResolveHooks
17+
public class GenerateDepsFile : TaskBase
1818
{
1919
[Required]
2020
public string ProjectPath { get; set; }
@@ -198,15 +198,15 @@ bool ShouldIncludeRuntimeAsset(ITaskItem item)
198198
{
199199
// Generate the RID-fallback for self-contained builds.
200200
//
201-
// In order to support loading components with RID-specific assets,
201+
// In order to support loading components with RID-specific assets,
202202
// the AssemblyDependencyResolver requires a RID fallback graph.
203203
// The component itself should not carry the RID fallback graph with it, because
204204
// it would need to carry graph of all the RIDs and needs updates for newer RIDs.
205-
// For framework dependent apps, the RID fallback graph comes from the core framework Microsoft.NETCore.App,
205+
// For framework dependent apps, the RID fallback graph comes from the core framework Microsoft.NETCore.App,
206206
// so there is no need to write it into the app.
207207
// If self-contained apps, the (applicable subset of) RID fallback graph needs to be written to the deps.json manifest.
208208
//
209-
// If a RID-graph is provided to the DependencyContextBuilder, it generates a RID-fallback
209+
// If a RID-graph is provided to the DependencyContextBuilder, it generates a RID-fallback
210210
// graph with respect to the target RuntimeIdentifier.
211211

212212
RuntimeGraph runtimeGraph =

‎src/Tasks/Microsoft.NET.Build.Tasks/GenerateRegFreeComManifest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.NET.Build.Tasks
88
{
9-
public class GenerateRegFreeComManifest : TaskWithAssemblyResolveHooks
9+
public class GenerateRegFreeComManifest : TaskBase
1010
{
1111
[Required]
1212
public string IntermediateAssembly { get; set; }

‎src/Tasks/Microsoft.NET.Build.Tasks/GenerateShims.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.NET.Build.Tasks
1010
{
11-
public sealed class GenerateShims : TaskWithAssemblyResolveHooks
11+
public sealed class GenerateShims : TaskBase
1212
{
1313
/// <summary>
1414
/// Relative paths for Apphost for different ShimRuntimeIdentifiers with RuntimeIdentifier as meta data

‎src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
the same System.Reflection.Metadata assembly and their types can unify. See the following link for the MSBuild binding redirect config.
7272
https://github.com/dotnet/msbuild/blob/5d102ae37163fc1f22610bb433c3ab9a2fff91f0/src/MSBuild/app.config#L59
7373
-->
74-
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutablePackageVersion)" />
75-
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
76-
<PackageReference Include="System.Reflection.MetadataLoadContext" VersionOverride="$(SystemReflectionMetadataVersion)" />
74+
<PackageReference Include="System.Collections.Immutable" VersionOverride="7.0.0" />
75+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="7.0.0" />
76+
<PackageReference Include="System.Reflection.MetadataLoadContext" VersionOverride="7.0.0" />
7777
</ItemGroup>
7878

7979
<!-- These are loaded from the CLI's copy on .NET Core, we don't need to duplicate them on disk -->

0 commit comments

Comments
 (0)