Merge branch 'SDK' into develop

.gitlab-ci.yml

@@ -92,9 +92,32 @@ variables:
    - |
       $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format dHH)
       echo "Set vers: $env:NEW_REL"
+      $anno = (get-date -format yyyy)
+      $adesso = (get-date -format dd:HH:mm)
       $contenuto = Get-Content -path 'VersGen\MoonPro.cs' -Raw
       $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL
       $newContenuto | Set-Content -Path 'VersGen\MoonPro.cs'
+      echo "Modifica dati file nuspec Release"
+      $currRelease = $env:NEW_REL 
+      $currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot);
+      $find = "<version>(.|\n)*?</version>";
+      $fileNameRel = "MapoSDK.Release.nuspec";
+      $replRel = "<version>" + $currRelease + "</version>";
+      $replCopy = "Copyright SteamWare-EgalWare, 2007-" + $anno
+      $nuspDataRel = Get-Content $fileNameRel;
+      $nuspDataRelUpd = $nuspDataRel -replace $find, $replRel;
+      $nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#", $replCopy;
+      $nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#", "Build $adesso";
+      Set-Content -Path $fileNameRel -Value $nuspDataRelUpd;
+      echo "Modifica dati file nuspec Debug"
+      $fileNameDeb = "MapoSDK.Debug.nuspec";
+      $replDeb = "<version>" + $currDebug + "</version>";
+      $nuspDataDeb = Get-Content $fileNameDeb;
+      $nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb;
+      $nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#", $replCopy;
+      $nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#", "Build $adesso";
+      Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd;
+      echo "replace completati"
 
 stages:
  - build
@@ -104,7 +127,7 @@ stages:
  - installer
 
 
-SDK:
+SDK-stable:
  stage: sdk
  tags:
    - win
@@ -120,11 +143,30 @@ SDK:
  script: 
    - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m'
    - '& Remove-Item *.nupkg'
-   - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Version $env:NEW_REL'
+   - '& $env:NUGET_PATH pack MapoSDK.Release.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'
-  #  - *sendSDK
- 
+
+SDK-unstable:
+ stage: sdk
+ tags:
+   - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH == "develop"'
+ variables:
+  APP_NAME: MP-ADM
+  NEXUS_PATH: MP-ADM
+ before_script:
+   - *nuget-fix
+   - '& "$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'
+   - '& 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'
+    
 ADM:build:
  stage: build
  variables:

MP-IO/MP-IO.csproj.user

@@ -10,7 +10,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
     <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>

MP-Site/MP-Site.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ShowAllFiles</ProjectView>
     <NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
   </PropertyGroup>

MapoSDK.Debug.nuspec

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>MapoSDK</id>
+    <version>#version#</version>
+    <title>MapoSDK</title>
+    <authors>Samuele E. Locatelli</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <description>SDK for MAPO solutions - beta/unstable</description>
+    <releaseNotes>#releaseNotes#</releaseNotes>
+    <copyright>#copyright#</copyright>
+    <tags>MAPO;SDK;IOB</tags>
+    <dependencies>
+      <dependency id="Newtonsoft.Json" version="13.0.1" />
+    </dependencies>
+  </metadata>
+</package>

MapoSDK.Release.nuspec

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>MapoSDK</id>
+    <version>#version#</version>
+    <title>MapoSDK</title>
+    <authors>Samuele E. Locatelli</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>
+    <dependencies>
+      <dependency id="Newtonsoft.Json" version="13.0.1" />
+    </dependencies>
+  </metadata>
+</package>