From f02e8835b7bcd11e8c842345aad7ba16453d34f4 Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Sun, 30 Apr 2023 14:37:09 -0400 Subject: [PATCH 1/4] Update cd_release_msstore.yml --- .github/workflows/cd_release_msstore.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd_release_msstore.yml b/.github/workflows/cd_release_msstore.yml index 5286c40..9cf3b58 100644 --- a/.github/workflows/cd_release_msstore.yml +++ b/.github/workflows/cd_release_msstore.yml @@ -100,12 +100,16 @@ jobs: CertThumbprint: ${{ secrets.LancelotSoftwareCert_Thumbprint }} HoursBetweenUpdateChecks: 6 AppxBundle: Always - AppxPackageDir: 'D:\a\MediaFileManager\MediaFileManager\src\MediaFileManager\PackageProject\SideLoadPackages\' AppxPackageSigningEnabled: False GenerateAppInstallerFile: False BuildMode: StoreUpload AppInstUri: 'https://dvlup.blob.core.windows.net/general-app-files/Installers/MediaFileManager/' + - uses: actions/upload-artifact@v3 + with: + name: store-artifacts + path: ${{ env.AppxPackageDirectory }} + # Use Store Broker to publish to Microsoft Store - name: Submit to Partner Center (aka DevCenter) shell: pwsh From 0011ff6913b9e467495fe8fc22064e5637ec395b Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Fri, 7 Jul 2023 09:44:17 -0400 Subject: [PATCH 2/4] Update cd_release_sideload.yml --- .github/workflows/cd_release_sideload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd_release_sideload.yml b/.github/workflows/cd_release_sideload.yml index 116ef11..092d66e 100644 --- a/.github/workflows/cd_release_sideload.yml +++ b/.github/workflows/cd_release_sideload.yml @@ -126,7 +126,7 @@ jobs: # This automatically distributes the sideLoad package, which users can visit the index.html page and run the appinstaller - name: Uploading appInstaller to Azure Blob id: sideload-blob-upload - uses: LanceMcCarthy/Action-AzureBlobUpload@v1.9.0 + uses: LanceMcCarthy/Action-AzureBlobUpload@v2 with: connection_string: "${{ secrets.AZURE_DVLUP_BLOB_CONNECTION_STRING }}" container_name: general-app-files From a98f4730577603942b154098e6865c013b10bd84 Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Fri, 7 Jul 2023 09:57:10 -0400 Subject: [PATCH 3/4] Update cd_release_sideload.yml Fix missing packages --- .github/workflows/cd_release_sideload.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd_release_sideload.yml b/.github/workflows/cd_release_sideload.yml index 092d66e..c14327f 100644 --- a/.github/workflows/cd_release_sideload.yml +++ b/.github/workflows/cd_release_sideload.yml @@ -116,12 +116,17 @@ jobs: [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte) # Build using SideLoad and AppInstaller instructions (requires code signing) - - name: Build wapproj for Sideloading - run: msbuild ${{ env.WappProjectPath }} /t:Restore /p:GenerateAppInstallerFile=${{ env.GenerateAppInstallerFile }} /p:AppInstallerUri=${{ env.AppInstUri }} /p:HoursBetweenUpdateChecks=${{ env.HoursBetweenUpdateChecks }} /p:AppxPackageDir=${{ env.AppxPackageDirectory }} /p:Configuration=${{ env.Configuration }} /p:UapAppxPackageBuildMode=${{ env.AppxBuildMode }} /p:AppxBundle=${{ env.AppxBundleMode }} /p:PackageCertificateKeyFile=${{ env.SigningCertificate }} /p:PackageCertificatePassword=${{ env.CertPrivateKey }} /p:PackageCertificateThumbprint=${{ env.CertThumbprint }} /p:AppxPackageSigningEnabled=${{ env.AppxPackageSigningEnabled }} /p:Platform=${{ env.TargetPlatform }} /p:AppxBundlePlatforms="${{ env.AppxBundlePlatforms }}" + - name: Restore wapproj + run: msbuild ${{ env.WappProjectPath }} /t:Restore /p:Configuration=${{ env.Configuration }} env: CertPrivateKey: ${{ secrets.LancelotSoftwareCert_Key }} CertThumbprint: ${{ secrets.LancelotSoftwareCert_Thumbprint }} + - name: Build wapproj for Sideloading + run: msbuild ${{ env.WappProjectPath }} /p:GenerateAppInstallerFile=${{ env.GenerateAppInstallerFile }} /p:AppInstallerUri=${{ env.AppInstUri }} /p:HoursBetweenUpdateChecks=${{ env.HoursBetweenUpdateChecks }} /p:AppxPackageDir=${{ env.AppxPackageDirectory }} /p:Configuration=${{ env.Configuration }} /p:UapAppxPackageBuildMode=${{ env.AppxBuildMode }} /p:AppxBundle=${{ env.AppxBundleMode }} /p:PackageCertificateKeyFile=${{ env.SigningCertificate }} /p:PackageCertificatePassword=${{ env.CertPrivateKey }} /p:PackageCertificateThumbprint=${{ env.CertThumbprint }} /p:AppxPackageSigningEnabled=${{ env.AppxPackageSigningEnabled }} /p:Platform=${{ env.TargetPlatform }} /p:AppxBundlePlatforms="${{ env.AppxBundlePlatforms }}" + env: + CertPrivateKey: ${{ secrets.LancelotSoftwareCert_Key }} + CertThumbprint: ${{ secrets.LancelotSoftwareCert_Thumbprint }} # UPLOAD TO AZURE STORAGE BLOB # This automatically distributes the sideLoad package, which users can visit the index.html page and run the appinstaller - name: Uploading appInstaller to Azure Blob From 604e6c69669d1f7e437b76ef295e3c9601383764 Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Fri, 7 Jul 2023 09:58:48 -0400 Subject: [PATCH 4/4] Update cd_release_sideload.yml --- .github/workflows/cd_release_sideload.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/cd_release_sideload.yml b/.github/workflows/cd_release_sideload.yml index c14327f..58468f5 100644 --- a/.github/workflows/cd_release_sideload.yml +++ b/.github/workflows/cd_release_sideload.yml @@ -118,15 +118,13 @@ jobs: # Build using SideLoad and AppInstaller instructions (requires code signing) - name: Restore wapproj run: msbuild ${{ env.WappProjectPath }} /t:Restore /p:Configuration=${{ env.Configuration }} - env: - CertPrivateKey: ${{ secrets.LancelotSoftwareCert_Key }} - CertThumbprint: ${{ secrets.LancelotSoftwareCert_Thumbprint }} - name: Build wapproj for Sideloading run: msbuild ${{ env.WappProjectPath }} /p:GenerateAppInstallerFile=${{ env.GenerateAppInstallerFile }} /p:AppInstallerUri=${{ env.AppInstUri }} /p:HoursBetweenUpdateChecks=${{ env.HoursBetweenUpdateChecks }} /p:AppxPackageDir=${{ env.AppxPackageDirectory }} /p:Configuration=${{ env.Configuration }} /p:UapAppxPackageBuildMode=${{ env.AppxBuildMode }} /p:AppxBundle=${{ env.AppxBundleMode }} /p:PackageCertificateKeyFile=${{ env.SigningCertificate }} /p:PackageCertificatePassword=${{ env.CertPrivateKey }} /p:PackageCertificateThumbprint=${{ env.CertThumbprint }} /p:AppxPackageSigningEnabled=${{ env.AppxPackageSigningEnabled }} /p:Platform=${{ env.TargetPlatform }} /p:AppxBundlePlatforms="${{ env.AppxBundlePlatforms }}" env: CertPrivateKey: ${{ secrets.LancelotSoftwareCert_Key }} CertThumbprint: ${{ secrets.LancelotSoftwareCert_Thumbprint }} + # UPLOAD TO AZURE STORAGE BLOB # This automatically distributes the sideLoad package, which users can visit the index.html page and run the appinstaller - name: Uploading appInstaller to Azure Blob @@ -139,7 +137,6 @@ jobs: destination_folder: Installers/MediaFileManager clean_destination_folder: true is_recursive: true - delete_if_exists: true # ZIP up the sideload packages for GitHub release using Powershell - name: Create SideLoadPackages.zip