Updated to latest toolkit versions

madskristensen · madskristensen · commit 46c001aec955 · 2021-06-30T16:10:26.000-07:00
diff --git a/InsertGuid/Commands/MyCommand.cs b/InsertGuid/Commands/MyCommand.cs
@@ -2,6 +2,7 @@
 using Community.VisualStudio.Toolkit;
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Text.Editor;
 using Task = System.Threading.Tasks.Task;
 
 namespace InsertGuid
@@ -11,10 +12,10 @@ internal sealed class MyCommand : BaseCommand<MyCommand>
     {
         protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
-            TextDocument doc = await VS.Editor.GetActiveTextDocumentAsync();
+            IWpfTextView view = await VS.Documents.GetCurrentTextViewAsync();
+            var position = view.Selection.Start.Position.Position;
 
-            doc?.Selection.Insert(Guid.NewGuid().ToString());
+            view.TextBuffer.Insert(position, Guid.NewGuid().ToString());
         }
     }
 }
diff --git a/InsertGuid/InsertGuid.csproj b/InsertGuid/InsertGuid.csproj
@@ -83,7 +83,7 @@
     <Reference Include="System.Design" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Community.VisualStudio.Toolkit" Version="16.0.75.81" ExcludeAssets="runtime">
+    <PackageReference Include="Community.VisualStudio.Toolkit" Version="16.0.75.152-pre" ExcludeAssets="runtime">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Community.VisualStudio.VSCT" Version="16.0.29.6" PrivateAssets="all" />
diff --git a/Options/Options.csproj b/Options/Options.csproj
@@ -84,7 +84,9 @@
     <Reference Include="System.Design" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Community.VisualStudio.Toolkit" Version="16.0.75.81" ExcludeAssets="Runtime" />
+    <PackageReference Include="Community.VisualStudio.Toolkit" Version="16.0.75.152-pre" ExcludeAssets="Runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Community.VisualStudio.VSCT" Version="16.0.29.6" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.10.11" />
   </ItemGroup>
diff --git a/ToolWindow/ToolWindow.csproj b/ToolWindow/ToolWindow.csproj
@@ -96,7 +96,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Community.VisualStudio.Toolkit" Version="16.0.75.81" ExcludeAssets="Runtime" />
+    <PackageReference Include="Community.VisualStudio.Toolkit" Version="16.0.75.152-pre" ExcludeAssets="Runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Community.VisualStudio.VSCT" Version="16.0.29.6" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.10.11" />
   </ItemGroup>
diff --git a/ToolWindow/ToolWindows/MyToolWindow.cs b/ToolWindow/ToolWindows/MyToolWindow.cs
@@ -16,8 +16,8 @@ public class MyToolWindow : BaseToolWindow<MyToolWindow>
 
         public override async Task<FrameworkElement> CreateAsync(int toolWindowId, CancellationToken cancellationToken)
         {
-            EnvDTE80.DTE2 dte = await VS.GetDTEAsync();
-            return new MyToolWindowControl(dte);
+            Version vsVersion = await VS.Shell.GetVsVersionAsync();
+            return new MyToolWindowControl(vsVersion);
         }
 
         [Guid("03030460-e1a2-49ab-a4c5-b7b9cfc2a4df")]
diff --git a/ToolWindow/ToolWindows/MyToolWindowControl.xaml.cs b/ToolWindow/ToolWindows/MyToolWindowControl.xaml.cs
@@ -1,21 +1,22 @@
 ﻿using Community.VisualStudio.Toolkit;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 
 namespace ToolWindow
 {
     public partial class MyToolWindowControl : UserControl
     {
-        public MyToolWindowControl(EnvDTE80.DTE2 dte)
+        public MyToolWindowControl(Version vsVersion)
         {
             InitializeComponent();
 
-            lblHeadline.Content = $"Visual Studio v{dte.Version}";
+            lblHeadline.Content = $"Visual Studio v{vsVersion}";
         }
 
         private void button1_Click(object sender, RoutedEventArgs e)
         {
-            VS.Notifications.ShowMessage("ToolWindow", "Button clicked");
+            VS.MessageBox.Show("ToolWindow", "Button clicked");
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Community.VisualStudio.Toolkit;`
`3`	`3`	`using EnvDTE;`
`4`	`4`	`using Microsoft.VisualStudio.Shell;`
	`5`	`+using Microsoft.VisualStudio.Text.Editor;`
`5`	`6`	`using Task = System.Threading.Tasks.Task;`
`6`	`7`
`7`	`8`	`namespace InsertGuid`
`@@ -11,10 +12,10 @@ internal sealed class MyCommand : BaseCommand<MyCommand>`
`11`	`12`	`{`
`12`	`13`	`protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)`
`13`	`14`	`{`
`14`		`- await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();`
`15`		`- TextDocument doc = await VS.Editor.GetActiveTextDocumentAsync();`
	`15`	`+ IWpfTextView view = await VS.Documents.GetCurrentTextViewAsync();`
	`16`	`+ var position = view.Selection.Start.Position.Position;`
`16`	`17`
`17`		`- doc?.Selection.Insert(Guid.NewGuid().ToString());`
	`18`	`+ view.TextBuffer.Insert(position, Guid.NewGuid().ToString());`
`18`	`19`	`}`
`19`	`20`	`}`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public class MyToolWindow : BaseToolWindow<MyToolWindow>`
`16`	`16`
`17`	`17`	`public override async Task<FrameworkElement> CreateAsync(int toolWindowId, CancellationToken cancellationToken)`
`18`	`18`	`{`
`19`		`- EnvDTE80.DTE2 dte = await VS.GetDTEAsync();`
`20`		`- return new MyToolWindowControl(dte);`
	`19`	`+ Version vsVersion = await VS.Shell.GetVsVersionAsync();`
	`20`	`+ return new MyToolWindowControl(vsVersion);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`[Guid("03030460-e1a2-49ab-a4c5-b7b9cfc2a4df")]`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,22 @@`
`1`	`1`	`using Community.VisualStudio.Toolkit;`
	`2`	`+using System;`
`2`	`3`	`using System.Windows;`
`3`	`4`	`using System.Windows.Controls;`
`4`	`5`
`5`	`6`	`namespace ToolWindow`
`6`	`7`	`{`
`7`	`8`	`public partial class MyToolWindowControl : UserControl`
`8`	`9`	`{`
`9`		`- public MyToolWindowControl(EnvDTE80.DTE2 dte)`
	`10`	`+ public MyToolWindowControl(Version vsVersion)`
`10`	`11`	`{`
`11`	`12`	`InitializeComponent();`
`12`	`13`
`13`		`- lblHeadline.Content = $"Visual Studio v{dte.Version}";`
	`14`	`+ lblHeadline.Content = $"Visual Studio v{vsVersion}";`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`private void button1_Click(object sender, RoutedEventArgs e)`
`17`	`18`	`{`
`18`		`- VS.Notifications.ShowMessage("ToolWindow", "Button clicked");`
	`19`	`+ VS.MessageBox.Show("ToolWindow", "Button clicked");`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`	`}`