diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3a435aa525..bb320658f4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -83,7 +83,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Install local file to be used within Javadoc plugin of generated POM - run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.12 -Dpackaging=jar -Dfile=./bin/net5.0/JCOBridge.jar + run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.12 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar shell: bash - name: Create Jars diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c120d2ccc8..e4b69750f0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -55,10 +55,6 @@ jobs: 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: @@ -83,11 +79,11 @@ jobs: - name: Maven preparation (step 1) if: matrix.language == 'java' - run: dotnet build --no-incremental --configuration Release --framework net5.0 /p:Platform="Any CPU" ./src/net/KNet.sln + run: dotnet build --no-incremental --configuration Release --framework net6.0 /p:Platform="Any CPU" ./src/net/KNet.sln - name: Maven preparation (step 2) if: matrix.language == 'java' - run: mvn "install:install-file" "-DgroupId=JCOBridge" "-DartifactId=JCOBridge" "-Dversion=2.4.12" "-Dpackaging=jar" "-Dfile=./bin/net5.0/JCOBridge.jar" + run: mvn "install:install-file" "-DgroupId=JCOBridge" "-DartifactId=JCOBridge" "-Dversion=2.4.12" "-Dpackaging=jar" "-Dfile=./bin/net6.0/JCOBridge.jar" - if: matrix.language == 'java' run: mvn --file ./src/java/knet/pom.xml --no-transfer-progress package diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index 8e26992883..b56ccf8476 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -51,7 +51,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Install local file to be used within Javadoc plugin of generated POM - run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.12 -Dpackaging=jar -Dfile=./bin/net5.0/JCOBridge.jar + run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.12 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar shell: bash - name: Create Jars diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9e9a059e1a..9298d5bed9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,7 +42,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Install local file to be used within Javadoc plugin of generated POM - run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.12 -Dpackaging=jar -Dfile=./bin/net5.0/JCOBridge.jar + run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.4.12 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar shell: bash - name: Create Jars diff --git a/src/java/knet/pom.xml b/src/java/knet/pom.xml index 10d434328d..30328d07a2 100644 --- a/src/java/knet/pom.xml +++ b/src/java/knet/pom.xml @@ -9,7 +9,7 @@ mases.knet Interface bridging implementation for Apache Kafka https://github.com/masesgroup/KNet - 1.3.0.0 + 1.3.1.0 @@ -132,7 +132,7 @@ -cp - ${originalClassPath}${path.separator}${basedir}/../../../bin/net5.0/JCOBridge.jar + ${originalClassPath}${path.separator}${basedir}/../../../bin/net6.0/JCOBridge.jar diff --git a/src/net/KNet/KNet.csproj b/src/net/KNet/KNet.csproj index 0366195710..9a4fe66fad 100644 --- a/src/net/KNet/KNet.csproj +++ b/src/net/KNet/KNet.csproj @@ -9,10 +9,10 @@ MASES s.r.l. MASES s.r.l. MASES s.r.l. - 1.3.0.0 + 1.3.1.0 KNet true - net462;netcoreapp3.1;net5.0;net6.0 + net462;netcoreapp3.1;net6.0 ..\..\..\bin\ true true diff --git a/src/net/KNetCLI/KNetCLI.csproj b/src/net/KNetCLI/KNetCLI.csproj index c9c2f813ac..05d1b3b4d5 100644 --- a/src/net/KNetCLI/KNetCLI.csproj +++ b/src/net/KNetCLI/KNetCLI.csproj @@ -10,10 +10,10 @@ MASES s.r.l. MASES s.r.l. MASES s.r.l. - 1.3.0.0 + 1.3.1.0 KNetCLI true - net462;netcoreapp3.1;net5.0;net6.0 + net462;netcoreapp3.1;net6.0 ..\..\..\bin\ true diff --git a/src/net/KNetCLI/KNetCLI.nuspec b/src/net/KNetCLI/KNetCLI.nuspec index b2c55cb561..b0a11e09db 100644 --- a/src/net/KNetCLI/KNetCLI.nuspec +++ b/src/net/KNetCLI/KNetCLI.nuspec @@ -2,7 +2,7 @@ MASES.KNetCLI - 1.3.0 + 1.3.1 KNetCLI - CLI interface of KNet MASES s.r.l. MASES s.r.l. @@ -25,13 +25,10 @@ - - - diff --git a/src/net/templates/templatepack.csproj b/src/net/templates/templatepack.csproj index e24e47882e..a958999813 100644 --- a/src/net/templates/templatepack.csproj +++ b/src/net/templates/templatepack.csproj @@ -1,7 +1,7 @@ Template - 1.2.4.0 + 1.3.1.0 MASES.KNet.Templates KNet Templates - Templates to use the KNet MASES s.r.l. @@ -10,7 +10,7 @@ Copyright © MASES s.r.l. 2022 Ready made templates to create applications based on KNet Ready made templates to create applications based on KNet. The templates are ready made starting points, all information and APIs are available in the official website https://masesgroup.github.io/KNet - net6.0;net5.0;netcoreapp3.1;net462 + net6.0;netcoreapp3.1;net462 ..\..\..\bin\ true true diff --git a/src/net/templates/templates/knetConnectSink/knetConnectSink.csproj b/src/net/templates/templates/knetConnectSink/knetConnectSink.csproj index bd91055354..c32e528407 100644 --- a/src/net/templates/templates/knetConnectSink/knetConnectSink.csproj +++ b/src/net/templates/templates/knetConnectSink/knetConnectSink.csproj @@ -1,6 +1,6 @@  - net6.0;net5.0;netcoreapp3.1;net462 + net6.0;netcoreapp3.1;net462 @@ -11,6 +11,6 @@ - + diff --git a/src/net/templates/templates/knetConnectSource/knetConnectSource.csproj b/src/net/templates/templates/knetConnectSource/knetConnectSource.csproj index bd91055354..c32e528407 100644 --- a/src/net/templates/templates/knetConnectSource/knetConnectSource.csproj +++ b/src/net/templates/templates/knetConnectSource/knetConnectSource.csproj @@ -1,6 +1,6 @@  - net6.0;net5.0;netcoreapp3.1;net462 + net6.0;netcoreapp3.1;net462 @@ -11,6 +11,6 @@ - + diff --git a/src/net/templates/templates/knetConsumerApp/knetConsumerApp.csproj b/src/net/templates/templates/knetConsumerApp/knetConsumerApp.csproj index 9d7885f352..3d9a0d90d7 100644 --- a/src/net/templates/templates/knetConsumerApp/knetConsumerApp.csproj +++ b/src/net/templates/templates/knetConsumerApp/knetConsumerApp.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net5.0;netcoreapp3.1;net462 + net6.0;netcoreapp3.1;net462 @@ -12,6 +12,6 @@ - + diff --git a/src/net/templates/templates/knetPipeStreamApp/knetPipeStreamApp.csproj b/src/net/templates/templates/knetPipeStreamApp/knetPipeStreamApp.csproj index 9d7885f352..3d9a0d90d7 100644 --- a/src/net/templates/templates/knetPipeStreamApp/knetPipeStreamApp.csproj +++ b/src/net/templates/templates/knetPipeStreamApp/knetPipeStreamApp.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net5.0;netcoreapp3.1;net462 + net6.0;netcoreapp3.1;net462 @@ -12,6 +12,6 @@ - + diff --git a/src/net/templates/templates/knetProducerApp/knetProducerApp.csproj b/src/net/templates/templates/knetProducerApp/knetProducerApp.csproj index 9d7885f352..3d9a0d90d7 100644 --- a/src/net/templates/templates/knetProducerApp/knetProducerApp.csproj +++ b/src/net/templates/templates/knetProducerApp/knetProducerApp.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net5.0;netcoreapp3.1;net462 + net6.0;netcoreapp3.1;net462 @@ -12,6 +12,6 @@ - + diff --git a/tests/KNetBenchmark/KNetBenchmark.csproj b/tests/KNetBenchmark/KNetBenchmark.csproj index 6063749632..aa4883c04b 100644 --- a/tests/KNetBenchmark/KNetBenchmark.csproj +++ b/tests/KNetBenchmark/KNetBenchmark.csproj @@ -8,8 +8,8 @@ Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. - 1.3.0.0 - net462;netcoreapp3.1;net5.0;net6.0 + 1.3.1.0 + net462;netcoreapp3.1;net6.0 ..\..\bin\ latest diff --git a/tests/KNetConnectTest/KNetConnectTest.csproj b/tests/KNetConnectTest/KNetConnectTest.csproj index 04b95359df..0181082820 100644 --- a/tests/KNetConnectTest/KNetConnectTest.csproj +++ b/tests/KNetConnectTest/KNetConnectTest.csproj @@ -7,8 +7,8 @@ Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. - 1.3.0.0 - net462;netcoreapp3.1;net5.0;net6.0 + 1.3.1.0 + net462;netcoreapp3.1;net6.0 ..\..\bin\ latest diff --git a/tests/KNetTest/KNetTest.csproj b/tests/KNetTest/KNetTest.csproj index f1a96b0ee1..2d30c9e67d 100644 --- a/tests/KNetTest/KNetTest.csproj +++ b/tests/KNetTest/KNetTest.csproj @@ -8,8 +8,8 @@ Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. - 1.3.0.0 - net462;netcoreapp3.1;net5.0;net6.0 + 1.3.1.0 + net462;netcoreapp3.1;net6.0 ..\..\bin\ latest diff --git a/tests/KNetTestAdmin/KNetTestAdmin.csproj b/tests/KNetTestAdmin/KNetTestAdmin.csproj index d75f9a3383..edc0c1c6c3 100644 --- a/tests/KNetTestAdmin/KNetTestAdmin.csproj +++ b/tests/KNetTestAdmin/KNetTestAdmin.csproj @@ -8,8 +8,8 @@ Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. - 1.3.0.0 - net462;netcoreapp3.1;net5.0;net6.0 + 1.3.1.0 + net462;netcoreapp3.1;net6.0 ..\..\bin\ latest diff --git a/tests/KNetTestStreams/KNetTestStreams.csproj b/tests/KNetTestStreams/KNetTestStreams.csproj index e8caf924b2..ec3827b1a7 100644 --- a/tests/KNetTestStreams/KNetTestStreams.csproj +++ b/tests/KNetTestStreams/KNetTestStreams.csproj @@ -8,8 +8,8 @@ Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. - 1.3.0.0 - net462;netcoreapp3.1;net5.0;net6.0 + 1.3.1.0 + net462;netcoreapp3.1;net6.0 ..\..\bin\ latest diff --git a/tests/KNetTopicCopyBenchmark/KNetTopicCopyBenchmark.csproj b/tests/KNetTopicCopyBenchmark/KNetTopicCopyBenchmark.csproj index 334cca40ea..57bfcd8159 100644 --- a/tests/KNetTopicCopyBenchmark/KNetTopicCopyBenchmark.csproj +++ b/tests/KNetTopicCopyBenchmark/KNetTopicCopyBenchmark.csproj @@ -8,8 +8,8 @@ Copyright © MASES s.r.l. 2022 MASES s.r.l. MASES s.r.l. - 1.3.0.0 - net462;netcoreapp3.1;net5.0;net6.0 + 1.3.1.0 + net462;netcoreapp3.1;net6.0 ..\..\bin\ latest