diff --git a/Setup/Components/Application.wxs b/Setup/Components/Application.wxs index 99aee2dc1..32334552a 100644 --- a/Setup/Components/Application.wxs +++ b/Setup/Components/Application.wxs @@ -1,5 +1,4 @@ - - + diff --git a/Setup/Components/Application.xslt b/Setup/Components/Application.xslt index 0252d275c..f203befe0 100644 --- a/Setup/Components/Application.xslt +++ b/Setup/Components/Application.xslt @@ -1,36 +1,49 @@ - - - - - - - - - - - - - MainExecutable - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + MainExecutable + yes + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Setup/Components/Configuration.wxs b/Setup/Components/Configuration.wxs index ebbb9f6d2..dee6e5c7e 100644 --- a/Setup/Components/Configuration.wxs +++ b/Setup/Components/Configuration.wxs @@ -1,5 +1,4 @@ - - + diff --git a/Setup/Components/Reset.wxs b/Setup/Components/Reset.wxs index ff0e24857..b6437fb9d 100644 --- a/Setup/Components/Reset.wxs +++ b/Setup/Components/Reset.wxs @@ -1,5 +1,4 @@ - - + diff --git a/Setup/Components/Service.wxs b/Setup/Components/Service.wxs index ebbb9f6d2..dee6e5c7e 100644 --- a/Setup/Components/Service.wxs +++ b/Setup/Components/Service.wxs @@ -1,5 +1,4 @@ - - + diff --git a/Setup/Directories.wxs b/Setup/Directories.wxs index 8125bdc08..e62d4187d 100644 --- a/Setup/Directories.wxs +++ b/Setup/Directories.wxs @@ -1,23 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Setup/LegacyCleanup.wxs b/Setup/LegacyCleanup.wxs index 3ec04d7eb..f7dfbfed4 100644 --- a/Setup/LegacyCleanup.wxs +++ b/Setup/LegacyCleanup.wxs @@ -1,7 +1,5 @@ - - + - + diff --git a/Setup/Product.wxs b/Setup/Product.wxs index 1a1ee8e1c..72498ec3b 100644 --- a/Setup/Product.wxs +++ b/Setup/Product.wxs @@ -1,10 +1,8 @@ - - - - + + + - + @@ -24,5 +22,5 @@ - + diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj index 27dcbce2a..7f526f258 100644 --- a/Setup/Setup.wixproj +++ b/Setup/Setup.wixproj @@ -1,165 +1,131 @@ - - - - Debug - x86 - 3.10 - 0e14d163-557e-469e-9112-96936af43a7b - 2.0 - Setup - Package - - - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - Debug - ICE61 - - - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - ICE61 - - - Debug - ICE61 - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - ICE61 - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - - - - - - - - - - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - - - - - - - SafeExamBrowser.Client - {7cc5a895-e0d3-4e43-9b39-ccec05a5a6a7} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - SafeExamBrowser.ResetUtility - {bc229e80-ff93-424f-9930-d9c07d9b57b4} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - SafeExamBrowser.Runtime - {e3aed2f8-b5df-45d1-ac19-48066923d6d8} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - SafeExamBrowser.Service - {fa3c6692-dfed-4afa-bd58-9a3da2753c78} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - SebWindowsConfig - {bef73897-0d04-4f40-ad89-62e24d260cd0} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - - - - - - - - - - - - - - - - - - - - git -C $(SolutionDir) checkout -- Setup/Components/Application.wxs -git -C $(SolutionDir) checkout -- Setup/Components/Configuration.wxs -git -C $(SolutionDir) checkout -- Setup/Components/Reset.wxs -git -C $(SolutionDir) checkout -- Setup/Components/Service.wxs - - - - true - - - - - - - - - setlocal enabledelayedexpansion + + + Debug + x64 + Setup + Package + $(OutputName)-$(Configuration)-$(Platform) + HEAT5149 + + + + Debug + ICE61 + + + ICE61 + + + + bin\$(Platform)\$(Configuration) + $(SolutionDir)SafeExamBrowser.Runtime\$(BinDir) + $(SolutionDir)SebWindowsConfig\$(BinDir) + $(SolutionDir)SafeExamBrowser.ResetUtility\$(BinDir) + $(SolutionDir)SafeExamBrowser.Service\$(BinDir) + + false + + + + + + + + + + + ApplicationComponents + ApplicationDirectory + true + true + true + var.SafeExamBrowser.Runtime.TargetDir + Components\Application.xslt + + + ConfigurationComponents + ConfigurationDirectory + true + true + true + var.SebWindowsConfig.TargetDir + Components\Configuration.xslt + + + ResetComponents + ResetDirectory + true + true + true + var.SafeExamBrowser.ResetUtility.TargetDir + Components\Reset.xslt + + + ServiceComponents + ServiceDirectory + true + true + true + var.SafeExamBrowser.Service.TargetDir + Components\Service.xslt + + + + + + + -set binaries= -FOR /F %25%25G IN (%27dir "$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)\%2a.exe" "$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)\%2a.dll" /s /b%27) DO set binaries=!binaries! %25%25G -signtool sign /sha1 ecac9df025f5d208f6190fc4d6f9d329576598c7 /sm /tr http://timestamp.digicert.com /td sha256 /fd sha256 %25binaries%25 + + + Configuration=$(Configuration);Platform=x64;RuntimeIdentifier=win-x64 + + + Configuration=$(Configuration);Platform=x64;RuntimeIdentifier=win-x64 + + + Configuration=$(Configuration);Platform=x64;RuntimeIdentifier=win-x64 + + + Configuration=$(Configuration);Platform=x64;RuntimeIdentifier=win-x64 + + + Configuration=$(Configuration);Platform=x64;RuntimeIdentifier=win-x64 + + -set binaries= -FOR /F %25%25G IN (%27dir "$(SolutionDir)SebWindowsConfig\bin\$(PlatformName)\$(ConfigurationName)\%2a.exe" "$(SolutionDir)SebWindowsConfig\bin\$(PlatformName)\$(ConfigurationName)\%2a.dll" /s /b%27) DO set binaries=!binaries! %25%25G -signtool sign /sha1 ecac9df025f5d208f6190fc4d6f9d329576598c7 /sm /tr http://timestamp.digicert.com /td sha256 /fd sha256 %25binaries%25 + + + + + + -set binaries= -FOR /F %25%25G IN (%27dir "$(SolutionDir)SafeExamBrowser.ResetUtility\bin\$(PlatformName)\$(ConfigurationName)\%2a.exe" "$(SolutionDir)SafeExamBrowser.ResetUtility\bin\$(PlatformName)\$(ConfigurationName)\%2a.dll" /s /b%27) DO set binaries=!binaries! %25%25G -signtool sign /sha1 ecac9df025f5d208f6190fc4d6f9d329576598c7 /sm /tr http://timestamp.digicert.com /td sha256 /fd sha256 %25binaries%25 + + + $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32)) + $(WindowsKitsRoot)bin\ + -set binaries= -FOR /F %25%25G IN (%27dir "$(SolutionDir)SafeExamBrowser.Service\bin\$(PlatformName)\$(ConfigurationName)\%2a.exe" "$(SolutionDir)SafeExamBrowser.Service\bin\$(PlatformName)\$(ConfigurationName)\%2a.dll" /s /b%27) DO set binaries=!binaries! %25%25G -signtool sign /sha1 ecac9df025f5d208f6190fc4d6f9d329576598c7 /sm /tr http://timestamp.digicert.com /td sha256 /fd sha256 %25binaries%25 + + + + + + @(SignToolArray->Last()) + + + + + + + + + + + + + + -"$(WIX)bin\heat.exe" dir "$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)" -nologo -ag -g1 -scom -srd -sreg -cg ApplicationComponents -dr ApplicationDirectory -sfrag -var var.SafeExamBrowser.Runtime.TargetDir -out $(ProjectDir)Components\Application.wxs -t $(ProjectDir)Components\Application.xslt -"$(WIX)bin\heat.exe" dir "$(SolutionDir)SebWindowsConfig\bin\$(PlatformName)\$(ConfigurationName)" -nologo -ag -g1 -scom -srd -sreg -cg ConfigurationComponents -dr ConfigurationDirectory -sfrag -var var.SebWindowsConfig.TargetDir -out $(ProjectDir)Components\Configuration.wxs -t $(ProjectDir)Components\Configuration.xslt -"$(WIX)bin\heat.exe" dir "$(SolutionDir)SafeExamBrowser.ResetUtility\bin\$(PlatformName)\$(ConfigurationName)" -nologo -ag -g1 -scom -srd -sreg -cg ResetComponents -dr ResetDirectory -sfrag -var var.SafeExamBrowser.ResetUtility.TargetDir -out $(ProjectDir)Components\Reset.wxs -t $(ProjectDir)Components\Reset.xslt -"$(WIX)bin\heat.exe" dir "$(SolutionDir)SafeExamBrowser.Service\bin\$(PlatformName)\$(ConfigurationName)" -nologo -ag -g1 -scom -srd -sreg -cg ServiceComponents -dr ServiceDirectory -sfrag -var var.SafeExamBrowser.Service.TargetDir -out $(ProjectDir)Components\Service.wxs -t $(ProjectDir)Components\Service.xslt - \ No newline at end of file diff --git a/Setup/Shortcuts.wxs b/Setup/Shortcuts.wxs index ef951e9e0..64043fa0c 100644 --- a/Setup/Shortcuts.wxs +++ b/Setup/Shortcuts.wxs @@ -1,16 +1,9 @@ - - + - - - + + + diff --git a/SetupBundle/Bundle.wxs b/SetupBundle/Bundle.wxs index c58a0bd6e..301b96436 100644 --- a/SetupBundle/Bundle.wxs +++ b/SetupBundle/Bundle.wxs @@ -1,33 +1,34 @@ - - - + + - - - - - - - + + + + + + + + + - - - - + + + \ No newline at end of file diff --git a/SetupBundle/DotNetFramework.wxs b/SetupBundle/DotNetFramework.wxs index 985ba0745..c7f9f49c3 100644 --- a/SetupBundle/DotNetFramework.wxs +++ b/SetupBundle/DotNetFramework.wxs @@ -1,21 +1,21 @@ - - + - + diff --git a/SetupBundle/Resources/Theme.wxl b/SetupBundle/Resources/Theme.wxl index eeddd2e56..14124dfc2 100644 --- a/SetupBundle/Resources/Theme.wxl +++ b/SetupBundle/Resources/Theme.wxl @@ -1,63 +1,54 @@ - + - - - - [WixBundleName] Installation - [WixBundleName] - Version [WixBundleVersion] - Are you sure you want to cancel? - Previous version - Setup Help - /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or - creates a complete local copy of the bundle in directory. Install is the default. - -/passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default UI will prompt before restart. -/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. - &Close - This setup bundle will install [WixBundleName] version [WixBundleVersion] and all required components on your computer. - Please read the following license agreement carefully: - I &agree to the license terms and conditions - &Options - &Install - &Close - Setup Options - Install location: - &Browse - &OK - &Cancel - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Close - Repair Successfully Completed - Uninstall Successfully Completed - Installation Successfully Completed - Setup Successful - &Launch - You must restart your computer before you can use the software. - &Restart - &Close - Setup Failed - Setup Failed - Uninstall Failed - Repair Failed - One or more issues caused the setup to fail. In some cases, the .NET Framework or the VC++ Redistributable fail to install due to insufficient disk space (at least 4.5 GB required) or network issues. Please fix the issues (e.g. manually install the .NET Framework Runtime 4.8 from https://dotnet.microsoft.com/download or the VC++ 2015-2019 Redistributable from https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and then retry setup. For more information see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - Files In Use - The following applications are using files that need to be updated: - Close the &applications and attempt to restart them. - &Do not close applications. A reboot will be required. - &OK - &Cancel - No action was taken as a system reboot is required. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SetupBundle/SetupBundle.wixproj b/SetupBundle/SetupBundle.wixproj index 18d960fea..a32d3a6c3 100644 --- a/SetupBundle/SetupBundle.wixproj +++ b/SetupBundle/SetupBundle.wixproj @@ -1,103 +1,81 @@ - - - - Debug - x86 - 3.10 - 95b68cbf-c483-4824-bb39-663e840519a0 - 2.0 - SetupBundle - Bundle - - - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - Debug - - - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - Debug - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - - - - - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixBalExtension.dll - WixBalExtension - - - - - Setup - {0e14d163-557e-469e-9112-96936af43a7b} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - IF NOT EXIST "C:\Temp" ( - mkdir "C:\Temp" -) -curl "https://go.microsoft.com/fwlink/%3fLinkId=2085155" -L -o "C:\Temp\ndp48-web.exe" -curl "https://go.microsoft.com/fwlink/%3fLinkId=2124703" -L -o "C:\Temp\MicrosoftEdgeWebview2Setup.exe" - - - del "C:\Temp\ndp48-web.exe" -del "C:\Temp\MicrosoftEdgeWebview2Setup.exe" - \ No newline at end of file diff --git a/SetupBundle/VisualCppRuntime.wxs b/SetupBundle/VisualCppRuntime.wxs index 98a2aaadf..7fce7b299 100644 --- a/SetupBundle/VisualCppRuntime.wxs +++ b/SetupBundle/VisualCppRuntime.wxs @@ -1,29 +1,33 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file