Made progress on MS.VS.Threading issue

The problem turned out to be logic in the app.config files of the VSIX projects. These had binding redirect logic in it for several DLLs and that, apparently, was contributing to how `ResolveAssemblyReference` functions. I'm unsure how but once I removed the app.config files (which weren't needed) the issues went away. Something to dig into later to see what actually was happening here. Good news though is I'm back on track. Need to undo the part where I moved the VS2017 project no 2015 but that (hopefully) can make progress now.
VsVim · Jul 4, 2021 · 4aa0c0a · 4aa0c0a
1 parent d735aa8
commit 4aa0c0a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 90 deletions.
diff --git a/References/Vs2017/Vs2017.Build.targets b/References/Vs2017/Vs2017.Build.targets
@@ -9,7 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.0.26201" Condition="'$(VsVimProjectType)' == 'Vsix'" />
+    <!-- <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.0.26201" Condition="'$(VsVimProjectType)' == 'Vsix'" /> -->
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="14.3.25420" Condition="'$(VsVimProjectType)' == 'Vsix'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -50,7 +51,7 @@
     <Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Platform.VSEditor.Interop, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />

diff --git a/Src/VimCore/VimCore.fsproj b/Src/VimCore/VimCore.fsproj
@@ -3,7 +3,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Vim.Core</RootNamespace>
     <AssemblyName>Vim.Core</AssemblyName>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <OtherFlags>--standalone</OtherFlags>
     <NoWarn>2011</NoWarn>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>

diff --git a/Src/VimWpf/VimWpf.csproj b/Src/VimWpf/VimWpf.csproj
@@ -4,7 +4,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Vim.UI.Wpf</RootNamespace>
     <AssemblyName>Vim.UI.Wpf</AssemblyName>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

diff --git a/Src/VsVim2017/VsVim2017.csproj b/Src/VsVim2017/VsVim2017.csproj
@@ -6,7 +6,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Vim.VisualStudio</RootNamespace>
     <AssemblyName>VsVim</AssemblyName>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <StartAction>Program</StartAction>
     <UseCodebase>true</UseCodebase>
     <StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
@@ -53,8 +53,6 @@
       <SubType>Designer</SubType>
     </VSCTCompile>
 
-    <!-- Non shared items -->
-    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>

diff --git a/Src/VsVim2017/app.config b/Src/VsVim2017/app.config
diff --git a/Src/VsVim2019/VsVim2019.csproj b/Src/VsVim2019/VsVim2019.csproj
@@ -18,7 +18,7 @@
     <!-- TODO_SHARED should undo this but suppressing for now. -->
     <RunAnalyzers>false</RunAnalyzers>
 
-    <DeployExtension Condition="'$(VisualStudioVersion)' != '16.0'">False</DeployExtension>
+    <DeployExtension Condition="'$(VisualStudioVersion)' != '16.0' OR '$(BuildingInsideVisualStudio)' != 'true'">False</DeployExtension>
 
     <!-- This is needed to prevent forced migrations when opening the project in Vs2017 -->
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
@@ -55,8 +55,6 @@
       <SubType>Designer</SubType>
     </VSCTCompile>
 
-    <!-- Non shared items -->
-    <None Include="app.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>

diff --git a/Src/VsVim2019/app.config b/Src/VsVim2019/app.config