From 45535e659ea8b58101fe9e8adfa6aa273d2bb544 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 19 Mar 2025 16:46:08 -0700 Subject: Formalize official WiX build and update tags in nupkgs --- .github/workflows/build.yml | 18 +++++++++------- src/Directory.Build.props | 24 ++++++++++++++------- src/Directory.Build.targets | 11 ++++++++-- src/Directory.csproj.props | 3 ++- src/Directory.wixproj.targets | 3 ++- .../WixToolset.BootstrapperApplicationApi.nuspec | 5 +++-- src/api/burn/bextutil/bextutil.nuspec | 5 +++-- src/burn/stub/stub.nuspec | 1 + .../WixToolset.Dtf.CustomAction.nuspec | 5 +++-- .../WixToolset.Bal.wixext.nuspec | 5 +++-- src/ext/Bal/wixstdfn/wixstdfn.nuspec | 5 +++-- src/ext/WixExt.props | 1 + src/internal/images/icon.png | Bin 0 -> 4833 bytes src/internal/images/official/icon.png | Bin 0 -> 3410 bytes src/internal/images/wix.png | Bin 3410 -> 0 bytes src/libs/dutil/WixToolset.DUtil/dutil.nuspec | 5 +++-- src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec | 5 +++-- src/setup/ThmViewerPackage/ThmViewerPackage.wxs | 2 +- .../WixAdditionalTools/WixAdditionalTools.wxs | 2 +- src/setup/wix-cli/Package.wxs | 2 +- src/tools/WixToolset.Heat/WixToolset.Heat.nuspec | 5 +++-- .../WixToolset.Core.Native.nuspec | 1 + src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec | 5 +++-- src/wix/pack-wix/pack-wix.nuspec | 5 +++-- 24 files changed, 75 insertions(+), 43 deletions(-) create mode 100644 src/internal/images/icon.png create mode 100644 src/internal/images/official/icon.png delete mode 100644 src/internal/images/wix.png diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36e0583c..78720df2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,8 @@ jobs: name: Build runs-on: windows-2022 env: + RepoOrg: ${{ github.repository_owner }} + SignBuild: ${{ github.repository_owner == 'wixtoolset' && startsWith(github.ref, 'refs/tags/v') }} WixOfficialBuild: ${{ github.repository_owner == 'wixtoolset' && startsWith(github.ref, 'refs/tags/v') }} permissions: packages: write @@ -37,7 +39,7 @@ jobs: # run: ./src/vs_config.cmd - name: Install sign tool - if: ${{ env.WixOfficialBuild == 'true' }} + if: ${{ env.SignBuild == 'true' }} shell: cmd run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.24170.3 @@ -54,7 +56,7 @@ jobs: reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1 # - name: 'Az CLI login' - # if: ${{ env.WixOfficialBuild == 'true' }} + # if: ${{ env.SignBuild == 'true' }} # uses: azure/login@v1 # with: # allow-no-subscriptions: true @@ -66,11 +68,11 @@ jobs: run: ./src/build_official.cmd env: RuntimeTestsEnabled: true - SigningKeyVaultUri: ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_VAULTURI || '' }} - SigningTenantId: ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_TENANTID || '' }} - SigningClientId: ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_CLIENTID || '' }} - SigningClientSecret: ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_SECRET || '' }} - SigningCertName: ${{ env.WixOfficialBuild == 'true' && secrets.WIX_SIGNING_CERTNAME || '' }} + SigningKeyVaultUri: ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_VAULTURI || '' }} + SigningTenantId: ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_TENANTID || '' }} + SigningClientId: ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_CLIENTID || '' }} + SigningClientSecret: ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_SECRET || '' }} + SigningCertName: ${{ env.SignBuild == 'true' && secrets.WIX_SIGNING_CERTNAME || '' }} - name: Validate test results shell: cmd @@ -99,7 +101,7 @@ jobs: # Do NOT publish logs on `official builds` (version tagged builds) as they may contain secrets in them. - name: Save logs - if: ${{ env.WixOfficialBuild != 'true' && !cancelled() }} + if: ${{ env.SignBuild != 'true' && !cancelled() }} uses: actions/upload-artifact@v4 with: name: logs_${{ github.run_id }} diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4c5c0668..0ca36281 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -27,21 +27,29 @@ $(WixNativeSdkLibraryToolset) v143 - WiX Toolset Team - WiX Toolset + true + all + low + + + + Private WiX Build + WiX Toolset Team + Private WiX Build + WiX Toolset Copyright (c) .NET Foundation and contributors. All rights reserved. $(RootFolder)OSMFEULA.txt OSMFEULA.txt true - WiX Toolset + Private WiX Build + WiX Toolset https://wixtoolset.org/ - wix.png - - true - all - low + icon.png + $(MSBuildThisFileDirectory)internal\images\icon.png + $(MSBuildThisFileDirectory)internal\images\official\icon.png + WiX MSI install setup diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 91aadf5b..7083da38 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -32,7 +32,8 @@ $(GenerateNuspecDependsOn); - __SetNuspecProperties + __SetNuspecProperties; + VerifyOfficialBuild @@ -46,7 +47,8 @@ $(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);MajorVersion=$(SomeVerInfoMajor);NextMajorVersion=$(SomeVerInfoNextMajor);Authors=$(Authors);Configuration=$(Configuration) $(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title) $(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl) - $(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory);RootFolder=$(RootFolder);EulaTxt=$(PackageEulaSource) + $(NuspecProperties);PackageTags=$(PackageTags) + $(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory);RootFolder=$(RootFolder);EulaTxt=$(PackageEulaSource);IconPng=$(PackageIconSource) @@ -97,6 +99,11 @@ WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> + + + + diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props index 57111c40..c926f263 100644 --- a/src/Directory.csproj.props +++ b/src/Directory.csproj.props @@ -11,6 +11,7 @@ - + + diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets index b36bca75..142342e9 100644 --- a/src/Directory.wixproj.targets +++ b/src/Directory.wixproj.targets @@ -14,7 +14,8 @@ SetupMajorMinorVersion=$(SomeVerInfoMajor).$(SomeVerInfoMinor); SetupMajorMinorPatchVersion=$(SomeVerInfoMajor).$(SomeVerInfoMinor).$(SomeVerInfoPatch); SetupDashedMajorMinorVersion=$(SomeVerInfoMajor)-$(SomeVerInfoMinor); - SetupDashedPrerelease=$(PrereleaseSuffix) + SetupDashedPrerelease=$(PrereleaseSuffix); + Company=$(Company); diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec index 61c19117..63acc895 100644 --- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec +++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -23,7 +24,7 @@ - + diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec index 5bb3875c..f790e0b8 100644 --- a/src/api/burn/bextutil/bextutil.nuspec +++ b/src/api/burn/bextutil/bextutil.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -19,8 +20,8 @@ + - diff --git a/src/burn/stub/stub.nuspec b/src/burn/stub/stub.nuspec index 7e868c67..e8506505 100644 --- a/src/burn/stub/stub.nuspec +++ b/src/burn/stub/stub.nuspec @@ -8,6 +8,7 @@ $authors$ OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec index 232a3c1d..8eb7110f 100644 --- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec +++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ CustomActions $copyright$ $projectUrl$ @@ -19,8 +20,8 @@ + - diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec index 2327f0a2..2bebad30 100644 --- a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec +++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -16,7 +17,7 @@ - + diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec index 4ca6eadb..86860b67 100644 --- a/src/ext/Bal/wixstdfn/wixstdfn.nuspec +++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -23,9 +24,9 @@ + - diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props index c6afb59f..538c6b97 100644 --- a/src/ext/WixExt.props +++ b/src/ext/WixExt.props @@ -7,6 +7,7 @@ true NU5100 wixext6 + $(PackageTags) wixext CustomActions diff --git a/src/internal/images/icon.png b/src/internal/images/icon.png new file mode 100644 index 00000000..01944a48 Binary files /dev/null and b/src/internal/images/icon.png differ diff --git a/src/internal/images/official/icon.png b/src/internal/images/official/icon.png new file mode 100644 index 00000000..9a92155e Binary files /dev/null and b/src/internal/images/official/icon.png differ diff --git a/src/internal/images/wix.png b/src/internal/images/wix.png deleted file mode 100644 index 9a92155e..00000000 Binary files a/src/internal/images/wix.png and /dev/null differ diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec index cd95990a..5c4634e4 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec +++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -16,8 +17,8 @@ + - diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec index 87c35b52..827a946d 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -19,8 +20,8 @@ + - diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs index 66bbe766..0851450e 100644 --- a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs +++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs @@ -1,6 +1,6 @@  - + diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs index da8201ee..08dc90fe 100644 --- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs @@ -2,7 +2,7 @@ - - + diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec index fea090c3..48e94797 100644 --- a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec +++ b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -16,8 +17,8 @@ + - diff --git a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec index 32ba7614..b5421c1a 100644 --- a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec +++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec @@ -8,6 +8,7 @@ $authors$ OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec b/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec index 12c121ce..104e5cd8 100644 --- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec +++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -19,7 +20,7 @@ - + diff --git a/src/wix/pack-wix/pack-wix.nuspec b/src/wix/pack-wix/pack-wix.nuspec index eb065149..cee65f79 100644 --- a/src/wix/pack-wix/pack-wix.nuspec +++ b/src/wix/pack-wix/pack-wix.nuspec @@ -6,9 +6,10 @@ $title$ $description$ $authors$ - wix.png + icon.png OSMFEULA.txt true + $packageTags$ $copyright$ $projectUrl$ @@ -19,8 +20,8 @@ + - -- cgit v1.2.3-55-g6feb