Merge branch 'main' into fix-2312889-duplicate-platforms

Author: drewnoakes

.editorconfig

@@ -133,6 +133,9 @@ dotnet_naming_style.pascal_case_and_prefix_with_I_style.capitalization
 # CSharp code style settings:
 [*.cs]
 
+# Use file-scoped namespaces
+csharp_style_namespace_declarations = file_scoped:error
+
 # Prefer "var" only when the type is apparent
 csharp_style_var_for_built_in_types = false:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# convert solution to use file-scoped namespaces
+e13927f27b47320d8179af850b1ea31e8b24e12b

Directory.Packages.props

@@ -115,6 +115,7 @@
     <!-- 3rd party -->
     <PackageVersion Include="Newtonsoft.Json"                                                        Version="13.0.3" />
     <PackageVersion Include="IsExternalInit"                                                         Version="1.0.3" />
+    <PackageVersion Include="PolySharp"                                                              Version="1.15.0" />
 
     <!-- Tests -->
     <PackageVersion Include="Microsoft.NET.Test.Sdk"                                                 Version="17.5.0-preview-20221003-04" />

docs/design-time-builds.md

@@ -195,6 +195,7 @@ CollectFrameworkReferences                     | NuGet      | Returns non-transi
 CollectNuGetAuditSuppressions                  | NuGet      | Returns `NuGetAuditSuppress` items. Supports package restore.
 CollectPackageDownloads                        | NuGet      | Returns `PackageDownload` items. Supports package restore.
 CollectPackageReferences                       | NuGet      | Returns `PackageReference` items. Supports package restore.
+CollectPrunePackageReferences                  | NuGet      | Returns `PrunePackageReference` items. Supports package restore.
 CollectResolvedCompilationReferencesDesignTime | DNPS       |
 CollectResolvedSDKReferencesDesignTime         | SDK        |
 CollectSuggestedVisualStudioComponentIds       | DNPS       | Supports in-product acquisition (IPA).

eng/imports/HostAgnostic.props

@@ -60,7 +60,7 @@
 
     <!-- 3rd party -->
     <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="IsExternalInit" PrivateAssets="all" />
+    <PackageReference Include="PolySharp" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
 
     <!-- Host-Agnostic Visual Studio -->
     <PackageReference Include="Microsoft.VisualStudio.ImageCatalog" />

setup/Common/ProvideCodeBaseBindingRedirection.cs

@@ -2,36 +2,35 @@
 
 using Microsoft.VisualStudio.Shell;
 
-namespace Microsoft.VisualStudio
+namespace Microsoft.VisualStudio;
+
+/// <summary>
+///     A <see cref="RegistrationAttribute"/> that provides code-base binding redirects.
+/// </summary>
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+internal sealed class ProvideCodeBaseBindingRedirectionAttribute : RegistrationAttribute
 {
-    /// <summary>
-    ///     A <see cref="RegistrationAttribute"/> that provides code-base binding redirects.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-    internal sealed class ProvideCodeBaseBindingRedirectionAttribute : RegistrationAttribute
-    {
-        private readonly ProvideBindingRedirectionAttribute _redirectionAttribute;
+    private readonly ProvideBindingRedirectionAttribute _redirectionAttribute;
 
-        public ProvideCodeBaseBindingRedirectionAttribute(string assemblyName)
+    public ProvideCodeBaseBindingRedirectionAttribute(string assemblyName)
+    {
+        // ProvideBindingRedirectionAttribute is sealed, so we can't inherit from it to provide defaults.
+        // Instead, we'll do more of an aggregation pattern here.
+        _redirectionAttribute = new ProvideBindingRedirectionAttribute
         {
-            // ProvideBindingRedirectionAttribute is sealed, so we can't inherit from it to provide defaults.
-            // Instead, we'll do more of an aggregation pattern here.
-            _redirectionAttribute = new ProvideBindingRedirectionAttribute
-            {
-                AssemblyName = assemblyName,
-                OldVersionLowerBound = "0.0.0.0",
-                CodeBase = assemblyName + ".dll",
-            };
-        }
+            AssemblyName = assemblyName,
+            OldVersionLowerBound = "0.0.0.0",
+            CodeBase = assemblyName + ".dll",
+        };
+    }
 
-        public override void Register(RegistrationContext context)
-        {
-            _redirectionAttribute.Register(context);
-        }
+    public override void Register(RegistrationContext context)
+    {
+        _redirectionAttribute.Register(context);
+    }
 
-        public override void Unregister(RegistrationContext context)
-        {
-            _redirectionAttribute.Unregister(context);
-        }
+    public override void Unregister(RegistrationContext context)
+    {
+        _redirectionAttribute.Unregister(context);
     }
 }

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/CodeMarkerTimerId.cs

