Sample update for VS 17.9 Preview 1

New_Extensibility_Model/Samples/.editorconfig

@@ -4,7 +4,7 @@
 root = true
 
 [*]
-indent_style = tab
+indent_style = spaces
 
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
@@ -125,7 +125,7 @@ csharp_indent_labels = flush_left
 # Prefer "var" everywhere
 csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = false:warning
+csharp_style_var_elsewhere = false:suggestion
 
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none

New_Extensibility_Model/Samples/CommandParentingSample/.vsextension/string-resources.json

@@ -1,4 +1,4 @@
 {
-	"CommandParentingSample.SampleCommand.DisplayName": "My Command",
-	"CommandParentingSample.ToolBar.DisplayName": "Command Parenting Sample Toolbar"
+  "CommandParentingSample.SampleCommand.DisplayName": "My Command",
+  "CommandParentingSample.ToolBar.DisplayName": "Command Parenting Sample Toolbar"
 }

New_Extensibility_Model/Samples/CommandParentingSample/CommandParentingSample.csproj

@@ -1,26 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFrameworks>net6.0</TargetFrameworks>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<LangVersion>11</LangVersion>
-		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-		<NoWarn>SA1633;SA1600;CA1303;CA1016;CA1031;CA1812;$(NoWarn)</NoWarn>
+  <PropertyGroup>
+    <TargetFrameworks>net8.0-windows8.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>11</LangVersion>
+    <NoWarn>$(NoWarn);CS1591;CA1812;CA1303;SA1600</NoWarn>
 
-		<!-- The VisualStudio.Extensibility preview packages are available from the azure-public/vside/msft_consumption feed -->
-		<RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption/nuget/v3/index.json;$(RestoreAdditionalProjectSources)</RestoreAdditionalProjectSources>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.8.2055-preview-3" />
-		<PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.8.2055-preview-3" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Content Include=".vsextension\**\string-resources.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
+    <!-- The VisualStudio.Extensibility preview packages are available from the azure-public/vside/msft_consumption feed -->
+    <RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption/nuget/v3/index.json;$(RestoreAdditionalProjectSources)</RestoreAdditionalProjectSources>
+  </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.9.41-preview-1" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.9.41-preview-1" />
+  </ItemGroup>
 </Project>

New_Extensibility_Model/Samples/CommandParentingSample/CommandParentingSampleExtension.cs

@@ -12,19 +12,20 @@ namespace CommandParentingSample;
 [VisualStudioContribution]
 public class CommandParentingSampleExtension : Extension
 {
-	/// <inheritdoc/>
-	public override ExtensionConfiguration ExtensionConfiguration => new()
-	{
-		Metadata = new(
-				id: "CommandParentingSample.c30b7870-76bc-4ef6-93e8-15b9a54c9e2b",
-				version: this.ExtensionAssemblyVersion,
-				publisherName: "Microsoft",
-				displayName: "Command Parenting Sample Extension"),
-	};
+    /// <inheritdoc/>
+    public override ExtensionConfiguration ExtensionConfiguration => new()
+    {
+        Metadata = new(
+                id: "CommandParentingSample.c30b7870-76bc-4ef6-93e8-15b9a54c9e2b",
+                version: this.ExtensionAssemblyVersion,
+                publisherName: "Microsoft",
+                displayName: "Command Parenting Sample Extension",
+                description: "Sample extension demonstrating command parenting"),
+    };
 
-	/// <inheritdoc/>
-	protected override void InitializeServices(IServiceCollection serviceCollection)
-	{
-		base.InitializeServices(serviceCollection);
-	}
+    /// <inheritdoc/>
+    protected override void InitializeServices(IServiceCollection serviceCollection)
+    {
+        base.InitializeServices(serviceCollection);
+    }
 }

New_Extensibility_Model/Samples/CommandParentingSample/ExtensionCommandConfiguration.cs

