Skip to content

Commit a015bfe

Browse files
xtqqczzextqqczze
authored
Remove assets\license.rtf (#12721)
# PR Summary Since #8846, we do not show an EULA in the MSI, so we can remove `license.rtf`. ## PR Context Fix #12719 ## PR Checklist - [x] [PR has a meaningful title](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission) - Use the present tense and imperative mood when describing your changes - [x] [Summarized changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission) - [x] [Make sure all `.h`, `.cpp`, `.cs`, `.ps1` and `.psm1` files have the correct copyright header](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission) - [x] This PR is ready to merge and is not [Work in Progress](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---work-in-progress). - If the PR is work in progress, please add the prefix `WIP:` or `[ WIP ]` to the beginning of the title (the `WIP` bot will keep its status check at `Pending` while the prefix is present) and remove the prefix when the PR is ready. - **[Breaking changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#making-breaking-changes)** - [x] None - **OR** - [ ] [Experimental feature(s) needed](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/reference/6/Microsoft.PowerShell.Core/About/about_Experimental_Features.md) - [ ] Experimental feature name(s): <!-- Experimental feature name(s) here --> - **User-facing changes** - [x] Not Applicable - **OR** - [ ] [Documentation needed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission) - [ ] Issue filed: <!-- Number/link of that issue here --> - **Testing - New and feature** - [x] N/A or can only be tested interactively - **OR** - [ ] [Make sure you've added a new test if existing tests do not effectively test the code changed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#before-submitting) - **Tooling** - [x] I have considered the user experience from a tooling perspective and don't believe tooling will be impacted. - **OR** - [ ] I have considered the user experience from a tooling perspective and enumerated concerns in the summary. This may include: - Impact on [PowerShell Editor Services](https://github.com/PowerShell/PowerShellEditorServices) which is used in the [PowerShell extension](https://github.com/PowerShell/vscode-powershell) for VSCode (which runs in a different PS Host). - Impact on Completions (both in the console and in editors) - one of PowerShell's most powerful features. - Impact on [PSScriptAnalyzer](https://github.com/PowerShell/PSScriptAnalyzer) (which provides linting & formatting in the editor extensions). - Impact on [EditorSyntax](https://github.com/PowerShell/EditorSyntax) (which provides syntax highlighting with in VSCode, GitHub, and many other editors).
1 parent 9fe96f0 commit a015bfe

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

‎tools/packaging/packaging.psm1‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ function Start-PSPackage {
337337
ProductSourcePath = $Source
338338
ProductVersion = $Version
339339
AssetsPath = "$RepoRoot\assets"
340-
LicenseFilePath = "$RepoRoot\assets\license.rtf"
341340
# Product Code needs to be unique for every PowerShell version since it is a unique identifier for the particular product release
342341
ProductCode = New-Guid
343342
ProductTargetArchitecture = $TargetArchitecture
@@ -2959,11 +2958,6 @@ function New-MSIPackage
29592958
[ValidateScript( {Test-Path $_})]
29602959
[string] $AssetsPath = "$RepoRoot\assets",
29612960

2962-
# Path to license.rtf file - for the EULA
2963-
[ValidateNotNullOrEmpty()]
2964-
[ValidateScript( {Test-Path $_})]
2965-
[string] $LicenseFilePath = "$RepoRoot\assets\license.rtf",
2966-
29672961
# Architecture to use when creating the MSI
29682962
[Parameter(Mandatory = $true)]
29692963
[ValidateSet("x86", "x64")]
@@ -3087,7 +3081,7 @@ function New-MSIPackage
30873081
Write-Log "running light..."
30883082
# suppress ICE61, because we allow same version upgrades
30893083
# suppress ICE57, this suppresses an error caused by our shortcut not being installed per user
3090-
Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sice:ICE61 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $wixObjProductPath $wixObjFragmentPath -ext WixUIExtension -ext WixUtilExtension -dWixUILicenseRtf="$LicenseFilePath"}
3084+
Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sice:ICE61 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $wixObjProductPath $wixObjFragmentPath -ext WixUIExtension -ext WixUtilExtension }
30913085

30923086
Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force
30933087
Remove-Item -ErrorAction SilentlyContinue $wixObjProductPath -Force

0 commit comments

Comments
 (0)