Skip to content

Commit

Permalink
Upgrade .NET Framework version (#107)
Browse files Browse the repository at this point in the history 
* #83 (comment)

* #61: update to JCOBridge 2.4.9

* #106: upgrade to .NET Framework 4.6.2
  • Loading branch information
@masesdevelopers
masesdevelopers authored Mar 30, 2022
1 parent c7815d0 commit 9ece678
Show file tree
Hide file tree
Showing 13,742 changed files with 160 additions and 160 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/createjars_framework_win19.job
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<JDKFolder>C:\hostedtoolcache\windows\Java_Adopt_jdk\13.0.2-8.1\x64</JDKFolder>
<JDKTarget>Version8</JDKTarget>
<JDKToolExtraOptions></JDKToolExtraOptions>
<JarDestinationFolder>bin\net461</JarDestinationFolder>
<JarDestinationFolder>bin\net462</JarDestinationFolder>
<WithJARSource>false</WithJARSource>
<EmbeddingJCOBridge>true</EmbeddingJCOBridge>
</JARBuilderEventArgs>
32 changes: 16 additions & 16 deletions .github/workflows/docs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ jobs:
git checkout master
cd ..\..\..
- name: Switch to master net461 help file
- name: Switch to master net462 help file
run: |
cd .\netreflected\docs\net461
cd .\netreflected\docs\net462
git checkout master
cd ..\..\..
Expand Down Expand Up @@ -141,15 +141,15 @@ jobs:
Copy-Item .\_data\LICENSE -Destination .\netreflected\docs\net6.0\LICENSE -Force
Copy-Item .\_data\README.md -Destination .\netreflected\docs\net6.0\README.md -Force
- name: Clean net461 help file folders
- name: Clean net462 help file folders
run: |
Copy-Item .\netreflected\docs\net461\.git -Destination .\_data\.git -Force
Copy-Item .\netreflected\docs\net461\LICENSE -Destination .\_data\LICENSE -Force
Copy-Item .\netreflected\docs\net461\README.md -Destination .\_data\README.md -Force
Remove-Item .\netreflected\docs\net461\* -Recurse -Force
Copy-Item .\_data\.git -Destination .\netreflected\docs\net461\.git -Force
Copy-Item .\_data\LICENSE -Destination .\netreflected\docs\net461\LICENSE -Force
Copy-Item .\_data\README.md -Destination .\netreflected\docs\net461\README.md -Force
Copy-Item .\netreflected\docs\net462\.git -Destination .\_data\.git -Force
Copy-Item .\netreflected\docs\net462\LICENSE -Destination .\_data\LICENSE -Force
Copy-Item .\netreflected\docs\net462\README.md -Destination .\_data\README.md -Force
Remove-Item .\netreflected\docs\net462\* -Recurse -Force
Copy-Item .\_data\.git -Destination .\netreflected\docs\net462\.git -Force
Copy-Item .\_data\LICENSE -Destination .\netreflected\docs\net462\LICENSE -Force
Copy-Item .\_data\README.md -Destination .\netreflected\docs\net462\README.md -Force
- name: Extract commit SHA
run: |
Expand All @@ -168,8 +168,8 @@ jobs:
run: dotnet bin\net6.0\MASES.JCOReflectorCLI.dll -JobType BuildDocs -JobFile .github\workflows\builddocs_win19.job -CommitVersion ${{ env.GITHUB_COMMIT_MESSAGE }} -JDKFolder %JAVA_HOME_11_X64%
shell: cmd

- name: Build net461 Java Help files
run: .\bin\net461\MASES.JCOReflectorCLI -JobType BuildDocs -JobFile .github\workflows\builddocs_win19.job -CommitVersion ${{ env.GITHUB_COMMIT_MESSAGE }} -JDKFolder %JAVA_HOME_11_X64%
- name: Build net462 Java Help files
run: .\bin\net462\MASES.JCOReflectorCLI -JobType BuildDocs -JobFile .github\workflows\builddocs_win19.job -CommitVersion ${{ env.GITHUB_COMMIT_MESSAGE }} -JDKFolder %JAVA_HOME_11_X64%
shell: cmd

- name: Clean temporary files
Expand Down Expand Up @@ -207,9 +207,9 @@ jobs:
env:
GITHUB_WORKSPACE: $GITHUB_WORKSPACE

- name: Commit changes to net461 help file
- name: Commit changes to net462 help file
run: |
cd .\netreflected\docs\net461
cd .\netreflected\docs\net462
%GITHUB_WORKSPACE%\.github\workflows\commit.cmd github-actions 41898282+github-actions[bot]@users.noreply.github.com "Update help file to commit masesgroup/JCOReflector@${{ env.GITHUB_COMMIT_MESSAGE }}"
cd ..\..\..
shell: cmd
Expand Down Expand Up @@ -258,9 +258,9 @@ jobs:
SUPER_SECRET: ${{ secrets.DOCS_API_TOKEN_GITHUB }}
REPO: masesgroup/NET6Docs

- name: Push changes to net461 help file
- name: Push changes to net462 help file
run: |
cd .\netreflected\docs\net461
cd .\netreflected\docs\net462
%GITHUB_WORKSPACE%\.github\workflows\push.cmd %REPO%
cd ..\..\..
shell: cmd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
fetch-depth: '1'

- name: Extract file
run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} $env:GITHUB_WORKSPACE/JCOBridge.lic
run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_249 }} $env:GITHUB_WORKSPACE/JCOBridge.lic
shell: pwsh

