Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added namespace ending with Internal option and upgrade to JCOBridge 247 #85

Merged
merged 10 commits into from
Mar 10, 2022
Merged

Added namespace ending with Internal option and upgrade to JCOBridge 247 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3956da4
#61: upgrade JCOBridge and version
masesdevelopers Mar 10, 2022
78b506d
#84: added AvoidDisableInternalNamespace property
masesdevelopers Mar 10, 2022
f98367e
#83: license is available in the package
masesdevelopers Mar 10, 2022
a1096b0
Test now runs with a license
masesdevelopers Mar 10, 2022
ba551f1
Trigger
masesdevelopers Mar 10, 2022
18ab6b6
Update missing workflows/testbranch.yaml
masesdevelopers Mar 10, 2022
746ca10
Update workflows/pullrequests.yaml
masesdevelopers Mar 10, 2022
19e0599
Fix workflows
masesdevelopers Mar 10, 2022
52ce6b6
Retest for wrong license position
masesdevelopers Mar 10, 2022
d972f87
Updates all files to use license
masesdevelopers Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/GetLicense.ps1
View file
Open in desktop
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)
6 changes: 6 additions & 0 deletions .github/workflows/SaveLicense.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
4 changes: 4 additions & 0 deletions .github/workflows/linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
84 changes: 43 additions & 41 deletions .github/workflows/pullrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading