icsharpcode/ILSpy
1
0
Fork 0
mirror of https://github.com/icsharpcode/ILSpy.git synced 2026-10-12 02:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retarget projects to .NET 4.6 so Roslyn can load them

Browse Source
This commit is contained in:
Sam Harwell
2017-11-27 13:15:34 -06:00
parent d4169237b7
commit 996e04075e
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net46</TargetFramework>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+1 -1
View File
@@ -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>
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template
+4 -4
View File
@@ -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" />
ILSpy.AddIn/ILSpy.AddIn.csproj
+2 -2
View File
@@ -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 @@
<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)" />
ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net46</TargetFramework>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
+1 -1
View File
@@ -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>
ILSpy/ILSpy.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net46</TargetFramework>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
SharpTreeView/ICSharpCode.TreeView.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net46</TargetFramework>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
appveyor.yml
+3 -3
View File
@@ -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: