Skip to content

Commit d741b2f

Browse files
jbtulejbtule
authored
Merge pull request #37 from ekonbenefits/update-deps,-reduce-targets
Update deps, reduce targets, incr major vers
2 parents c6a4202 + f7737ca commit d741b2f

14 files changed

+78
-70
lines changed

‎.github/workflows/dotnet.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
11-
dotnet: [2.1.802]
11+
dotnet: [ '6.0.x' ]
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313

1414
steps:

‎.github/workflows/dotnet48.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Build CrossComple .net core/.net framework Windows
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
name: Test Windows .net Framework Only
8+
runs-on: windows-2019
9+
steps:
10+
11+
- uses: actions/checkout@v2
12+
13+
- name: Setup NuGet
14+
uses: NuGet/[email protected]
15+
16+
- name: setup-msbuild
17+
uses: microsoft/[email protected]
18+
19+
- name: Restore Packages
20+
run: nuget restore Dynamitey.sln
21+
- name: Build solution
22+
run: msbuild Dynamitey.sln -t:rebuild -property:Configuration=Release
23+
- name: Run vstests
24+
uses: microsoft/[email protected]
25+
with:
26+
testAssembly: Tests.dll
27+
searchFolder: .\Tests\bin\Release\*\
28+
runInParallel: true
29+
otherConsoleOptions: /TestCaseFilter:"(TestCategory!=Performance)"
30+
platform: x64

‎Dynamitey.sln

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.9
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.7.34202.233
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{691EBA79-CAA4-4670-BC8B-4537F990ADBF}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{C33F07DB-7ACB-4081-92C2-BB739CB605C0}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{C33F07DB-7ACB-4081-92C2-BB739CB605C0}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SupportLibrary", "SupportLibrary\SupportLibrary.csproj", "{18E19833-D47E-4A7F-AE64-31E28FEF8728}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SupportLibrary", "SupportLibrary\SupportLibrary.csproj", "{18E19833-D47E-4A7F-AE64-31E28FEF8728}"
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dynamitey", "Dynamitey\Dynamitey.csproj", "{8902AFBA-4ACA-4880-B606-ADEC6BB21A1B}"
1313
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3535FA34-121F-4DEB-97C5-4A90E54AEE94}"
15+
ProjectSection(SolutionItems) = preProject
16+
Version.props = Version.props
17+
EndProjectSection
18+
EndProject
1419
Global
1520
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1621
Debug|Any CPU = Debug|Any CPU

‎Dynamitey.sln.DotSettings

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<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">
22
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DB/@EntryIndexedValue">DB</s:String>
33
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SL/@EntryIndexedValue">SL</s:String>
4+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EIde_002ECore_002EFilterManagement_002EModel_002ESolutionFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
45
<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
56
<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
67
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cacheable/@EntryIndexedValue">True</s:Boolean>

‎Dynamitey/DynamicObjects/ExtensionToInstanceProxy.cs

+16-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,22 @@ public override bool TryInvokeMember(System.Dynamic.InvokeMemberBinder binder, o
293293

294294
}catch(RuntimeBinderException)
295295
{
296-
types = null;
296+
try
297+
{
298+
IList<Type> typeList = Dynamic.InvokeGet(binder,
299+
"TypeArguments");
300+
if (typeList != null)
301+
{
302+
303+
types = typeList.ToArray();
304+
305+
}
306+
307+
}
308+
catch (RuntimeBinderException)
309+
{
310+
types = null;
311+
}
297312
}
298313

299314
var name=InvokeMemberName.Create;

‎Dynamitey/Dynamitey.csproj

+1-19
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard1.5;net40;portable-net45+sl5+win8+wp8</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(WithoutCrossCompile)' != ''">netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
65
<Description>(pronounced dyna-mighty) flexes DLR muscle to do meta-mazing things in .net</Description>
76
<Company>Ekon Benefits</Company>
87
<Authors />
@@ -23,11 +22,6 @@
2322
<Import Project="..\Version.props" />
2423

2524

26-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.5'">
27-
<PackageReference Include="Microsoft.CSharp" Version="4.*" />
28-
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
29-
</ItemGroup>
30-
3125
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
3226
<PackageReference Include="Microsoft.CSharp" Version="4.*" />
3327
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
@@ -36,10 +30,6 @@
3630
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
3731
<Reference Include="Microsoft.CSharp" />
3832
</ItemGroup>
39-
40-
<ItemGroup Condition="'$(TargetFramework)'=='portable-net45+sl5+win8+wp8'">
41-
<Reference Include="Microsoft.CSharp" />
42-
</ItemGroup>
4333

4434

4535
<ItemGroup>
@@ -57,9 +47,6 @@
5747
</None>
5848
</ItemGroup>
5949

60-
<ItemGroup>
61-
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
62-
</ItemGroup>
6350

