diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..d89ca442 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,504 @@ +variables: + NUGET_PATH: 'C:\Tools\nuget.exe' + MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' + ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' + EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\MoonPro\Release' + DEPLOY_FOLDER: 'c:\Projects\Deploy\MoonPro\Builds' + VERS_MAIN: '6.14' + 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 + - | + $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C + if ($hasSource -eq 0) { + C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" + } else { + C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`"" + } + echo $hasSource + +# helper creazione hash files x IIS +.hashBuild: &hashBuild + # $Target = $env:APP_NAME + "\ReleaseClienti\MAPO_PROD\" + $env:NEW_REL + "\" + $env:APP_NAME + ".zip" + - | + $Target = $env:APP_NAME + "\Release\" + $env:APP_NAME + ".zip" + $MD5 = Get-FileHash $Target -Algorithm MD5 + $SHA1 = Get-FileHash $Target -Algorithm SHA1 + New-Item $Target".md5" + New-Item $Target".sha1" + $MD5.Hash | Set-Content -Path $Target".md5" + $SHA1.Hash | Set-Content -Path $Target".sha1" + + echo "Created HASH files for $Target" + +# helper x send su NEXUS x pack +.nexusUpload: &nexusUpload + - | + Set-Alias mCurl C:\Windows\system32\curl.exe + $currentDate = get-date -format yyMM; + $currentTime = get-date -format ddHH; + $VersNumb = $env:NEW_REL + echo "Curr Version: $VersNumb" + $FileManIn="VersGen\manifest.xml" + $FileManOut=$env:APP_NAME +"\Resources\manifest.xml" + $FileCLogIn="VersGen\ChangeLog.html" + $FileCLogOut=$env:APP_NAME +"\Resources\ChangeLog.html" + echo "Manifest path: $FileManOut" + echo "ChangeLog path: $FileCLogOut" + if($CI_COMMIT_BRANCH -eq "master") + { + $version = "stable" + } + else + { + $version = "unstable" + } + $manData = Get-Content $FileManIn + $manData = $manData -replace "1.0.0.0", $VersNumb + $manData = $manData -replace "{{DIRNAME}}", $env:NEXUS_PATH + $manData = $manData -replace "{{BRANCHNAME}}", "$version/LAST" + $manData = $manData -replace "{{PACKNAME}}", $env:APP_NAME + Set-Content -Path $FileManOut -Value $manData + $clogData = Get-Content $FileCLogIn + $clogData = $clogData -replace "{{CURRENT-REL}}", $VersNumb + Set-Content -Path $FileCLogOut -Value $clogData + $File2Send = Get-ChildItem($env:APP_NAME + "\Release\*") + 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 + 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 + - | + Remove-Item *.nupkg + echo "C:\Tools\nuget.exe pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Version $env:NEW_REL"" + C:\Tools\nuget.exe pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Version $env:NEW_REL" + echo "Start upload with nuget push" + echo "C:\Tools\nuget.exe setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted" + C:\Tools\nuget.exe setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted + echo "C:\Tools\nuget.exe push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted" + C:\Tools\nuget.exe push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted + +# helper x fix version number +.version-fix: &version-fix + - | + $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format dHH) + echo "Set vers: $env:NEW_REL" + $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' + +stages: + - build + - sdk + - staging + - deploy + - installer + + +SDK: + stage: sdk + tags: + - win + rules: + # - if: '$CI_COMMIT_BRANCH == "master"' + # when: manual + # - if: '$CI_COMMIT_BRANCH == "develop"' + - 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: + - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' + - *sendSDK + +ADM:build: + stage: build + variables: + CURR_PRJ: "MP-ADM" + tags: + - win + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" MP-ADM/MP-ADM.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + +IO:build: + stage: build + variables: + CURR_PRJ: "MP-IO" + tags: + - win + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" MP-IO/MP-IO.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + + +SITE:build: + stage: build + variables: + CURR_PRJ: "MP-SITE" + tags: + - win + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" MP-SITE/MP-SITE.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + +MON:build: + stage: build + variables: + CURR_PRJ: "MP-MON" + tags: + - win + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + +TAB:build: + stage: build + variables: + CURR_PRJ: "MP-TAB" + tags: + - win + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" MP-TAB/MP-TAB.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + +MAG:build: + stage: build + variables: + CURR_PRJ: "MP-MAG" + tags: + - win + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" MP-MAG/MP-MAG.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' + +ADM:staging: + stage: staging + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' + needs: ["ADM:build"] + +IO:staging: + stage: staging + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' + needs: ["IO:build"] + +SITE:staging: + stage: staging + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' + needs: ["SITE:build"] + +MON:staging: + stage: staging + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' + needs: ["MON:build"] + +TAB:staging: + stage: staging + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' + needs: ["TAB:build"] + +MAG:staging: + stage: staging + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "develop"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' + needs: ["MAG:build"] + +ADM:deploy: + stage: deploy + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' + needs: ["ADM:build"] + +IO:deploy: + stage: deploy + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' + needs: ["IO:build"] + +SITE:deploy: + stage: deploy + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' + needs: ["SITE:build"] + +MON:deploy: + stage: deploy + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' + needs: ["MON:build"] + +TAB:deploy: + stage: deploy + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' + needs: ["TAB:build"] + +MAG:deploy: + stage: deploy + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' + needs: ["MAG:build"] + +ADM:install: + stage: installer + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + when: manual + - 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" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj' + - *hashBuild + - *nexusUpload + needs: ["ADM:build"] + +IO:install: + stage: installer + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' + variables: + APP_NAME: MP-IO + NEXUS_PATH: MP-IO + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/IO" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj' + - *hashBuild + - *nexusUpload + needs: ["IO:build"] + +SITE:install: + stage: installer + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' + variables: + APP_NAME: MP-SITE + NEXUS_PATH: MP-SITE + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/SITE" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj' + - *hashBuild + - *nexusUpload + needs: ["SITE:build"] + + +MON:install: + stage: installer + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' + variables: + APP_NAME: MP-MON + NEXUS_PATH: MP-MON + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/MON" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj' + - *hashBuild + - *nexusUpload + needs: ["MON:build"] + +TAB:install: + stage: installer + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' + variables: + APP_NAME: MP-TAB + NEXUS_PATH: MP-TAB + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/TAB" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj' + - *hashBuild + - *nexusUpload + needs: ["TAB:build"] + +MAG:install: + stage: installer + tags: + - win + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' + variables: + APP_NAME: MP-MAG + NEXUS_PATH: MP-MAG + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/MAG" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj' + - *hashBuild + - *nexusUpload + needs: ["MAG:build"] + diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index a266b61a..bb654f97 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -472,10 +472,8 @@ - - @@ -505,8 +503,6 @@ - - @@ -596,8 +592,6 @@ - - diff --git a/MP-ADM/Resources/manifest.xml b/MP-ADM/Resources/manifest.xml index cec8fcad..d41c3b84 100644 --- a/MP-ADM/Resources/manifest.xml +++ b/MP-ADM/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html false \ No newline at end of file diff --git a/MP-ADM/libmongocrypt.dylib b/MP-ADM/libmongocrypt.dylib deleted file mode 100644 index 91418d4d..00000000 Binary files a/MP-ADM/libmongocrypt.dylib and /dev/null differ diff --git a/MP-ADM/libmongocrypt.so b/MP-ADM/libmongocrypt.so deleted file mode 100644 index 2e6bae00..00000000 Binary files a/MP-ADM/libmongocrypt.so and /dev/null differ diff --git a/MP-ADM/libzstd.dll b/MP-ADM/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MP-ADM/libzstd.dll and /dev/null differ diff --git a/MP-ADM/mongocrypt.dll b/MP-ADM/mongocrypt.dll deleted file mode 100644 index 39d7e016..00000000 Binary files a/MP-ADM/mongocrypt.dll and /dev/null differ diff --git a/MP-ADM/snappy32.dll b/MP-ADM/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MP-ADM/snappy32.dll and /dev/null differ diff --git a/MP-ADM/snappy64.dll b/MP-ADM/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MP-ADM/snappy64.dll and /dev/null differ diff --git a/MP-IO/Resources/manifest.xml b/MP-IO/Resources/manifest.xml index cec8fcad..d41c3b84 100644 --- a/MP-IO/Resources/manifest.xml +++ b/MP-IO/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html false \ No newline at end of file diff --git a/MP-LAND/Controllers/HomeController.cs b/MP-LAND/Controllers/HomeController.cs index 58a08f33..f346201f 100644 --- a/MP-LAND/Controllers/HomeController.cs +++ b/MP-LAND/Controllers/HomeController.cs @@ -85,7 +85,7 @@ namespace MP.Controllers /// protected string updateUrl(string package) { - return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers")); + return string.Format("https://nexus.steamware.net/repository/SWS/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers")); } /// diff --git a/MP-LAND/Models/AnagKeyValue.cs b/MP-LAND/Models/AnagKeyValue.cs index 3cc2010e..6ac9e503 100644 --- a/MP-LAND/Models/AnagKeyValue.cs +++ b/MP-LAND/Models/AnagKeyValue.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // -// Codice generato da un modello. +// This code was generated from a template. // -// Le modifiche manuali a questo file potrebbero causare un comportamento imprevisto dell'applicazione. -// Se il codice viene rigenerato, le modifiche manuali al file verranno sovrascritte. +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-LAND/Models/AnagraficaOperatori.cs b/MP-LAND/Models/AnagraficaOperatori.cs index 50c4f336..75d3b5a7 100644 --- a/MP-LAND/Models/AnagraficaOperatori.cs +++ b/MP-LAND/Models/AnagraficaOperatori.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // -// Codice generato da un modello. +// This code was generated from a template. // -// Le modifiche manuali a questo file potrebbero causare un comportamento imprevisto dell'applicazione. -// Se il codice viene rigenerato, le modifiche manuali al file verranno sovrascritte. +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-LAND/Models/ConfigTmp.cs b/MP-LAND/Models/ConfigTmp.cs index e9f0fad8..56c7183a 100644 --- a/MP-LAND/Models/ConfigTmp.cs +++ b/MP-LAND/Models/ConfigTmp.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // -// Codice generato da un modello. +// This code was generated from a template. // -// Le modifiche manuali a questo file potrebbero causare un comportamento imprevisto dell'applicazione. -// Se il codice viene rigenerato, le modifiche manuali al file verranno sovrascritte. +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-LAND/Models/MPModel.Context.cs b/MP-LAND/Models/MPModel.Context.cs index 49c4b2c8..9bd750c5 100644 --- a/MP-LAND/Models/MPModel.Context.cs +++ b/MP-LAND/Models/MPModel.Context.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // -// Codice generato da un modello. +// This code was generated from a template. // -// Le modifiche manuali a questo file potrebbero causare un comportamento imprevisto dell'applicazione. -// Se il codice viene rigenerato, le modifiche manuali al file verranno sovrascritte. +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-LAND/Models/MPModel.Designer.cs b/MP-LAND/Models/MPModel.Designer.cs index 57578871..d9581f3a 100644 --- a/MP-LAND/Models/MPModel.Designer.cs +++ b/MP-LAND/Models/MPModel.Designer.cs @@ -1,10 +1,10 @@ -// Generazione del codice predefinita abilitata per il modello 'C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-LAND\Models\MPModel.edmx'. -// Per abilitare la generazione del codice legacy, modificare il valore della proprietà della finestra di progettazione 'Strategia di generazione del codice -// su 'Legacy ObjectContext'. Questa proprietà è disponibile nella finestra Proprietà quando il modello è -// aperto nella finestra di progettazione. +// T4 code generation is enabled for model 'C:\Users\samuele\source\repos\MoonPro_dotnet\MP-LAND\Models\MPModel.edmx'. +// To enable legacy code generation, change the value of the 'Code Generation Strategy' designer +// property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model +// is open in the designer. -// La mancata generazione di classi contesto ed entità può essere dovuta al fatto che è stato creato un modello vuoto, ma -// non è ancora stata scelta la versione di Entity Framework da utilizzare. Per generare una classe contesto e classi entità -// per il modello, aprire il modello nella finestra di progettazione, fare clic con il pulsante destro del mouse nell'area di progettazione e -// selezionare 'Aggiorna modello da database...', 'Genera database da modello...' o 'Aggiungi elemento di generazione -// codice...'. \ No newline at end of file +// If no context and entity classes have been generated, it may be because you created an empty model but +// have not yet chosen which version of Entity Framework to use. To generate a context class and entity +// classes for your model, open the model in the designer, right-click on the designer surface, and +// select 'Update Model from Database...', 'Generate Database from Model...', or 'Add Code Generation +// Item...'. \ No newline at end of file diff --git a/MP-LAND/Models/MPModel.cs b/MP-LAND/Models/MPModel.cs index d6f4df21..7cc06622 100644 --- a/MP-LAND/Models/MPModel.cs +++ b/MP-LAND/Models/MPModel.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // -// Codice generato da un modello. +// This code was generated from a template. // -// Le modifiche manuali a questo file potrebbero causare un comportamento imprevisto dell'applicazione. -// Se il codice viene rigenerato, le modifiche manuali al file verranno sovrascritte. +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-LAND/Models/stp_AKV_getByKey_Result.cs b/MP-LAND/Models/stp_AKV_getByKey_Result.cs index 48d57d4d..d4f458b0 100644 --- a/MP-LAND/Models/stp_AKV_getByKey_Result.cs +++ b/MP-LAND/Models/stp_AKV_getByKey_Result.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // -// Codice generato da un modello. +// This code was generated from a template. // -// Le modifiche manuali a questo file potrebbero causare un comportamento imprevisto dell'applicazione. -// Se il codice viene rigenerato, le modifiche manuali al file verranno sovrascritte. +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-LAND/Resources/manifest.xml b/MP-LAND/Resources/manifest.xml index cec8fcad..d41c3b84 100644 --- a/MP-LAND/Resources/manifest.xml +++ b/MP-LAND/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html false \ No newline at end of file diff --git a/MP-LAND/Views/Home/Index.cshtml b/MP-LAND/Views/Home/Index.cshtml index eb235ab0..9572db18 100644 --- a/MP-LAND/Views/Home/Index.cshtml +++ b/MP-LAND/Views/Home/Index.cshtml @@ -288,7 +288,7 @@
- +

