Merge pull request #9870 from drewnoakes/use-newer-mef-analyzers

drewnoakes · web-flow · commit 0204748cd969 · 2025-12-12T06:54:54.000+11:00
Use newer vs-mef analyzers
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -46,6 +46,7 @@
     <PackageVersion Include="Microsoft.ServiceHub.Framework"                                         Version="4.9.11-beta" />
     <PackageVersion Include="Microsoft.VisualStudio.ComponentModelHost"                              Version="17.14.116" />
     <PackageVersion Include="Microsoft.VisualStudio.Composition"                                     Version="17.13.50" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers"                           Version="18.3.29-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Data.Core"                                       Version="18.0.1755-preview.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Data.Services"                                   Version="18.0.1755-preview.1" />
     <PackageVersion Include="Microsoft.VisualStudio.DataDesign.Common"                               Version="18.0.1755-preview.1" />
diff --git a/eng/imports/HostAgnostic.props b/eng/imports/HostAgnostic.props
@@ -33,6 +33,7 @@
 
     <!-- VS MEF -->
     <PackageReference Include="Microsoft.VisualStudio.Composition" />
+    <PackageReference Include="Microsoft.VisualStudio.Composition.Analyzers" />
 
     <PackageReference Include="MessagePack" />
 
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Automation/VsBuildManager.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Automation/VsBuildManager.cs
@@ -38,7 +38,7 @@ internal VSBuildManager(IProjectThreadingService threadingService, IUnconfigured
 
     // This has to be a property import to prevent a circular dependency as the bridge imports this class in order to fire events
     [Import]
-    internal Lazy<IDesignTimeInputsBuildManagerBridge, IAppliesToMetadataView>? DesignTimeInputsBuildManagerBridge { get; private set; }
+    internal Lazy<IDesignTimeInputsBuildManagerBridge, IAppliesToMetadataView> DesignTimeInputsBuildManagerBridge { get; private set; } = null!;
 
     /// <summary>
     /// Occurs when a design time output moniker is deleted.
@@ -72,7 +72,7 @@ public object DesignTimeOutputMonikers
     {
         get
         {
-            if (DesignTimeInputsBuildManagerBridge?.AppliesTo(_unconfiguredProjectServices.Project.Capabilities) == true)
+            if (DesignTimeInputsBuildManagerBridge.AppliesTo(_unconfiguredProjectServices.Project.Capabilities))
             {
                 IDesignTimeInputsBuildManagerBridge bridge = DesignTimeInputsBuildManagerBridge.Value;
 
@@ -91,7 +91,7 @@ public object DesignTimeOutputMonikers
     /// </summary>
     public string BuildDesignTimeOutput(string bstrOutputMoniker)
     {
-        if (DesignTimeInputsBuildManagerBridge?.AppliesTo(_unconfiguredProjectServices.Project.Capabilities) == true)
+        if (DesignTimeInputsBuildManagerBridge.AppliesTo(_unconfiguredProjectServices.Project.Capabilities))
         {
             IDesignTimeInputsBuildManagerBridge bridge = DesignTimeInputsBuildManagerBridge.Value;
 
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/ComponentComposition.ScopeComponents.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/ComponentComposition.ScopeComponents.cs
@@ -1,6 +1,7 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
 #pragma warning disable IDE0051 // Remove unused private members
+#pragma warning disable VSMEF003 // Exported type not implemented by exporting class
 
 using ImportAttribute = System.Composition.ImportAttribute;
 using ExportAttribute = System.Composition.ExportAttribute;
@@ -19,7 +20,7 @@ private class GlobalScope
     {
         [Import]
         [SharingBoundary(ExportContractNames.Scopes.ProjectService)]
-        private System.Composition.ExportFactory<IProjectService>? ProjectServiceFactory { get; set; }
+        private System.Composition.ExportFactory<IProjectService> ProjectServiceFactory { get; set; } = null!;
     }
 
     [Export(typeof(IProjectService))]
@@ -28,7 +29,7 @@ private class ProjectServiceScope
     {
         [Import]
         [SharingBoundary(ExportContractNames.Scopes.UnconfiguredProject)]
-        private ExportFactory<UnconfiguredProject>? UnconfiguredProjectFactory { get; set; }
+        private ExportFactory<UnconfiguredProject> UnconfiguredProjectFactory { get; set; } = null!;
     }
 
     [Export(typeof(UnconfiguredProject))]
@@ -37,7 +38,7 @@ private class UnconfiguredProjectScope
     {
         [Import]
         [SharingBoundary(ExportContractNames.Scopes.ConfiguredProject)]
-        private ExportFactory<ConfiguredProject>? ConfiguredProjectFactory { get; set; }
+        private ExportFactory<ConfiguredProject> ConfiguredProjectFactory { get; set; } = null!;
     }
 
     [Export(typeof(ConfiguredProject))]

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ internal VSBuildManager(IProjectThreadingService threadingService, IUnconfigured`
`38`	`38`
`39`	`39`	`// This has to be a property import to prevent a circular dependency as the bridge imports this class in order to fire events`
`40`	`40`	`[Import]`
`41`		`- internal Lazy<IDesignTimeInputsBuildManagerBridge, IAppliesToMetadataView>? DesignTimeInputsBuildManagerBridge { get; private set; }`
	`41`	`+ internal Lazy<IDesignTimeInputsBuildManagerBridge, IAppliesToMetadataView> DesignTimeInputsBuildManagerBridge { get; private set; } = null!;`
`42`	`42`
`43`	`43`	`/// <summary>`
`44`	`44`	`/// Occurs when a design time output moniker is deleted.`
`@@ -72,7 +72,7 @@ public object DesignTimeOutputMonikers`
`72`	`72`	`{`
`73`	`73`	`get`
`74`	`74`	`{`
`75`		`- if (DesignTimeInputsBuildManagerBridge?.AppliesTo(_unconfiguredProjectServices.Project.Capabilities) == true)`
	`75`	`+ if (DesignTimeInputsBuildManagerBridge.AppliesTo(_unconfiguredProjectServices.Project.Capabilities))`
`76`	`76`	`{`
`77`	`77`	`IDesignTimeInputsBuildManagerBridge bridge = DesignTimeInputsBuildManagerBridge.Value;`
`78`	`78`
`@@ -91,7 +91,7 @@ public object DesignTimeOutputMonikers`
`91`	`91`	`/// </summary>`
`92`	`92`	`public string BuildDesignTimeOutput(string bstrOutputMoniker)`
`93`	`93`	`{`
`94`		`- if (DesignTimeInputsBuildManagerBridge?.AppliesTo(_unconfiguredProjectServices.Project.Capabilities) == true)`
	`94`	`+ if (DesignTimeInputsBuildManagerBridge.AppliesTo(_unconfiguredProjectServices.Project.Capabilities))`
`95`	`95`	`{`
`96`	`96`	`IDesignTimeInputsBuildManagerBridge bridge = DesignTimeInputsBuildManagerBridge.Value;`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.`
`2`	`2`
`3`	`3`	`#pragma warning disable IDE0051 // Remove unused private members`
	`4`	`+#pragma warning disable VSMEF003 // Exported type not implemented by exporting class`
`4`	`5`
`5`	`6`	`using ImportAttribute = System.Composition.ImportAttribute;`
`6`	`7`	`using ExportAttribute = System.Composition.ExportAttribute;`
`@@ -19,7 +20,7 @@ private class GlobalScope`
`19`	`20`	`{`
`20`	`21`	`[Import]`
`21`	`22`	`[SharingBoundary(ExportContractNames.Scopes.ProjectService)]`
`22`		`- private System.Composition.ExportFactory<IProjectService>? ProjectServiceFactory { get; set; }`
	`23`	`+ private System.Composition.ExportFactory<IProjectService> ProjectServiceFactory { get; set; } = null!;`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`[Export(typeof(IProjectService))]`
`@@ -28,7 +29,7 @@ private class ProjectServiceScope`
`28`	`29`	`{`
`29`	`30`	`[Import]`
`30`	`31`	`[SharingBoundary(ExportContractNames.Scopes.UnconfiguredProject)]`
`31`		`- private ExportFactory<UnconfiguredProject>? UnconfiguredProjectFactory { get; set; }`
	`32`	`+ private ExportFactory<UnconfiguredProject> UnconfiguredProjectFactory { get; set; } = null!;`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`[Export(typeof(UnconfiguredProject))]`
`@@ -37,7 +38,7 @@ private class UnconfiguredProjectScope`
`37`	`38`	`{`
`38`	`39`	`[Import]`
`39`	`40`	`[SharingBoundary(ExportContractNames.Scopes.ConfiguredProject)]`
`40`		`- private ExportFactory<ConfiguredProject>? ConfiguredProjectFactory { get; set; }`
	`41`	`+ private ExportFactory<ConfiguredProject> ConfiguredProjectFactory { get; set; } = null!;`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`[Export(typeof(ConfiguredProject))]`