@@ -1,16 +1,19 @@
-namespace CommandParentingSample;
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace CommandParentingSample;
 
 using Microsoft.VisualStudio.Extensibility;
 using Microsoft.VisualStudio.Extensibility.Commands;
 
 internal static class ExtensionCommandConfiguration
 {
-	[VisualStudioContribution]
-	public static ToolbarConfiguration ToolBar => new("%CommandParentingSample.ToolBar.DisplayName%")
-	{
-		Children = new[]
-		{
-			ToolbarChild.Command<SampleCommand>(),
-		},
-	};
+    [VisualStudioContribution]
+    public static ToolbarConfiguration ToolBar => new("%CommandParentingSample.ToolBar.DisplayName%")
+    {
+        Children = new[]
+        {
+            ToolbarChild.Command<SampleCommand>(),
+        },
+    };
 }

New_Extensibility_Model/Samples/CommandParentingSample/README.md

@@ -1,10 +1,73 @@
 ---
 title: Command Parenting Sample reference
-date: 2022-10-14
+date: 2023-10-17
 ---
 
 ## Command Parenting Sample
 
-This extension is meant to act as a sample for how to author a command that can be parented to different aspects of the IDE. The command in this extension is parented to a new Toolbar created by the extension, the context menu when a project item is selected in the Solution Explorer, the context menu when a project is selected in the Solution Explorer, and the solution is selected in the Solution Explorer. 
+This extension is meant to act as a sample for how to author a command that can be parented to different aspects of the IDE. The command in this extension is parented to a new Toolbar created by the extension, the context menu when a project item is selected in the Solution Explorer, the context menu when a project is selected in the Solution Explorer, and the solution is selected in the Solution Explorer.
 
-See also, [Add commands](https://learn.microsoft.com/visualstudio/extensibility/visualstudio.extensibility/command/command).
+## Walkthrough: Command Parenting Sample
+
+This extension is meant to act as a sample for how to author a command that can be parented to different aspects of the IDE. The command in this extension is parented to a new Toolbar created by the extension, the context menu when a project item is selected in the `Solution Explorer`, the context menu when a project is selected in the `Solution Explorer`, and the context menu when a solution is selected in the `Solution Explorer`.
+
+### Command definition
+
+The extension contains a code file that defines a command and its properties starting with the `VisualStudioContribution` class attribute which makes the command available to Visual Studio:
+
+```csharp
+[VisualStudioContribution]
+internal class SampleCommand : Command
+{
+```
+
+The `VisualStudioContribution` attribute registers the command using the class full type name `CommandParentingSample.SampleCommand` as its unique identifier.
+
+The `CommandConfiguration` property defines information about the command that are available to Visual Studio even before the extension is loaded:
+
+```csharp
+    public override CommandConfiguration CommandConfiguration => new("%CommandParentingSample.SampleCommand.DisplayName%")
+    {
+        Placements = new[]
+        {
+            // File in project context menu
+            CommandPlacement.VsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), id: 521, priority: 0),
+
+            // Project context menu
+            CommandPlacement.VsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), id: 518, priority: 0),
+
+            // Solution context menu
+            CommandPlacement.VsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), id: 537, priority: 0),
+        },
+    };
+```
+
+The command is placed in the in 3 different places in the IDE using the `CommandPlacement.VsctParent` method. The command will always be enabled and visible.
+
+### Toolbar Definition
+
+Different from commands, toolbars are configured as static properties and the `VisualStudioContribution` attribute is placed on the property itself instead of the owning class. The attribute registers the toolbar using the owning class full type name plus the property name, `CommandParentingSample.ExtensionCommandConfiguration.ToolBar`, as its unique identifier.
+
+The `ToolbarConfiguration` property defines information about the toolbar that are available to Visual Studio even before the extension is loaded:
+
+```csharp
+    [VisualStudioContribution]
+    public static ToolbarConfiguration ToolBar => new("%CommandParentingSample.ToolBar.DisplayName%")
+    {
+        Children = new[]
+        {
+            ToolbarChild.Command<SampleCommand>(),
+        },
+    };
+```
+
+By default, all toolbars registered this way are parented to the `Standard Toolbar Tray` in Visual Studio. The toolbar can be made visible by clicking the command under `View` -> `Toolbars` -> `Command Parenting Sample Toolbar`.
+
+The `SampleCommand` from earlier is parented onto this toolbar using `ToolbarChild.Command<SampleCommand>()` in the toolbar's `Children`.
+
+### Additional Readings
+
+More information can be found at:
+
+- [Add Visual Studio commands](https://learn.microsoft.com/visualstudio/extensibility/visualstudio.extensibility/command/command)
+- [Menus and Toolbars overview](https://learn.microsoft.com/en-us/visualstudio/extensibility/visualstudio.extensibility/command/menus-and-toolbars?view=vs-2022)

New_Extensibility_Model/Samples/CommandParentingSample/SampleCommand.cs

@@ -11,30 +11,25 @@ namespace CommandParentingSample;
 [VisualStudioContribution]
 internal class SampleCommand : Command
 {
-	public SampleCommand(VisualStudioExtensibility extensibility)
-		: base(extensibility)
-	{
-	}
+    /// <inheritdoc />
+    public override CommandConfiguration CommandConfiguration => new("%CommandParentingSample.SampleCommand.DisplayName%")
+    {
+        Placements = new[]
+        {
+            // File in project context menu
+            CommandPlacement.VsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), id: 521, priority: 0),
 
-	/// <inheritdoc />
-	public override CommandConfiguration CommandConfiguration => new("%CommandParentingSample.SampleCommand.DisplayName%")
-	{
-		Placements = new[]
-		{
-			// File in project context menu
-			CommandPlacement.FromVsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), 521),
+            // Project context menu
+            CommandPlacement.VsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), id: 518, priority: 0),
 
-			// Project context menu
-			CommandPlacement.FromVsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), 518),
+            // Solution context menu
+            CommandPlacement.VsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), id: 537, priority: 0),
+        },
+    };
 