6451
<ItemGroup>
6552
<Compile Update="InlineLambdas.cs">
@@ -79,10 +66,5 @@
7966
</Compile>
8067
</ItemGroup>
8168

82-
<ItemGroup>
83-
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.5" PrivateAssets="all" />
84-
</ItemGroup>
85-
86-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
8769

8870
</Project>

‎SupportLibrary/SupportLibrary.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.0</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
8+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
99
<PackageReference Include="System.Collections" Version="4.3.0" />
1010
<PackageReference Include="System.Runtime" Version="4.3.0" />
1111
</ItemGroup>

‎Tests/DynamicObjects.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ public void TestRecorder()
573573
}
574574

575575

576-
#if !NETCOREAPP2_0
576+
#if !NET6_0_OR_GREATER
577577

578578
[Test]
579579
public void TestCodeDomLateTypeBind()

‎Tests/Invoke.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Dynamitey.Tests
1616
{
1717
public class Invoke:AssertionHelper
1818
{
19-
[TestFixtureTearDown]
19+
[OneTimeTearDown]
2020
public void DestroyCaches()
2121
{
2222
Dynamic.ClearCaches();

‎Tests/Linq.cs

+2-11
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
using System.Text;
77
using System.Threading.Tasks;
88
using NUnit.Framework;
9-
#if !NETCOREAPP2_0
109
using IronPython.Hosting;
1110
using Microsoft.Scripting;
12-
#endif
11+
1312
namespace Dynamitey.Tests
1413
{
1514
[TestFixture]
@@ -37,7 +36,7 @@ public void MoreGenericsDynamicLinq()
3736
Assert.AreEqual(expected, actual);
3837

3938
}
40-
#if !NETCOREAPP2_0
39+
4140
private dynamic RunPythonHelper(object linq, string code)
4241
{
4342

@@ -53,15 +52,7 @@ private dynamic RunPythonHelper(object linq, string code)
5352
tCompiled.Execute(tScope);
5453
return tScope.GetVariable("result");
5554
}
56-
#else
57-
private dynamic RunPythonHelper(object linq, string code)
58-
{
59-
6055

61-
Assert.Ignore("Iron Python Doesn't work on .net core");
62-
return new object();
63-
}
64-
#endif
6556

6657

6758

‎Tests/Program.cs

-12
This file was deleted.

‎Tests/SpeedTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Dynamitey.Tests
1313
[Category("Performance")]
1414
public class SpeedTest:AssertionHelper
1515
{
16-
[TestFixtureSetUp]
16+
[OneTimeSetUp]
1717
public void WarmUpDlr()
1818
{
1919
Dynamic.InvokeMember(1, "ToString");

‎Tests/Tests.csproj

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(WithoutCrossCompile)' != ''">netcoreapp2.0</TargetFrameworks>
5-
<OutputType Condition="'$(TargetFramework)'!='netcoreapp2.0'">Exe</OutputType>
6-
<IsPackable>false</IsPackable>
3+
<TargetFrameworks>net6;net48</TargetFrameworks>
4+
<IsPackable>false</IsPackable>
75
</PropertyGroup>
86

97
<ItemGroup>
10-
<PackageReference Include="ImpromptuInterface" Version="7.0.1-alpha20" />
8+
<PackageReference Include="ImpromptuInterface" Version="7.0.1" />
119
<PackageReference Include="Microsoft.CSharp" Version="4.*" />
1210
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
13-
<PackageReference Include="NUnit" Version="3.7.1" />
14-
<PackageReference Include="FSharp.Core" Version="4.2.*" />
15-
<PackageReference Include="Moq" Version="4.7.*" />
16-
<PackageReference Include="NUnit.Console" Version="3.7.0" />
17-
<PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
18-
</ItemGroup>
11+
<PackageReference Include="NUnit" Version="3.13.3" />
12+
<PackageReference Include="FSharp.Core" Version="4.7.2" />
13+
<PackageReference Include="Moq" Version="4.20.69" />
14+
<PackageReference Include="NUnit.Console" Version="3.16.3" />
15+
<PackageReference Include="IronPython" Version="2.7.12" />
1916

20-
<ItemGroup Condition="'$(TargetFramework)'!='netcoreapp2.0'">
21-
<PackageReference Include="IronPython" Version="2.7.7" />
2217
</ItemGroup>
2318

24-
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
25-
<PackageReference Include="NUnit3TestAdapter" Version="3.8.*" />
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
19+
20+
<ItemGroup >
21+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
2723
</ItemGroup>
2824

2925
<ItemGroup>

‎Version.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>2.0.10</VersionPrefix>
3+
<VersionPrefix>3.0.2</VersionPrefix>
44
</PropertyGroup>
55
</Project>

0 commit comments

Comments
 (0)