dep/project upgrade, Passes tests for both runtimes

ekonbenefits · Nov 2, 2023 · c28ea54 · c28ea54
1 parent c6a4202
commit c28ea54
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 50 deletions.
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/Dynamitey.csproj b/Dynamitey/Dynamitey.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard1.5;net40;portable-net45+sl5+win8+wp8</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
     <TargetFrameworks Condition="'$(WithoutCrossCompile)' != ''">netstandard2.0</TargetFrameworks>
     <Description>(pronounced dyna-mighty) flexes DLR muscle to do meta-mazing things in .net</Description>
     <Company>Ekon Benefits</Company>
@@ -23,11 +23,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 +31,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 +48,6 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
 
   <ItemGroup>
     <Compile Update="InlineLambdas.cs">
@@ -79,10 +67,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/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/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,26 @@
 <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>
+    <TargetFrameworks Condition="'$(WithoutCrossCompile)' != ''">net6</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>