Merge branch 'develop' into SDK

.gitlab-ci.yml

@@ -6,6 +6,7 @@ variables:
  DEPLOY_FOLDER: 'c:\Projects\Deploy\MoonPro\Builds'
  VERS_MAIN: '6.14'
  NEW_REL: ''
+ NEW_DEB: ''
  NEXUS_PATH: 'MP-XXXX'
  APP_NAME: 'MP.Xxxx'
  APP_CONF: 'Release'
@@ -99,7 +100,9 @@ variables:
       $newContenuto | Set-Content -Path 'VersGen\MoonPro.cs'
       echo "Modifica dati file nuspec Release"
       $currRelease = $env:NEW_REL 
+      $lastDot = $currRelease.LastIndexOf(".");
       $currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot);
+      $env:NEW_DEB = $currDebug
       $find = "<version>(.|\n)*?</version>";
       $fileNameRel = "MapoSDK.Release.nuspec";
       $replRel = "<version>" + $currRelease + "</version>";
@@ -161,11 +164,11 @@ SDK-unstable:
    - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'  
    - *version-fix
  script: 
-   - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m'
+   - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Debug /verbosity:minimal /m'
    - '& Remove-Item *.nupkg'
    - '& $env:NUGET_PATH pack MapoSDK.Debug.nuspec'
    - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted'
-   - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted'
+   - '& $env:NUGET_PATH push MapoSDK.$env:NEW_DEB.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted'
     
 ADM:build:
  stage: build

MapoSDK.Debug.nuspec

@@ -10,9 +10,13 @@
     <description>SDK for MAPO solutions - beta/unstable</description>
     <releaseNotes>#releaseNotes#</releaseNotes>
     <copyright>#copyright#</copyright>
-    <tags>MAPO;SDK;IOB</tags>
+    <tags>MAPO SDK IOB</tags>
     <dependencies>
       <dependency id="Newtonsoft.Json" version="13.0.1" />
     </dependencies>
   </metadata>
+  <files>
+    <file src="MapoSDK\bin\Debug\Mapo*.dll" target="lib" />
+    <file src="MapoSDK\bin\Debug\Mapo*.pdb" target="lib" />
+  </files>
 </package>

MapoSDK.Release.nuspec

@@ -4,15 +4,18 @@
     <id>MapoSDK</id>
     <version>#version#</version>
     <title>MapoSDK</title>
-    <authors>Samuele E. Locatelli</authors>
+    <authors>Samuele E. Locatelli, EgalWare</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <description>SDK for MAPO solutions</description>
     <releaseNotes>#releaseNotes#</releaseNotes>
     <copyright>#copyright#</copyright>
-    <tags>MAPO;SDK;IOB</tags>
+    <tags>MAPO SDK IOB</tags>
     <dependencies>
       <dependency id="Newtonsoft.Json" version="13.0.1" />
     </dependencies>
   </metadata>
+  <files>
+    <file src="MapoSDK\bin\Release\Mapo*.dll" target="lib" />
+  </files>
 </package>