@@ -318,7 +318,7 @@

- +

diff --git a/MP-LAND/Web.config b/MP-LAND/Web.config index 35635c9c..523381f7 100644 --- a/MP-LAND/Web.config +++ b/MP-LAND/Web.config @@ -41,7 +41,7 @@ - + @@ -68,210 +68,210 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -371,4 +371,4 @@ - + \ No newline at end of file diff --git a/MP-MAG/Resources/manifest.xml b/MP-MAG/Resources/manifest.xml index cec8fcad..d41c3b84 100644 --- a/MP-MAG/Resources/manifest.xml +++ b/MP-MAG/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html false \ No newline at end of file diff --git a/MP-MON/Resources/manifest.xml b/MP-MON/Resources/manifest.xml index cec8fcad..d41c3b84 100644 --- a/MP-MON/Resources/manifest.xml +++ b/MP-MON/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html false \ No newline at end of file diff --git a/MP-SITE/Resources/manifest.xml b/MP-SITE/Resources/manifest.xml index cec8fcad..d41c3b84 100644 --- a/MP-SITE/Resources/manifest.xml +++ b/MP-SITE/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html false \ No newline at end of file diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj index 76c95240..2da8e006 100644 --- a/MP-TAB/MP-TAB.csproj +++ b/MP-TAB/MP-TAB.csproj @@ -489,10 +489,12 @@ + + diff --git a/MP-TAB/Resources/manifest.xml b/MP-TAB/Resources/manifest.xml index cec8fcad..d41c3b84 100644 --- a/MP-TAB/Resources/manifest.xml +++ b/MP-TAB/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html false \ No newline at end of file diff --git a/MP-TAB/Web.config b/MP-TAB/Web.config index 24d27747..639732be 100644 --- a/MP-TAB/Web.config +++ b/MP-TAB/Web.config @@ -30,7 +30,7 @@ - + diff --git a/MP-TAB/WebUserControls/mod_ODL.ascx.cs b/MP-TAB/WebUserControls/mod_ODL.ascx.cs index 40fd976a..ef0f3439 100644 --- a/MP-TAB/WebUserControls/mod_ODL.ascx.cs +++ b/MP-TAB/WebUserControls/mod_ODL.ascx.cs @@ -656,7 +656,7 @@ namespace MoonProTablet.WebUserControls } ///

