Fix for #62 (#63)

* #61 (#61 (comment)): added download of .NET 6
masesgroup · Nov 15, 2021 · 936837e · 936837e
1 parent 60b4915
commit 936837e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 35 deletions.
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -69,27 +69,29 @@ jobs:
           with: 
             fetch-depth: '1'
 
+        - name: Setup .NET 6.0
+          uses: actions/setup-dotnet@v1
+          with:
+            dotnet-version: 6.0.x
+
         # Runs a set of commands using the runners shell
         - name: Build JCOReflectorCLI
           run: |
             dotnet build --no-incremental --framework netcoreapp3.1 --configuration Release src/JCOReflectorCLI.sln		
             dotnet build --no-incremental --framework net5.0 --configuration Release src/JCOReflectorCLI.sln
-            
-#            dotnet build --no-incremental --framework net6.0 --configuration Release src/JCOReflectorCLI.sln            
+            dotnet build --no-incremental --framework net6.0 --configuration Release src/JCOReflectorCLI.sln            
 
         - name: Build Java files
           run: |
             dotnet bin/netcoreapp3.1/JCOReflectorCLI.dll -JobType Build -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/build_linux.job
             dotnet bin/net5.0/JCOReflectorCLI.dll -JobType Build -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/build_linux.job
-            
-#            dotnet bin/net6.0/JCOReflectorCLI.dll -JobType Build -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/build_linux.job
+            dotnet bin/net6.0/JCOReflectorCLI.dll -JobType Build -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/build_linux.job
 
         - name: Build JAR files
           run: |
             dotnet bin/netcoreapp3.1/JCOReflectorCLI.dll -JobType CreateJars -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/createjars_core3.1_linux.job
             dotnet bin/net5.0/JCOReflectorCLI.dll -JobType CreateJars -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/createjars_core5.0_linux.job
-            
-#            dotnet bin/net6.0/JCOReflectorCLI.dll -JobType CreateJars -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/createjars_core6.0_linux.job
+            dotnet bin/net6.0/JCOReflectorCLI.dll -JobType CreateJars -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/createjars_core6.0_linux.job
 
         - name: Build Java test source file .NET Core 3.1
           run: javac -cp ./bin/netcoreapp3.1/JCOReflector.jar ./netreflected-tests/java/src/hierarchy/*.java ./netreflected-tests/java/src/mscorlib/*.java ./netreflected-tests/java/src/nettest/*.java ./netreflected-tests/java/src/refout/*.java
@@ -118,17 +120,17 @@ jobs:
         - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" nettest.HelloNETSocket -server 127.0.0.1 
         - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" nettest.HelloNETSocket -async -server 127.0.0.1
 
-#        - name: Build Java test source file .NET 6.0
-#          run: javac -cp ./bin/net6.0/JCOReflector.jar ./netreflected-tests/java/src/hierarchy/*.java ./netreflected-tests/java/src/mscorlib/*.java ./netreflected-tests/java/src/nettest/*.java ./netreflected-tests/java/src/refout/*.java
-
-#        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloLock
-#        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloNET 
-#        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloNETEvent 
-#        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloIterator
-#        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" hierarchy.HelloHierarchy 
-#        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" hierarchy.HelloInterfaces 
-#        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" nettest.HelloNETSocket -server 127.0.0.1 
-#        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" nettest.HelloNETSocket -async -server 127.0.0.1
+        - name: Build Java test source file .NET 6.0
+          run: javac -cp ./bin/net6.0/JCOReflector.jar ./netreflected-tests/java/src/hierarchy/*.java ./netreflected-tests/java/src/mscorlib/*.java ./netreflected-tests/java/src/nettest/*.java ./netreflected-tests/java/src/refout/*.java
+
+        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloLock
+        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloNET 
+        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloNETEvent 
+        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloIterator
+        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" hierarchy.HelloHierarchy 
+        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" hierarchy.HelloInterfaces 
+        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" nettest.HelloNETSocket -server 127.0.0.1 
+        - run: java -cp "./bin/net6.0/JCOReflector.jar:./netreflected-tests/java/src/" nettest.HelloNETSocket -async -server 127.0.0.1
 
             #java -cp "./bin/net6.0/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOutBase
             #java -cp "./bin/net6.0/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOut
@@ -178,21 +180,21 @@ jobs:
         - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" refout.HelloRefOut
         - run: rm -rf ./netreflected-tests/scala/output
 
-#        - name: Build Scala test source file .NET 6.0
-#          run: |
-#            source "$HOME/.sdkman/bin/sdkman-init.sh"
-#            mkdir ./netreflected-tests/scala/output
-#            scalac -cp "./bin/net6.0/*" -d ./netreflected-tests/scala/output ./netreflected-tests/scala/src/main/scala/hierarchy/* ./netreflected-tests/scala/src/main/scala/mscorlib/* ./netreflected-tests/scala/src/main/scala/nettest/* ./netreflected-tests/scala/src/main/scala/refout/*
-
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" mscorlib.HelloLock
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" mscorlib.HelloNet
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" mscorlib.HelloNETEvent
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" mscorlib.HelloIterator
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" hierarchy.HelloHierarchy
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" hierarchy.HelloInterfaces
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" nettest.HelloNETSocket
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" nettest.HelloNETSocket -async
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" refout.HelloRefOutBase
-#        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" refout.HelloRefOut
-#        - run: rm -rf ./netreflected-tests/scala/output
+        - name: Build Scala test source file .NET 6.0
+          run: |
+            source "$HOME/.sdkman/bin/sdkman-init.sh"
+            mkdir ./netreflected-tests/scala/output
+            scalac -cp "./bin/net6.0/*" -d ./netreflected-tests/scala/output ./netreflected-tests/scala/src/main/scala/hierarchy/* ./netreflected-tests/scala/src/main/scala/mscorlib/* ./netreflected-tests/scala/src/main/scala/nettest/* ./netreflected-tests/scala/src/main/scala/refout/*
+
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" mscorlib.HelloLock
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" mscorlib.HelloNet
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" mscorlib.HelloNETEvent
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" mscorlib.HelloIterator
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" hierarchy.HelloHierarchy
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" hierarchy.HelloInterfaces
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" nettest.HelloNETSocket
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" nettest.HelloNETSocket -async
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" refout.HelloRefOutBase
+        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net6.0/*:./netreflected-tests/scala/output" refout.HelloRefOut
+        - run: rm -rf ./netreflected-tests/scala/output
 
diff --git a/...c/net6.0/jcoreflectorgenerated/org/mases/jcobridge/netreflection/JCOReflectorOptions.java b/...c/net6.0/jcoreflectorgenerated/org/mases/jcobridge/netreflection/JCOReflectorOptions.java
@@ -24,7 +24,7 @@
 
 /**************************************************************************************
  * <auto-generated>
- *      This code was generated from a template using JCOReflector
+ *      This code was generated from a template using JCOReflector 
  * 
  *      Manual changes to this file may cause unexpected behavior in your application.
  *      Manual changes to this file will be overwritten if the code is regenerated.