@@ -2,16 +2,15 @@
 
 #pragma warning disable CA1200 // Avoid using cref tags with a prefix
 
-namespace Microsoft.VisualStudio
+namespace Microsoft.VisualStudio;
+
+/// <summary>
+///     Represents timer IDs that are passed to <see cref="T:Microsoft.Internal.Performance.CodeMarker"/>.
+/// </summary>
+internal static class CodeMarkerTimerId
 {
     /// <summary>
-    ///     Represents timer IDs that are passed to <see cref="T:Microsoft.Internal.Performance.CodeMarker"/>.
+    ///     Indicates that NuGet package restore has finished.
     /// </summary>
-    internal static class CodeMarkerTimerId
-    {
-        /// <summary>
-        ///     Indicates that NuGet package restore has finished.
-        /// </summary>
-        public const int PerfPackageRestoreEnd = 7343;
-    }
+    public const int PerfPackageRestoreEnd = 7343;
 }

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/IO/WindowsFileExplorer.cs

@@ -3,76 +3,75 @@
 using System.Runtime.InteropServices;
 using Path = Microsoft.IO.Path;
 
-namespace Microsoft.VisualStudio.IO
+namespace Microsoft.VisualStudio.IO;
+
+[Export(typeof(IFileExplorer))]
+internal class WindowsFileExplorer : IFileExplorer
 {
-    [Export(typeof(IFileExplorer))]
-    internal class WindowsFileExplorer : IFileExplorer
+    private readonly IFileSystem _fileSystem;
+
+    [ImportingConstructor]
+    public WindowsFileExplorer(IFileSystem fileSystem)
+    {
+        _fileSystem = fileSystem;
+    }
+
+    public void OpenContainingFolder(string path)
     {
-        private readonly IFileSystem _fileSystem;
+        Requires.NotNullOrEmpty(path);
 
-        [ImportingConstructor]
-        public WindowsFileExplorer(IFileSystem fileSystem)
+        // When 'path' doesn't exist, Explorer just opens the default
+        // "Quick Access" page, so try to something better than that.
+        if (_fileSystem.PathExists(path))
         {
-            _fileSystem = fileSystem;
+            // Tell Explorer to open the parent folder of the item, selecting the item
+            ShellExecute(
+                string.Empty,
+                Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "explorer.exe"),
+                parameters: $"/select,\"{path}\"");
         }
-
-        public void OpenContainingFolder(string path)
+        else
         {
-            Requires.NotNullOrEmpty(path);
-
-            // When 'path' doesn't exist, Explorer just opens the default
-            // "Quick Access" page, so try to something better than that.
-            if (_fileSystem.PathExists(path))
-            {
-                // Tell Explorer to open the parent folder of the item, selecting the item
-                ShellExecute(
-                    string.Empty,
-                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "explorer.exe"),
-                    parameters: $"/select,\"{path}\"");
-            }
-            else
+            string? parentPath = GetParentPath(path);
+            if (parentPath is not null && _fileSystem.DirectoryExists(parentPath))
             {
-                string? parentPath = GetParentPath(path);
-                if (parentPath is not null && _fileSystem.DirectoryExists(parentPath))
-                {
-                    OpenFolder(parentPath);
-                }
+                OpenFolder(parentPath);
             }
         }
+    }
 
