diff --git a/.github/workflows/createjars_framework_win19.job b/.github/workflows/createjars_framework_win19.job index 44b96538910..790d3d9327c 100644 --- a/.github/workflows/createjars_framework_win19.job +++ b/.github/workflows/createjars_framework_win19.job @@ -7,7 +7,7 @@ C:\hostedtoolcache\windows\Java_Adopt_jdk\13.0.2-8.1\x64 Version8 - bin\net461 + bin\net462 false true diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index f68592bafb7..4e18f02c2bb 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -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 ..\..\.. @@ -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: | @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index bd174fabfac..e774359f017 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -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 diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 71c07bcc5dd..72d07c951ef 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -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 @@ -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 @@ -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 @@ -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 }} diff --git a/.github/workflows/pullrequests.yaml b/.github/workflows/pullrequests.yaml index de760e00cd6..5ddc1bf4579 100644 --- a/.github/workflows/pullrequests.yaml +++ b/.github/workflows/pullrequests.yaml @@ -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 @@ -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% @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/reflect_net461.job b/.github/workflows/reflect_net462.job similarity index 100% rename from .github/workflows/reflect_net461.job rename to .github/workflows/reflect_net462.job diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ef5ee0f0df1..4559cfaf44b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,8 +51,8 @@ jobs: - name: Build net6.0 Maven POM files run: dotnet bin\net6.0\MASES.JCOReflectorCLI.dll -JobType CreatePOM -POMStagingType Release -JobFile .github\workflows\createpom_win19.job - - name: Build net461 Maven POM files - run: .\bin\net461\MASES.JCOReflectorCLI -JobType CreatePOM -POMStagingType Release -JobFile .github\workflows\createpom_win19.job + - name: Build net462 Maven POM files + run: .\bin\net462\MASES.JCOReflectorCLI -JobType CreatePOM -POMStagingType Release -JobFile .github\workflows\createpom_win19.job - name: Set up Apache Maven Central uses: actions/setup-java@v1 @@ -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.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 @@ -84,9 +84,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 }} @@ -98,7 +98,7 @@ jobs: dotnet bin\netcoreapp3.1\MASES.JCOReflectorCLI.dll -JobType Build -JobFile .github\workflows\build_win19.job -JDKFolder %JAVA_HOME_11_X64% dotnet bin\net5.0\MASES.JCOReflectorCLI.dll -JobType Build -JobFile .github\workflows\build_win19.job -JDKFolder %JAVA_HOME_11_X64% dotnet bin\net6.0\MASES.JCOReflectorCLI.dll -JobType Build -JobFile .github\workflows\build_win19.job -JDKFolder %JAVA_HOME_11_X64% - .\bin\net461\MASES.JCOReflectorCLI -JobType Build -JobFile .github\workflows\build_win19.job -JDKFolder %JAVA_HOME_11_X64% + .\bin\net462\MASES.JCOReflectorCLI -JobType Build -JobFile .github\workflows\build_win19.job -JDKFolder %JAVA_HOME_11_X64% shell: cmd - name: Build JAR files @@ -106,7 +106,7 @@ jobs: dotnet .\bin\netcoreapp3.1\MASES.JCOReflectorCLI.dll -JobType CreateJars -JobFile .github\workflows\createjars_core3.1_win19.job -JDKFolder %JAVA_HOME_11_X64% dotnet .\bin\net5.0\MASES.JCOReflectorCLI.dll -JobType CreateJars -JobFile .github\workflows\createjars_core5.0_win19.job -JDKFolder %JAVA_HOME_11_X64% dotnet .\bin\net6.0\MASES.JCOReflectorCLI.dll -JobType CreateJars -JobFile .github\workflows\createjars_core6.0_win19.job -JDKFolder %JAVA_HOME_11_X64% - .\bin\net461\MASES.JCOReflectorCLI -JobType CreateJars -JobFile .github\workflows\createjars_framework_win19.job -JDKFolder %JAVA_HOME_11_X64% + .\bin\net462\MASES.JCOReflectorCLI -JobType CreateJars -JobFile .github\workflows\createjars_framework_win19.job -JDKFolder %JAVA_HOME_11_X64% shell: cmd - name: Compress release files @@ -114,14 +114,14 @@ jobs: Compress-Archive -Path .\bin\netcoreapp3.1\* -DestinationPath .\bin\netcoreapp3.1.zip Compress-Archive -Path .\bin\net5.0\* -DestinationPath .\bin\net5.0.zip Compress-Archive -Path .\bin\net6.0\* -DestinationPath .\bin\net6.0.zip - Compress-Archive -Path .\bin\net461\* -DestinationPath .\bin\net461.zip + Compress-Archive -Path .\bin\net462\* -DestinationPath .\bin\net462.zip - name: Compress documentation files run: | Compress-Archive -Path .\netreflected\docs\netcoreapp3.1\* -DestinationPath .\netcoreapp3.1.docs.zip Compress-Archive -Path .\netreflected\docs\net5.0\* -DestinationPath .\net5.0.docs.zip Compress-Archive -Path .\netreflected\docs\net6.0\* -DestinationPath .\net6.0.docs.zip - Compress-Archive -Path .\netreflected\docs\net461\* -DestinationPath .\net461.docs.zip + Compress-Archive -Path .\netreflected\docs\net462\* -DestinationPath .\net462.docs.zip - name: Upload netcoreapp3.1 binaries to release uses: svenstaro/upload-release-action@v2 @@ -150,12 +150,12 @@ jobs: tag: ${{ github.ref }} overwrite: true - - name: Upload net461 binaries to release + - name: Upload net462 binaries to release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: .\bin\net461.zip - asset_name: net461.zip + file: .\bin\net462.zip + asset_name: net462.zip tag: ${{ github.ref }} overwrite: true @@ -186,12 +186,12 @@ jobs: tag: ${{ github.ref }} overwrite: true - - name: Upload net461 binaries to release + - name: Upload net462 binaries to release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: .\net461.docs.zip - asset_name: net461.docs.zip + file: .\net462.docs.zip + asset_name: net462.docs.zip tag: ${{ github.ref }} overwrite: true diff --git a/.github/workflows/testbranch.yaml b/.github/workflows/testbranch.yaml index 7b1d1df43e6..8a17c43dce4 100644 --- a/.github/workflows/testbranch.yaml +++ b/.github/workflows/testbranch.yaml @@ -78,7 +78,7 @@ jobs: shell: cmd - name: Extract secret - run: .github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} .\JCOBridge.lic + run: .github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_249 }} .\JCOBridge.lic # Runs a set of commands using the runners shell - name: Build JCOReflectorCLI @@ -102,7 +102,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 @@ -114,7 +114,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% @@ -129,7 +129,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 @@ -145,7 +145,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 @@ -191,18 +191,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 @@ -305,27 +305,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 @@ -335,7 +335,7 @@ jobs: Compress-Archive -Path .\bin\netcoreapp3.1\* -DestinationPath .\bin\netcoreapp3.1.zip Compress-Archive -Path .\bin\net5.0\* -DestinationPath .\bin\net5.0.zip Compress-Archive -Path .\bin\net6.0\* -DestinationPath .\bin\net6.0.zip - Compress-Archive -Path .\bin\net461\* -DestinationPath .\bin\net461.zip + Compress-Archive -Path .\bin\net462\* -DestinationPath .\bin\net462.zip - uses: actions/upload-artifact@v2 with: @@ -359,5 +359,5 @@ jobs: - uses: actions/upload-artifact@v2 with: - name: net461 - path: .\bin\net461.zip + name: net462 + path: .\bin\net462.zip diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 67120168a13..3660dea68ca 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -72,7 +72,7 @@ jobs: fetch-depth: '1' - name: Extract secret - run: .github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_247 }} .\JCOBridge.lic + run: .github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_249 }} .\JCOBridge.lic # Runs a set of commands using the runners shell - name: Build JCOReflectorCLI @@ -96,7 +96,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 @@ -108,7 +108,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% @@ -123,7 +123,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 @@ -139,7 +139,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 @@ -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: 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: 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/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 @@ -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 @@ -329,7 +329,7 @@ jobs: Compress-Archive -Path .\bin\netcoreapp3.1\* -DestinationPath .\bin\netcoreapp3.1.zip Compress-Archive -Path .\bin\net5.0\* -DestinationPath .\bin\net5.0.zip Compress-Archive -Path .\bin\net6.0\* -DestinationPath .\bin\net6.0.zip - Compress-Archive -Path .\bin\net461\* -DestinationPath .\bin\net461.zip + Compress-Archive -Path .\bin\net462\* -DestinationPath .\bin\net462.zip - name: Extract commit SHA run: | @@ -402,5 +402,5 @@ jobs: - uses: actions/upload-artifact@v2 with: - name: net461 - path: .\bin\net461.zip + name: net462 + path: .\bin\net462.zip diff --git a/.gitmodules b/.gitmodules index 6c14a460f75..7217fe07c9b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "netreflected/docs/netcoreapp3.1"] path = netreflected/docs/netcoreapp3.1 url = https://github.com/masesgroup/CoreDocs.git -[submodule "netreflected/docs/net461"] - path = netreflected/docs/net461 +[submodule "netreflected/docs/net462"] + path = netreflected/docs/net462 url = https://github.com/masesgroup/FrameworkDocs.git [submodule "netreflected/docs/net5.0"] path = netreflected/docs/net5.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aba617de2db..4f6d24a457e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ This project and everyone participating in it is governed by the [JCOReflector C The project is organized in this folder structure: * **bin** (The output folder, automatically generated and not in git) - * net461 (folder for .NET Framework output) + * net462 (folder for .NET Framework output) * netcoreapp3.1 (folder for .NET Core 3.1 output) * net5.0 (folder for .NET 5 output) * net6.0 (folder for .NET 6 output) @@ -22,17 +22,17 @@ The project is organized in this folder structure: * **src** (a standard folder used in any Java IDE) * **JCOReflector** (contains the base classes used from JCOReflector to build reflected classes) * **netcoreapp3.1** (contains, sepearated in folders, the sets of reflected classes of .NET Core generated from JCOReflector: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) - * **net461** (contains, sepearated in folders, the sets of reflected classes of .NET Framework generated from JCOReflector: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) + * **net462** (contains, sepearated in folders, the sets of reflected classes of .NET Framework generated from JCOReflector: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) * **net5.0** (contains, sepearated in folders, the sets of reflected classes of .NET 5 generated from JCOReflector: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) * **net6.0** (contains, sepearated in folders, the sets of reflected classes of .NET 6 generated from JCOReflector: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) * **docs** * **netcoreapp3.1** (contains the generated documentation related to .NET Core: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) - * **net461** (contains the generated documentation related to .NET Framework: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) + * **net462** (contains the generated documentation related to .NET Framework: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) * **net5.0** (contains the generated documentation related to .NET 5: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) * **net6.0** (contains the generated documentation related to .NET 6: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) * **statistics** * **netcoreapp3.1** (contains the generated statistics related to .NET Core: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) - * **net461** (contains the generated statistics related to .NET Framework: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) + * **net462** (contains the generated statistics related to .NET Framework: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) * **net5.0** (contains the generated statistics related to .NET 5: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) * **net6.0** (contains the generated statistics related to .NET 6: **no manual action shall be made on this folder and subfolders, an issue or enhancement shall be made in the JCOReflector engine (code or templates)**) @@ -85,7 +85,7 @@ The basic and simple rules for the project are: * *netreflected/src/net5.0* * *netreflected/src/net6.0* * *netreflected/src/netcoreapp3.1* - * *netreflected/src/net461* + * *netreflected/src/net462* ## Suggesting Enhancements diff --git a/README.md b/README.md index aaee0cf8f40..7fe83b5ada0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ |.NET Framework | .NET 5 | .NET 6 | |--- |--- |--- | -|[![Maven Central](https://img.shields.io/maven-central/v/com.masesgroup/jcoreflector_net461.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.masesgroup%22%20AND%20a:%22jcoreflector_net461%22) | [![Maven Central](https://img.shields.io/maven-central/v/com.masesgroup/jcoreflector_net5.0.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.masesgroup%22%20AND%20a:%22jcoreflector_net5.0%22) | [![Maven Central](https://img.shields.io/maven-central/v/com.masesgroup/jcoreflector_net6.0.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.masesgroup%22%20AND%20a:%22jcoreflector_net6.0%22)| +|[![Maven Central](https://img.shields.io/maven-central/v/com.masesgroup/jcoreflector_net462.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.masesgroup%22%20AND%20a:%22jcoreflector_net462%22) | [![Maven Central](https://img.shields.io/maven-central/v/com.masesgroup/jcoreflector_net5.0.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.masesgroup%22%20AND%20a:%22jcoreflector_net5.0%22) | [![Maven Central](https://img.shields.io/maven-central/v/com.masesgroup/jcoreflector_net6.0.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.masesgroup%22%20AND%20a:%22jcoreflector_net6.0%22)| |JCOReflectorEngine | JCOReflectorCLI | |--- |--- | @@ -191,7 +191,7 @@ or Within the folder bin you will find three subfolders: -- **net461** (available only on Windows platform) +- **net462** (available only on Windows platform) - **netcoreapp3.1** (available on .NET Core supported platforms) - **net5.0** (available on .NET 5 supported platforms) - **net6.0** (available on .NET 6 supported platforms) @@ -206,7 +206,7 @@ in each subfolder will be available two executables: ## Reflected Assemblies -The folder [netreflected](/netreflected/src) contains all reflected classes generated for **.NET** **Framework** (_net461_), **Core** (_netcoreapp3.1_), **5** (_net5.0_) and **6** (_net6.0_). Below the coverage statistics and the list of analyzed and reflected assemblies: +The folder [netreflected](/netreflected/src) contains all reflected classes generated for **.NET** **Framework** (_net462_), **Core** (_netcoreapp3.1_), **5** (_net5.0_) and **6** (_net6.0_). Below the coverage statistics and the list of analyzed and reflected assemblies: ### Statistics diff --git a/_data/navigation.yml b/_data/navigation.yml index 9c1d7a906bb..8846efbb2b2 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -26,7 +26,7 @@ sidebar_elements: - title: Documentation children: - title: ".NET Framework documentation" - url: /netreflected/docs/net461/ + url: /netreflected/docs/net462/ - title: ".NET Core documentation" url: /netreflected/docs/netcoreapp3.1/ - title: ".NET 5 documentation" diff --git a/netreflected/README.md b/netreflected/README.md index 933825667ff..ac433c3bb21 100644 --- a/netreflected/README.md +++ b/netreflected/README.md @@ -2,7 +2,7 @@ The available reflected classes are generated starting from root assemblies, generation is done using up to 10 recursions to explore for exportable Exceptions. There are two main folders: -* **_net461_** contains the reflected classes generated from .NET Framework, divided by the containing assembly +* **_net462_** contains the reflected classes generated from .NET Framework, divided by the containing assembly * **_netcoreapp3.1_** contains the reflected classes generated from .NET Core 3.1, divided by the containing assembly * **_net5.0_** contains the reflected classes generated from .NET 5, divided by the containing assembly * **_net6.0_** contains the reflected classes generated from .NET 6, divided by the containing assembly @@ -14,7 +14,7 @@ There are two main folders: ![FrameworkStatisticPercent](https://docs.google.com/spreadsheets/d/e/2PACX-1vRKe-7bBH40JmQmq4I194xz9g2YsoU7L9fHwzY0fqZyWepyjqnOC0B7lgO9CjAuTrBkOA8qbTiScLpS/pubchart?oid=485555819&format=image) -[//]: # "BeginReport net461" +[//]: # "BeginReport net462" Parsed assemblies are: * PresentationFramework,Version=4.0.0.0,Culture=neutral,PublicKeyToken=31bf3856ad364e35 * System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -123,7 +123,7 @@ Parsed assemblies are: > * Generic = 354 > * Internals = 50 -[//]: # "EndReport net461" +[//]: # "EndReport net462" ## .NET Core (reference is .NET Core 3.1) ![NetcoreStatistic](https://docs.google.com/spreadsheets/d/e/2PACX-1vRKe-7bBH40JmQmq4I194xz9g2YsoU7L9fHwzY0fqZyWepyjqnOC0B7lgO9CjAuTrBkOA8qbTiScLpS/pubchart?oid=964222969&format=image) diff --git a/netreflected/docs/net461.md b/netreflected/docs/net461.md deleted file mode 100644 index 943c65f1478..00000000000 --- a/netreflected/docs/net461.md +++ /dev/null @@ -1 +0,0 @@ -