Merge branch 'release/FixCiCdNkcReman'

.gitlab-ci.yml

@@ -35,10 +35,10 @@ variables:
 .manifest-fix: &manifest-fix
    - |
       echo "Set manifest.xml for branch: $CI_COMMIT_BRANCH"
-      $contenuto = Get-Content -path 'NKC_WF\Resources\manifest.xml' -Raw
+      $contenuto = Get-Content -path '$env:PROJ_NAME\Resources\manifest.xml' -Raw
       $newContenuto = $contenuto -replace '{{BRANCHNAME}}', $CI_COMMIT_BRANCH
       $newContenuto = $newContenuto -replace '0.0.0.0', $env:NEW_REL
-      $newContenuto | Set-Content -Path 'NKC_WF\Resources\manifest.xml'
+      $newContenuto | Set-Content -Path '$env:PROJ_NAME\Resources\manifest.xml'
 
 # helper creazione hash files
 .hashBuild: &hashBuild
@@ -102,9 +102,9 @@ Core:build:
     - win
  before_script:
     - *nuget-fix
-    - dotnet restore REMAN/REMAN.sln
+    - dotnet restore REMAN.sln
  script:
-    - dotnet build REMAN/REMAN/REMAN.csproj
+    - dotnet build REMAN/REMAN.csproj
 
 Net:IIS01:deploy:
  stage: deploy
@@ -142,7 +142,7 @@ Core:IIS01:deploy:
     - develop
   needs: ["Core:build"]
   script: 
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN/REMAN.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN.csproj
   
 Core:IIS02:deploy:
   stage: deploy
@@ -152,8 +152,8 @@ Core:IIS02:deploy:
     - master
   needs: ["Core:build"]
   script: 
-    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN/REMAN.csproj
-    - dotnet publish -p:PublishProfile=W2019-IIS-DevProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN/REMAN.csproj
+    - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN.csproj
+    - dotnet publish -p:PublishProfile=W2019-IIS-Dev.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true REMAN/REMAN.csproj
   
 
 
@@ -164,6 +164,10 @@ Net:install:
 #  rules:
 #    - if: '$CI_COMMIT_BRANCH == "master"'
 #      when: manual
+ variables:
+   APP_NAME: NKC
+   PROJ_NAME: NKC_WF
+   NEXUS_PATH: NKC
  before_script:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' 
@@ -186,12 +190,13 @@ Core:install:
   needs: ["Core:build"]
   variables:
     APP_NAME: REMAN
+    PROJ_NAME: REMAN
     NEXUS_PATH: REMAN
   before_script:
     # - *nuget-fix
-    - dotnet restore REMAN/REMAN.sln
+    - dotnet restore REMAN.sln
   script: 
-    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release REMAN/REMAN/REMAN.csproj -o:publish
+    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release REMAN/REMAN.csproj -o:publish
     # qui il deploy su nexus...
     - *hashBuild
     - *nexusUpload

MajMin.vers

@@ -0,0 +1 @@
+1.1.

REMAN/Properties/PublishProfiles/IISProfile.pubxml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>Package</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <TargetFramework>net6.0</TargetFramework>
+    <ProjectGuid>9e15e9ea-0511-4d7e-9391-a7d1c3cc7922</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <DesktopBuildPackageLocation>Release\REMAN.zip</DesktopBuildPackageLocation>
+    <PackageAsSingleFile>true</PackageAsSingleFile>
+    <DeployIisAppPath>Default Web Site/REMAN</DeployIisAppPath>
+    <PublishDatabaseSettings>
+      <Objects xmlns="" />
+    </PublishDatabaseSettings>
+  </PropertyGroup>
+</Project>

REMAN/REMAN.csproj

@@ -4,13 +4,14 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Version>1.1.2111.2511</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01Profile.pubxml" />
-    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02Profile.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" />
     <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" />
-    <_WebToolingArtifacts Remove="Properties\PublishProfiles\W2019-IIS-DevProfile.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\W2019-IIS-Dev.pubxml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -23,4 +24,16 @@
     <ProjectReference Include="..\NKC.Data\NKC.Data.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="post-build.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
+  </Target>
 </Project>

REMAN/REMAN/Properties/PublishProfiles/IISProfile.pubxml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<WebPublishMethod>Package</WebPublishMethod>
-		<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-		<LastUsedPlatform>Any CPU</LastUsedPlatform>
-		<SiteUrlToLaunchAfterPublish />
-		<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-		<ExcludeApp_Data>False</ExcludeApp_Data>
-		<TargetFramework>net6.0</TargetFramework>
-		<ProjectGuid>9e15e9ea-0511-4d7e-9391-a7d1c3cc7922</ProjectGuid>
-		<SelfContained>false</SelfContained>
-		<DesktopBuildPackageLocation>bin\publish\REMAN.zip</DesktopBuildPackageLocation>
-		<PackageAsSingleFile>true</PackageAsSingleFile>
-		<DeployIisAppPath>Default Web Site/REMAN</DeployIisAppPath>
-		<PublishDatabaseSettings>
-			<Objects xmlns="" />
-		</PublishDatabaseSettings>
-	</PropertyGroup>
-</Project>

