Merge pull request amaggiulli#231 from potatman/develop

Making all projects dotnet standard/coreapp. (Changes minimum framework to net 4.5.1)
egorpavlikhin · May 3, 2019 · 1c28fa0 · 1c28fa0
2 parents 6d0024d + 37dfa23
commit 1c28fa0
Show file tree

Hide file tree

Showing 95 changed files with 634 additions and 653 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -61,7 +61,7 @@
   nuget:
     disable_publish_on_pr: true
   before_build:
-  - cmd: "choco install msbuild-sonarqube-runner --version 2.3 -y\ndotnet restore qlnet.sln\ndotnet clean qlnet.sln\nSET runner_args=\"\"\nif \"%APPVEYOR_PULL_REQUEST_NUMBER%\"==\"\" SET runner_args=%sonar_commit% \nif not \"%APPVEYOR_PULL_REQUEST_NUMBER%\"==\"\" SET runner_args=%sonar_pr% \nMSBuild.SonarQube.Runner.exe begin %runner_args%\nmsbuild qlnet.sln /p:TargetFrameworkVersion=v4.5 /p:TargetFrameworks=net45 /p:Configuration=Debug /logger:\"C:\\Program Files\\AppVeyor\\BuildAgent\\Appveyor.MSBuildLogger.dll\" /target:src\\qlnet > log.txt\nMSBuild.SonarQube.Runner.exe end /d:\"sonar.login=%sonar_token%\""
+  - cmd: "choco install msbuild-sonarqube-runner --version 2.3 -y\ndotnet restore qlnet.sln\ndotnet clean qlnet.sln\nSET runner_args=\"\"\nif \"%APPVEYOR_PULL_REQUEST_NUMBER%\"==\"\" SET runner_args=%sonar_commit% \nif not \"%APPVEYOR_PULL_REQUEST_NUMBER%\"==\"\" SET runner_args=%sonar_pr% \nMSBuild.SonarQube.Runner.exe begin %runner_args%\nmsbuild qlnet.sln /p:TargetFrameworkVersion=v4.5.2 /p:TargetFrameworks=net452 /p:Configuration=Debug /logger:\"C:\\Program Files\\AppVeyor\\BuildAgent\\Appveyor.MSBuildLogger.dll\" /target:src\\qlnet > log.txt\nMSBuild.SonarQube.Runner.exe end /d:\"sonar.login=%sonar_token%\""
   build:
     project: QLNet.sln
     verbosity: minimal
@@ -79,7 +79,7 @@
     file_version: '{version}'
     informational_version: '{version}'
   test_script:
-    - cmd: vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory!=LongRun" "c:\projects\qlnet_develop\tests\QLNet.Tests\bin\Debug\net45\QLNet.Tests.dll"
+    - cmd: vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory!=LongRun" "c:\projects\qlnet_develop\tests\QLNet.Tests\bin\Debug\net452\QLNet.Tests.dll"
   deploy:
     - provider: NuGet
       api_key:

diff --git a/src/BermudanSwaption/BermudanSwaption.csproj b/src/BermudanSwaption/BermudanSwaption.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>BermudanSwaption</AssemblyName>
     <PackageId>BermudanSwaption</PackageId>

diff --git a/src/Bonds/Bonds.csproj b/src/Bonds/Bonds.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>Bonds</AssemblyName>
     <PackageId>Bonds</PackageId>

diff --git a/src/CVAIRS/CVAIRS.csproj b/src/CVAIRS/CVAIRS.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>CVAIRS</AssemblyName>
     <PackageId>CVAIRS</PackageId>

diff --git a/src/CallableBonds/CallableBonds.csproj b/src/CallableBonds/CallableBonds.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>CallableBonds</AssemblyName>
     <PackageId>CallableBonds</PackageId>

diff --git a/src/ConvertibleBonds/ConvertibleBonds.csproj b/src/ConvertibleBonds/ConvertibleBonds.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>ConvertibleBonds</AssemblyName>
     <PackageId>ConvertibleBonds</PackageId>

diff --git a/src/EquityOption/EquityOption.csproj b/src/EquityOption/EquityOption.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>EquityOption</AssemblyName>
     <PackageId>EquityOption</PackageId>

diff --git a/src/FRA/FRA.csproj b/src/FRA/FRA.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>FRA</AssemblyName>
     <PackageId>FRA</PackageId>

diff --git a/src/FittedBondCurve/FittedBondCurve.csproj b/src/FittedBondCurve/FittedBondCurve.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>FittedBondCurve</AssemblyName>
     <PackageId>FittedBondCurve</PackageId>

diff --git a/src/QLNet/Patterns/FastActivator.cs b/src/QLNet/Patterns/FastActivator.cs
@@ -39,7 +39,7 @@ public static class DynamicModuleLambdaCompiler
          Expression<Func<T>> expr = () => new T();
          NewExpression newExpr = (NewExpression)expr.Body;
 
