Browse Source

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

pull/1417/head
Christoph Wille 7 years ago
parent
commit
29e05778c6
  1. 2
      ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
  2. 2
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  3. 5
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  4. 6
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
  5. 4
      ILSpy.AddIn/ILSpy.AddIn.csproj
  6. 2
      ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
  7. 2
      ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
  8. 2
      ILSpy.Tests/ILSpy.Tests.csproj
  9. 4
      ILSpy/ILSpy.csproj
  10. 2
      ILSpy/Properties/app.config.template
  11. 2
      SharpTreeView/ICSharpCode.TreeView.csproj
  12. 2
      TestPlugin/TestPlugin.csproj

2
ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj

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

2
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net46</TargetFramework> <TargetFramework>net462</TargetFramework>
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

5
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -3,13 +3,12 @@
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" /> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net46;net45</TargetFrameworks>
<Description>IL decompiler engine</Description> <Description>IL decompiler engine</Description>
<Company>ic#code</Company> <Company>ic#code</Company>
<Product>ILSpy</Product> <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> <NeutralLanguage>en-US</NeutralLanguage>
<GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute> <GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute> <GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute>

6
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template

@ -22,12 +22,6 @@
</dependencies> </dependencies>
</metadata> </metadata>
<files> <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.dll" target="lib\netstandard2.0" />
<file src="bin\$Configuration$\netstandard2.0\ICSharpCode.Decompiler.pdb" target="lib\netstandard2.0" /> <file src="bin\$Configuration$\netstandard2.0\ICSharpCode.Decompiler.pdb" target="lib\netstandard2.0" />
</files> </files>

4
ILSpy.AddIn/ILSpy.AddIn.csproj

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net46</TargetFramework> <TargetFramework>net462</TargetFramework>
<RootNamespace>ICSharpCode.ILSpy.AddIn</RootNamespace> <RootNamespace>ICSharpCode.ILSpy.AddIn</RootNamespace>
<Company>IC#Code</Company> <Company>IC#Code</Company>
@ -56,7 +56,7 @@
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.27740" /> <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.Text.UI.Wpf" Version="15.6.27740" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.6.56" /> <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" /> <PackageReference Include="VSLangProj" Version="7.0.3301" />
</ItemGroup> </ItemGroup>

2
ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj

@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras"> <Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net46</TargetFramework> <TargetFramework>net462</TargetFramework>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

2
ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj

@ -3,7 +3,7 @@
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" /> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net46</TargetFramework> <TargetFramework>net462</TargetFramework>
<AssemblyName>ILSpy.BamlDecompiler.Plugin</AssemblyName> <AssemblyName>ILSpy.BamlDecompiler.Plugin</AssemblyName>
<LangVersion>7.2</LangVersion> <LangVersion>7.2</LangVersion>

2
ILSpy.Tests/ILSpy.Tests.csproj

@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net46</TargetFramework> <TargetFramework>net462</TargetFramework>
<LangVersion>7.3</LangVersion> <LangVersion>7.3</LangVersion>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

4
ILSpy/ILSpy.csproj

@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras"> <Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net46</TargetFramework> <TargetFramework>net462</TargetFramework>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<LangVersion>7.2</LangVersion> <LangVersion>7.2</LangVersion>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
@ -49,7 +49,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AvalonEdit" Version="5.0.4" /> <PackageReference Include="AvalonEdit" Version="5.0.4" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="15.5.23" /> <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>
<ItemGroup> <ItemGroup>

2
ILSpy/Properties/app.config.template

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup> </startup>
<runtime> <runtime>
<AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false;Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" /> <AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false;Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />

2
SharpTreeView/ICSharpCode.TreeView.csproj

@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras"> <Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net46</TargetFramework> <TargetFramework>net462</TargetFramework>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

2
TestPlugin/TestPlugin.csproj

@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras"> <Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net461</TargetFramework> <TargetFramework>net462</TargetFramework>
<AssemblyName>Test.Plugin</AssemblyName> <AssemblyName>Test.Plugin</AssemblyName>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

Loading…
Cancel
Save