From 524a3db3d4f96ec8c697a7c4e3c7218e5e08afe5 Mon Sep 17 00:00:00 2001
From: Jay Tuley <jay@tuley.name>
Date: Fri, 15 Nov 2024 22:23:44 -0600
Subject: [PATCH] Update build system

---
 .github/workflows/dotnet.yml                 |  6 ++--
 .github/workflows/dotnet48.yml               | 30 ++++++++++----------
 ImpromptuInterface.sln                       |  1 +
 ImpromptuInterface/ImpromptuInterface.csproj |  6 ++++
 Version.props                                |  2 +-
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 8751fe4..4f71f78 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -8,8 +8,8 @@ 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
@@ -20,4 +20,4 @@ jobs:
     - 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 DotNetDBF.Test/DotNetDBF.Test.csproj --configuration Release --no-build --no-restore
\ 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..e681edd 100644
--- a/ImpromptuInterface/ImpromptuInterface.csproj
+++ b/ImpromptuInterface/ImpromptuInterface.csproj
@@ -27,4 +27,10 @@
     <PackageReference Include="System.Reflection.Emit" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
   </ItemGroup>
+  <Target Name="CopyPackage" AfterTargets="Pack">
+    <Copy
+            SourceFiles="$(OutputPath)$(PackageId).$(PackageVersion).nupkg"
+            DestinationFolder="$(SolutionDir)\publish"
+    />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/Version.props b/Version.props
index 0421ff3..e1fcc38 100644
--- a/Version.props
+++ b/Version.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>8.0.4</VersionPrefix>
+        <VersionPrefix>8.0.5</VersionPrefix>
     </PropertyGroup>
 </Project>
\ No newline at end of file