- /// RImozione dati e parametri (TAB e su PLC) x ODL corrente + /// Rimozione dati e parametri (TAB e su PLC) x ODL corrente /// private void doRemoveCurrOdlData() { diff --git a/MP-TAB/WebUserControls/mod_mappaStato.ascx b/MP-TAB/WebUserControls/mod_mappaStato.ascx index 9200488c..27d1963a 100644 --- a/MP-TAB/WebUserControls/mod_mappaStato.ascx +++ b/MP-TAB/WebUserControls/mod_mappaStato.ascx @@ -75,7 +75,7 @@
- + diff --git a/MP-TAB/WebUserControls/mod_mappaStato.ascx.designer.cs b/MP-TAB/WebUserControls/mod_mappaStato.ascx.designer.cs index 744efc15..b67455e4 100644 --- a/MP-TAB/WebUserControls/mod_mappaStato.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_mappaStato.ascx.designer.cs @@ -1,51 +1,52 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MoonProTablet.WebUserControls { - public partial class mod_mappaStato { - + public partial class mod_mappaStato + { + /// - /// Controllo UpdatePanel1. + /// UpdatePanel1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.UpdatePanel UpdatePanel1; - + /// - /// Controllo repLI. + /// repLI control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Repeater repLI; - + /// - /// Controllo ods. + /// ods control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; - + /// - /// Controllo Timer1. + /// Timer1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.Timer Timer1; } diff --git a/MP-TAB/WebUserControls/mod_title.ascx.cs b/MP-TAB/WebUserControls/mod_title.ascx.cs index c46f5b6a..bf0bcc66 100644 --- a/MP-TAB/WebUserControls/mod_title.ascx.cs +++ b/MP-TAB/WebUserControls/mod_title.ascx.cs @@ -42,7 +42,7 @@ namespace MoonProTablet.WebUserControls { get { - return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/TAB/{0}/manifest.xml", memLayer.ML.CRS("appVers")); + return string.Format("https://nexus.steamware.net/repository/SWS/TAB/{0}/manifest.xml", memLayer.ML.CRS("appVers")); } } diff --git a/MagData/MagData.csproj b/MagData/MagData.csproj index 10f3f0be..b7672216 100644 --- a/MagData/MagData.csproj +++ b/MagData/MagData.csproj @@ -166,6 +166,9 @@ + + MoonPro.cs + True True @@ -248,8 +251,6 @@ DS_Utility.xsd - - SettingsSingleFileGenerator @@ -262,10 +263,6 @@ - - - - diff --git a/MagData/Properties/AssemblyInfo.cs b/MagData/Properties/AssemblyInfo.cs index 3db39823..ea2b440a 100644 --- a/MagData/Properties/AssemblyInfo.cs +++ b/MagData/Properties/AssemblyInfo.cs @@ -2,15 +2,15 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// Le informazioni generali relative a un assembly sono controllate dal seguente +// Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. [assembly: AssemblyTitle("MagData")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +//[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("MagData")] -[assembly: AssemblyCopyright("Copyright © 2020")] +//[assembly: AssemblyCopyright("Copyright © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +//[assembly: AssemblyVersion("1.0.0.0")] +//[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/MagData/libmongocrypt.dylib b/MagData/libmongocrypt.dylib deleted file mode 100644 index 91418d4d..00000000 Binary files a/MagData/libmongocrypt.dylib and /dev/null differ diff --git a/MagData/libmongocrypt.so b/MagData/libmongocrypt.so deleted file mode 100644 index 2e6bae00..00000000 Binary files a/MagData/libmongocrypt.so and /dev/null differ diff --git a/MagData/libzstd.dll b/MagData/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MagData/libzstd.dll and /dev/null differ diff --git a/MagData/mongocrypt.dll b/MagData/mongocrypt.dll deleted file mode 100644 index 39d7e016..00000000 Binary files a/MagData/mongocrypt.dll and /dev/null differ diff --git a/MagData/snappy32.dll b/MagData/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MagData/snappy32.dll and /dev/null differ diff --git a/MagData/snappy64.dll b/MagData/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MagData/snappy64.dll and /dev/null differ diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index b5fd940f..75b89af8 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -1672,9 +1672,12 @@ namespace MapoDb } string cookieName = memLayer.ML.CRS("cookieName"); //DateTime expDate = DateTime.Now.AddDays(memLayer.ML.CRI("cookieDayExpire")); - string cookieDayExpire = memLayer.ML.CRS("cookieDayExpire"); + + string cookieDayExpire = memLayer.ML.CRS("cookieDayExpire").Replace(".", ","); double dayExp = 1; - double.TryParse(cookieDayExpire, out dayExp); + NumberStyles style = NumberStyles.AllowDecimalPoint | NumberStyles.AllowThousands; + CultureInfo culture = CultureInfo.CreateSpecificCulture("it-IT"); + double.TryParse(cookieDayExpire, style, culture, out dayExp); DateTime expDate = DateTime.Now.AddDays(dayExp); string Secret = authProxy.getSecret(Dominio, UsrName, matricola, DeviceName, adesso); string devSecret = SteamCrypto.EncryptString(Secret, cookieName); diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index dc004634..eed72731 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -207,6 +207,9 @@ + + MoonPro.cs + diff --git a/MapoDb/Properties/AssemblyInfo.cs b/MapoDb/Properties/AssemblyInfo.cs index 51bc88ad..fb4396e8 100644 --- a/MapoDb/Properties/AssemblyInfo.cs +++ b/MapoDb/Properties/AssemblyInfo.cs @@ -1,20 +1,20 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("MapoDb")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Steamware s.r.l.")] +//[assembly: AssemblyCompany("Steamware s.r.l.")] [assembly: AssemblyProduct("MapoDb")] -[assembly: AssemblyCopyright("Copyright © Steamware 2007")] +//[assembly: AssemblyCopyright("Copyright © Steamware 2007")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(true)] @@ -24,11 +24,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.1")] -[assembly: AssemblyFileVersion("1.0.0.1")] +//[assembly: AssemblyVersion("1.0.0.1")] +//[assembly: AssemblyFileVersion("1.0.0.1")] \ No newline at end of file diff --git a/MapoSDK/Enums.cs b/MapoSDK/Enums.cs index 63196da3..b84f5193 100644 --- a/MapoSDK/Enums.cs +++ b/MapoSDK/Enums.cs @@ -76,7 +76,27 @@ /// /// Tipo stringa /// - String + String, + + /// + /// ModBus Coil (booleano) - OUT R/W + /// + ModBusCoil, + + /// + /// ModBus Input discreto (booleano) - IN R + /// + ModBusDiscreteInput, + + /// + /// ModBus Holding Register (int[] convertibile a vari int/real) - OUT R/W + /// + ModBusHoldingRegister, + + /// + /// ModBus Input Register (int[] convertibile a vari int/real) - IN R + /// + ModBusInputRegister } /// diff --git a/VersGen/ChangeLog.html b/VersGen/ChangeLog.html index 3e830861..6be8fae5 100644 --- a/VersGen/ChangeLog.html +++ b/VersGen/ChangeLog.html @@ -1,5 +1,5 @@ - Server gestioen devices TAB per MAPO/MoonPro + Soluzione MAPO MES

Versione: {{CURRENT-REL}}


Note di rilascio: @@ -8,6 +8,18 @@ Ultime modifiche:
    {{LAST-CHANGES}}
+
  • + v.6.* → +
      +
    • Integrazione codice DotNet Cor + Framework
      • +
    +
    • +
  • + v.5.* → +
      +
    • GEstione sistemi 2020 Siemens ed OSAI
      • +
    +
  • v.4.* →
      diff --git a/VersGen/MoonPro.cs b/VersGen/MoonPro.cs index e6b4bab4..395f4dbd 100644 --- a/VersGen/MoonPro.cs +++ b/VersGen/MoonPro.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyCopyright("Steamware ©")] -[assembly: AssemblyCompany("Steamware")] +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.0.0.0")] +[assembly: AssemblyCopyright("SteamWare-EgalWare © 2007+")] +[assembly: AssemblyCompany("EgalWare")] diff --git a/VersGen/MoonPro.tt b/VersGen/MoonPro.tt index 93f7213f..bbca491c 100644 --- a/VersGen/MoonPro.tt +++ b/VersGen/MoonPro.tt @@ -6,7 +6,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyCopyright("Steamware ©")] -[assembly: AssemblyCompany("Steamware")] +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.0.0.0")] +[assembly: AssemblyCopyright("SteamWare-EgalWare © 2007+")] +[assembly: AssemblyCompany("EgalWare")] diff --git a/VersGen/manifest.xml b/VersGen/manifest.xml index cec8fcad..d41c3b84 100644 --- a/VersGen/manifest.xml +++ b/VersGen/manifest.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html false \ No newline at end of file