Removed .NET 5 (#113)

* Versions upgrade * #111: removed .NET 5 * Update runtime info * Removed Sealed from manifest * Upload latest generation to check locally repo status * Upgrade to JCOBridge 2.4.14 * Store info in case of error * Bypass in case of errors in windows.yaml
masesgroup · Aug 18, 2022 · b69ac77 · b69ac77
1 parent 0d6e8cc
commit b69ac77
Show file tree

Hide file tree

Showing 19 changed files with 270 additions and 447 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -92,12 +92,6 @@ jobs:
           git checkout master
           cd ..\..\..
 
-      - name: Switch to master net5.0 help file
-        run: |
-          cd .\netreflected\docs\net5.0
-          git checkout master
-          cd ..\..\..
-
       - name: Switch to master net6.0 help file
         run: |
           cd .\netreflected\docs\net6.0
@@ -121,16 +115,6 @@ jobs:
           Copy-Item .\_data\LICENSE -Destination .\netreflected\docs\netcoreapp3.1\LICENSE -Force
           Copy-Item .\_data\README.md -Destination .\netreflected\docs\netcoreapp3.1\README.md -Force
 
-      - name: Clean net5.0 help file folders
-        run: |
-          Copy-Item .\netreflected\docs\net5.0\.git -Destination .\_data\.git -Force
-          Copy-Item .\netreflected\docs\net5.0\LICENSE -Destination .\_data\LICENSE -Force
-          Copy-Item .\netreflected\docs\net5.0\README.md -Destination .\_data\README.md -Force
-          Remove-Item .\netreflected\docs\net5.0\* -Recurse -Force
-          Copy-Item .\_data\.git -Destination .\netreflected\docs\net5.0\.git -Force
-          Copy-Item .\_data\LICENSE -Destination .\netreflected\docs\net5.0\LICENSE -Force
-          Copy-Item .\_data\README.md -Destination .\netreflected\docs\net5.0\README.md -Force
-
       - name: Clean net6.0 help file folders
         run: |
           Copy-Item .\netreflected\docs\net6.0\.git -Destination .\_data\.git -Force
@@ -160,10 +144,6 @@ jobs:
         run: dotnet bin\netcoreapp3.1\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 net5.0 Java Help files
-        run: dotnet bin\net5.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 net6.0 Java Help files
         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
@@ -189,15 +169,6 @@ jobs:
         env:
           GITHUB_WORKSPACE: $GITHUB_WORKSPACE
 
-      - name: Commit changes to net5.0 help file
-        run: |
-          cd .\netreflected\docs\net5.0
-          %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
-        env:
-          GITHUB_WORKSPACE: $GITHUB_WORKSPACE
-
       - name: Commit changes to net6.0 help file
         run: |
           cd .\netreflected\docs\net6.0
@@ -236,17 +207,6 @@ jobs:
           SUPER_SECRET: ${{ secrets.DOCS_API_TOKEN_GITHUB }}
           REPO: masesgroup/CoreDocs
 
-      - name: Push changes to net5.0 help file
-        run: |
-          cd .\netreflected\docs\net5.0
-          %GITHUB_WORKSPACE%\.github\workflows\push.cmd %REPO%
-          cd ..\..\..
-        shell: cmd
-        env:
-          GITHUB_WORKSPACE: $GITHUB_WORKSPACE
-          SUPER_SECRET: ${{ secrets.DOCS_API_TOKEN_GITHUB }}
-          REPO: masesgroup/NET5Docs
-
       - name: Push changes to net6.0 help file
         run: |
           cd .\netreflected\docs\net6.0

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -70,18 +70,15 @@ jobs:
             fetch-depth: '1'
 
         - name: Extract file
-          run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_249 }} $env:GITHUB_WORKSPACE/JCOBridge.lic
+          run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_2_4_14 }} $env:GITHUB_WORKSPACE/JCOBridge.lic
           shell: pwsh
 
         # Install .NET SDKs
         - name: Setup .NET Core 3.1
           uses: actions/setup-dotnet@v1
           with:
             dotnet-version: 3.1.x
-        - name: Setup .NET 5.0
-          uses: actions/setup-dotnet@v1
-          with:
-            dotnet-version: 5.0.x
+
         - name: Setup .NET 6.0
           uses: actions/setup-dotnet@v1
           with:
