Merge branch 'release/FixSdkCreation'

2021-09-28 08:15:05 +02:00
parent 1feecbc181 05be044b9b
commit 35f740fc9f
2 changed files with 62 additions and 6 deletions
@@ -8,6 +8,7 @@ variables:
 NEW_REL: ''
 NEXUS_PATH: 'MP-XXXX'
 APP_NAME: 'MP.Xxxx'
+ APP_CONF: 'Release'

 # helper x fix pacchetti nuget da repo locale nexus.steamware.net
 .nuget-fix: &nuget-fix
@@ -69,19 +70,23 @@ variables:
      ForEach ($File in $File2Send) {
        $FileName = Split-Path $File -leaf
        echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName"
-        mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName
-        
+        mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName        
        echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ARCHIVE/$VersNumb/$FileName"
        mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ARCHIVE/$VersNumb/$FileName
      }
      echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileManOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml"
      mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileManOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
-
      echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileCLogOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html"
      mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileCLogOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
   
-
-
+# helper x send su NEXUS di pack SDK in formato nuget
+.sendSDK: &sendSDK
+   - |
+      '& "$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 -Description="Mapo SDK helper library" -Author=EgalWare -Version $env:NEW_REL'
+      '& $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'

 # helper x fix version number
 .version-fix: &version-fix
@@ -94,16 +99,36 @@ variables:

 stages:
 - build
+ - sdk
 - staging
 - deploy
 - installer

+
+SDK:
+ stage: sdk
+ tags:
+   - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH == "SDK"'
+ variables:
+  APP_NAME: MP-ADM
+  NEXUS_PATH: MP-ADM
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'  
+   - *version-fix
+ script: 
+   - *sendSDK
+ 
 ADM:build:
 stage: build
 variables:
    CURR_PRJ: "MP-ADM"
 tags:
   - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH != "SDK"'
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
@@ -117,6 +142,8 @@ IO:build:
    CURR_PRJ: "MP-IO"
 tags:
   - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH != "SDK"'
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
@@ -131,6 +158,8 @@ SITE:build:
    CURR_PRJ: "MP-SITE"
 tags:
   - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH != "SDK"'
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
@@ -144,6 +173,8 @@ MON:build:
    CURR_PRJ: "MP-MON"
 tags:
   - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH != "SDK"'
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
@@ -157,6 +188,8 @@ TAB:build:
    CURR_PRJ: "MP-TAB"
 tags:
   - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH != "SDK"'
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
@@ -170,6 +203,8 @@ MAG:build:
    CURR_PRJ: "MP-MAG"
 tags:
   - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH != "SDK"'
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
@@ -471,3 +506,4 @@ MAG:install:
   - *hashBuild
   - *nexusUpload
 needs: ["MAG:build"]
+
@@ -76,7 +76,27 @@
        /// <summary>
        /// Tipo stringa
        /// </summary>
-        String
+        String,
+
+        /// <summary>
+        /// ModBus Coil (booleano) - OUT R/W
+        /// </summary>
+        ModBusCoil,
+
+        /// <summary>
+        /// ModBus Input discreto (booleano) - IN R
+        /// </summary>
+        ModBusDiscreteInput,
+
+        /// <summary>
+        /// ModBus Holding Register (int[] convertibile a vari int/real) - OUT R/W
+        /// </summary>
+        ModBusHoldingRegister,
+
+        /// <summary>
+        /// ModBus Input Register (int[] convertibile a vari int/real) - IN R
+        /// </summary>
+        ModBusInputRegister
    }

    /// <summary>