Update Docker build system (#126)

* #125: forced target to .NET 6

* Fix README.md

* #53: update version

Dockerfile.linux

@@ -1,10 +1,11 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 WORKDIR /app
 
 # Copy everything
 COPY ./src/net ./
+ENV JNET_DOCKER_BUILD_ACTIONS=true
 # Restore as distinct layers
-RUN dotnet restore JNet.sln
+RUN dotnet restore JNetDocker.sln
 # Build and publish a release
 RUN dotnet publish ./JNetCLI/JNetCLI.csproj --framework net6.0 -c Release -o out
 

README.md

@@ -43,13 +43,15 @@ JNet uses [JCOBridge](https://www.jcobridge.com), and its [features](https://www
   * Documentation is shared;
 * **Dynamic code**: it helps to write a Java/Scala/Kotlin/etc seamless language code directly inside a standard .NET application written in C#/VB.NET: look at this [simple example](https://www.jcobridge.com/net-examples/dotnet-examples/) and [JNet APIs extensibility](src/net/Documentation/articles/API_extensibility.md).
 
-Have a look at the following resources:
+### JCOBridge resources
+
+Have a look at the following JCOBridge resources:
 - [Release notes](https://www.jcobridge.com/release-notes/)
 - ~~[Non Profit or University](https://www.jcobridge.com/pricing/)~~
 - ~~[Commercial info: Professional or Enterprise](https://www.jcobridge.com/pricing/)~~
 - [Community Edition](https://www.jcobridge.com/pricing-25/)
 - [Commercial Edition](https://www.jcobridge.com/pricing-25/)
-- [![JCOBridge nuget](https://img.shields.io/nuget/v/MASES.JCOBridge)](https://www.nuget.org/packages/MASES.JCOBridge)
+- Latest release: [![JCOBridge nuget](https://img.shields.io/nuget/v/MASES.JCOBridge)](https://www.nuget.org/packages/MASES.JCOBridge)
 
 ---
 ## Summary

src/java/jnet/pom.xml

@@ -40,7 +40,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <classpathfile>${basedir}/classpathfile.classpath</classpathfile>
-		<jnetversion>1.5.0.0</jnetversion>
+		<jnetversion>1.5.1.0</jnetversion>
 		<jcobridgeversion>2.5.2</jcobridgeversion>
     </properties>
     <distributionManagement>

src/net/Common/Common.props

@@ -4,11 +4,9 @@
 		<Owners>MASES s.r.l.</Owners>
 		<Authors>MASES s.r.l.</Authors>
 		<Company>MASES s.r.l.</Company>
-		<Version>1.5.0.0</Version>
-		<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
+		<Version>1.5.1.0</Version>
 		<LangVersion>latest</LangVersion>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<PackageProjectUrl>https://github.com/masesgroup/JNet/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/masesgroup/JNet</RepositoryUrl>
@@ -21,8 +19,18 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\Common\JNet.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
-	<ItemGroup>
+	<PropertyGroup Condition="'$(JNET_DOCKER_BUILD_ACTIONS)' != 'true'">
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(JNET_DOCKER_BUILD_ACTIONS)' == 'true'">
+		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+		<TargetFramework>net6.0</TargetFramework>
+	</PropertyGroup>
+	<ItemGroup Condition="'$(JNET_DOCKER_BUILD_ACTIONS)' != 'true'">
 		<None Include="..\..\..\LICENSE" Pack="true" PackagePath="" />
+	</ItemGroup>
+	<ItemGroup>
 		<None Include="..\Common\JCOB128x128.png" Pack="true" PackagePath="" />
 		<None Include="..\Common\JNet.snk" Link="JNet.snk" />
 	</ItemGroup>

src/net/JNetCLI/JNetCLI.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>MASES.JNetCLI</id>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <title>JNetCLI - JNet command line interface</title>
     <authors>MASES s.r.l.</authors>
     <owners>MASES s.r.l.</owners>

src/net/JNetDocker.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNet", "JNet\JNet.csproj", "{4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JNetCLI", "JNetCLI\JNetCLI.csproj", "{9179A73E-9425-4745-A07B-45C34945961B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F5B925E-7E21-4971-AE00-9D0C5DBC25E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9179A73E-9425-4745-A07B-45C34945961B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9179A73E-9425-4745-A07B-45C34945961B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9179A73E-9425-4745-A07B-45C34945961B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9179A73E-9425-4745-A07B-45C34945961B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {337100A8-DBCD-4838-B9C7-74EC0DE78755}
+	EndGlobalSection
+EndGlobal

src/net/JNetPS/MASES.JNetPS.psd1

@@ -8,7 +8,7 @@
 
 RootModule = 'MASES.JNetPS.psm1'
 
-ModuleVersion = '1.5.0'
+ModuleVersion = '1.5.1'
 
 # CompatiblePSEditions = @()
 

src/net/JNetPS/MASES.JNetPSCore.psd1

@@ -10,7 +10,7 @@
 ModuleToProcess = 'MASES.JNetPS.dll'
 
 # Version number of this module.
-ModuleVersion = '1.5.0'
+ModuleVersion = '1.5.1'
 
 # ID used to uniquely identify this module
 GUID = '85834DBD-838A-4B04-8303-DB4CF8FA44A7'

src/net/JNetPS/MASES.JNetPSFramework.psd1

@@ -10,7 +10,7 @@
 ModuleToProcess = 'MASES.JNetPS.dll'
 
 # Version number of this module.
-ModuleVersion = '1.5.0'
+ModuleVersion = '1.5.1'
 
 # ID used to uniquely identify this module
 GUID = 'AD7117B7-AC1A-4769-80FC-BF63A11D2B92'

src/net/JNetReflector/JNetReflector.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>MASES.JNetReflector</id>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <title>JNetReflector - JNet class reflection utility command line interface</title>
     <authors>MASES s.r.l.</authors>
     <owners>MASES s.r.l.</owners>

src/net/templates/templates/jnetAWTApp/jnetAWTApp.csproj

@@ -12,6 +12,6 @@
 	</ItemGroup>
 	<ItemGroup Condition="!Exists('..\..\..\JNet\JNet.csproj')">
 		<!--Outside GitHub repo-->
-		<PackageReference Include="MASES.JNet" Version="1.5.0" IncludeAssets="All" PrivateAssets="None" />
+		<PackageReference Include="MASES.JNet" Version="1.5.1" IncludeAssets="All" PrivateAssets="None" />
 	</ItemGroup>
 </Project>

src/net/templates/templates/jnetApp/jnetApp.csproj

@@ -12,6 +12,6 @@
   </ItemGroup>
   <ItemGroup Condition="!Exists('..\..\..\JNet\JNet.csproj')">
     <!--Outside GitHub repo-->
-    <PackageReference Include="MASES.JNet" Version="1.5.0" IncludeAssets="All" PrivateAssets="None" />
+    <PackageReference Include="MASES.JNet" Version="1.5.1" IncludeAssets="All" PrivateAssets="None" />
   </ItemGroup>
 </Project>