# Install .NET SDKs
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/maven.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
run: |
dotnet build --no-incremental --framework net5.0 src\JCOReflectorCLI.sln
dotnet build --no-incremental --framework net6.0 src\JCOReflectorCLI.sln
dotnet build --no-incremental --framework net461 src\JCOReflectorCLI.sln
dotnet build --no-incremental --framework net462 src\JCOReflectorCLI.sln
# Runs a set of commands using the runners shell
- name: Copy configuration file
Expand All @@ -105,8 +105,8 @@ jobs:
- name: Build net6.0 Maven POM files
run: dotnet bin\net6.0\MASES.JCOReflectorCLI.dll -JobType CreatePOM -JobFile .github\workflows\createpom_win19.job

- name: Build net461 Maven POM files
run: .\bin\net461\MASES.JCOReflectorCLI -JobType CreatePOM -JobFile .github\workflows\createpom_win19.job
- name: Build net462 Maven POM files
run: .\bin\net462\MASES.JCOReflectorCLI -JobType CreatePOM -JobFile .github\workflows\createpom_win19.job

- name: Set up Apache Maven Central
uses: actions/setup-java@v1
Expand All @@ -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.7 -Dpackaging=jar -DgeneratePom=true
run: mvn install:install-file -Dfile=./bin/net5.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.9 -Dpackaging=jar -DgeneratePom=true

- name: Publish net5.0 to Apache Maven Central
shell: bash
Expand All @@ -138,9 +138,9 @@ jobs:
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Publish net461 to Apache Maven Central
- name: Publish net462 to Apache Maven Central
shell: bash
run: mvn --file ./netreflected/src/net461.xml --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }} deploy
run: mvn --file ./netreflected/src/net462.xml --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }} deploy
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/pullrequests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
Remove-Item .\netreflected\src\netcoreapp3.1 -Recurse -Force
Remove-Item .\netreflected\src\net5.0 -Recurse -Force
Remove-Item .\netreflected\src\net6.0 -Recurse -Force
Remove-Item .\netreflected\src\net461 -Recurse -Force
Remove-Item .\netreflected\src\net462 -Recurse -Force
- name: Reflect .NET Core 3.1 Java files
run: dotnet bin\netcoreapp3.1\MASES.JCOReflectorCLI.dll -JobType Reflect -JobFile .github\workflows\reflect_netcoreapp3.1.job
Expand All @@ -105,7 +105,7 @@ jobs:
run: .\bin\net6.0\MASES.JCOReflectorCLI -JobType Reflect -JobFile .github\workflows\reflect_net6.0.job

