Browse Source

Close #1033: Add TFM for net45

pull/1051/head 3.0.2
Siegfried Pammer 8 years ago
parent
commit
b28a1719e7
  1. 6
      ICSharpCode.Decompiler/CSharp/CallBuilder.cs
  2. 4
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  3. 3
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template

6
ICSharpCode.Decompiler/CSharp/CallBuilder.cs

@ -117,7 +117,7 @@ namespace ICSharpCode.Decompiler.CSharp
expandedArguments.Add(expressionBuilder.GetDefaultValueExpression(elementType).WithoutILInstruction());
}
}
if (IsUnambiguousCall(expectedTargetDetails, method, target, Array.Empty<IType>(), expandedArguments) == OverloadResolutionErrors.None) {
if (IsUnambiguousCall(expectedTargetDetails, method, target, Empty<IType>.Array, expandedArguments) == OverloadResolutionErrors.None) {
isExpandedForm = true;
expectedParameters = expandedParameters;
arguments = expandedArguments.SelectList(a => new TranslatedExpression(a.Expression.Detach()));
@ -170,7 +170,7 @@ namespace ICSharpCode.Decompiler.CSharp
.WithRR(rr);
} else {
if (IsUnambiguousCall(expectedTargetDetails, method, target, Array.Empty<IType>(), arguments) != OverloadResolutionErrors.None) {
if (IsUnambiguousCall(expectedTargetDetails, method, target, Empty<IType>.Array, arguments) != OverloadResolutionErrors.None) {
for (int i = 0; i < arguments.Count; i++) {
if (settings.AnonymousTypes && expectedParameters[i].Type.ContainsAnonymousType()) {
if (arguments[i].Expression is LambdaExpression lambda) {
@ -199,7 +199,7 @@ namespace ICSharpCode.Decompiler.CSharp
bool requireTypeArguments = false;
bool targetCasted = false;
bool argumentsCasted = false;
IType[] typeArguments = Array.Empty<IType>();
IType[] typeArguments = Empty<IType>.Array;
OverloadResolutionErrors errors;
while ((errors = IsUnambiguousCall(expectedTargetDetails, method, target, typeArguments, arguments)) != OverloadResolutionErrors.None) {

4
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -4,12 +4,12 @@
<PropertyGroup>
<TargetFramework Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFramework>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net46;net45</TargetFrameworks>
<Description>IL decompiler engine</Description>
<Company>ic#code</Company>
<Product>ILSpy</Product>
<Copyright>Copyright 2011-2017 AlphaSierraPapa for the SharpDevelop Team</Copyright>
<Copyright>Copyright 2011-2018 AlphaSierraPapa for the SharpDevelop Team</Copyright>
<NeutralLanguage>en-US</NeutralLanguage>
<GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute>

3
ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template

@ -25,6 +25,9 @@
<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>
Loading…
Cancel
Save