-			// Solution context menu
-			CommandPlacement.FromVsctParent(new Guid("{d309f791-903f-11d0-9efc-00a0c911004f}"), 537),
-		},
-	};
-
-	/// <inheritdoc />
-	public override Task ExecuteCommandAsync(IClientContext context, CancellationToken cancellationToken)
-	{
-		return Task.CompletedTask;
-	}
+    /// <inheritdoc />
+    public override Task ExecuteCommandAsync(IClientContext context, CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
 }

New_Extensibility_Model/Samples/CommentRemover/.vsextension/string-resources.json

@@ -0,0 +1,9 @@
+{
+  "CommentRemover.CommentRemoverMenu.DisplayName": "Comments",
+  "CommentRemover.RemoveAllComments.DisplayName": "Remove All",
+  "CommentRemover.RemoveAllExceptTaskComments.DisplayName": "Remove All Except Tasks",
+  "CommentRemover.RemoveAllExceptXmlDocComments.DisplayName": "Remove All Except Xml Docs",
+  "CommentRemover.RemoveRegions.DisplayName": "Remove Regions",
+  "CommentRemover.RemoveTasks.DisplayName": "Remove Tasks",
+  "CommentRemover.RemoveXmlDocComments.DisplayName": "Remove Xml Docs"
+}

New_Extensibility_Model/Samples/CommentRemover/BaseCommand.cs