REMAN/Resources/ChangeLog-original.html

@@ -0,0 +1,25 @@
+<body>
+    <i>REMAN module for NKC</i>
+    <h4>Versione: {{CURRENT-REL}}</h4>
+    <br />
+    Release Note:
+    <ul>
+        <li>
+            <b>v.1.* &rarr;</b>
+            <ul>
+                <li>First release dotnet6</li>
+                <li>EFCore Integration</li>
+                <li>Materials + Remnant management</li>
+                <li>PickUp + Deposit + Search</li>
+            </ul>
+        </li>
+    </ul>
+    <div>
+        <div style="float: left;">
+            <img src="logoSteamware.png" />
+        </div>
+        <div style="float: right;">
+            <a href="https://www.steamware.net/IOT" target="_blank">&copy; Egalware 2006-{{YEAR}}</a>
+        </div>
+    </div>
+</body>

REMAN/Resources/ChangeLog.html

@@ -0,0 +1,25 @@
+<body>
+    <i>REMAN module for NKC</i>
+    <h4>Versione: 1.1.2111.2511</h4>
+    <br />
+    Release Note:
+    <ul>
+        <li>
+            <b>v.1.* &rarr;</b>
+            <ul>
+                <li>First release dotnet6</li>
+                <li>EFCore Integration</li>
+                <li>Materials + Remnant management</li>
+                <li>PickUp + Deposit + Search</li>
+            </ul>
+        </li>
+    </ul>
+    <div>
+        <div style="float: left;">
+            <img src="logoSteamware.png" />
+        </div>
+        <div style="float: right;">
+            <a href="https://www.steamware.net/IOT" target="_blank">&copy; Egalware 2006-2021</a>
+        </div>
+    </div>
+</body>

REMAN/Resources/VersNum.txt

@@ -0,0 +1 @@
+1.1.2111.2511

REMAN/Resources/manifest-original.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<item>
+  <version>1.0.0.0</version>
+  <url>https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip</url>
+  <changelog>https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html</changelog>
+  <mandatory>false</mandatory>
+</item>

REMAN/Resources/manifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<item>
+  <version>1.1.2111.2511</version>
+  <url>https://nexus.steamware.net/repository/SWS/REMAN/stable/LAST/REMAN.zip</url>
+  <changelog>https://nexus.steamware.net/repository/SWS/REMAN/stable/LAST/ChangeLog.html</changelog>
+  <mandatory>false</mandatory>
+</item>

REMAN/post-build.ps1

@@ -0,0 +1,34 @@
+param([string]$ProjectDir, [string]$ProjectPath);
+
+$FileMajMin = "..\MajMin.vers"
+$FileVers = "Resources\VersNum.txt"
+$FileManIn = "Resources\manifest-original.xml"
+$FileManOut = "Resources\manifest.xml"
+$FileCLogIn = "Resources\ChangeLog-original.html"
+$FileCLogOut = "Resources\ChangeLog.html"
+$MajMin =  Get-Content $FileMajMin # "6.14." 
+$currentDate = get-date -format yyMM;
+$currentTime = get-date -format ddHH;
+$currentYear = get-date -format yyyy;
+$find = "<Version>(.|\n)*?</Version>";
+$currRelNum = $MajMin + $currentDate +"." + $currentTime
+$replace = "<Version>" + $MajMin + $currentDate +"." + $currentTime + "</Version>";
+$csproj = Get-Content $ProjectPath
+$csprojUpdated = $csproj -replace $find, $replace
+
+Set-Content -Path $ProjectPath -Value $csprojUpdated
+Set-Content -Path $FileVers -Value $currRelNum
+
+# replace x manifest
+$manData = Get-Content $FileManIn
+$manData = $manData -replace "1.0.0.0", $currRelNum
+$manData = $manData -replace "{{DIRNAME}}", "REMAN"
+$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST"
+$manData = $manData -replace "{{PACKNAME}}", "REMAN"
+Set-Content -Path $FileManOut -Value $manData
+
+# replace x ChangeLog
+$clogData = Get-Content $FileCLogIn
+$clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum
+$clogData = $clogData -replace "{{YEAR}}", $currentYear
+Set-Content -Path $FileCLogOut -Value $clogData