Skip to content

Commit

Permalink
masesgroup#38: JCOBridge version upgrade and version alignment
Browse files Browse the repository at this point in the history
  • Loading branch information
masesdevelopers committed Dec 20, 2022
1 parent a9ee0bd commit c20c54b
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,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.14 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.0 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
shell: bash

- name: Create Jars
Expand Down Expand Up @@ -136,7 +136,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.14 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.0 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
shell: bash

- name: Create Jars
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pullrequest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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.14 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.0 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
shell: bash

- name: Create Jars
Expand Down Expand Up @@ -117,7 +117,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.14 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.0 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
shell: bash

- name: Create Jars
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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.14 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.0 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
shell: bash

- name: Create Jars
Expand Down Expand Up @@ -102,7 +102,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.14 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
run: mvn install:install-file -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.0 -Dpackaging=jar -Dfile=./bin/net6.0/JCOBridge.jar
shell: bash

- name: Create Jars
Expand Down
4 changes: 2 additions & 2 deletions src/net/Common/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<Owners>MASES s.r.l.</Owners>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>1.4.15.0</Version>
<TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>1.5.0.0</Version>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down
2 changes: 1 addition & 1 deletion src/net/JNetCLI/JNetCLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<IncludeAssets>All</IncludeAssets>
<PrivateAssets>None</PrivateAssets>
</ProjectReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.3.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/net/JNetCLI/JNetCLI.nuspec
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.JNetCLI</id>
<version>1.4.15</version>
<version>1.5.0</version>
<title>JNetCLI - JNet command line interface</title>
<authors>MASES s.r.l.</authors>
<owners>MASES s.r.l.</owners>
Expand Down
2 changes: 1 addition & 1 deletion src/net/JNetPS/MASES.JNetPS.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

RootModule = 'MASES.JNetPS.psm1'

ModuleVersion = '1.4.15'
ModuleVersion = '1.5.0'

# CompatiblePSEditions = @()

Expand Down
2 changes: 1 addition & 1 deletion src/net/JNetPS/MASES.JNetPSCore.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
ModuleToProcess = 'MASES.JNetPS.dll'

# Version number of this module.
ModuleVersion = '1.4.15'
ModuleVersion = '1.5.0'

# ID used to uniquely identify this module
GUID = '85834DBD-838A-4B04-8303-DB4CF8FA44A7'
Expand Down
2 changes: 1 addition & 1 deletion src/net/JNetPS/MASES.JNetPSFramework.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
ModuleToProcess = 'MASES.JNetPS.dll'

# Version number of this module.
ModuleVersion = '1.4.15'
ModuleVersion = '1.5.0'

# ID used to uniquely identify this module
GUID = 'AD7117B7-AC1A-4769-80FC-BF63A11D2B92'
Expand Down
2 changes: 1 addition & 1 deletion src/net/JNetReflector/JNetReflector.nuspec
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.JNetReflector</id>
<version>1.4.15</version>
<version>1.5.0</version>
<title>JNetReflector - JNet class reflection utility command line interface</title>
<authors>MASES s.r.l.</authors>
<owners>MASES s.r.l.</owners>
Expand Down
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;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions src/net/templates/templates/jnetAWTApp/jnetAWTApp.csproj
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;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="Microsoft.CSharp" />
Expand All @@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup Condition="!Exists('..\..\..\JNet\JNet.csproj')">
<!--Outside GitHub repo-->
<PackageReference Include="MASES.JNet" Version="1.4.15" IncludeAssets="All" PrivateAssets="None" />
<PackageReference Include="MASES.JNet" Version="1.5.0" IncludeAssets="All" PrivateAssets="None" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/net/templates/templates/jnetApp/jnetApp.csproj
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;netcoreapp3.1;net462</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="Microsoft.CSharp" />
Expand All @@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup Condition="!Exists('..\..\..\JNet\JNet.csproj')">
<!--Outside GitHub repo-->
<PackageReference Include="MASES.JNet" Version="1.4.15" IncludeAssets="All" PrivateAssets="None" />
<PackageReference Include="MASES.JNet" Version="1.5.0" IncludeAssets="All" PrivateAssets="None" />
</ItemGroup>
</Project>

0 comments on commit c20c54b

Please sign in to comment.