From f81adbee2906bcdde26168e91d47043c717fab75 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 17 Jun 2021 16:56:16 +0200
Subject: [PATCH] provo modifiche x deploy su nexus

---
 .gitlab-ci.yml           | 56 ++++++++++++++++++++--------------------
 MP.Stats/MP.Stats.csproj |  2 +-
 Resources/ChangeLog.html |  2 +-
 Resources/VersNum.txt    |  2 +-
 Resources/manifest.xml   |  2 +-
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1156a995..fb23fe63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,8 +53,8 @@ variables:
       }
       echo $hasSource
       
-# helper creazione hash files
-.hashBuild: &hashBuild
+# helper creazione hash files x CORE
+.hashBuildCore: &hashBuildCore
    - |
       $Target = $env:APP_NAME + "\bin\Release\" + $env:APP_NAME + ".zip"
       $MD5 = Get-FileHash $Target -Algorithm MD5
@@ -67,7 +67,7 @@ variables:
       echo "Created HASH files for $Target"      
 
 # helper creazione hash files x IIS
-.hashBuildIIS: &hashBuildIIS
+.hashBuild: &hashBuild
    - |
       $Target = $env:APP_NAME + "\bin\publish\" + $env:APP_NAME + ".zip"
       $MD5 = Get-FileHash $Target -Algorithm MD5
@@ -79,8 +79,8 @@ variables:
 
       echo "Created HASH files for $Target" 
 
-# helper x send su NEXUS
-.nexusUpload: &nexusUpload
+# helper x send su NEXUS CORE
+.nexusUploadCore: &nexusUploadCore
    - |
       Set-Alias mCurl  C:\Windows\system32\curl.exe
       $currentDate = get-date -format yyMM;
@@ -101,8 +101,8 @@ variables:
         mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/SLS/$FileName
       }
 
-# helper x send su NEXUS x pack IIS
-.nexusUploadIIS: &nexusUploadIIS
+# helper x send su NEXUS x pack
+.nexusUploadIIS: &nexusUpload
    - |
       Set-Alias mCurl  C:\Windows\system32\curl.exe
       $currentDate = get-date -format yyMM;
@@ -177,6 +177,25 @@ staging:
     - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj
     - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true MP.Stats/MP.Stats.csproj
 
+# staging:
+#   stage: installerCore
+#   only:
+#     - develop
+#     - master
+#   needs: ["build"]
+#   before_script:
+#     # - *nuget-fix
+#     # - dotnet restore
+#     # - '& "$env:NUGET_PATH" restore LPA.sln' # path alla solution corrente
+#     # - *version-fix
+#     - *cleanup-zip
+#   script: 
+#     - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj
+#     # deploy su nexus...
+#     - *zipper
+#     - *hashBuildCore
+#     - *nexusUploadCore
+
 staging:
   stage: installer
   only:
@@ -186,31 +205,12 @@ staging:
   before_script:
     # - *nuget-fix
     # - dotnet restore
-    # - '& "$env:NUGET_PATH" restore LPA.sln' # path alla solution corrente
-    # - *version-fix
-    # - *cleanup-zip
   script: 
-    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj
-    # deploy su nexus...
-    # - *zipper
+    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj -p:output "publish/net5.0"
+    # qui il deploy su nexus...
     - *hashBuild
     - *nexusUpload
 
-staging:
-  stage: installerIIS
-  only:
-    - develop
-    - master
-  needs: ["build"]
-  before_script:
-    # - *nuget-fix
-    # - dotnet restore
-  script: 
-    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release MP.Stats/MP.Stats.csproj
-    # qui il deploy su nexus...
-    - *hashBuildIIS
-    - *nexusUploadIIS
-
 release:
   stage: release
   only:
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 6e87e94e..ad113c8f 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>1.0.2106.1518</Version>
+        <Version>1.0.2106.1716</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 0bea0c3c..93eae0d7 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 1.0.2106.1518</h4>
+    <h4>Versione: 1.0.2106.1716</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 7cfe175c..141eb829 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2106.1518
+1.0.2106.1716
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index b7248fc4..9548c50c 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2106.1518</version>
+  <version>1.0.2106.1716</version>
   <url>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/MP.Stats.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>