Fix emergency resolution (VS2017 for dataflow) - fixes #542

We can't do this because we don't ship the dataflow assembly. Doing so requires some extra build targets which seems like more complexity.
[assembly: ProvideBindingRedirection(AssemblyName = "System.Threading.Tasks.Dataflow",
      OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = "4.5.9999.9999", NewVersion = "4.6.0.0")]

Author: GrahamTheCoder

CHANGELOG.md

@@ -14,6 +14,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### C# -> VB
 
 
+## [8.0.1] - 2020-03-13
+
+
+### Vsix
+
+* Fixes conversion in VS2017
+
+### VB -> C#
+
+
+### C# -> VB
+
+
 ## [8.0.0] - 2020-03-11
 
 * Known issue: Breaks VS2017 support - please use [7.9.0](https://github.com/icsharpcode/CodeConverter/releases/tag/7.9.0) until the next version is released

CodeConverter/CodeConverter.csproj

@@ -10,8 +10,8 @@
 * Completely free and open source: Check out [GitHub](https://github.com/icsharpcode/CodeConverter#code-converter-).</Description>
     <Product>Code Converter for C# to/from VB.NET</Product>
     <Copyright>Copyright (c) 2017-2020 AlphaSierraPapa for the CodeConverter team</Copyright>
-    <AssemblyVersion>8.0.0.0</AssemblyVersion>
-    <FileVersion>8.0.0.0</FileVersion>
+    <AssemblyVersion>8.0.1.0</AssemblyVersion>
+    <FileVersion>8.0.1.0</FileVersion>
     <Version>8.0.0</Version>
     <PackageId>ICSharpCode.CodeConverter</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

Vsix/CodeConverterPackage.cs

@@ -84,22 +84,23 @@ public sealed class CodeConverterPackage : AsyncPackage
         internal Cancellation PackageCancellation { get; } = new Cancellation();
 
         private readonly AssemblyName _thisAssemblyName;
-        private readonly AssemblyName[] _ourAssemblyNames;
+        private readonly HashSet<string> _ourAssemblyNames;
         /// <summary>
         /// Initializes a new instance of package class.
         /// </summary>
         public CodeConverterPackage()
         {
             var thisAssembly = GetType().Assembly;
             _thisAssemblyName = thisAssembly.GetName();
-            _ourAssemblyNames = new[] { _thisAssemblyName }.Concat(thisAssembly.GetReferencedAssemblies().Where(a => a.Name.StartsWith("ICSharpCode"))).ToArray();
+            _ourAssemblyNames = new HashSet<string>(new[] { _thisAssemblyName }.Concat(thisAssembly.GetReferencedAssemblies().Where(a => a.Name.StartsWith("ICSharpCode"))).Select(a => a.FullName));
             AppDomain.CurrentDomain.AssemblyResolve += LoadWithoutVersionForOurDependencies;
             // Inside this method you can place any initialization code that does not require
             // any Visual Studio service because at this point the package object is created but
             // not sited yet inside Visual Studio environment. The place to do all the other
             // initialization is the Initialize method.
         }
 
+        // System.Threading.Tasks.Dataflow 4.5.24.0 shipped with VS2017 15.9.21+28307.1064 but we want to target 4.6.0.0
         private Assembly LoadWithoutVersionForOurDependencies(object sender, ResolveEventArgs args)
         {
             var requestedAssemblyName = new AssemblyName(args.Name);
@@ -126,7 +127,7 @@ private static Assembly LoadAnyVersionOfAssembly(AssemblyName assemblyName)
 
         private bool IsThisExtensionRequestingAssembly()
         {
-            return GetPossibleRequestingAssemblies().Any(requesting => _ourAssemblyNames.Any(assemblyName => Equals(requesting, assemblyName)));
+            return GetPossibleRequestingAssemblies().Any(requesting => _ourAssemblyNames.Contains(requesting.FullName));
         }
 
         private IEnumerable<AssemblyName> GetPossibleRequestingAssemblies()

Vsix/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="7e2a69d6-193b-4cdf-878d-3370d5931942" Version="8.0.0.0" Language="en-US" Publisher="IC#Code"/>
+        <Identity Id="7e2a69d6-193b-4cdf-878d-3370d5931942" Version="8.0.1.0" Language="en-US" Publisher="IC#Code"/>
         <DisplayName>Code Converter C# to/from VB.NET</DisplayName>
         <Description xml:space="preserve">Based on Roslyn, this converter allows you to convert C# code to VB.NET and vice versa</Description>
         <License>license.txt</License>

Web/Web.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <AssemblyVersion>8.0.0.0</AssemblyVersion>
-    <FileVersion>8.0.0.0</FileVersion>
+    <AssemblyVersion>8.0.1.0</AssemblyVersion>
+    <FileVersion>8.0.1.0</FileVersion>
     <Version>8.0.0</Version>
     <LangVersion>7.3</LangVersion>
     <NoWarn>$(NoWarn);1998</NoWarn>

appveyor.yml

@@ -1,5 +1,5 @@
 platform: Any CPU
-version: 8.0.0.{build}
+version: 8.0.1.{build}
 configuration: Debug
 image: Visual Studio 2019
 

azure-pipelines.yml

@@ -7,7 +7,7 @@ pr:
 variables:
   solution: '**/CodeConverter.sln'
   buildPlatform: 'Any CPU'
-  buildVersion: '8.0.0.$(Build.BuildId)'
+  buildVersion: '8.0.1.$(Build.BuildId)'
 
 pool:
   vmImage: 'windows-2019'