Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KNetCLI publishing fix #74

Merged
merged 5 commits into from
May 23, 2022
Merged

KNetCLI publishing fix #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2edf3da
Version upgrade on fix
masesdevelopers May 23, 2022
1850961
Removed .NET 5
masesdevelopers May 23, 2022
576b423
Fix file location
masesdevelopers May 23, 2022
2337283
Refix
masesdevelopers May 23, 2022
79d6c52
WORKFLOW FIX
masesdevelopers May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/java/knet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<name>mases.knet</name>
<description>Interface bridging implementation for Apache Kafka</description>
<url>https://github.com/masesgroup/KNet</url>
<version>1.3.0.0</version>
<version>1.3.1.0</version>

<licenses>
<license>
Expand Down Expand Up @@ -132,7 +132,7 @@
<configuration>
<compilerArgs>
<arg>-cp</arg>
<arg>${originalClassPath}${path.separator}${basedir}/../../../bin/net5.0/JCOBridge.jar</arg>
<arg>${originalClassPath}${path.separator}${basedir}/../../../bin/net6.0/JCOBridge.jar</arg>
</compilerArgs>
</configuration>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions src/net/KNet/KNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<Owners>MASES s.r.l.</Owners>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.3.0.0</Version>
<Version>1.3.1.0</Version>
<Product>KNet</Product>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<OutputPath>..\..\..\bin\</OutputPath>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down
4 changes: 2 additions & 2 deletions src/net/KNetCLI/KNetCLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<Owners>MASES s.r.l.</Owners>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.3.0.0</Version>
<Version>1.3.1.0</Version>
<Product>KNetCLI</Product>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<OutputPath>..\..\..\bin\</OutputPath>
<!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down
5 changes: 1 addition & 4 deletions src/net/KNetCLI/KNetCLI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>MASES.KNetCLI</id>
<version>1.3.0</version>
<version>1.3.1</version>
<title>KNetCLI - CLI interface of KNet</title>
<authors>MASES s.r.l.</authors>
<owners>MASES s.r.l.</owners>
Expand All @@ -25,13 +25,10 @@
<file src="..\Common\JCOB128x128.png" target="" />
<file src="..\Documentation\articles\usageCLI.md" target="" />
<file src="..\..\..\jars\" target="tools\netcoreapp3.1\any\jars\" />
<file src="..\..\..\jars\" target="tools\net5.0\any\jars\" />
<file src="..\..\..\jars\" target="tools\net6.0\any\jars\" />
<file src="..\..\config\" target="tools\netcoreapp3.1\any\config\" />
<file src="..\..\config\" target="tools\net5.0\any\config\" />
<file src="..\..\config\" target="tools\net6.0\any\config\" />
<file src="..\..\..\bin\netcoreapp3.1\" target="tools\netcoreapp3.1\any\" />
<file src="..\..\..\bin\net5.0\" target="tools\net5.0\any\" />
<file src="..\..\..\bin\net6.0\" target="tools\net6.0\any\" />
</files>
</package>
4 changes: 2 additions & 2 deletions src/net/templates/templatepack.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageType>Template</PackageType>
<PackageVersion>1.2.4.0</PackageVersion>
<PackageVersion>1.3.1.0</PackageVersion>
<PackageId>MASES.KNet.Templates</PackageId>
<Title>KNet Templates - Templates to use the KNet</Title>
<Authors>MASES s.r.l.</Authors>
Expand All @@ -10,7 +10,7 @@
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Summary>Ready made templates to create applications based on KNet</Summary>
<Description>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</Description>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
<OutputPath>..\..\..\bin\</OutputPath>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
Expand Down
4 changes: 2 additions & 2 deletions src/net/templates/templates/knetConnectSink/knetConnectSink.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="Microsoft.CSharp" />
Expand All @@ -11,6 +11,6 @@
</ItemGroup>
<ItemGroup Condition="!Exists('..\..\..\KNet\KNet.csproj')">
<!--Outside GitHub repo-->
<PackageReference Include="MASES.KNet" Version="1.3.0" IncludeAssets="All" PrivateAssets="None" />
<PackageReference Include="MASES.KNet" Version="1.3.1" IncludeAssets="All" PrivateAssets="None" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/net/templates/templates/knetConnectSource/knetConnectSource.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="Microsoft.CSharp" />
Expand All @@ -11,6 +11,6 @@
</ItemGroup>
<ItemGroup Condition="!Exists('..\..\..\KNet\KNet.csproj')">
<!--Outside GitHub repo-->
<PackageReference Include="MASES.KNet" Version="1.3.0" IncludeAssets="All" PrivateAssets="None" />
<PackageReference Include="MASES.KNet" Version="1.3.1" IncludeAssets="All" PrivateAssets="None" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/net/templates/templates/knetConsumerApp/knetConsumerApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="Microsoft.CSharp" />
Expand All @@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup Condition="!Exists('..\..\..\KNet\KNet.csproj')">
<!--Outside GitHub repo-->
<PackageReference Include="MASES.KNet" Version="1.3.0" IncludeAssets="All" PrivateAssets="None" />
<PackageReference Include="MASES.KNet" Version="1.3.1" IncludeAssets="All" PrivateAssets="None" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/net/templates/templates/knetPipeStreamApp/knetPipeStreamApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="Microsoft.CSharp" />
Expand All @@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup Condition="!Exists('..\..\..\KNet\KNet.csproj')">
<!--Outside GitHub repo-->
<PackageReference Include="MASES.KNet" Version="1.3.0" IncludeAssets="All" PrivateAssets="None" />
<PackageReference Include="MASES.KNet" Version="1.3.1" IncludeAssets="All" PrivateAssets="None" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/net/templates/templates/knetProducerApp/knetProducerApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="Microsoft.CSharp" />
Expand All @@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup Condition="!Exists('..\..\..\KNet\KNet.csproj')">
<!--Outside GitHub repo-->
<PackageReference Include="MASES.KNet" Version="1.3.0" IncludeAssets="All" PrivateAssets="None" />
<PackageReference Include="MASES.KNet" Version="1.3.1" IncludeAssets="All" PrivateAssets="None" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/KNetBenchmark/KNetBenchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.3.0.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<Version>1.3.1.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<OutputPath>..\..\bin\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/KNetConnectTest/KNetConnectTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.3.0.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<Version>1.3.1.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<OutputPath>..\..\bin\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/KNetTest/KNetTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.3.0.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<Version>1.3.1.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<OutputPath>..\..\bin\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/KNetTestAdmin/KNetTestAdmin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.3.0.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<Version>1.3.1.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<OutputPath>..\..\bin\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/KNetTestStreams/KNetTestStreams.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.3.0.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<Version>1.3.1.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<OutputPath>..\..\bin\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/KNetTopicCopyBenchmark/KNetTopicCopyBenchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.3.0.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<Version>1.3.1.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<OutputPath>..\..\bin\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down