native package name, tests

ERGO-Code · Mar 26, 2024 · d964141 · d964141
1 parent 7320c8a
commit d964141
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 31 deletions.
diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: macos-x64
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+          path: ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
   # macos 14 is M1 (beta)
   build_macos_14:
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: macos-arm64
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+          path: ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
   # Build windows 32 and linux 
   build_windows_32:
@@ -76,7 +76,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: win-x32
-          path: ${{runner.workspace}}/build32/dotnet/Highs.Native/runtimes/win-x64/
+          path: ${{runner.workspace}}/build32/dotnet/Highs/runtimes/win-x64/
 
   build_linux:
     runs-on: ubuntu-latest
@@ -97,7 +97,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: linux-x64
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+          path: ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
   build_linux_arm64:
     runs-on: ubuntu-latest
@@ -120,7 +120,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: linux-arm64
-          path: ${{runner.workspace}}/build_linux_arm64/dotnet/Highs.Native/runtimes
+          path: ${{runner.workspace}}/build_linux_arm64/dotnet/Highs/runtimes
 
   build_windows:
     runs-on: windows-latest
@@ -144,53 +144,53 @@ jobs:
       - name: Display structure of downloaded files
         run: |
           pwd 
-          ls -R ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+          ls -R ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
       - name: Download runtimes macos-x64
         uses: actions/download-artifact@v4
         with:
           name: macos-x64
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+          path: ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
       - name: Download runtimes macos-arm64
         uses: actions/download-artifact@v4
         with:
           name: macos-arm64
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+          path: ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
       - name: Download runtimes win-x32
         uses: actions/download-artifact@v4
         with:
           name: win-x32
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes/win-x32
+          path: ${{runner.workspace}}/build/dotnet/Highs/runtimes/win-x32
 
       - name: Download runtimes
         uses: actions/download-artifact@v4
         with:
           name: linux-x64
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+          path: ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
       - name: Download runtimes
         uses: actions/download-artifact@v4
         with:
           name: linux-arm64
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+          path: ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
       - name: Display structure of downloaded files
-        run: ls -R ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
+        run: ls -R ${{runner.workspace}}/build/dotnet/Highs/runtimes
 
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '2.1.x'
 
       - name: Dotnet pack
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet pack -c Release
 
       - uses: actions/upload-artifact@v4
         with:
           name: nuget
-          path: ${{runner.workspace}}/build/dotnet/Highs.Native/bin/Release/*.nupkg
+          path: ${{runner.workspace}}/build/dotnet/Highs/bin/Release/*.nupkg
 
   dotnet_push:
     runs-on: windows-latest

diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml
@@ -34,14 +34,14 @@ jobs:
           dotnet-version: '2.1.x'
 
       - name: Dotnet pack
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet pack -c Release
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
 
       - name: Dotnet push to local feed
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet nuget push ./bin/Release/*.nupkg -s ${{runner.workspace}}/nugets
 
       - name: Create new project and test
@@ -51,7 +51,7 @@ jobs:
           dotnet new console
           rm Program.cs 
           cp $GITHUB_WORKSPACE/examples/call_highs_from_csharp.cs . 
-          dotnet add package Highs.Native -s ${{runner.workspace}}/nugets 
+          dotnet add package Highs -s ${{runner.workspace}}/nugets 
 
 
             
@@ -77,14 +77,14 @@ jobs:
           dotnet-version: '2.1.x'
 
       - name: Dotnet pack
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet pack -c Release
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
 
       - name: Dotnet push to local feed
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet nuget push ./bin/Release/*.nupkg -s ${{runner.workspace}}/nugets
 
       - name: Create new project and test
@@ -94,7 +94,7 @@ jobs:
           dotnet new console
           rm Program.cs 
           cp $GITHUB_WORKSPACE/examples/call_highs_from_csharp.cs . 
-          dotnet add package Highs.Native -s ${{runner.workspace}}/nugets 
+          dotnet add package Highs -s ${{runner.workspace}}/nugets 
 
   build_linux:
     runs-on: ubuntu-latest
@@ -117,14 +117,14 @@ jobs:
           dotnet-version: '2.1.x'
 
       - name: Dotnet pack
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet pack -c Release
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
 
       - name: Dotnet push to local feed
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet nuget push ./bin/Release/*.nupkg -s ${{runner.workspace}}/nugets
 
       - name: Create new project and test
@@ -134,11 +134,10 @@ jobs:
           dotnet new console
           rm Program.cs 
           cp $GITHUB_WORKSPACE/examples/call_highs_from_csharp.cs . 
-          dotnet add package Highs.Native -s ${{runner.workspace}}/nugets 
+          dotnet add package Highs -s ${{runner.workspace}}/nugets 
 
   build_windows:
     runs-on: windows-latest
-    needs: [build_macos_12, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS Windows native
@@ -160,14 +159,14 @@ jobs:
           dotnet-version: '2.1.x'
 
       - name: Dotnet pack
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet pack -c Release
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
 
       - name: Dotnet push to local feed
-        working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
+        working-directory: ${{runner.workspace}}/build/dotnet/Highs
         run: dotnet nuget push ./bin/Release/*.nupkg -s ${{runner.workspace}}/nugets
 
       - name: Create new project and test
@@ -177,4 +176,4 @@ jobs:
           dotnet new console
           rm Program.cs 
           cp $GITHUB_WORKSPACE/examples/call_highs_from_csharp.cs . 
-          dotnet add package Highs.Native -s ${{runner.workspace}}/nugets 
+          dotnet add package Highs-s ${{runner.workspace}}/nugets 
diff --git a/cmake/dotnet.cmake b/cmake/dotnet.cmake
@@ -14,7 +14,7 @@ endif()
 #   message(STATUS "Found dotnet Program: ${DOTNET_EXECUTABLE}")
 # endif()
 
-set(DOTNET_PACKAGE Highs.Native)
+set(DOTNET_PACKAGE Highs)
 set(DOTNET_PACKAGES_DIR "${PROJECT_BINARY_DIR}/dotnet")
 
 # Runtime IDentifier
@@ -119,7 +119,7 @@ file(MAKE_DIRECTORY ${DOTNET_PACKAGES_DIR})
 # CMake variable(s) (@PROJECT_NAME@) that configure_file() can manage and
 # generator expression ($<TARGET_FILE:...>) that file(GENERATE) can manage.
 configure_file(
-  ${PROJECT_SOURCE_DIR}/nuget/Highs.Native.csproj.in
+  ${PROJECT_SOURCE_DIR}/nuget/Highs.csproj.in
   ${DOTNET_PROJECT_DIR}/${DOTNET_PROJECT}.csproj
   @ONLY)
 

diff --git a/nuget/Highs.Native.csproj.in → nuget/Highs.csproj.in b/nuget/Highs.Native.csproj.in → nuget/Highs.csproj.in
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Highs.Native</PackageId>
+    <PackageId>Highs</PackageId>
     <Version>@PROJECT_VERSION@</Version>
 
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -307,7 +307,7 @@ else()
       endif()
       message(STATUS ".Net RID: ${DOTNET_RID}")
 
-      set(DOTNET_PROJECT Highs.Native)
+      set(DOTNET_PROJECT Highs)
       set(DOTNET_PROJECT_DIR ${PROJECT_BINARY_DIR}/dotnet/${DOTNET_PROJECT})
       file(MAKE_DIRECTORY ${DOTNET_PROJECT_DIR}/runtimes/${DOTNET_RID}/native)
       add_custom_command(TARGET highs POST_BUILD