diff --git a/.gitignore b/.gitignore index 97c3cd5..8c876dc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,13 +7,12 @@ #-------------------------------- # aree temp: log/bin/obj #-------------------------------- -/*/*/bin/* -/*/*/obj/* -/*/*/logs/*.txt -/*/*/logs/*.log -/*/*/logs/*.zip - - +/*/bin/* +/*/obj/* +/*/logs/*.txt +/*/logs/*.log +/*/logs/*.zip +/*/logs/*.json # ---> VisualStudio ## Ignore Visual Studio temporary files, build results, and @@ -346,4 +345,4 @@ UpgradeLog*.XML .fake -.ionide \ No newline at end of file +.ionide diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5d01fa..9ed7b1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: VERS_MAIN: '0.9' NEW_REL: '' APP_NAME: '' + APP_CONF: 'Release' # Step esecuzione script powershell x code obfuscation (tool install + esecuzione) .obfuscate: &obfuscate @@ -59,8 +60,8 @@ variables: mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:APP_NAME/$version/LAST/manifest.xml mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:APP_NAME/$version/LAST/ChangeLog.html -# helper creazione files zip -.zipper: &zipper +# helper creazione files zip x app console +.artifactZipper: &artifactZipper - | $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe" if (-not (Test-Path -Path $7zipPath -PathType Leaf)) { @@ -68,41 +69,25 @@ variables: } Set-Alias 7zip $7zipPath $Target = "$env:APP_NAME\Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" - $Source = "$env:APP_NAME\bin\publish\net6.0\*" + $Source = "$env:APP_NAME\bin\$env:APP_CONF\net6.0\*" 7zip a -tzip $Target $Source -xr!DATA echo "called ZIP $Source --> $Target" +# helper copia pubblicati in dir x upload +.artifactMover: &artifactMover + - | + $Target = "$env:APP_NAME\Releases\" + $CI_COMMIT_BRANCH + "\" + $Source = "$env:APP_NAME\bin\publish\net6.0\" + ROBOCOPY $Source $Target /MIR + echo "called ROBOCOPY $Source --> $Target" + + stages: - build - staging - deploy - - release - - -UI:build: - stage: build - tags: - - win - variables: - APP_NAME: MP.MONO.UI - before_script: - - *nuget-fix - - dotnet restore MP.MONO.ALL.sln - script: - - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + - pack -SIM:build: - stage: build - tags: - - win - variables: - APP_NAME: MP.MONO.SIM - before_script: - - *nuget-fix - - dotnet restore MP.MONO.ALL.sln - script: - - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - DECODER:build: stage: build tags: @@ -115,6 +100,30 @@ DECODER:build: script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj +SIM:build: + stage: build + tags: + - win + variables: + APP_NAME: MP.MONO.SIM + before_script: + - *nuget-fix + - dotnet restore MP.MONO.ALL.sln + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + +UI:build: + stage: build + tags: + - win + variables: + APP_NAME: MP.MONO.UI + before_script: + - *nuget-fix + - dotnet restore MP.MONO.ALL.sln + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + UI:staging: stage: staging tags: @@ -142,48 +151,101 @@ UI:deploy: # IIS DEV - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj -SIM:release: - stage: release + +DECODER:packDebug: + stage: pack tags: - win only: - - main + - develop + variables: + APP_NAME: MP.MONO.DECODER + APP_CONF: Debug + needs: ["DECODER:build"] + script: + - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=$env:APP_CONF $env:APP_NAME/$env:APP_NAME.csproj + - *artifactZipper + - *hashBuild + - *nexusUpload + +SIM:packDebug: + stage: pack + tags: + - win + only: + - develop variables: APP_NAME: MP.MONO.SIM + APP_CONF: Debug needs: ["SIM:build"] script: - - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj - - *zipper + - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=$env:APP_CONF $env:APP_NAME/$env:APP_NAME.csproj + - *artifactZipper - *hashBuild - *nexusUpload -DECODER:release: - stage: release +UI:packDebug: + stage: pack + tags: + - win + only: + - develop + variables: + APP_NAME: MP.MONO.UI + APP_CONF: Debug + needs: ["UI:build"] + script: + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=$env:APP_CONF $env:APP_NAME/$env:APP_NAME.csproj -o:publish + - *artifactMover + - *hashBuild + - *nexusUpload + + +DECODER:packRelease: + stage: pack tags: - win only: - main variables: APP_NAME: MP.MONO.DECODER + APP_CONF: Release needs: ["DECODER:build"] script: - - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj - - *zipper + - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=$env:APP_CONF $env:APP_NAME/$env:APP_NAME.csproj + - *artifactZipper - *hashBuild - *nexusUpload -# UI:release: -# stage: release -# tags: -# - win -# only: -# - main -# except: -# - branches -# needs: ["UI:build"] -# artifacts: -# paths: -# - publish/ -# script: -# - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj +SIM:packRelease: + stage: pack + tags: + - win + only: + - main + variables: + APP_NAME: MP.MONO.SIM + APP_CONF: Release + needs: ["SIM:build"] + script: + - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=$env:APP_CONF $env:APP_NAME/$env:APP_NAME.csproj + - *artifactZipper + - *hashBuild + - *nexusUpload + +UI:packRelease: + stage: pack + tags: + - win + only: + - main + variables: + APP_NAME: MP.MONO.UI + APP_CONF: Release + needs: ["UI:build"] + script: + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=$env:APP_CONF $env:APP_NAME/$env:APP_NAME.csproj -o:publish + - *artifactMover + - *hashBuild + - *nexusUpload \ No newline at end of file diff --git a/MP.MONO.ADAPTER/MP.MONO.ADAPTER.csproj b/MP.MONO.ADAPTER/MP.MONO.ADAPTER.csproj index 9b803b9..09f2c78 100644 --- a/MP.MONO.ADAPTER/MP.MONO.ADAPTER.csproj +++ b/MP.MONO.ADAPTER/MP.MONO.ADAPTER.csproj @@ -5,7 +5,7 @@ net6.0 enable enable - 1.12206.714 + 1.12206.819 diff --git a/MP.MONO.ADAPTER/Resources/ChangeLog.html b/MP.MONO.ADAPTER/Resources/ChangeLog.html index 9384154..432256c 100644 --- a/MP.MONO.ADAPTER/Resources/ChangeLog.html +++ b/MP.MONO.ADAPTER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

Version: 1.12206.714

+

Version: 1.12206.819


Release Note: