See #1416. Also upgraded Cecil to .3 (from .1)

6 years ago · 29e05778c6
12 changed files with 14 additions and 21 deletions
--- a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
+++ b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
@ -7,7 +7,7 @@
				@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.10.1" />
+    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
  </ItemGroup>

  <ItemGroup>
--- 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>net46</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
    <LangVersion>7.3</LangVersion>

    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
@ -3,13 +3,12 @@
				@@ -3,13 +3,12 @@
  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

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

    <Description>IL decompiler engine</Description>
    <Company>ic#code</Company>
    <Product>ILSpy</Product>
-    <Copyright>Copyright 2011-2018 AlphaSierraPapa for the SharpDevelop Team</Copyright>
+    <Copyright>Copyright 2011-2019 AlphaSierraPapa for the SharpDevelop Team</Copyright>
    <NeutralLanguage>en-US</NeutralLanguage>
    <GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
    <GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute>
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
@ -22,12 +22,6 @@
				@@ -22,12 +22,6 @@
    </dependencies>
  </metadata>
  <files>
-    <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$\net45\ICSharpCode.Decompiler.dll" target="lib\net45" />
-    <file src="bin\$Configuration$\net45\ICSharpCode.Decompiler.pdb" target="lib\net45" />
-
    <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" />
  </files>
--- a/ILSpy.AddIn/ILSpy.AddIn.csproj
+++ b/ILSpy.AddIn/ILSpy.AddIn.csproj
@ -7,7 +7,7 @@
				@@ -7,7 +7,7 @@
  </PropertyGroup>

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

    <Company>IC#Code</Company>
@ -56,7 +56,7 @@
				@@ -56,7 +56,7 @@
    <PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.27740" />
    <PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.27740" />
    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.6.56" />
-    <PackageReference Include="Mono.Cecil" Version="0.10.1" />
+    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
    <PackageReference Include="VSLangProj" Version="7.0.3301" />
  </ItemGroup>

--- 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="MSBuild.Sdk.Extras">

  <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net462</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>net46</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
    <AssemblyName>ILSpy.BamlDecompiler.Plugin</AssemblyName>
    <LangVersion>7.2</LangVersion>

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

  <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
    <LangVersion>7.3</LangVersion>

    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">

  <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
    <OutputType>WinExe</OutputType>
    <LangVersion>7.2</LangVersion>
    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
@ -49,7 +49,7 @@
				@@ -49,7 +49,7 @@
  <ItemGroup>
    <PackageReference Include="AvalonEdit" Version="5.0.4" />
    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="15.5.23" />
-    <PackageReference Include="Mono.Cecil" Version="0.10.1" />
+    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
  </ItemGroup>

  <ItemGroup>
--- a/ILSpy/Properties/app.config.template
+++ b/ILSpy/Properties/app.config.template
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<startup>
-		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
 	</startup>
 	<runtime>
 		<AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false;Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
--- a/SharpTreeView/ICSharpCode.TreeView.csproj
+++ b/SharpTreeView/ICSharpCode.TreeView.csproj
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">

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

    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

--- a/TestPlugin/TestPlugin.csproj
+++ b/TestPlugin/TestPlugin.csproj
@ -2,7 +2,7 @@
				@@ -2,7 +2,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
    <AssemblyName>Test.Plugin</AssemblyName>

    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>