@@ -91,19 +88,16 @@ jobs:
         - 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            
 
         - name: Build Java files
           run: |
             dotnet bin/netcoreapp3.1/MASES.JCOReflectorCLI.dll -JobType Build -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/build_linux.job
-            dotnet bin/net5.0/MASES.JCOReflectorCLI.dll -JobType Build -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/build_linux.job
             dotnet bin/net6.0/MASES.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/MASES.JCOReflectorCLI.dll -JobType CreateJars -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/createjars_core3.1_linux.job
-            dotnet bin/net5.0/MASES.JCOReflectorCLI.dll -JobType CreateJars -JDKFolder /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/ -JobFile .github/workflows/createjars_core5.0_linux.job
             dotnet bin/net6.0/MASES.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
@@ -121,18 +115,6 @@ jobs:
             #java -cp "./bin/netcoreapp3.1/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NETCore.App
             #java -cp "./bin/netcoreapp3.1/JCOReflector.jar;./netreflected-tests/java/src/" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App
 
-        - name: Build Java test source file .NET 5.0
-          run: javac -cp ./bin/net5.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/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloNET --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" nettest.HelloNETSocket -server 127.0.0.1 --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: java -cp "./bin/net5.0/JCOReflector.jar:./netreflected-tests/java/src/" nettest.HelloNETSocket -async -server 127.0.0.1 --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-
         - 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
 
@@ -175,24 +157,6 @@ jobs:
         - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/netcoreapp3.1/*:./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NETCore.App --LicensePath:$GITHUB_WORKSPACE
         - run: rm -rf ./netreflected-tests/scala/output
 
-        - name: Build Scala test source file .NET 5.0
-          run: |
-            source "$HOME/.sdkman/bin/sdkman-init.sh"
-            mkdir ./netreflected-tests/scala/output
-            scalac -cp "./bin/net5.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/net5.0/*:./netreflected-tests/scala/output" mscorlib.HelloLock --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" mscorlib.HelloNet --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" mscorlib.HelloNETEvent --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" mscorlib.HelloIterator --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" hierarchy.HelloHierarchy --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" hierarchy.HelloInterfaces --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" nettest.HelloNETSocket --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" nettest.HelloNETSocket -async --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" refout.HelloRefOutBase --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/net5.0/*:./netreflected-tests/scala/output" refout.HelloRefOut --CoreCLRApp:Microsoft.NET5.App --LicensePath:$GITHUB_WORKSPACE
-        - run: rm -rf ./netreflected-tests/scala/output
-
         - name: Build Scala test source file .NET 6.0
           run: |
             source "$HOME/.sdkman/bin/sdkman-init.sh"

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
@@ -89,19 +89,14 @@ jobs:
       # Runs a set of commands using the runners shell
       - name: Build JCOReflectorCLI
         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 net462 src\JCOReflectorCLI.sln  
 
       # Runs a set of commands using the runners shell
       - name: Copy configuration file
         run: |
-          Copy-Item .github\workflows\JCOReflectorCLI5.0.runtimeconfig.json -Destination bin\net5.0\MASES.JCOReflectorCLI.runtimeconfig.json -Force
           Copy-Item .github\workflows\JCOReflectorCLI6.0.runtimeconfig.json -Destination bin\net6.0\MASES.JCOReflectorCLI.runtimeconfig.json -Force
 
-      - name: Build net5.0 Maven POM files
-        run: dotnet bin\net5.0\MASES.JCOReflectorCLI.dll -JobType CreatePOM -JobFile .github\workflows\createpom_win19.job
-
       - name: Build net6.0 Maven POM files
         run: dotnet bin\net6.0\MASES.JCOReflectorCLI.dll -JobType CreatePOM -JobFile .github\workflows\createpom_win19.job
 
@@ -120,15 +115,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.9 -Dpackaging=jar -DgeneratePom=true
-
-      - name: Publish net5.0 to Apache Maven Central
-        shell: bash
-        run: mvn --file ./netreflected/src/net5.0.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 }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+        run: mvn install:install-file -Dfile=./bin/net6.0/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.14 -Dpackaging=jar -DgeneratePom=true
 
       - name: Publish net6.0 to Apache Maven Central
         shell: bash