-        public void OpenFolder(string path)
-        {
-            Requires.NotNullOrEmpty(path);
+    public void OpenFolder(string path)
+    {
+        Requires.NotNullOrEmpty(path);
 
-            // Tell Explorer just open the contents of the folder, selecting nothing
-            ShellExecute("explore", path);
-        }
+        // Tell Explorer just open the contents of the folder, selecting nothing
+        ShellExecute("explore", path);
+    }
 
-        protected static void ShellExecute(string operation, string filePath, string? parameters = null)
-        {
-            // Workaround of CLR bug 1134711; System.Diagnostics.Process.Start() does not support GB18030
-            _ = ShellExecute(IntPtr.Zero, operation, filePath, parameters, lpDirectory: null, 1);
-        }
+    protected static void ShellExecute(string operation, string filePath, string? parameters = null)
+    {
+        // Workaround of CLR bug 1134711; System.Diagnostics.Process.Start() does not support GB18030
+        _ = ShellExecute(IntPtr.Zero, operation, filePath, parameters, lpDirectory: null, 1);
+    }
 
-        private static string? GetParentPath(string path)
+    private static string? GetParentPath(string path)
+    {
+        // Remove trailing slashes, so that GetDirectoryName returns 
+        // "Foo" in C:\Foo\Project\" instead of "C:\Foo\Project".
+        if (Path.EndsInDirectorySeparator(path))
         {
-            // Remove trailing slashes, so that GetDirectoryName returns 
-            // "Foo" in C:\Foo\Project\" instead of "C:\Foo\Project".
-            if (Path.EndsInDirectorySeparator(path))
-            {
-                path = path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
-            }
-
-            return Path.GetDirectoryName(path);
+            path = path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
         }
 
-        [DllImport("shell32.dll", EntryPoint = "ShellExecuteW")]
-        internal static extern IntPtr ShellExecute(
-            IntPtr hwnd,
-            [MarshalAs(UnmanagedType.LPWStr)] string lpOperation,
-            [MarshalAs(UnmanagedType.LPWStr)] string lpFile,
-            [MarshalAs(UnmanagedType.LPWStr)] string? lpParameters,
-            [MarshalAs(UnmanagedType.LPWStr)] string? lpDirectory,
-            int nShowCmd);
+        return Path.GetDirectoryName(path);
     }
+
+    [DllImport("shell32.dll", EntryPoint = "ShellExecuteW")]
+    internal static extern IntPtr ShellExecute(
+        IntPtr hwnd,
+        [MarshalAs(UnmanagedType.LPWStr)] string lpOperation,
+        [MarshalAs(UnmanagedType.LPWStr)] string lpFile,
+        [MarshalAs(UnmanagedType.LPWStr)] string? lpParameters,
+        [MarshalAs(UnmanagedType.LPWStr)] string? lpDirectory,
+        int nShowCmd);
 }

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Input/CommandGroup.cs

@@ -1,18 +1,17 @@
 // 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.
 
-namespace Microsoft.VisualStudio.Input
+namespace Microsoft.VisualStudio.Input;
+
+/// <summary>
+///     Provides common well-known command groups.
+/// </summary>
+internal static class CommandGroup
 {
-    /// <summary>
-    ///     Provides common well-known command groups.
-    /// </summary>
-    internal static class CommandGroup
-    {
-        public const string UIHierarchyWindow = VSConstants.CMDSETID.UIHierarchyWindowCommandSet_string;
-        public const string VisualStudioStandard97 = VSConstants.CMDSETID.StandardCommandSet97_string;
-        public const string VisualStudioStandard2k = VSConstants.CMDSETID.StandardCommandSet2K_string;
-        public const string FSharpProject = "{75AC5611-A912-4195-8A65-457AE17416FB}";
-        public const string ManagedProjectSystemOrder = "{6C4806E9-034E-4B64-99DE-29A6F837B993}";
-        public const string ManagedProjectSystem = "{568ABDF7-D522-474D-9EED-34B5E5095BA5}";
-        public const string WPF = "{A8878AC2-6163-4C15-9767-1871DD750C6A}";
-    }
+    public const string UIHierarchyWindow = VSConstants.CMDSETID.UIHierarchyWindowCommandSet_string;
+    public const string VisualStudioStandard97 = VSConstants.CMDSETID.StandardCommandSet97_string;
+    public const string VisualStudioStandard2k = VSConstants.CMDSETID.StandardCommandSet2K_string;
+    public const string FSharpProject = "{75AC5611-A912-4195-8A65-457AE17416FB}";
+    public const string ManagedProjectSystemOrder = "{6C4806E9-034E-4B64-99DE-29A6F837B993}";
+    public const string ManagedProjectSystem = "{568ABDF7-D522-474D-9EED-34B5E5095BA5}";
+    public const string WPF = "{A8878AC2-6163-4C15-9767-1871DD750C6A}";
 }

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Input/ExternalResourceIds.cs

