Added namespace ending with Internal option and upgrade to JCOBridge …

…247 (#85) * #61: upgrade JCOBridge and version * #84: added AvoidDisableInternalNamespace property * #83: license is available in the package * Test now runs with a license
masesgroup · Mar 10, 2022 · 3bd9dea · 3bd9dea
1 parent 34c8f5c
commit 3bd9dea
Show file tree

Hide file tree

Showing 20 changed files with 212 additions and 173 deletions.
diff --git a/.github/workflows/GetLicense.ps1 b/.github/workflows/GetLicense.ps1
@@ -0,0 +1,2 @@
+$bytes = [Convert]::FromBase64String($args[0])
+[IO.File]::WriteAllBytes($args[1], $bytes)
diff --git a/.github/workflows/SaveLicense.ps1 b/.github/workflows/SaveLicense.ps1
@@ -0,0 +1,6 @@
+[Console]::WriteLine("Reading {0}, writing {1}", $args[0], $args[1])
+$bytes = [IO.File]::ReadAllBytes($args[0])
+[Console]::WriteLine("Read {0} bytes from {1}", $bytes.Length, $args[0])
+$b64 = [Convert]::ToBase64String($bytes)
+[Console]::WriteLine("Writing {0} with length {1} on {2}", $b64, $b64.Length, $args[1])
+[IO.File]::WriteAllText($args[1], [Convert]::ToBase64String($bytes))
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -69,6 +69,10 @@ jobs:
           with: 
             fetch-depth: '1'
 
+        - name: Extract file
+          run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} ./JCOBridge.lic
+          shell: pwsh
+
         # Install .NET SDKs
         - name: Setup .NET Core 3.1
           uses: actions/setup-dotnet@v1

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
@@ -120,7 +120,7 @@ jobs:
 
       - name: Install local file to be used within Javadoc section of generated POM 
         shell: bash
-        run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.6 -Dpackaging=jar -DgeneratePom=true
+        run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.7 -Dpackaging=jar -DgeneratePom=true
 
       - name: Publish net5.0 to Apache Maven Central
         shell: bash

diff --git a/.github/workflows/pullrequests.yaml b/.github/workflows/pullrequests.yaml
@@ -70,6 +70,9 @@ jobs:
       - uses: actions/checkout@v2
         with: 
           fetch-depth: '1'
+
+      - name: Extract secret
+        run: .github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} .\JCOBridge.lic
 
       # Runs a set of commands using the runners shell
       - name: Build JCOReflectorCLI
@@ -211,25 +214,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/netcoreapp3.1/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
 
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/netcoreapp3.1/*;./output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/netcoreapp3.1/*;./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd
@@ -241,25 +244,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net5.0/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
               
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net5.0/*;./output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net5.0/*;./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd 
@@ -271,25 +274,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net6.0/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
               
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloLock
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloLock
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloNet
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloNet
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloNETEvent
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" mscorlib.HelloIterator
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" hierarchy.HelloHierarchy
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" hierarchy.HelloInterfaces
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" nettest.HelloNETSocket
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" nettest.HelloNETSocket -async
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" refout.HelloRefOutBase
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net6.0/*;./output" refout.HelloRefOut
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net6.0/*;./netreflected-tests/scala/output" refout.HelloRefOut
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd 
@@ -301,26 +304,25 @@ jobs:
           mkdir output
           ..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net461/*" -d ./output ./src/main/scala/hierarchy/*.scala ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
              
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloLock
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloLock
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloNet
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNet
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloNETEvent
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" mscorlib.HelloIterator
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" hierarchy.HelloHierarchy
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" hierarchy.HelloInterfaces
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" nettest.HelloNETSocket
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" nettest.HelloNETSocket -async
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" refout.HelloRefOutBase
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
         shell: cmd      
-      - run: cd ./netreflected-tests/scala && ..\..\scala-2.13.5\bin\scala -toolcp "../../bin/net461/*;./output" refout.HelloRefOut
+      - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOut
         shell: cmd      
       - run: cd ./netreflected-tests/scala && rmdir output /s /q
         shell: cmd  
-
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -66,7 +66,7 @@ jobs:
 
       - name: Install local file to be used within Javadoc section of generated POM 
         shell: bash
-        run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.6 -Dpackaging=jar -DgeneratePom=true
+        run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.7 -Dpackaging=jar -DgeneratePom=true
 
       - name: Publish net5.0 to Apache Maven Central
         shell: bash
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		$bytes = [Convert]::FromBase64String($args[0])
		[IO.File]::WriteAllBytes($args[1], $bytes)