Bump MASES.JCOBridge from 2.5.17 to 2.5.19 in /src/net (#572)

* Bump MASES.JCOBridge from 2.5.17 to 2.5.18 in /src/net Bumps MASES.JCOBridge from 2.5.17 to 2.5.18. --- updated-dependencies: - dependency-name: MASES.JCOBridge dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update templates * Added .NET 9 and removed .NET 6 * Update to JCOBridge 2.5.19 * Update workflows to support .NET 9 while new runner images are deployed * Update target JCOBridge license * Test update * Update test execution * Try to log error during initialize * Try add .NET setup * Verify what the folder contains to test it locally * Avoid .NET Core install on Windows --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
masesgroup · Dec 3, 2024 · 424871d · 424871d
1 parent 5af2aed
commit 424871d
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 19 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -257,6 +257,11 @@ jobs:
           path: ./bin/
           key: JNet_${{ github.run_number }}_${{ github.run_attempt }}_bin_${{ github.sha }}
 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: JNetBin
+          path: .\bin\
+
   execute_tests:
     needs: build_windows
     strategy:
@@ -271,14 +276,15 @@ jobs:
             framework: net462
           - os: macos-latest
             framework: net462
-          - os: macos-latest
-            framework: net6.0
           - os: macos-13
             framework: net462
           - jdk_vendor: oracle
             jdk_version: 11
 
     runs-on: ${{ matrix.os }}
+    env:
+      JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
+
     steps:
       - name: Restore JNet bin from cache
         uses: actions/cache/restore@v4
@@ -289,6 +295,7 @@ jobs:
           key: JNet_${{ github.run_number }}_${{ github.run_attempt }}_bin_${{ github.sha }}
 
       - uses: actions/setup-dotnet@v4
+        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' || matrix.os == 'macos-13' }}
         with:
           dotnet-version: |
             6.x
@@ -305,16 +312,13 @@ jobs:
         run: |
           dotnet ./bin/${{ matrix.framework }}/JNetTest.dll
           dotnet ./bin/${{ matrix.framework }}/JNetByteBufferTest.dll
-        env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
+
 
       - name: WINDOWS ONLY - Execute tests on ${{ matrix.os }} with ${{ matrix.jdk_vendor }} ${{ matrix.jdk_version }}
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
           .\bin\${{ matrix.framework }}\JNetTest.exe
           .\bin\${{ matrix.framework }}\JNetByteBufferTest.exe
-        env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - uses: actions/upload-artifact@v4
         if: failure()
@@ -334,9 +338,15 @@ jobs:
         exclude:
           - jdk_vendor: oracle
             jdk_version: 11
-        
+
     runs-on: ${{ matrix.os }}
     steps:
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            6.x
+            9.x
+    
       - name: Restore JNet bin from cache
         uses: actions/cache/restore@v4
         with:
@@ -359,8 +369,6 @@ jobs:
           Register-PSRepository -Name Local_Nuget_Feed -SourceLocation $env:GITHUB_WORKSPACE\bin -PublishLocation $env:GITHUB_WORKSPACE\bin -InstallationPolicy Trusted
           Install-Module MASES.JNetPS -Repository Local_Nuget_Feed
           ${{ github.workspace }}/bin/JNetPSTest.ps1
-        env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - name: Execute PowerShell test on ${{ matrix.os }} with ${{ matrix.jdk_vendor }} ${{ matrix.jdk_version }}
         if: ${{ matrix.os == 'windows-latest' }}
@@ -370,8 +378,6 @@ jobs:
           Register-PSRepository -Name Local_Nuget_Feed -SourceLocation $env:GITHUB_WORKSPACE\bin -PublishLocation $env:GITHUB_WORKSPACE\bin -InstallationPolicy Trusted
           Install-Module MASES.JNetPS -Repository Local_Nuget_Feed
           ${{ github.workspace }}\bin\JNetPSTest.ps1
-        env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - name: Execute PowerShell 5.1 test on ${{ matrix.os }} with ${{ matrix.jdk_vendor }} ${{ matrix.jdk_version }}
         if: ${{ matrix.os == 'windows-latest' }}
@@ -380,8 +386,6 @@ jobs:
           $env:DOTNET_CLI_UI_LANGUAGE="en_US"
           Install-Module MASES.JNetPS -Repository Local_Nuget_Feed
           ${{ github.workspace }}\bin\JNetPSTest.ps1
-        env:
-          JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_5_19 }}
 
       - uses: actions/upload-artifact@v4
         if: failure()

diff --git a/tests/net/JNetByteBufferTest/Program.cs b/tests/net/JNetByteBufferTest/Program.cs
@@ -32,9 +32,9 @@ class Program
         const int iterations = 100;
         static void Main(string[] args)
         {
-            JNetTestCore.ApplicationHeapSize = "4G";
-            JNetTestCore.CreateGlobalInstance();
-            var appArgs = JNetTestCore.FilteredArgs;
+            Console.WriteLine("Starting JNetByteBufferTest");
+
+            Initialize();
 
             Console.WriteLine("Start insert from CLR to JVM");
 
@@ -51,6 +51,23 @@ static void Main(string[] args)
             }
         }
 
+        static void Initialize()
+        {
+            try
+            {
+                JNetTestCore.ApplicationHeapSize = "4G";
+                JNetTestCore.CreateGlobalInstance();
+                var appArgs = JNetTestCore.FilteredArgs;
+
+                System.Console.WriteLine($"Initialized JNetTestCore, remaining arguments are {string.Join(" ", appArgs)}");
+            }
+            catch (Exception ex)
+            {
+                System.Console.WriteLine(ex);
+                throw;
+            }
+        }
+
         static void TestInsertByteBuffers(int iteration, int length)
         {
             byte[] bytes = new byte[length];

diff --git a/tests/net/JNetTest/Program.cs b/tests/net/JNetTest/Program.cs
@@ -25,7 +25,6 @@
 using System.Threading.Tasks;
 using System.Linq;
 using Java.Nio;
-using MASES.JCOBridge.C2JBridge.JVMInterop;
 using MASES.JNet.Specific;
 
 namespace MASES.JNetTest
@@ -34,8 +33,9 @@ class Program
     {
         static void Main(string[] args)
         {
-            JNetTestCore.CreateGlobalInstance();
-            var appArgs = JNetTestCore.FilteredArgs;
+            System.Console.WriteLine("Starting JNetTest");
+
+            Initialize();
 
             TestExtensions();
 
@@ -58,6 +58,22 @@ static void Main(string[] args)
             TestAsyncIterator().Wait();
         }
 
+        static void Initialize()
+        {
+            try
+            {
+                JNetTestCore.CreateGlobalInstance();
+                var appArgs = JNetTestCore.FilteredArgs;
+
+                System.Console.WriteLine($"Initialized JNetTestCore, remaining arguments are {string.Join(" ", appArgs)}");
+            }
+            catch (Exception ex)
+            {
+                System.Console.WriteLine(ex);
+                throw;
+            }
+        }
+
         static void TestSingleton()
         {
             System.Console.WriteLine("TestSingleton");