Retarget projects to .NET 4.6 so Roslyn can load them

8 years ago · 996e04075e
9 changed files with 15 additions and 15 deletions
--- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
+++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net46</TargetFramework>

    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
@ -4,7 +4,7 @@
				@@ -4,7 +4,7 @@

  <PropertyGroup>
    <TargetFramework Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFramework>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net46</TargetFrameworks>

    <Description>IL decompiler engine</Description>
    <Company>ic#code</Company>
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
@ -22,10 +22,10 @@
				@@ -22,10 +22,10 @@
    </dependencies>
  </metadata>
  <files>
-    <file src="bin\$Configuration$\net461\ICSharpCode.Decompiler.dll" target="lib\net461" />
-    <file src="bin\$Configuration$\net461\ICSharpCode.Decompiler.pdb" target="lib\net461" />
-    <file src="bin\$Configuration$\net461\Mono.Cecil.dll" target="lib\net461" />
-    <file src="bin\$Configuration$\net461\Mono.Cecil.pdb" target="lib\net461" />
+    <file src="bin\$Configuration$\net46\ICSharpCode.Decompiler.dll" target="lib\net46" />
+    <file src="bin\$Configuration$\net46\ICSharpCode.Decompiler.pdb" target="lib\net46" />
+    <file src="bin\$Configuration$\net46\Mono.Cecil.dll" target="lib\net46" />
+    <file src="bin\$Configuration$\net46\Mono.Cecil.pdb" target="lib\net46" />

    <file src="bin\$Configuration$\netstandard2.0\ICSharpCode.Decompiler.dll" target="lib\netstandard2.0" />
    <file src="bin\$Configuration$\netstandard2.0\ICSharpCode.Decompiler.pdb" target="lib\netstandard2.0" />
--- a/ILSpy.AddIn/ILSpy.AddIn.csproj
+++ b/ILSpy.AddIn/ILSpy.AddIn.csproj
@ -7,7 +7,7 @@
				@@ -7,7 +7,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net46</TargetFramework>
    <RootNamespace>ICSharpCode.ILSpy.AddIn</RootNamespace>

    <Company>IC#Code</Company>
@ -135,7 +135,7 @@
				@@ -135,7 +135,7 @@

  <ItemGroup>
    <!-- https://github.com/dotnet/sdk/issues/433 -->
-    <ProjectReference Update="@(ProjectReference)" AdditionalProperties="TargetFramework=net461" />
+    <ProjectReference Update="@(ProjectReference)" AdditionalProperties="TargetFramework=net46" />

    <!-- https://github.com/Microsoft/extendvs/issues/57 -->
    <ProjectReference Update="@(ProjectReference)" Name="%(Filename)" />
--- a/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
+++ b/ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net46</TargetFramework>

    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

--- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
+++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
@ -3,7 +3,7 @@
				@@ -3,7 +3,7 @@
  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net46</TargetFramework>
    <AssemblyName>ILSpy.BamlDecompiler.Plugin</AssemblyName>

    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net46</TargetFramework>
    <OutputType>WinExe</OutputType>

    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
--- a/SharpTreeView/ICSharpCode.TreeView.csproj
+++ b/SharpTreeView/ICSharpCode.TreeView.csproj
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net46</TargetFramework>

    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

--- a/appveyor.yml
+++ b/appveyor.yml
@ -15,11 +15,11 @@ before_build:
				@@ -15,11 +15,11 @@ before_build:
 build_script:
 - msbuild ILSpy.sln /v:minimal /p:ResolveNuGetPackages=false "/logger:%ProgramFiles%\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 after_build:
- 7z a ILSpy_binaries.zip %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net461\*.dll %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net461\*.exe %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net461\*.config
+- 7z a ILSpy_binaries.zip %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.dll %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.exe %APPVEYOR_BUILD_FOLDER%\ILSpy\bin\%configuration%\net46\*.config
 test:
  assemblies:
-    - 'ICSharpCode.Decompiler.Tests\bin\%configuration%\net461\ICSharpCode.Decompiler.Tests.exe'
-    - 'ILSpy.BamlDecompiler.Tests\bin\%configuration%\net461\ILSpy.BamlDecompiler.Tests.dll'
+    - 'ICSharpCode.Decompiler.Tests\bin\%configuration%\net46\ICSharpCode.Decompiler.Tests.exe'
+    - 'ILSpy.BamlDecompiler.Tests\bin\%configuration%\net46\ILSpy.BamlDecompiler.Tests.dll'
 after_test:
 - python BuildTools\tidy.py
 for: