087d4acf54
Fix bug #5597: x86/x64 installer are uninstalling each other when installing either of them: -Make x86 installer to be installed as an x86 component (-arch argument to candle.exe, which sets the `sys.BUILDARCH` variable) -Make the UpgradeCode unique per platform -Replace `var.ProductTargetArchitecture` variable with sys.BUILDARCH use to have only 1 variable for the architecture -Additionally, the architecture was appended to the package name to be able to distinguish the installations. # Conflicts: # assets/Product.wxs |
||
|---|---|---|
| .. | ||
| AppImageThirdPartyNotices.txt | ||
| av_colors_128.svg | ||
| Avatar.svg | ||
| avatar_128.svg | ||
| license.rtf | ||
| macDialog.png | ||
| Powershell.icns | ||
| Powershell_64.png | ||
| powershell_128.svg | ||
| Powershell_256.png | ||
| Powershell_av_colors.ico | ||
| Powershell_avatar.ico | ||
| Powershell_black.ico | ||
| Powershell_black_64.png | ||
| Product.wxs | ||
| ps_black_128.svg | ||
| pwsh.1.ronn | ||
| README.md | ||
| WixUIBannerBmp.bmp | ||
| WixUIDialogBmp.bmp | ||
| WixUIInfoIco.bmp | ||
Use of Trademarked Logos
The assets in this folder are trademarked by Microsoft and don't fall under the same License as the source code.
Permitted Uses
Parties interested in using these logos can review the Use of Microsoft Copyrighted Material page. If the use falls into any of those categories, you can move forward with the use and will not need additional permission.
Third Party Permission Requests
If questions remain after reviewing the permitted uses page, please submit a request to Third Party Permissions. The people supporting this will direct the request depending upon the content.
If a request needs to be submitted to the Third Party Permissions, the request should include the following:
- A statement that the Use of Microsoft Copyrighted Material was reviewed and did not address the situation.
- A statement that Microsoft (and not a third party) is the owner of the logo at issue.
- Clear identification of the materials to be used (i.e., the picture of the book cover included by the author in the letter request should suffice).
- A description, including URLs of how they found or located the logo.
- A description of how the party intends to use or distribute the logo (i.e., that it is for the book cover of an instructional book on PowerShell).
- A description of how long the party needs to use the logo.