diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 8751fe4..8102e8d 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -8,16 +8,16 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- dotnet: [ '6.0.x' ]
- os: [ubuntu-latest, windows-latest, macOS-latest]
+ dotnet: [ '8.0.x' ]
+ os: [ubuntu-latest, macOS-latest]
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v4
- name: Setup .NET Core
- uses: actions/setup-dotnet@v1
+ uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Build with dotnet core
run: dotnet build --configuration Release
- name: Tests
- run: dotnet test Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj --configuration Release --no-build --no-restore --filter=TestCategory!=Performance
+ run: dotnet test Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj --configuration Release --no-build --no-restore --filter=TestCategory!=Performance
\ No newline at end of file
diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml
index 7f8e94f..9b6ba8f 100644
--- a/.github/workflows/dotnet48.yml
+++ b/.github/workflows/dotnet48.yml
@@ -1,30 +1,30 @@
-name: Build CrossComple .net core/.net framework Windows
+name: .net framework Windows
on: [push]
jobs:
build:
name: Test Windows .net Framework Only
- runs-on: windows-2019
+ runs-on: windows-2022
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
+ - uses: actions/checkout@v4
+ - uses: NuGet/setup-nuget@v2
+ - uses: microsoft/setup-msbuild@v2
+ with:
+ dotnet-version: 4.7.2
+
+ - name: Restore
run: nuget restore ImpromptuInterface.sln
- - name: Build solution
+ - name: Build
run: msbuild ImpromptuInterface.sln -t:rebuild -property:Configuration=Release
- - name: Run vstests
- uses: microsoft/vstest-action@v1.0.0
+ - name: Test
+ uses: josepho0918/vstest-action@0e887de8dcfab5ce3eecaf4ad6320bb9b3ecf633
with:
testAssembly: UnitTestImpromptuInterface.dll
searchFolder: .\Tests\UnitTestImpromptuInterface\bin\Release\*\
runInParallel: true
otherConsoleOptions: /TestCaseFilter:"(TestCategory!=Performance)"
platform: x64
+ - name: Publish
+ run:
+ dotnet nuget push '${{ github.workspace }}\publish\*.nupkg' --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/ImpromptuInterface.sln b/ImpromptuInterface.sln
index b87b509..dbc8ff7 100644
--- a/ImpromptuInterface.sln
+++ b/ImpromptuInterface.sln
@@ -14,6 +14,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{87291621-4395-4EFE-A070-9A007B26EF6D}"
ProjectSection(SolutionItems) = preProject
Version.props = Version.props
+ Readme.md = Readme.md
EndProjectSection
EndProject
Global
diff --git a/ImpromptuInterface/ImpromptuInterface.csproj b/ImpromptuInterface/ImpromptuInterface.csproj
index 37262fb..709b477 100644
--- a/ImpromptuInterface/ImpromptuInterface.csproj
+++ b/ImpromptuInterface/ImpromptuInterface.csproj
@@ -8,8 +8,8 @@
jbtule
Copyright © Contributors 2010-2017
https://github.com/ekonbenefits/impromptu-interface
- https://github.com/ekonbenefits/impromptu-interface/blob/master/License.txt
- https://raw.githubusercontent.com/ekonbenefits/impromptu-interface/master/graphics/ImpromptuInterface-Icon.png
+ Apache-2.0
+ ImpromptuInterface-Icon.png
ducktyping duckcasting dynamic .net40 Silverlight proxy impromptu interface reflection dlr currying
True
True
@@ -17,6 +17,7 @@
True
+
@@ -27,4 +28,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ImpromptuInterface/src/EmitProxy/ActLikeMaker.cs b/ImpromptuInterface/src/EmitProxy/ActLikeMaker.cs
index f81152c..3e0f5f6 100644
--- a/ImpromptuInterface/src/EmitProxy/ActLikeMaker.cs
+++ b/ImpromptuInterface/src/EmitProxy/ActLikeMaker.cs
@@ -15,7 +15,7 @@
namespace ImpromptuInterface.Build
{
-#if NET40
+#if NETFRAMEWORK
public class SaveableActLikeMaker : ActLikeMaker
{
public SaveableActLikeMaker(AssemblyBuilderAccess access, string assemblyName = null) : base(access, assemblyName)
@@ -1775,7 +1775,7 @@ private static void GenerateAssembly(string name, AssemblyBuilderAccess access,
mb =
-#if NET40
+#if NETFRAMEWORK
access.HasFlag(AssemblyBuilderAccess.Save)
? ab.DefineDynamicModule("MainModule", $"{tName.Name}.dll") :
#endif
diff --git a/ImpromptuInterface/src/EmitProxy/BuildProxy.cs b/ImpromptuInterface/src/EmitProxy/BuildProxy.cs
index 3de34ec..32932c9 100644
--- a/ImpromptuInterface/src/EmitProxy/BuildProxy.cs
+++ b/ImpromptuInterface/src/EmitProxy/BuildProxy.cs
@@ -22,7 +22,7 @@ namespace ImpromptuInterface.Build
using System.Reflection.Emit;
-#if NET40
+#if NETFRAMEWORK
internal static class CompatHelper
{
public static Type GetTypeInfo(this Type type) => type;
@@ -50,7 +50,7 @@ public static class BuildProxy
public static ActLikeMaker CollectableProxyMaker() => new ActLikeMaker(AssemblyBuilderAccess.RunAndCollect);
-#if NET40
+#if NETFRAMEWORK
public static SaveableActLikeMaker SaveableProxyMaker(string assemblyName = null) => new SaveableActLikeMaker(AssemblyBuilderAccess.RunAndSave, assemblyName);
#endif
}
diff --git a/Tests/UnitTestImpromptuInterface/Support/Helper.cs b/Tests/UnitTestImpromptuInterface/Support/Helper.cs
index cfe339e..d973d56 100644
--- a/Tests/UnitTestImpromptuInterface/Support/Helper.cs
+++ b/Tests/UnitTestImpromptuInterface/Support/Helper.cs
@@ -16,8 +16,11 @@ public void WriteLine(string format, params object[] args)
Console.WriteLine(format,args);
}
}
-
+
+ //Not rewriting test for no good reason
+#pragma warning disable CS0618 // Type or member is obsolete
public class Helper:AssertionHelper
+#pragma warning restore CS0618 // Type or member is obsolete
{
public WriteLineContext TestContext
{
diff --git a/Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj b/Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj
index c5fe914..a84c610 100644
--- a/Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj
+++ b/Tests/UnitTestImpromptuInterface/UnitTestImpromptuInterface.csproj
@@ -1,6 +1,6 @@
- net6;net47
+ net8.0;net47
false
diff --git a/Version.props b/Version.props
index 0421ff3..e930509 100644
--- a/Version.props
+++ b/Version.props
@@ -1,5 +1,6 @@
- 8.0.4
+ 8.0.6
+ preview$(GITHUB_RUN_NUMBER)
\ No newline at end of file