diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ac5ff3..ec5f9bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ variables:
# helper creazione hash files x Nexus
.hashBuild: &hashBuild
- |
- $Target = "$env:APP_NAME\bin\" + $env:APP_CONF + "\en-US\" + $env:APP_NAME + ".msi"
+ $Target = "$env:INST_NAME\bin\" + $env:APP_CONF + "\en-US\" + $env:INST_NAME + ".msi"
$MD5 = Get-FileHash $Target -Algorithm MD5
$SHA1 = Get-FileHash $Target -Algorithm SHA1
New-Item $Target".md5"
@@ -74,7 +74,7 @@ variables:
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:INST_NAME/$version/LAST/$FileName
- mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/ARCHIVE/$VersNumb/$FileName
+ mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/ARCHIVE/$fileVers/$FileName
echo "mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/LAST/$FileName"
}
#mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:INST_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:INST_NAME/$version/LAST/manifest.xml
@@ -155,9 +155,9 @@ Runner:deploy-dev:
- *version-fix
script:
# pubblicazione come singleApp
- - dotnet publish -p:PublishProfile=SingleAppDebug.pubxml -p:RunCodeAnalysis=false -p:Configuration=Debug $env:APP_NAME/$env:APP_NAME.csproj
+ - dotnet publish -p:PublishProfile=SingleAppDebug.pubxml -p:RunCodeAnalysis=false -p:Configuration=$env:APP_CONF $env:APP_NAME/$env:APP_NAME.csproj
# creazione installer WIX
- - dotnet build $env:INST_NAME/$env:INST_NAME.wixproj
+ - dotnet build $env:INST_NAME/$env:INST_NAME.wixproj -p:Configuration=$env:APP_CONF
#- *artifactZipper
- *hashBuild
- *nexusUpload
@@ -180,9 +180,9 @@ Runner:deploy:
- *version-fix
script:
# pubblicazione come singleApp
- - dotnet publish -p:PublishProfile=SingleApp.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj
+ - dotnet publish -p:PublishProfile=SingleApp.pubxml -p:RunCodeAnalysis=false -p:Configuration=$env:APP_CONF $env:APP_NAME/$env:APP_NAME.csproj
# creazione installer WIX
- - dotnet build $env:INST_NAME/$env:INST_NAME.wixproj
+ - dotnet build $env:INST_NAME/$env:INST_NAME.wixproj -p:Configuration=$env:APP_CONF
#- *artifactZipper
- *hashBuild
- *nexusUpload
diff --git a/Maat.Installer/Maat.Installer.wixproj b/Maat.Installer/Maat.Installer.wixproj
index 9fae972..83dedd6 100644
--- a/Maat.Installer/Maat.Installer.wixproj
+++ b/Maat.Installer/Maat.Installer.wixproj
@@ -17,4 +17,9 @@
+
+ bin\$(Configuration)\
+ obj\$(Configuration)\
+ true
+
\ No newline at end of file