@@ -0,0 +1,130 @@
+namespace CommentRemover;
+
+using EnvDTE;
+using EnvDTE80;
+using Microsoft;
+using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.Editor;
+using Microsoft.VisualStudio.Extensibility;
+using Microsoft.VisualStudio.Extensibility.VSSdkCompatibility;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
+using Microsoft.VisualStudio.Text.Tagging;
+using Microsoft.VisualStudio.TextManager.Interop;
+using Microsoft.VisualStudio.Threading;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+
+internal abstract class CommentRemoverCommand : Microsoft.VisualStudio.Extensibility.Commands.Command
+{
+    protected static readonly ActivationConstraint CommandEnabledWhen = ActivationConstraint.ClientContext(ClientContextKey.Shell.ActiveSelectionFileName, @"\.(cs|vb|fs)$");
+
+    private static readonly string[] TaskCaptions = { "TODO", "HACK", "UNDONE", "UNRESOLVEDMERGECONFLICT" };
+
+    public CommentRemoverCommand(
+        TraceSource traceSource,
+        AsyncServiceProviderInjection<DTE, DTE2> dte,
+        MefInjection<IBufferTagAggregatorFactoryService> bufferTagAggregatorFactoryService,
+        MefInjection<IVsEditorAdaptersFactoryService> editorAdaptersFactoryService,
+        AsyncServiceProviderInjection<SVsTextManager, IVsTextManager> textManager)
+    {
+        this.TraceSource = traceSource;
+        this.Dte = dte;
+        this.BufferTagAggregatorFactoryService = bufferTagAggregatorFactoryService;
+        this.EditorAdaptersFactoryService = editorAdaptersFactoryService;
+        this.TextManager = textManager;
+    }
+
+    protected AsyncServiceProviderInjection<DTE, DTE2> Dte { get; private set; }
+
+    protected MefInjection<IBufferTagAggregatorFactoryService> BufferTagAggregatorFactoryService { get; private set; }
+
+    protected MefInjection<IVsEditorAdaptersFactoryService> EditorAdaptersFactoryService { get; private set; }
+
+    protected AsyncServiceProviderInjection<SVsTextManager, IVsTextManager> TextManager { get; private set; }
+
+    protected TraceSource TraceSource { get; private set; }
+
+    protected static bool IsLineEmpty(ITextSnapshotLine line)
+    {
+        var text = line.GetText().Trim();
+
+        return string.IsNullOrWhiteSpace(text)
+               || text == "<!--"
+               || text == "-->"
+               || text == "<%%>"
+               || text == "<%"
+               || text == "%>"
+               || Regex.IsMatch(text, @"<!--(\s+)?-->");
+    }
+
+    protected static bool IsXmlDocComment(ITextSnapshotLine line)
+    {
+        var text = line.GetText().Trim();
+        Microsoft.VisualStudio.Utilities.IContentType contentType = line.Snapshot.TextBuffer.ContentType;
+
+        if (contentType.IsOfType("CSharp") && text.StartsWith("///", StringComparison.Ordinal))
+        {
+            return true;
+        }
+
+        if (contentType.IsOfType("FSharp") && text.StartsWith("///", StringComparison.Ordinal))
+        {
+            return true;
+        }
+
+        if (contentType.IsOfType("Basic") && text.StartsWith("'''", StringComparison.Ordinal))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    protected static bool ContainsTaskComment(ITextSnapshotLine line)
+    {
+        string text = line.GetText().ToUpperInvariant();
+
+        foreach (var task in TaskCaptions)
+        {
+            if (text.Contains(task + ":"))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    protected async Task<IEnumerable<IMappingSpan>> GetClassificationSpansAsync(IWpfTextView view, string classificationName)
+    {
+        if (view is null)
+        {
+            return Enumerable.Empty<IMappingSpan>();
+        }
+
+        IBufferTagAggregatorFactoryService bufferTagAggregatorFactoryService = await this.BufferTagAggregatorFactoryService.GetServiceAsync();
+        ITagAggregator<IClassificationTag> classifier = bufferTagAggregatorFactoryService.CreateTagAggregator<IClassificationTag>(view.TextBuffer);
+        var snapshot = new SnapshotSpan(view.TextBuffer.CurrentSnapshot, 0, view.TextBuffer.CurrentSnapshot.Length);
+
+        return from s in classifier.GetTags(snapshot).Reverse()
+               where s.Tag.ClassificationType.Classification.IndexOf(classificationName, StringComparison.OrdinalIgnoreCase) > -1
+               select s.Span;
+    }
+
+    protected async Task<IWpfTextView> GetCurrentTextViewAsync()
+    {
+        IVsEditorAdaptersFactoryService editorAdapter = await this.EditorAdaptersFactoryService.GetServiceAsync();
+        var view = editorAdapter.GetWpfTextView(await this.GetCurrentNativeTextViewAsync());
+        Assumes.Present(view);
+        return view;
+    }
+
+    protected async Task<IVsTextView> GetCurrentNativeTextViewAsync()
+    {
+        var textManager = await this.TextManager.GetServiceAsync();
+        ErrorHandler.ThrowOnFailure(textManager.GetActiveView(1, null, out IVsTextView activeView));
+        return activeView;
+    }
+}