Merge branch 'fix-256'

hvanbakel · Jul 24, 2019 · 28cac93 · 28cac93
2 parents d5a5ba7 + bb7cbc4
commit 28cac93
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 144 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,13 +10,17 @@
 		<Copyright>Copyright Hans van Bakel</Copyright>
 		<Description>Tool for converting a MSBuild project file to VS2017 format and beyond.</Description>
 		<PackageTags>dotnet csproj fsproj vbproj msbuild conversion vs2015 vs14 vs15 vs2017</PackageTags>
-		<Version>4.1.0</Version>
+		<Version>4.1.1</Version>
 		<AssemblyVersion>4.1.0.0</AssemblyVersion>
 
 		<!-- SourceLink -->
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+
+		<!-- Workarounds for https://github.com/hvanbakel/CsprojToVs2017/issues/256 -->
+		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+		<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+    <Target Name="ForceGenerationOfBindingRedirects" AfterTargets="ResolveAssemblyReferences" BeforeTargets="GenerateBindingRedirects" Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
+        <PropertyGroup>
+            <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        </PropertyGroup>
+    </Target>
+</Project>
diff --git a/Project2015To2017.Console/Options.cs b/Project2015To2017.Console/Options.cs
diff --git a/Project2015To2017.Console/Program.cs b/Project2015To2017.Console/Program.cs
diff --git a/Project2015To2017.Console/Project2015To2017.Console.csproj b/Project2015To2017.Console/Project2015To2017.Console.csproj
diff --git a/Project2015To2017.Core/Project2015To2017.Core.csproj b/Project2015To2017.Core/Project2015To2017.Core.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
-	<PackageReference Include="NuGet.Configuration" Version="4.9.3" />
+	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.1.0" />
+	<PackageReference Include="NuGet.Configuration" Version="5.1.0" />
 	<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
-	<PackageReference Include="System.Memory" Version="4.5.2" />
+	<PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">

diff --git a/Project2015To2017.Migrate2017.Tool/Project2015To2017.Migrate2017.Tool.csproj b/Project2015To2017.Migrate2017.Tool/Project2015To2017.Migrate2017.Tool.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="DotNet.Glob" Version="2.1.1" />
+	<PackageReference Include="DotNet.Glob" Version="3.0.5" />
 	<PackageReference Include="Serilog" Version="2.8.0" />
-	<PackageReference Include="Serilog.Enrichers.Demystify" Version="0.1.0-dev-00016" />
-	<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
+	<PackageReference Include="Serilog.Enrichers.Demystify" Version="1.0.0-dev-00019" />
+	<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.4" />
 	<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
   </ItemGroup>
 

diff --git a/Project2015To2017.Migrate2017.Tool/app.config b/Project2015To2017.Migrate2017.Tool/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/Project2015To2017.Migrate2019.Tool/Project2015To2017.Migrate2019.Tool.csproj b/Project2015To2017.Migrate2019.Tool/Project2015To2017.Migrate2019.Tool.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="DotNet.Glob" Version="2.1.1" />
+	<PackageReference Include="DotNet.Glob" Version="3.0.5" />
 	<PackageReference Include="Serilog" Version="2.8.0" />
-	<PackageReference Include="Serilog.Enrichers.Demystify" Version="0.1.0-dev-00016" />
-	<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
+	<PackageReference Include="Serilog.Enrichers.Demystify" Version="1.0.0-dev-00019" />
+	<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.4" />
 	<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
   </ItemGroup>
 

diff --git a/Project2015To2017.Migrate2019.Tool/app.config b/Project2015To2017.Migrate2019.Tool/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/Project2015To2017.Tests/Project2015To2017.Tests.csproj b/Project2015To2017.Tests/Project2015To2017.Tests.csproj
@@ -171,7 +171,7 @@
 
   <ItemGroup>
 	<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
 	<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
 	<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>

diff --git a/Project2015To2017.sln b/Project2015To2017.sln
@@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Project2015To2017", "Projec
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Project2015To2017.Core", "Project2015To2017.Core\Project2015To2017.Core.csproj", "{D9D7DB74-7503-47B3-ABFB-E6B991082E47}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Project2015To2017.Console", "Project2015To2017.Console\Project2015To2017.Console.csproj", "{89BDCF6C-0B08-4545-9423-CBBBD826226B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Project2015To2017.Migrate2017.Tool", "Project2015To2017.Migrate2017.Tool\Project2015To2017.Migrate2017.Tool.csproj", "{449F6C91-0C98-40CE-8819-D24BD6FFE2C5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Project2015To2017.Migrate2017.Library", "Project2015To2017.Migrate2017.Library\Project2015To2017.Migrate2017.Library.csproj", "{EBB75840-2B0E-4F56-B702-E256E34A40C1}"
@@ -45,10 +43,6 @@ Global
 		{D9D7DB74-7503-47B3-ABFB-E6B991082E47}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9D7DB74-7503-47B3-ABFB-E6B991082E47}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9D7DB74-7503-47B3-ABFB-E6B991082E47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89BDCF6C-0B08-4545-9423-CBBBD826226B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89BDCF6C-0B08-4545-9423-CBBBD826226B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89BDCF6C-0B08-4545-9423-CBBBD826226B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89BDCF6C-0B08-4545-9423-CBBBD826226B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{449F6C91-0C98-40CE-8819-D24BD6FFE2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{449F6C91-0C98-40CE-8819-D24BD6FFE2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{449F6C91-0C98-40CE-8819-D24BD6FFE2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU