diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7be988..7087d8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,11 +2,11 @@ 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' - VERS_MAIN: '1.8' + VERS_MAIN: '1.1' NEW_REL: '' NEXUS_PATH: 'WebLCP' APP_NAME: 'WebLCP' - SOL_NAME: 'INTERFACE\WebLCP' + SOL_NAME: 'WebLCP' APP_CONF: 'Release' PROJ_NAME: 'WebLCP' @@ -26,16 +26,15 @@ variables: .version-fix: &version-fix - | # Esecuzione fix numero versione x pack nuget - $fileName = ".\VersGen\VersGen.cs"; + $fileName = "INTERFACE\VersGen\VersGen.cs"; # calcolo nuova $env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format dHH) echo "New vers: $env:NEW_REL" # aggiorno file $contenuto = Get-Content -path $fileName -Raw - $newContenuto = $contenuto -replace '1.0.0.0', $env:NEW_REL + $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL $newContenuto | Set-Content -path $fileName - # helper x fix manifest xml .manifest-fix: &manifest-fix - | @@ -44,7 +43,7 @@ variables: $contenuto = Get-Content -path $fileName -Raw $newContenuto = $contenuto -replace '{{BRANCHNAME}}', $CI_COMMIT_BRANCH $newContenuto = $newContenuto -replace '{{PACKNAME}}', $env:APP_NAME - $newContenuto = $newContenuto -replace '1.0.0.0', $env:NEW_REL + $newContenuto = $newContenuto -replace '0.0.0.0', $env:NEW_REL $newContenuto | Set-Content -path $fileName # helper creazione hash files @@ -78,7 +77,7 @@ variables: { $version = "unstable" } - $File2Send = Get-ChildItem("$env:APP_NAME\Release\*") + $File2Send = Get-ChildItem("INTERFACE\$env:APP_NAME\Release\*") ForEach ($File in $File2Send) { $FileName = Split-path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName @@ -100,82 +99,99 @@ WebLCP:build: APP_NAME: WebLCP before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' + - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' - -# WebLCP:IIS01:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] -# WebLCP:IIS02:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] +WebLCP:IIS01:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] -# WebLCP:IIS03:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] +WebLCP:IIS02:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] -# WebLCP:File:release: -# stage: release -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# only: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# - *manifest-fix -# script: -# - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Package /p:PublishProfile=FileExport.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:PackageLocation=Release/$env:APP_NAME.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# - *hashBuild -# - *nexusUpload -# needs: ["WebLCP:build"] +WebLCP:IIS03:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] + + +WebLCP:OVH:release: + stage: release + tags: + - win + only: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$env:APP_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=OVH.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] + +WebLCP:File:release: + stage: release + tags: + - win + variables: + APP_NAME: WebLCP + only: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + - *manifest-fix + script: + - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Package /p:PublishProfile=FileExport.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:PackageLocation=Release/$env:APP_NAME.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + - *hashBuild + - *nexusUpload + needs: ["WebLCP:build"] diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/FileExport.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/FileExport.pubxml new file mode 100644 index 0000000..f2575a3 --- /dev/null +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/FileExport.pubxml @@ -0,0 +1,22 @@ + + + + + Package + Release + Any CPU + + true + WebLCP/Release/WebLCP.zip + true + Default Web Site/WebLCP + true + true + true + false + DonotMerge + + \ No newline at end of file diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml index f410476..f460b51 100644 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml @@ -9,20 +9,16 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere Release Any CPU - True - True - https://IIS01:8172/MsDeploy.axd + true + true + https://IIS01.egalware.com:8172/MsDeploy.axd Default Web Site/test/admodelling - False + false WMSVC - True + true jenkins - <_SavePWD>True - True - True - False - DonotMerge + <_SavePWD>true @@ -35,10 +31,26 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere + + + + + + + + + + + false + true + true + false + DonotMerge + \ No newline at end of file diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS02.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS02.pubxml index 45c28a7..db19e69 100644 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS02.pubxml +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS02.pubxml @@ -11,7 +11,7 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere True True - https://IIS02:8172/MsDeploy.axd + https://IIS02.egalware.com:8172/MsDeploy.axd Default Web Site/test/admodelling False diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml new file mode 100644 index 0000000..126c9d1 --- /dev/null +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml @@ -0,0 +1,56 @@ + + + + + MSDeploy + Release + Any CPU + + true + true + https://IIS03.egalware.com:8172/MsDeploy.axd + Default Web Site/test/admodelling + + false + WMSVC + true + jenkins + <_SavePWD>true + + + + + + + + + + + + + + + + + + + + + + + + + false + true + true + false + DonotMerge + + + + + + \ No newline at end of file diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml index 9bbd177..f4e6934 100644 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml @@ -14,7 +14,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt https://172.16.0.214:8172/MsDeploy.axd admodelling.org - False + true WMSVC True steamware diff --git a/INTERFACE/WebLCP/WebLCP.csproj b/INTERFACE/WebLCP/WebLCP.csproj index c43b91d..bedf4cb 100644 --- a/INTERFACE/WebLCP/WebLCP.csproj +++ b/INTERFACE/WebLCP/WebLCP.csproj @@ -302,7 +302,9 @@ DS_App.xsd + + diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html new file mode 100644 index 0000000..ba3680c --- /dev/null +++ b/Resources/ChangeLog.html @@ -0,0 +1,28 @@ + + Server gestioen devices TAB per MAPO/MoonPro +

Versione: {{CURRENT-REL}}

+
+ Note di rilascio: +
    +
  • + Ultime modifiche: +
      {{LAST-CHANGES}}
    +
  • +
  • + v.1.7.* → +
      +
    • Integrazione sistemi di AutoUpdate
    • +
    • Auto Approvazione
    • +
    +
  • +
+
+
+ +
+ +
+ + \ No newline at end of file diff --git a/Resources/logoSteamware.png b/Resources/logoSteamware.png new file mode 100644 index 0000000..0958b50 Binary files /dev/null and b/Resources/logoSteamware.png differ diff --git a/Resources/manifest.xml b/Resources/manifest.xml new file mode 100644 index 0000000..87b774b --- /dev/null +++ b/Resources/manifest.xml @@ -0,0 +1,7 @@ + + + 0.0.0.0 + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/LAST/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/LAST/ChangeLog.html + false + \ No newline at end of file