- name: Reflect .NET Framework Java files
run: .\bin\net461\MASES.JCOReflectorCLI -JobType Reflect -JobFile .github\workflows\reflect_net461.job
run: .\bin\net462\MASES.JCOReflectorCLI -JobType Reflect -JobFile .github\workflows\reflect_net462.job

- name: Build Java files .NET Core 3.1
run: dotnet bin\netcoreapp3.1\MASES.JCOReflectorCLI.dll -JobType Build -JobFile .github\workflows\build_win19.job -JDKFolder %JAVA_HOME_11_X64%
Expand All @@ -120,7 +120,7 @@ jobs:
shell: cmd

- name: Build Java files .NET Framework
run: .\bin\net461\MASES.JCOReflectorCLI -JobType Build -JobFile .github\workflows\build_win19.job -JDKFolder %JAVA_HOME_11_X64%
run: .\bin\net462\MASES.JCOReflectorCLI -JobType Build -JobFile .github\workflows\build_win19.job -JDKFolder %JAVA_HOME_11_X64%
shell: cmd

- name: Build JAR files .NET Core 3.1
Expand All @@ -136,7 +136,7 @@ jobs:
shell: cmd

- name: Build JAR files .NET Framework
run: .\bin\net461\MASES.JCOReflectorCLI -JobType CreateJars -JobFile .github\workflows\createjars_framework_win19.job -JDKFolder %JAVA_HOME_11_X64%
run: .\bin\net462\MASES.JCOReflectorCLI -JobType CreateJars -JobFile .github\workflows\createjars_framework_win19.job -JDKFolder %JAVA_HOME_11_X64%
shell: cmd

- name: Build Java test source file .NET Core 3.1
Expand Down Expand Up @@ -185,18 +185,18 @@ jobs:
# - run: java -cp "./bin/net6.0/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOut

- name: Build Java test source file .NET Framework
run: javac -cp ./bin/net461/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: javac -cp ./bin/net462/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/net461/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloLock
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloNET
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloNETEvent
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloIterator
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" hierarchy.HelloHierarchy
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" hierarchy.HelloInterfaces
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" nettest.HelloNETSocket
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" nettest.HelloNETSocket -async
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOutBase
# - run: java -cp "./bin/net461/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOut
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloLock
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloNET
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloNETEvent
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" mscorlib.HelloIterator
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" hierarchy.HelloHierarchy
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" hierarchy.HelloInterfaces
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" nettest.HelloNETSocket
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" nettest.HelloNETSocket -async
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOutBase
# - run: java -cp "./bin/net462/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOut

- name: Download Scala package
run: C:\msys64\usr\bin\wget.exe https://downloads.lightbend.com/scala/2.13.5/scala-2.13.5.zip
Expand Down Expand Up @@ -299,27 +299,27 @@ jobs:
run: |
cd ./netreflected-tests/scala
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/*
..\..\scala-2.13.5\bin\scalac -toolcp "../../bin/net462/*" -d ./output ./src/main/scala/hierarchy/*.scala ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/*
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloLock
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" mscorlib.HelloLock
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNet
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" mscorlib.HelloNet
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" mscorlib.HelloNETEvent
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" mscorlib.HelloIterator
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" hierarchy.HelloHierarchy
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" hierarchy.HelloInterfaces
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" nettest.HelloNETSocket
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" nettest.HelloNETSocket -async
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" refout.HelloRefOutBase
# shell: cmd
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net461/*;./netreflected-tests/scala/output" refout.HelloRefOut
# - run: .\scala-2.13.5\bin\scala -toolcp "./bin/net462/*;./netreflected-tests/scala/output" refout.HelloRefOut
# shell: cmd
# - run: cd ./netreflected-tests/scala && rmdir output /s /q
# shell: cmd
0 .github/workflows/reflect_net461.job → .github/workflows/reflect_net462.job
View file
File renamed without changes.
Loading

0 comments on commit 9ece678

Please sign in to comment.