Merge pull request #37 from ekonbenefits/update-deps,-reduce-targets

Update deps, reduce targets, incr major vers
ekonbenefits · Nov 3, 2023 · d741b2f · d741b2f
2 parents c6a4202 + f7737ca
commit d741b2f
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 70 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        dotnet: [2.1.802]
+        dotnet: [ '6.0.x' ]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml
@@ -0,0 +1,30 @@
+name: Build CrossComple .net core/.net framework Windows
+
+on: [push]
+
+jobs:
+  build:
+    name: Test Windows .net Framework Only
+    runs-on: windows-2019
+    steps:
+
+    - uses: actions/checkout@v2
+
+    - name: Setup NuGet
+      uses: NuGet/setup-nuget@v1.2.0
+
+    - name: setup-msbuild
+      uses: microsoft/setup-msbuild@v1.1
+
+    - name: Restore Packages
+      run: nuget restore Dynamitey.sln
+    - name: Build solution
+      run: msbuild Dynamitey.sln -t:rebuild -property:Configuration=Release
+    - name: Run vstests
+      uses: microsoft/vstest-action@v1.0.0
+      with:
+        testAssembly: Tests.dll
+        searchFolder: .\Tests\bin\Release\*\
+        runInParallel: true
+        otherConsoleOptions: /TestCaseFilter:"(TestCategory!=Performance)"
+        platform: x64
diff --git a/Dynamitey.sln b/Dynamitey.sln
@@ -1,16 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34202.233
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{691EBA79-CAA4-4670-BC8B-4537F990ADBF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{C33F07DB-7ACB-4081-92C2-BB739CB605C0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{C33F07DB-7ACB-4081-92C2-BB739CB605C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SupportLibrary", "SupportLibrary\SupportLibrary.csproj", "{18E19833-D47E-4A7F-AE64-31E28FEF8728}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SupportLibrary", "SupportLibrary\SupportLibrary.csproj", "{18E19833-D47E-4A7F-AE64-31E28FEF8728}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dynamitey", "Dynamitey\Dynamitey.csproj", "{8902AFBA-4ACA-4880-B606-ADEC6BB21A1B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3535FA34-121F-4DEB-97C5-4A90E54AEE94}"
+	ProjectSection(SolutionItems) = preProject
+		Version.props = Version.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/Dynamitey.sln.DotSettings b/Dynamitey.sln.DotSettings
@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DB/@EntryIndexedValue">DB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SL/@EntryIndexedValue">SL</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EIde_002ECore_002EFilterManagement_002EModel_002ESolutionFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Cacheable/@EntryIndexedValue">True</s:Boolean>

diff --git a/Dynamitey/DynamicObjects/ExtensionToInstanceProxy.cs b/Dynamitey/DynamicObjects/ExtensionToInstanceProxy.cs
@@ -293,7 +293,22 @@ public override bool TryInvokeMember(System.Dynamic.InvokeMemberBinder binder, o
 
                 }catch(RuntimeBinderException)
                 {
-                    types = null;
+                    try
+                    {
+                        IList<Type> typeList = Dynamic.InvokeGet(binder,
+                            "TypeArguments");
+                        if (typeList != null)
+                        {
+
+                            types = typeList.ToArray();
+
+                        }
+
+                    }
+                    catch (RuntimeBinderException)
+                    {
+                        types = null;
+                    }
                 }
 
                 var name=InvokeMemberName.Create;

diff --git a/Dynamitey/Dynamitey.csproj b/Dynamitey/Dynamitey.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard1.5;net40;portable-net45+sl5+win8+wp8</TargetFrameworks>
-    <TargetFrameworks Condition="'$(WithoutCrossCompile)' != ''">netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
     <Description>(pronounced dyna-mighty) flexes DLR muscle to do meta-mazing things in .net</Description>
     <Company>Ekon Benefits</Company>
     <Authors />
@@ -23,11 +22,6 @@
   <Import Project="..\Version.props" />
 
 
-  <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.5'">
-    <PackageReference Include="Microsoft.CSharp" Version="4.*" />
-    <PackageReference Include="System.ComponentModel" Version="4.3.0" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.ComponentModel" Version="4.3.0" />
@@ -36,10 +30,6 @@
   <ItemGroup Condition="'$(TargetFramework)'=='net40'">
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='portable-net45+sl5+win8+wp8'">
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
 
 
   <ItemGroup>
@@ -57,9 +47,6 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
 
   <ItemGroup>
     <Compile Update="InlineLambdas.cs">
@@ -79,10 +66,5 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.5" PrivateAssets="all" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 
 </Project>
diff --git a/SupportLibrary/SupportLibrary.csproj b/SupportLibrary/SupportLibrary.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.Runtime" Version="4.3.0" />
   </ItemGroup>

diff --git a/Tests/DynamicObjects.cs b/Tests/DynamicObjects.cs
@@ -573,7 +573,7 @@ public void TestRecorder()
         }
 
 
-#if !NETCOREAPP2_0
+#if !NET6_0_OR_GREATER
 
         [Test]
         public void TestCodeDomLateTypeBind()

diff --git a/Tests/Invoke.cs b/Tests/Invoke.cs
@@ -16,7 +16,7 @@ namespace Dynamitey.Tests
 {
     public class Invoke:AssertionHelper
     {
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void DestroyCaches()
         {
             Dynamic.ClearCaches();

diff --git a/Tests/Linq.cs b/Tests/Linq.cs
@@ -6,10 +6,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using NUnit.Framework;
-#if !NETCOREAPP2_0
 using IronPython.Hosting;
 using Microsoft.Scripting;
-#endif
+
 namespace Dynamitey.Tests
 {
     [TestFixture]
@@ -37,7 +36,7 @@ public void MoreGenericsDynamicLinq()
             Assert.AreEqual(expected, actual);
 
         }
-#if !NETCOREAPP2_0
+
         private dynamic RunPythonHelper(object linq, string code)
         {
 
@@ -53,15 +52,7 @@ private dynamic RunPythonHelper(object linq, string code)
             tCompiled.Execute(tScope);
             return tScope.GetVariable("result");
         }
-#else
-     private dynamic RunPythonHelper(object linq, string code)
-        {
-
 
-            Assert.Ignore("Iron Python Doesn't work on .net core");
-            return new object();
-        }
-#endif
 
 
 

diff --git a/Tests/Program.cs b/Tests/Program.cs
diff --git a/Tests/SpeedTest.cs b/Tests/SpeedTest.cs
@@ -13,7 +13,7 @@ namespace Dynamitey.Tests
     [Category("Performance")]
     public class SpeedTest:AssertionHelper
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void WarmUpDlr()
         {
             Dynamic.InvokeMember(1, "ToString");

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,29 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
-    <TargetFrameworks Condition="'$(WithoutCrossCompile)' != ''">netcoreapp2.0</TargetFrameworks>
-    <OutputType Condition="'$(TargetFramework)'!='netcoreapp2.0'">Exe</OutputType>
-   <IsPackable>false</IsPackable>
+    <TargetFrameworks>net6;net48</TargetFrameworks>
+	  <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ImpromptuInterface" Version="7.0.1-alpha20" />
+    <PackageReference Include="ImpromptuInterface" Version="7.0.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="NUnit" Version="3.7.1" />
-    <PackageReference Include="FSharp.Core" Version="4.2.*" />
-    <PackageReference Include="Moq" Version="4.7.*" />
-    <PackageReference Include="NUnit.Console" Version="3.7.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
-  </ItemGroup>
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="FSharp.Core" Version="4.7.2" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="NUnit.Console" Version="3.16.3" />
+    <PackageReference Include="IronPython" Version="2.7.12" />
 
-  <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp2.0'">
-    <PackageReference Include="IronPython" Version="2.7.7" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
-    <PackageReference Include="NUnit3TestAdapter" Version="3.8.*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
+
+  <ItemGroup >
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Version.props b/Version.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>2.0.10</VersionPrefix>
+        <VersionPrefix>3.0.2</VersionPrefix>
     </PropertyGroup>
 </Project>