Support Zip/7z containers with PanelSwWix4

.github/workflows/codeql-analysis.yml

@@ -38,15 +38,15 @@ jobs:
     - name: Clean PanelSwWixExtension (keep extranal code build)
       run: |
         Remove-Item ("${{ github.workspace }}" + "\build") -Recurse -Force
-        nuget restore
+        nuget restore src/dirs.proj
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
     - name: Build & scan
-      run: msbuild dirs.proj -restore -p:DisableNuget=true
+      run: msbuild src/dirs.proj -restore -p:DisableNuget=true
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/github-actions-build.yml

@@ -11,7 +11,7 @@ on:
       psw_wix_version:
         description: 'PanelSwWix4 version'
         required: true
-        default: 5.0.0-psw-wix.0246-34
+        default: 5.0.0-psw-wix.0248-35
         type: string
 
 jobs:
@@ -26,7 +26,7 @@ jobs:
       - name: Resolve build version
         run: |
           $xmlDoc = New-Object System.Xml.XmlDocument
-          $file = [System.IO.Path]::Combine("${{ github.workspace }}", "TidyBuild.custom.props")
+          $file = [System.IO.Path]::Combine("${{ github.workspace }}", "src", "TidyBuild.custom.props")
           [xml]$xmlDoc = Get-Content $file
           $node = $xmlDoc.SelectSingleNode('//*[local-name(.)="FullVersion"]')
           Add-Content -Path ${{ github.env }} -Value ("FULL_VERSION=" + $node.InnerText + ".${{ github.run_number }}")
@@ -37,34 +37,34 @@ jobs:
             Add-Content -Path ${{ github.env }} -Value "PSW_WIX_VERSION=${{ env.DEFAULT_PSW_WIX_VERSION }}"
           }
         env:
-          DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0246-34'
+          DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0248-35'
 
       - name: Prepare for build
         run: |
           choco install windows-adk-all
           dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
-          nuget restore
+          nuget restore src/dirs.proj
 
       - name: Build PanelSwWixExtension
-        run: msbuild dirs.proj -restore -p:FullVersion=${{ env.FULL_VERSION }}
+        run: msbuild src/dirs.proj -restore -p:FullVersion=${{ env.FULL_VERSION }}
 
       - name: Build PanelSwWixExtension with PanelSwWix4
         run: |
-          msbuild dirs.proj -t:WixtoolsetToPanelSwWix4 "-p:PanelSwWix4Version=${{ env.PSW_WIX_VERSION }}" -p:NugetPrereleaseVersion=-psw-wix
+          msbuild src/dirs.proj -t:WixtoolsetToPanelSwWix4 "-p:PanelSwWix4Version=${{ env.PSW_WIX_VERSION }}" -p:NugetPrereleaseVersion=-psw-wix
           Remove-Item ("${{ github.workspace }}" + "\build") -Recurse -Force
-          msbuild dirs.proj -restore -p:FullVersion=${{ env.FULL_VERSION }} "-p:PanelSwWix4Version=${{ env.PSW_WIX_VERSION }}" -p:NugetPrereleaseVersion=-psw-wix
+          msbuild src/dirs.proj -restore -p:FullVersion=${{ env.FULL_VERSION }} "-p:PanelSwWix4Version=${{ env.PSW_WIX_VERSION }}" -p:NugetPrereleaseVersion=-psw-wix -p:EnableZipContainer=true
 
       - uses: actions/[email protected]
         with:
           name: nuget
-          path: nuget-out\*.nupkg
+          path: src\nuget-out\*.nupkg
 
       - name: Publish nuget packages to github and nuget.org
         if: ${{ github.event.inputs.publish_nuget == 'true' && github.ref == 'refs/heads/master4' }}
         env:
           GITHUB_TOKEN: ${{ secrets.TAGGER_PAT }}
         run: |
-          dotnet nuget push nuget-out\PanelSwWixExtension4.*.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --source github
-          dotnet nuget push nuget-out\PanelSwWixExtension4.*.nupkg --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json
+          dotnet nuget push src\nuget-out\PanelSwWixExtension4.*.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --source github
+          dotnet nuget push src\nuget-out\PanelSwWixExtension4.*.nupkg --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json
           git tag "wix4-v${{ env.FULL_VERSION }}"
           git push --tags

.gitignore

@@ -1,5 +1,4 @@
 Debug
-/
 obj/
 bin/
 *.sdf
@@ -11,7 +10,7 @@ bin/
 /nuget-out
 .vs/
 *.ipch
-/packages/
+packages/
 /build/
 /build-common/
 *.user.*

.gitmodules

@@ -1,10 +1,13 @@
 [submodule "protobuf"]
-	path = protobuf
+	path = src/protobuf
 	url = https://github.com/google/protobuf.git
 	branch = 3.5.1.1
 [submodule "exprtk"]
-	path = exprtk
+	path = src/exprtk
 	url = https://github.com/ArashPartow/exprtk.git
 [submodule "poco"]
-	path = poco
+	path = src/poco
 	url = https://github.com/pocoproject/poco.git
+[submodule "7Zap"]
+	path = src/7Zap
+	url = https://github.com/nirbar/7Zap.git

nuget.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+		<add key="nuget" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+
+  <packageSourceMapping>
+    <packageSource key="nuget">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>