From 38ab2037690e50f48c4979b1aee52bd9eee1e2fd Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sun, 18 Jul 2021 11:50:34 -0700 Subject: [PATCH 01/14] Add MSIX installer --- .github/workflows/git-artifacts.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index d0ac596367fa72..87b19546f4bbfa 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -516,3 +516,29 @@ jobs: with: name: nuget-x86_64 path: artifacts + msix: + runs-on: windows-latest + needs: artifacts + steps: + - name: Download portable-arm64 artifacts + uses: actions/download-artifact@v1 + with: + name: portable-arm64 + path: portable + - name: Download portable-x86_64 artifacts + uses: actions/download-artifact@v1 + with: + name: portable-x86_64 + path: portable + - name: Download portable-i686 artifacts + uses: actions/download-artifact@v1 + with: + name: portable-i686 + path: portable + - name: Extract portable artifacts + uses: edgarrc/action-7z@v1 + with: + args: 7z -y x "portable/*.7z" -obuild + - name: Show content of build + run: | + gci build From dccfcc2411119080dd2b953992c140da65c04cd2 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sun, 18 Jul 2021 13:01:09 -0700 Subject: [PATCH 02/14] Fix paths --- .github/workflows/git-artifacts.yml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index 87b19546f4bbfa..b09c7bf9a42f56 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -535,10 +535,29 @@ jobs: with: name: portable-i686 path: portable - - name: Extract portable artifacts - uses: edgarrc/action-7z@v1 + - name: Find filenames + run: | + $filename_arm64 = (Get-ChildItem portable\*arm64.7z.exe)[0].FullName + $filename_x64 = (Get-ChildItem portable\*64-bit.7z.exe)[0].FullName + $filename_x86 = (Get-ChildItem portable\*32-bit.7z.exe)[0].FullName + Write-Output "FILENAMEX64=$($filename_x64)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + Write-Output "FILENAMEX86=$($filename_x86)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + Write-Output "FILENAMEARM64=$($filename_arm64)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Extract portable x64 artifacts + uses: DuckSoft/extract-7z-action@v1 + with: + pathSource: {{ env.FILENAMEX64 }} + pathTarget: build + - name: Extract portable x86 artifacts + uses: DuckSoft/extract-7z-action@v1 + with: + pathSource: {{ env.FILENAMEX86 }} + pathTarget: build + - name: Extract portable arm64 artifacts + uses: DuckSoft/extract-7z-action@v1 with: - args: 7z -y x "portable/*.7z" -obuild + pathSource: {{ env.FILENAMEARM64 }} + pathTarget: build - name: Show content of build run: | gci build From b617ba86ed0c8c3156c9803eb34026df3907799d Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sun, 18 Jul 2021 13:07:25 -0700 Subject: [PATCH 03/14] Fix bug --- .github/workflows/git-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index b09c7bf9a42f56..ed85a7bcf0a833 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -546,17 +546,17 @@ jobs: - name: Extract portable x64 artifacts uses: DuckSoft/extract-7z-action@v1 with: - pathSource: {{ env.FILENAMEX64 }} + pathSource: ${{ env.FILENAMEX64 }} pathTarget: build - name: Extract portable x86 artifacts uses: DuckSoft/extract-7z-action@v1 with: - pathSource: {{ env.FILENAMEX86 }} + pathSource: ${{ env.FILENAMEX86 }} pathTarget: build - name: Extract portable arm64 artifacts uses: DuckSoft/extract-7z-action@v1 with: - pathSource: {{ env.FILENAMEARM64 }} + pathSource: ${{ env.FILENAMEARM64 }} pathTarget: build - name: Show content of build run: | From 11e64661aee760f59b00438f3b5e1f2b0c8ff5ca Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sun, 18 Jul 2021 13:35:59 -0700 Subject: [PATCH 04/14] Fix bug --- .github/workflows/git-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index ed85a7bcf0a833..381144d9d16f54 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -544,17 +544,17 @@ jobs: Write-Output "FILENAMEX86=$($filename_x86)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append Write-Output "FILENAMEARM64=$($filename_arm64)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Extract portable x64 artifacts - uses: DuckSoft/extract-7z-action@v1 + uses: DuckSoft/extract-7z-action@v1.0 with: pathSource: ${{ env.FILENAMEX64 }} pathTarget: build - name: Extract portable x86 artifacts - uses: DuckSoft/extract-7z-action@v1 + uses: DuckSoft/extract-7z-action@v1.0 with: pathSource: ${{ env.FILENAMEX86 }} pathTarget: build - name: Extract portable arm64 artifacts - uses: DuckSoft/extract-7z-action@v1 + uses: DuckSoft/extract-7z-action@v1.0 with: pathSource: ${{ env.FILENAMEARM64 }} pathTarget: build From 0dfa399a61eb34199cd3a4a7e62260532374c2ed Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sun, 18 Jul 2021 15:06:17 -0700 Subject: [PATCH 05/14] Build MSIX --- .github/workflows/git-artifacts.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index 381144d9d16f54..40ab4eb75b60fe 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -547,17 +547,28 @@ jobs: uses: DuckSoft/extract-7z-action@v1.0 with: pathSource: ${{ env.FILENAMEX64 }} - pathTarget: build + pathTarget: build/x64 - name: Extract portable x86 artifacts uses: DuckSoft/extract-7z-action@v1.0 with: pathSource: ${{ env.FILENAMEX86 }} - pathTarget: build + pathTarget: build/x86 - name: Extract portable arm64 artifacts uses: DuckSoft/extract-7z-action@v1.0 with: pathSource: ${{ env.FILENAMEARM64 }} - pathTarget: build + pathTarget: build/arm64 - name: Show content of build run: | gci build + - name: Clone build-extra + run: git clone --single-branch -b msix https://github.com/davidanthoff/build-extra build-extra + - name: Write packaging layout file + run: build-extra\msix\create_packaginglayout_file.ps1 + - name: Build MSIX + run: | + &"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\MakeAppx.exe" build /f build\PackagingLayout.xml /op build /pv 1.0.0.0 /bv 1.0.0.0 + - uses: actions/upload-artifact@v2 + with: + name: msixinstaller + path: build\*.appxbundle \ No newline at end of file From 9b319c7df08f5662bb59e771889d4d2508ec5909 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sun, 18 Jul 2021 17:27:21 -0700 Subject: [PATCH 06/14] Output diagnostic --- .github/workflows/git-artifacts.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index 40ab4eb75b60fe..5fd3c074440a99 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -565,6 +565,12 @@ jobs: run: git clone --single-branch -b msix https://github.com/davidanthoff/build-extra build-extra - name: Write packaging layout file run: build-extra\msix\create_packaginglayout_file.ps1 + - name: Show content of build + run: | + gci build + - name: Show content of build + run: | + gci build-extra\msix - name: Build MSIX run: | &"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\MakeAppx.exe" build /f build\PackagingLayout.xml /op build /pv 1.0.0.0 /bv 1.0.0.0 From b83ac2df699dbc0bd92a08b70853917222c68aaf Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sun, 18 Jul 2021 19:24:17 -0700 Subject: [PATCH 07/14] Fix problems --- .github/workflows/git-artifacts.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index 5fd3c074440a99..ccfc57e9a86e78 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -564,7 +564,10 @@ jobs: - name: Clone build-extra run: git clone --single-branch -b msix https://github.com/davidanthoff/build-extra build-extra - name: Write packaging layout file - run: build-extra\msix\create_packaginglayout_file.ps1 + run: | + build-extra\msix\create_packaginglayout_file.ps1 + - name: Copy appxmanifest + run: copy-item build-extra\msix\appxmanifest.xml build\appxmanifest.xml - name: Show content of build run: | gci build @@ -573,7 +576,9 @@ jobs: gci build-extra\msix - name: Build MSIX run: | - &"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\MakeAppx.exe" build /f build\PackagingLayout.xml /op build /pv 1.0.0.0 /bv 1.0.0.0 + push-location build + &"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\MakeAppx.exe" build /f PackagingLayout.xml /op . /pv 1.0.0.0 /bv 1.0.0.0 + pop-location - uses: actions/upload-artifact@v2 with: name: msixinstaller From adaf4b91ef66cfe76634c12852c147efd683d94e Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 19 Jul 2021 21:06:12 -0700 Subject: [PATCH 08/14] Try something --- .github/workflows/git-artifacts.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index ccfc57e9a86e78..d3e90e9e513994 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -574,8 +574,13 @@ jobs: - name: Show content of build run: | gci build-extra\msix - - name: Build MSIX + - name: Delete WebView2Loader.dll run: | + Remove-Item build\x64\mingw64\libexec\git-core\WebView2Loader.dll + Remove-Item build\x86\mingw64\libexec\git-core\WebView2Loader.dll + Remove-Item build\arm64\mingw64\libexec\git-core\WebView2Loader.dll + - name: Build MSIX + run: | push-location build &"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\MakeAppx.exe" build /f PackagingLayout.xml /op . /pv 1.0.0.0 /bv 1.0.0.0 pop-location From 228645014c95664365daafcdc1703909b2611721 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 19 Jul 2021 21:22:33 -0700 Subject: [PATCH 09/14] Fix --- .github/workflows/git-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index d3e90e9e513994..5c481be0c827b3 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -577,8 +577,8 @@ jobs: - name: Delete WebView2Loader.dll run: | Remove-Item build\x64\mingw64\libexec\git-core\WebView2Loader.dll - Remove-Item build\x86\mingw64\libexec\git-core\WebView2Loader.dll - Remove-Item build\arm64\mingw64\libexec\git-core\WebView2Loader.dll + Remove-Item build\x86\mingw32\libexec\git-core\WebView2Loader.dll + Remove-Item build\arm64\mingw32\libexec\git-core\WebView2Loader.dll - name: Build MSIX run: | push-location build From 67ee87a7ba7fd7bfd07c2f13966eb9a7129e327f Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 23 Jul 2021 21:01:57 -0700 Subject: [PATCH 10/14] Build store and standalone msix --- .github/workflows/git-artifacts.yml | 38 +++++++++++++++++++---------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index 5c481be0c827b3..ea82ff1a48cd90 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -563,28 +563,40 @@ jobs: gci build - name: Clone build-extra run: git clone --single-branch -b msix https://github.com/davidanthoff/build-extra build-extra - - name: Write packaging layout file + - name: Create folder for store and msix version run: | - build-extra\msix\create_packaginglayout_file.ps1 - - name: Copy appxmanifest - run: copy-item build-extra\msix\appxmanifest.xml build\appxmanifest.xml - - name: Show content of build - run: | - gci build - - name: Show content of build + md buildmsix + md buildstore + - name: Write packaging layout files run: | - gci build-extra\msix + build-extra\msix\create_packaginglayout_file.ps1 + Write-PackageLayoutFile "1.0.0.0" "buildmsix\appxmanifest.xml" + Write-PackageLayoutFile "1.0.0.0" "buildstore\appxmanifest.xml" + Write-AppxManifest "1.0.0.0" "CN=Johannes Schindelin, O=Johannes Schindelin, L=Köln, S=North Rhine-Westphalia, C=DE" "buildmsix\PackagingLayout.xml" + Write-AppxManifest "1.0.0.0" "CN=82A13EFD-FE37-4EFC-8BA4-1C3E9EFE5F23" "buildstore\PackagingLayout.xml" - name: Delete WebView2Loader.dll run: | Remove-Item build\x64\mingw64\libexec\git-core\WebView2Loader.dll Remove-Item build\x86\mingw32\libexec\git-core\WebView2Loader.dll Remove-Item build\arm64\mingw32\libexec\git-core\WebView2Loader.dll - - name: Build MSIX + - name: Build Standalone MSIX run: | - push-location build + push-location buildmsix &"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\MakeAppx.exe" build /f PackagingLayout.xml /op . /pv 1.0.0.0 /bv 1.0.0.0 pop-location + - name: Build Store MSIX + run: | + push-location buildstore + &"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\MakeAppx.exe" build /f PackagingLayout.xml /op . /pv 1.0.0.0 /bv 1.0.0.0 + pop-location + - name: Sign standalone MSIX + run: | + Write-Output "Here we should sign the appxbundle that is in the buildstore folder with signtool." + - uses: actions/upload-artifact@v2 + with: + name: standalonemsixinstaller + path: buildmsix\*.appxbundle - uses: actions/upload-artifact@v2 with: - name: msixinstaller - path: build\*.appxbundle \ No newline at end of file + name: storemsixinstaller + path: buildstore\*.appxbundle From 20087b75426b356ec8ede81d7d58714d5f362f04 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 23 Jul 2021 23:40:54 -0700 Subject: [PATCH 11/14] Remove some whitespaces --- .github/workflows/git-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index ea82ff1a48cd90..d13db221e72726 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -572,7 +572,7 @@ jobs: build-extra\msix\create_packaginglayout_file.ps1 Write-PackageLayoutFile "1.0.0.0" "buildmsix\appxmanifest.xml" Write-PackageLayoutFile "1.0.0.0" "buildstore\appxmanifest.xml" - Write-AppxManifest "1.0.0.0" "CN=Johannes Schindelin, O=Johannes Schindelin, L=Köln, S=North Rhine-Westphalia, C=DE" "buildmsix\PackagingLayout.xml" + Write-AppxManifest "1.0.0.0" "CN=Johannes Schindelin,O=Johannes Schindelin,L=Köln,S=North Rhine-Westphalia,C=DE" "buildmsix\PackagingLayout.xml" Write-AppxManifest "1.0.0.0" "CN=82A13EFD-FE37-4EFC-8BA4-1C3E9EFE5F23" "buildstore\PackagingLayout.xml" - name: Delete WebView2Loader.dll run: | From 316185978bd16dca46b5f89ba7cbccb1d7a92b52 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sat, 24 Jul 2021 11:42:41 -0700 Subject: [PATCH 12/14] Fix a ps1 loading error --- .github/workflows/git-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index d13db221e72726..2f32c147a265a9 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -569,7 +569,7 @@ jobs: md buildstore - name: Write packaging layout files run: | - build-extra\msix\create_packaginglayout_file.ps1 + . build-extra\msix\create_packaginglayout_file.ps1 Write-PackageLayoutFile "1.0.0.0" "buildmsix\appxmanifest.xml" Write-PackageLayoutFile "1.0.0.0" "buildstore\appxmanifest.xml" Write-AppxManifest "1.0.0.0" "CN=Johannes Schindelin,O=Johannes Schindelin,L=Köln,S=North Rhine-Westphalia,C=DE" "buildmsix\PackagingLayout.xml" From 9eba8e3d277843d564b77e8c71810d83589e669e Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sat, 24 Jul 2021 12:34:39 -0700 Subject: [PATCH 13/14] Fix publisher field --- .github/workflows/git-artifacts.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index 2f32c147a265a9..5cca6ed26cbbc1 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -570,10 +570,10 @@ jobs: - name: Write packaging layout files run: | . build-extra\msix\create_packaginglayout_file.ps1 - Write-PackageLayoutFile "1.0.0.0" "buildmsix\appxmanifest.xml" - Write-PackageLayoutFile "1.0.0.0" "buildstore\appxmanifest.xml" - Write-AppxManifest "1.0.0.0" "CN=Johannes Schindelin,O=Johannes Schindelin,L=Köln,S=North Rhine-Westphalia,C=DE" "buildmsix\PackagingLayout.xml" - Write-AppxManifest "1.0.0.0" "CN=82A13EFD-FE37-4EFC-8BA4-1C3E9EFE5F23" "buildstore\PackagingLayout.xml" + Write-PackageLayoutFile "1.0.0.0" (Join-Path -Path $pwd -ChildPath "buildmsix\PackagingLayout.xml") + Write-PackageLayoutFile "1.0.0.0" (Join-Path -Path $pwd -ChildPath "buildstore\PackagingLayout.xml") + Write-AppxManifest "1.0.0.0" "CN=Johannes Schindelin, O=Johannes Schindelin, L=Köln, S=North Rhine-Westphalia, C=DE" (Join-Path -Path $pwd -ChildPath "buildmsix\appxmanifest.xml") + Write-AppxManifest "1.0.0.0" "CN=82A13EFD-FE37-4EFC-8BA4-1C3E9EFE5F23" (Join-Path -Path $pwd -ChildPath "buildstore\appxmanifest.xml") - name: Delete WebView2Loader.dll run: | Remove-Item build\x64\mingw64\libexec\git-core\WebView2Loader.dll From 088a8c7403b85f536be98bb0cd6d5ca9211d9134 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sat, 24 Jul 2021 13:32:03 -0700 Subject: [PATCH 14/14] Change name of artifacts --- .github/workflows/git-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/git-artifacts.yml b/.github/workflows/git-artifacts.yml index 5cca6ed26cbbc1..eb89b56e6e3bf5 100644 --- a/.github/workflows/git-artifacts.yml +++ b/.github/workflows/git-artifacts.yml @@ -594,9 +594,9 @@ jobs: Write-Output "Here we should sign the appxbundle that is in the buildstore folder with signtool." - uses: actions/upload-artifact@v2 with: - name: standalonemsixinstaller + name: msixinstallerstandalone path: buildmsix\*.appxbundle - uses: actions/upload-artifact@v2 with: - name: storemsixinstaller + name: msixinstallerstore path: buildstore\*.appxbundle