Skip to content

[release/7.0] Pass /norestart to Hosting Bundle nested bundles #47543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2023
Merged

[release/7.0] Pass /norestart to Hosting Bundle nested bundles #47543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
Vital="yes"
InstallCondition="(NativeMachine="$(var.NativeMachine_arm64)") AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME="0")"
InstallCommand="/quiet /norestart"
RepairCommand="/quiet /repair"
RepairCommand="/quiet /norestart /repair"
Permanent="yes"
DetectCondition="DotNetRedistLtsProductVersion_arm64 = v$(var.DotNetRedistLtsInstallerProductVersionarm64)">
</ExePackage>
Expand All @@ -42,8 +42,8 @@
Vital="yes"
InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)"
InstallCommand="/quiet /norestart"
RepairCommand="/quiet /repair"
UninstallCommand="/quiet /uninstall"
RepairCommand="/quiet /norestart /repair"
UninstallCommand="/quiet /norestart /uninstall"
DetectCondition="DotNetRedistLtsProductVersion_x64 = v$(var.DotNetRedistLtsInstallerProductVersionx64)">
</ExePackage>

Expand All @@ -54,8 +54,8 @@
Vital="yes"
InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)"
InstallCommand="/quiet /norestart"
RepairCommand="/quiet /repair"
UninstallCommand="/quiet /uninstall"
RepairCommand="/quiet /norestart /repair"
UninstallCommand="/quiet /norestart /uninstall"
DetectCondition="DotNetRedistLtsProductVersion_x86 = v$(var.DotNetRedistLtsInstallerProductVersionx86)">
</ExePackage>
</PackageGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
Vital="yes"
InstallCondition="(NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)"
InstallCommand="/quiet /norestart"
RepairCommand="/quiet /repair"
RepairCommand="/quiet /norestart /repair"
Permanent="yes"
DetectCondition="SharedFxRedistProductVersion_arm64 = v$(var.SharedFxInstallerProductVersionarm64)">
</ExePackage>
Expand All @@ -42,8 +42,8 @@
Vital="yes"
InstallCondition="VersionNT64 AND NOT (NativeMachine=&quot;$(var.NativeMachine_arm64)&quot;) AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)"
InstallCommand="/quiet /norestart"
RepairCommand="/quiet /repair"
UninstallCommand="/quiet /uninstall"
RepairCommand="/quiet /norestart /repair"
UninstallCommand="/quiet /norestart /uninstall"
DetectCondition="SharedFxRedistProductVersion_x64 = v$(var.SharedFxInstallerProductVersionx64)">
</ExePackage>

Expand All @@ -54,8 +54,8 @@
Vital="yes"
InstallCondition="(NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)"
InstallCommand="/quiet /norestart"
RepairCommand="/quiet /repair"
UninstallCommand="/quiet /uninstall"
RepairCommand="/quiet /norestart /repair"
UninstallCommand="/quiet /norestart /uninstall"
DetectCondition="SharedFxRedistProductVersion_x86 = v$(var.SharedFxInstallerProductVersionx86)">
</ExePackage>

Expand Down