@@ -1,36 +1,35 @@
 // 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.
 
-namespace Microsoft.VisualStudio.Input
+namespace Microsoft.VisualStudio.Input;
+
+// from VS: src\vsproject\cool\coolpkg\resource.h
+internal enum LegacyCSharpStringResourceIds : uint
 {
-    // from VS: src\vsproject\cool\coolpkg\resource.h
-    internal enum LegacyCSharpStringResourceIds : uint
-    {
-        IDS_TEMPLATE_NEWWFCWIN32FORM = 2237,
-        IDS_TEMPLATE_DIRLOCALITEMS = 2339,
-        IDS_TEMPLATE_NEWCSharpCLASS = 2245,
-        IDS_TEMPLATE_NEWWFCCOMPONENT = 2246,
-        IDS_TEMPLATE_NEWUSERCONTROL = 2295,
-        IDS_PROJECTITEMTYPE_STR = 2346,
-    }
+    IDS_TEMPLATE_NEWWFCWIN32FORM = 2237,
+    IDS_TEMPLATE_DIRLOCALITEMS = 2339,
+    IDS_TEMPLATE_NEWCSharpCLASS = 2245,
+    IDS_TEMPLATE_NEWWFCCOMPONENT = 2246,
+    IDS_TEMPLATE_NEWUSERCONTROL = 2295,
+    IDS_PROJECTITEMTYPE_STR = 2346,
+}
 
-    // from VS: src\vsproject\vb\vbprj\vbprjstr.h
-    internal enum LegacyVBStringResourceIds : uint
-    {
-        IDS_VSDIR_ITEM_CLASS = 3020,
-        IDS_VSDIR_ITEM_COMPONENT = 3024,
-        IDS_VSDIR_ITEM_MODULE = 3028,
-        IDS_VSDIR_ITEM_USERCTRL = 3048,
-        IDS_VSDIR_ITEM_WINFORM = 3050,
-        IDS_VSDIR_CLIENTPROJECTITEMS = 3081,
-        IDS_VSDIR_VBPROJECTFILES = 3082,
-    }
+// from VS: src\vsproject\vb\vbprj\vbprjstr.h
+internal enum LegacyVBStringResourceIds : uint
+{
+    IDS_VSDIR_ITEM_CLASS = 3020,
+    IDS_VSDIR_ITEM_COMPONENT = 3024,
+    IDS_VSDIR_ITEM_MODULE = 3028,
+    IDS_VSDIR_ITEM_USERCTRL = 3048,
+    IDS_VSDIR_ITEM_WINFORM = 3050,
+    IDS_VSDIR_CLIENTPROJECTITEMS = 3081,
+    IDS_VSDIR_VBPROJECTFILES = 3082,
+}
 
-    // from VS: src\vsproject\fidalgo\WPF\Flavor\WPFFlavor\WPFProject.cs
-    internal enum WPFTemplateNames : uint
-    {
-        WPFPage = 4658,
-        WPFResourceDictionary = 4662,
-        WPFUserControl = 4664,
-        WPFWindow = 4666,
-    }
+// from VS: src\vsproject\fidalgo\WPF\Flavor\WPFFlavor\WPFProject.cs
+internal enum WPFTemplateNames : uint
+{
+    WPFPage = 4658,
+    WPFResourceDictionary = 4662,
+    WPFUserControl = 4664,
+    WPFWindow = 4666,
 }