Fix additional errors caused by the last release

Nightro · May 29, 2020 · 7360868 · 7360868
1 parent b29c2c8
commit 7360868
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/code/VSBlockJumper.csproj.user b/code/VSBlockJumper.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe</StartProgram>
+    <StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe</StartProgram>
     <StartArguments>/rootsuffix Exp</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">

diff --git a/code/VSBlockJumperPackage.cs b/code/VSBlockJumperPackage.cs
@@ -35,6 +35,7 @@ protected async override Task InitializeAsync(CancellationToken cancellationToke
             // yet initialised - by the time it IS initialised, we also load our options - I think this is the
             // safest way (if not cleanest) to ensure we have an options service ready to push our data into
             var componentModel = await GetServiceAsync(typeof(SComponentModel)) as IComponentModel;
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
             OptionPageGrid.OptionsService = componentModel.GetService<IEditorOptionsFactoryService>();
 
             // this also sucks - here we force the options to be loaded as they are otherwise NOT loaded even when 

diff --git a/code/source.extension.vsixmanifest b/code/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="VSBlockJumper.Anthony Reddan.6d90d2bf-c317-4e02-97e2-ebdc4d657a76" Version="1.1.3" Language="en-US" Publisher="Anthony Reddan" />
+        <Identity Id="VSBlockJumper.Anthony Reddan.6d90d2bf-c317-4e02-97e2-ebdc4d657a76" Version="1.1.4" Language="en-US" Publisher="Anthony Reddan" />
         <DisplayName>VSBlockJumper</DisplayName>
         <Description xml:space="preserve">Enables vertical navigation over blocks of code by allowing you to jump to the next blank line (above or below the cursor) adjacent to a block. This is similar to next/previous blank line in Vim.</Description>
         <MoreInfo>https://github.com/Nightro/VSBlockJumper</MoreInfo>