-#if NET40 || NET45
+#if NET452
          var method = new DynamicMethod(
             name: "lambda",
             returnType: newExpr.Type,

diff --git a/src/QLNet/Patterns/WeakEventSource.cs b/src/QLNet/Patterns/WeakEventSource.cs
@@ -117,7 +117,7 @@ private static OpenEventHandler CreateOpenHandler(MethodInfo method)
          public WeakDelegate(Delegate handler)
          {
             _weakTarget = handler.Target != null ? new WeakReference(handler.Target) : null;
-#if NET40 || NET45
+#if NET452
             _method = handler.Method;
 #else
             _method = handler.GetMethodInfo();
@@ -141,7 +141,7 @@ public bool Invoke()
 
          public bool IsMatch(Callback handler)
          {
-#if NET40 || NET45
+#if NET452
             return _weakTarget.Target != null && (ReferenceEquals(handler.Target, _weakTarget.Target)
                                                   && handler.Method.Equals(_method));
 #else
@@ -152,4 +152,4 @@ public bool IsMatch(Callback handler)
          }
       }
    }
-}
+}
diff --git a/src/QLNet/QLNet.csproj b/src/QLNet/QLNet.csproj
@@ -2,13 +2,11 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.2</VersionPrefix>
-    <TargetFrameworks>net45;net40;netstandard2.0;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard1.2;netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>QLNet</AssemblyName>
     <PackageId>QLNet</PackageId>
     <PackageVersion>1.11.2</PackageVersion>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
     <Authors>Andrea Maggiulli</Authors>
     <Company />
     <Description>A free/open-source library for quantitative finance</Description>
@@ -18,24 +16,8 @@
     <PackageTags>QLNet QuantLib quantitative finance financial</PackageTags>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
   </PropertyGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System.Numerics" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
-    <Reference Include="System.Numerics" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.0.1" />
-  </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+  <ItemGroup>
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/src/QLNet/Utils.cs b/src/QLNet/Utils.cs
@@ -151,7 +151,7 @@ public static MethodInfo GetMethodInfo(Object t, String function,  Type[] types
          MethodInfo methodInfo;
          if (types == null)
             types = new Type[0];
-#if NET40 || NET45
+#if NET452
          methodInfo =  t.GetType().GetMethod(function, types);
 #else
          methodInfo = t.GetType().GetRuntimeMethod(function, types);

diff --git a/src/Repo/Repo.csproj b/src/Repo/Repo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>Repo</AssemblyName>
     <PackageId>Repo</PackageId>

diff --git a/src/Swap/Swap.csproj b/src/Swap/Swap.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.11.0</VersionPrefix>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DefineConstants>$(DefineConstants);QL_NEGATIVE_RATES</DefineConstants>
     <AssemblyName>Swap</AssemblyName>
     <PackageId>Swap</PackageId>

diff --git a/tests/QLNet.Tests/QLNet.Tests.csproj b/tests/QLNet.Tests/QLNet.Tests.csproj
@@ -2,11 +2,10 @@
 
   <PropertyGroup>
     <VersionPrefix>1.10.0</VersionPrefix>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net452</TargetFrameworks>
     <AssemblyName>QLNet.Tests</AssemblyName>
     <PackageId>QLNet.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/QLNet.Tests/T_AmericanOption.cs b/tests/QLNet.Tests/T_AmericanOption.cs
@@ -21,7 +21,7 @@ under the terms of the QLNet license.  You should have received a
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if NET40 || NET45
+#if NET452
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 #else
 using Xunit;
@@ -60,7 +60,7 @@ public AmericanOptionData(Option.Type type_,
          result = result_;
       }
    }
-#if NET40 || NET45
+#if NET452
    [TestClass()]
 #endif
    public class T_AmericanOption
@@ -140,7 +140,7 @@ Journal of Derivatives Winter 1999
          new AmericanOptionData(Option.Type.Call, 100.00,  120.00,  0.03,  0.07, 3.0,  0.3,  37.177)
       };
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -244,7 +244,7 @@ The following values were replicated only up to the second digit
          }
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -319,7 +319,7 @@ public void testBjerksundStenslandValues()
          }
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -375,7 +375,7 @@ public void testJuValues()
          }
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -558,7 +558,7 @@ public void testFdValues()
          }
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -569,7 +569,7 @@ public void testFdAmericanGreeks()
          testFdGreeks<FDAmericanEngine>();
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -599,7 +599,7 @@ void REPORT_FAILURE(string greekName, StrikedTypePayoff payoff, Exercise exercis
                       + "    tolerance:        " + tolerance);
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -635,7 +635,7 @@ public void testFdImpliedVol()
             QAssert.Fail(string.Format("Implied volatility calculation failed. Expected {0}. Actual {1}", volatility, impliedVol));
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]

diff --git a/tests/QLNet.Tests/T_AsianOptions.cs b/tests/QLNet.Tests/T_AsianOptions.cs
@@ -21,7 +21,7 @@ under the terms of the QLNet license.  You should have received a
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if NET40 || NET45
+#if NET452
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 #else
 using Xunit;
@@ -30,7 +30,7 @@ under the terms of the QLNet license.  You should have received a
 
 namespace TestSuite
 {
-#if NET40 || NET45
+#if NET452
    [TestClass()]
 #endif
    public class T_AsianOptions
@@ -79,7 +79,7 @@ public string averageTypeToString(Average.Type averageType)
          return String.Empty;
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -162,7 +162,7 @@ public void testAnalyticContinuousGeometricAveragePrice()
 
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -327,7 +327,7 @@ public void testAnalyticContinuousGeometricAveragePriceGreeks()
          }
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -390,7 +390,7 @@ public void testAnalyticDiscreteGeometricAveragePrice()
          }
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]
@@ -522,7 +522,7 @@ public void testMCDiscreteGeometricAveragePrice()
          }
       }
 
-#if NET40 || NET45
+#if NET452
       [TestMethod()]
 #else
       [Fact]