update

README.md

@@ -1,2 +1,2 @@
-# usmt
+# User State Migration Tool - Backup Scripts
 

tools/amd64/Config_AppsAndSettings.xml

@@ -16,8 +16,10 @@
     <component displayname="Microsoft-Windows-AppX-Deployment-Server" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/Microsoft-Windows-AppX-Deployment-Server/settings"/>
     <component displayname="DiagTrack" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/DiagTrack/settings"/>
     <component displayname="Microsoft-OneCore-Bluetooth-Gatt" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/Microsoft-OneCore-Bluetooth-Gatt/settings"/>
+    <component displayname="Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer/Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer/settings"/>
     <component displayname="Microsoft-Windows-BrokerInfrastructure" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/microsoft-windows-brokerinfrastructure/microsoft-windows-brokerinfrastructure/settings"/>
     <component displayname="Microsoft-Windows-Security-NGC-PopKeySrv" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/microsoft-windows-security-ngc-popkeysrv/microsoft-windows-security-ngc-popkeysrv/settings"/>
+    <component displayname="Microsoft-Windows-WBioSrvc" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/Microsoft-Windows-WBioSrvc/Microsoft-Windows-WBioSrvc/settings"/>
   </WindowsComponents>
   <Policies>
     <ErrorControl>

tools/amd64/Config_SettingsOnly.xml

@@ -18,8 +18,10 @@
     <component displayname="Microsoft-Windows-AppX-Deployment-Server" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/Microsoft-Windows-AppX-Deployment-Server/settings"/>
     <component displayname="DiagTrack" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/DiagTrack/settings"/>
     <component displayname="Microsoft-OneCore-Bluetooth-Gatt" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/Microsoft-OneCore-Bluetooth-Gatt/settings"/>
+    <component displayname="Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer/Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer/settings"/>
     <component displayname="Microsoft-Windows-BrokerInfrastructure" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/microsoft-windows-brokerinfrastructure/microsoft-windows-brokerinfrastructure/settings"/>
     <component displayname="Microsoft-Windows-Security-NGC-PopKeySrv" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/microsoft-windows-security-ngc-popkeysrv/microsoft-windows-security-ngc-popkeysrv/settings"/>
+    <component displayname="Microsoft-Windows-WBioSrvc" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/Microsoft-Windows-WBioSrvc/Microsoft-Windows-WBioSrvc/settings"/>
   </WindowsComponents>
   <Policies>
     <ErrorControl>

tools/amd64/ReplacementManifests/International-Core-replacement.man

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes'?>
 
-<!-- replacement manifest for Vista, the original did not include the system default user keys -->
+<!-- replacement manifest for RS5, the original did not include the system default user keys -->
 <assembly
     xmlns="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -16,9 +16,8 @@
       />
   <migration
       scope="Upgrade,MigWiz,USMT"
-      replacementVersionRange="6.0-6.1"
       replacementSettingsVersionRange="0"
-      settingsVersion="0"
+      settingsVersion="1"
       >
     <machineSpecific>
       <migXml xmlns="">
@@ -36,7 +35,9 @@
               <!-- Custom keyboard layouts -->
               <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a* [*]</pattern>
               <!-- .Default settings -->
-              <pattern type="Registry">HKU\.Default\Control Panel\International\* [*]</pattern>
+              <!-- These are needed by lock screen and need better refactoring to comply with https://osgwiki.com/wiki/State_Separation#Compositional_State_Separation -->
+              <pattern type="Registry">HKU\.Default\Control Panel\International\User Profile\* [*]</pattern>
+              <pattern type="Registry">HKU\.Default\Control Panel\International\User Profile System Backup\* [*]</pattern>
             </objectSet>
           </include>
           <merge script="MigXmlHelper.SourcePriority()">
@@ -51,7 +52,9 @@
               <!-- Custom keyboard layouts -->
               <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a* [*]</pattern>
               <!-- .Default settings -->
-              <pattern type="Registry">HKU\.Default\Control Panel\International\* [*]</pattern>
+              <!-- These are needed by lock screen and need better refactoring to comply with https://osgwiki.com/wiki/State_Separation#Compositional_State_Separation -->
+              <pattern type="Registry">HKU\.Default\Control Panel\International\User Profile\* [*]</pattern>
+              <pattern type="Registry">HKU\.Default\Control Panel\International\User Profile System Backup\* [*]</pattern>
             </objectSet>
           </merge>
         </rules>
@@ -64,8 +67,10 @@
           <objectSet>
             <!-- Migrate custom locale files -->
             <pattern type="File">%windir%\Globalization [*.NLP]</pattern>
+            <pattern type="File">%windir%\Globalization [*.NLX]</pattern>
             <!-- Migrate custom locale reg keys -->
             <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CustomLocale\* [*]</pattern>
+            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\ExtendedLocale\* [*]</pattern>
           </objectSet>
         </include>
         <merge script="MigXmlHelper.SourcePriority()">
@@ -90,61 +95,6 @@
         </merge>
       </rules>
     </migXml>
-    <supportedComponents>
-      <supportedComponent>
-        <supportedComponentIdentity
-            buildFilter=""
-            buildType="$(build.buildType)"
-            language="neutral"
-            name="Microsoft-Windows-International-Core"
-            processorArchitecture="*"
-            publicKeyToken="$(Build.WindowsPublicKeyToken)"
-            settingsVersionRange="0"
-            type=""
-            versionScope="nonSxS"
-            />
-        <machineSpecific>
-          <migXml xmlns="">
-            <rules context="System">
-              <merge script="MigXmlHelper.SourcePriority()">
-                <objectSet>
-                  <!-- Locales -->
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\Language [Default]</pattern>
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\Locale [(Default)]</pattern>
-                  <!-- Codepages -->
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CodePage [ACP]</pattern>
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CodePage [OEMCP]</pattern>
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CodePage [MACCP]</pattern>
-                  <!-- Custom keyboard layouts -->
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a* [*]</pattern>
-                  <!-- .Default settings -->
-                  <pattern type="Registry">HKU\.Default\Control Panel\International\* [*]</pattern>
-                </objectSet>
-              </merge>
-            </rules>
-          </migXml>
-        </machineSpecific>
-        <migXml xmlns="">
-          <rules context="System">
-            <merge script="MigXmlHelper.SourcePriority()">
-              <objectSet>
-                <!-- Migrate custom locale files -->
-                <pattern type="File">%windir%\Globalization [*.NLP]</pattern>
-                <!-- Migrate custom locale reg keys -->
-                <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CustomLocale\* [*]</pattern>
-              </objectSet>
-            </merge>
-          </rules>
-          <rules context="User">
-            <merge script="MigXmlHelper.SourcePriority()">
-              <objectSet>
-                <pattern type="Registry">HKCU\Control Panel\International\* [*]</pattern>
-              </objectSet>
-            </merge>
-          </rules>
-        </migXml>
-      </supportedComponent>
-    </supportedComponents>
     <migrationDisplayID>Date_Time_Language_and_Region\Regional_Language_Options</migrationDisplayID>
   </migration>
 </assembly>

tools/amd64/ReplacementManifests/TerminalServices-RDP-WinStationExtensions-Replacement.man

@@ -31,12 +31,9 @@
             <!--
                 Ignore values under WinStations key
                 as ConsoleSecurity and DefaultSecurity are created through 'Microsoft-Windows-TerminalServices-LocalSessionManager' assembly
-                and SelfSignedCertificate and SelfSignedCertStore are created programmatically.
             -->
             <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations [ConsoleSecurity]</pattern>
             <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations [DefaultSecurity]</pattern>
-            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations [SelfSignedCertificate]</pattern>
-            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations [SelfSignedCertStore]</pattern>
             <!--
                 EH-Tcp is created through 'Microsoft-Windows-ehome-devices-McrMgr' assembly.
             -->

tools/amd64/ReplacementManifests/profsvcReplacement.man

@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes'?>
+<assembly
+    xmlns="urn:schemas-microsoft-com:asm.v3"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    manifestVersion="1.0"
+    >
+  <assemblyIdentity
+      language="neutral"
+      name="Microsoft-Windows-Profsvc"
+      processorArchitecture="*"
+      version="0.0.0.0"
+      />
+  <migration
+      scope="Upgrade,MigWiz,USMT"
+      settingsVersion="1"
+      replacementSettingsVersionRange="0"
+	  alwaysProcess="yes"
+      >
+    <migXml xmlns="">
+      <rules context="System">
+        <include>
+          <objectSet>
+            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Services\Profsvc\Parameters [UseProfilePathExtensionVersion]</pattern>
+            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Services\Profsvc\Parameters [UseProfilePathMinorExtensionVersion]</pattern>
+          </objectSet>
+        </include>
+      </rules>
+    </migXml>
+  </migration>
+</assembly>

tools/amd64/ReplacementManifests/shmig-replacement.man

@@ -14,10 +14,12 @@
       versionScope="nonSxS"
       />
   <!-- The replacement manifest will allow this _new_ gather plugin to run in the Old OS -->
+  <!-- The settingsVersion below should be the same as in shmig.man -->
+  <!-- replacementSettingsVersionRange should be 0 to settingsVersion minus 1 -->
   <migration
-      replacementSettingsVersionRange="0-1"
+      replacementSettingsVersionRange="0-4"
       scope="Upgrade,MigWiz,USMT"
-      settingsVersion="2"
+      settingsVersion="5"
       >
     <machineSpecific>
       <migXml xmlns="">
@@ -31,6 +33,12 @@
             <objectSet>
               <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\PropertySystem\PropertySchema\* [*]</pattern>
               <pattern type="Registry">HKLM\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\PropertySystem\PropertySchema\* [*]</pattern>
+              <!-- Migrate Desktop NamespaceRestrictionHelper keys used in EDU SharedPC scenarios -->
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\AllowedEnumeration\* [*]</pattern>
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\AllowedNavigation\* [*]</pattern>
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\TWinUI\FilePicker [OverrideDefaultLocation]</pattern>
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32 [OverrideDefaultLocation]</pattern>
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced [LaunchTo]</pattern>
             </objectSet>
           </include>
         </rules>
@@ -40,6 +48,7 @@
       <plugin
           classId="{050ed09e-a530-41e6-8ac9-a9a96e74a2c1}"
           file="Microsoft-Windows-shmig\shmig.dll"
+          offlineApply="yes"
           />
     </migXml>
   </migration>

tools/amd64/ReplacementManifests/win32k-settings-repl.man

@@ -74,6 +74,7 @@
             <pattern type="Registry">HKLM\SOFTWARE\Microsoft\Palm [*]</pattern>
             <!-- Pen/touch settings -->
             <pattern type="Registry">HKLM\SOFTWARE\\System\CurrentControlSet\Control\TabletPC\* [*]</pattern>
+            <pattern type="Registry">HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Pen\* [*]</pattern>
           </objectSet>
         </include>
         <exclude>
@@ -104,8 +105,11 @@
             <pattern type="Registry">HKCU\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows [MenuDropAlignment]</pattern>
             <!-- Pen/touch settings -->
             <pattern type="Registry">HKCU\Software\Microsoft\Wisp\* [*]</pattern>
+            <pattern type="Registry">HKCU\Software\Microsoft\Windows NT\CurrentVersion\Windows\Pen\* [*]</pattern>
             <!-- Precision touch pad settings -->
             <pattern type="Registry">HKCU\Software\Microsoft\Windows\CurrentVersion\PrecisionTouchPad\* [*]</pattern>
+            <!-- Pen interaction model setting -->
+            <pattern type="Registry">HKCU\Software\Microsoft\Windows\CurrentVersion\Pen [LegacyPenInteractionModel]</pattern>
           </objectSet>
         </include>
         <!-- Prune out some Console-related registry settings that we want to override on upgrade from pre-Win10 OS's -->

tools/amd64/SFPATRS1.INF

@@ -1243,6 +1243,8 @@
 "[microsoft.powershell.workflow.servicecore.resources, version=3.0.*]"
 "[microsoft.powershell.workflow.servicecore.resources, version=6.4.*]"
 "[microsoft.powershell.workflow.servicecore.resources, version=10.0.*]"
+"[microsoft.processmitigations.commands, version=10.0.*]"
+"[microsoft.processmitigations.commands.resources, version=10.0.*]"
 "[microsoft.rightsmanagementservices.admin, version=6.4.*]"
 "[microsoft.rightsmanagementservices.admin, version=10.0.*]"
 "[microsoft.rightsmanagementservices.admingui, version=6.4.*]"

tools/amd64/loadstate.log

@@ -1,131 +0,0 @@
-2019-08-13 22:53:51, Info                  [0x000000] LOADSTATE.EXE Version 10.0.17763
-2019-08-13 22:53:51, Info                  [0x000000] USMT Started at 2019/08/13:22:53:51.286
-2019-08-13 22:53:51, Info                  [0x000000] Command line: E:\usmt\tools\amd64\loadstate.exe /?
-2019-08-13 22:53:51, Info                  [0x000000] 
-LoadState.exe restores files and settings collected by ScanState.exe. You must
-specify the same .xml files on both the ScanState and LoadState command-lines.
-
-Syntax: loadstate <StorePath> [options]
-
-  StorePath             Indicates the path where the LoadState tool can find
-                        the files and settings saved by the ScanState tool.
-
-  /auto[:ScriptDir]     Calls migapp.xml, migdocs.xml, and sets logging to v:13.
-                        Use ScriptDir to specify the location of migapp.xml and
-                        migdocs.xml if they are not in the same directory as
-                        the LoadState executable.
-
-  /lac[:Password]       Creates disabled local accounts if they do not already
-                        exist on the destination computer. The password
-                        parameter is the password for the created accounts.
-                        The default is an empty password.
-
-  /lae                  Enables local accounts created by the /lac option.
-                        You must also specify the /lac option.
-
-  /mu:[OldDomain\]OldUserName:[NewDomain\]NewUserName
-
-                        Specifies a new user name. For local users, specify
-                        the OldUserName and NewUserName. Wildcard characters
-                        are not allowed.
-
-  /md:OldDomain:NewDomain
-
-                        Specifies a new domain for the users. The OldDomain
-                        can contain wildcard characters (* or ?).
-
-  /decrypt:AES|AES_128|AES_192|AES_256|3DES|3DES_112
-
-                        Specifies that the migration store is encrypted and
-                        needs to be decrypted. You must also specify the
-                        /key or /keyfile options. Optionally you can specify
-                        the cryptographic algorithm that was used to encrypt
-                        the store. Default value is 3DES.
-
-  /hardlink             Enables hardlinks for a non-compressed store. Use only
-                        for computer refresh scenarios. Requires /nocompress.
-
-  /key:KeyString        Specifies the encryption key.
-
-  /keyfile:FileName     Specifies the location and name of a .txt file that
-                        contains the encryption key.
-
-  /nocompress           Specifies that the migration store is not compressed.
-
-  /ppkg                 Specifies that the migration store is a provisioning
-                        package. Can't be used with /nocompress, /hardlink or /p.
-
-  /drivers[:<options>]  Specifies that USMT should migrate 3rd party drivers.
-                        By default all drivers are migrated. <options> can be
-                        used to select drivers to migrate. They are of the form
-                        +n:<pattern>, -n:<pattern>, +p:<pattern>, -p:<pattern>,
-                        +c:<pattern>, -c:<pattern>, where +-n can filter the
-                        migrated driver by the name of the INF file, +-p can filter
-                        them by publisher and +-c by class name or class GUID.
-                        Multiple /drivers are allowed, The last pattern matching
-                        a particular driver wins. /drivers must be used with /ppkg.
-
-  /l:FileName           Specifies the location and name of the log file.
-
-  /v:Level              Enables verbose output in the log file. Specify one
-                        of the following levels: 0, 1, 4, 5, 8, 9, 12, or 13.
-                        The default verbosity level is 0.
-
-  /progress:FileName    Specifies the location and name of the optional
-                        progress log file.
-
-  /c                    Specifies that the ScanState command continues to run
-                        even if there are non-fatal errors.
-
-  /r:TimesToRetry       Specifies the number of times to retry when an error
-                        occurs. The default value is 3 attempts.
-
-  /w:SecondsToWait      Specifies the time to wait, in seconds, before retrying
-                        a failed attempt. Default value is 1 second.
-
-  /ui:[Domain\]UserName Migrates the specified users. To migrate a local user,
-                        specify the UserName parameter only. The Domain and
-                        UserName parameters can contain wildcard characters
-                        (* or ?).
-
-  /ue:[Domain\]UserName Excludes the specified users. To exclude a local user,
-                        specify the UserName parameter only. The Domain and
-                        UserName parameters can contain wildcard characters
-                        (* or ?).
-
-  /uel:NumberOfDays|YYYY/MM/DD
-
-                        Specifies that the migration should exclude users that
-                        have not logged on within the specified time period.
-                        The NumberOfDays parameter can be 0 to exclude all
-                        users who were not logged on.
-
-  /i:FileName           Specifies the location and name of an .xml file that
-                        contains rules that define the settings and files
-                        to migrate.
-
-  /help or /?           Displays Help at the command line.
-
-  /config:FileName      Specifies the Config.xml file that USMT should use.
-
-  /sf                   Restores shell folder redirection.
-
-  /tel:[ON|OFF]         Turns on or off USMT telemetry. If on, the tool will send
-                        data about its usage to Microsoft.
-                        Telemetry is currently ON by default.
-
-
-Notes:
-
-  * For more information about these options, see the USMT User's Guide
-    (https://go.microsoft.com/fwlink/?LinkId=213336).
-  * You can specify the /i, /ui, /ue, and /uel options more than once
-    if necessary.
-  * You cannot specify the /key and /keyfile options together.
-  * You cannot specify the /decrypt and /nocompress options together.
-  * You cannot specify the /decrypt and /ppkg options together.
-  * You can specify the /md and /mu options more than once if necessary.
-
-[gle=0x00000002]
-2019-08-13 22:53:51, Info                  [0x000000] USMT Completed at 2019/08/13:22:53:51.489[gle=0x00000002]
-2019-08-13 22:53:51, Info                  [0x000000] ----------------------------------- USMT ERROR SUMMARY -----------------------------------[gle=0x00000002]

tools/amd64/scanstate.log

@@ -1,204 +0,0 @@
-2019-08-13 22:55:07, Info                  [0x000000] SCANSTATE.EXE
-2019-08-13 22:55:07, Info                  [0x000000] USMT Started at 2019/08/13:22:55:07.541
-2019-08-13 22:55:07, Info                  [0x000000] Command line: E:\usmt\tools\amd64\scanstate.exe /?
-2019-08-13 22:55:07, Info                  [0x000000] 
-ScanState.exe collects files and settings into a migration store to be restored
-using LoadState.exe. You must specify the same .xml files on both the
-ScanState and LoadState command-lines.
-
-Syntax: scanstate <StorePath> [Options]
-
-  StorePath             Path where Scanstate saves the files and settings.
-                        StorePath is the path to the upper level directory,
-                        not the migration file.
-                        For example, if you specify scanstate C:\store,
-                        the resulting StorePath is C:\store\usmt\usmt.mig.
-                        Do not specify the full path on the Scanstate.exe
-                        command-line, or the migration will fail.
-
-  /auto[:ScriptDir]     Calls migapp.xml, migdocs.xml, and sets logging to v:13
-                        Use ScriptDir to specify the location of migapp.xml and
-                        migdocs.xml if they are not in the same directory as
-                        the ScanState executable.
-
-  /targetWindows7       Optimizes ScanState when the destination computer is
-                        running Windows 7. You should use this option with
-                        /genconfig and when you create a store.
-
-  /targetWindows8       Optimizes ScanState when the destination computer is
-                        running Windows 8. You should use this option with
-                        /genconfig and when you create a store.
-
-  /genconfig:filename   Generates a Config.xml file. You cannot specify the
-                        <StorePath> parameter.
-                        Options you can specify are /o, /i, /v, and /l.
-
-  /genmigxml:filename   Generates a Mig.xml file containing patterns for
-                        data selection. You cannot specify the <StorePath>
-                        parameter.
-                        The only options that you can specify are /v and /l.
-
-  /o                    Overwrites any existing migration store.
-
-  /p:filename           Generates a space-estimate file.
-                        This option does not collect the user state.
-
-  /localonly            Specifies that only files that are stored on the local
-                        computer will be saved.
-
-  /efs:abort|skip|decryptcopy|copyraw|hardlink
-                        Controls the behavior of ScanState when Encrypting
-                        File System (EFS) files are encountered.
-                        Abort: Fails if EFS files are found.
-                        Skip: Ignores all EFS files and continues.
-                        Decryptcopy:
-                          Decrypts and copies files if possible.
-                          Fails if the files cannot be decrypted.
-                        Copyraw: Copies encrypted EFS files.
-                        Hardlink:
-                          Makes a hardlink to the EFS file.
-                          Use only with the /hardlink option.
-
-  /encrypt:AES|AES_128|AES_192|AES_256|3DES|3DES_112
-                        Encrypts the migration store using the specified
-                        cryptographic algorithm. Default value is 3DES.
-                        You must also specify the /key or /keyfile option.
-
-  /hardlink             Enables hardlinks for a non-compressed store. Use only
-                        for computer refresh scenarios. Requires /nocompress.
-
-  /key:KeyString        Specifies the encryption key.
-
-  /keyfile:FileName     Specifies the location and name of a .txt file
-                        containing the encryption key.
-
-  /nocompress           Specifies that the migration store is not compressed.
-
-  /ppkg                 Specifies that the migration store is a provisioning
-                        package. This option cannot be used with /nocompress,
-                        /hardlink or /p.
-
-  /drivers[:<options>]  Specifies that USMT should migrate 3rd party drivers.
-                        By default all drivers are migrated. <options> can be
-                        used to select drivers to migrate. They are of the form
-                        +n:<pattern>, -n:<pattern>, +p:<pattern>, -p:<pattern>,
-                        +c:<pattern>, -c:<pattern>, where +-n can filter the
-                        migrated driver by the name of the INF file, +-p can
-                        filter them by publisher and +-c by class name or class
-                        GUID. Multiple /drivers are allowed, The last pattern
-                        matching a particular driver wins.
-                        /drivers must be used with /ppkg.
-
-  /apps[:<options>]     Specifies that USMT should capture the customization of
-                        the current operating system. This consists of Win32
-                        applications, system-wide settings, and any other files
-                        that are not part of the operating system. No modern
-                        apps and no user state will be captured.
-                        A provisioning package captured this way can only be
-                        consumed during the process of deploying a new OS, it
-                        cannot be used with Loadstate
-                        <options> can be a ';' separated list of the following:
-                        +/-sysdrive - causes the /apps switch to examine the
-                        entire system drive for applications and other files,
-                        or be confined to the windows folders only
-                        +sysdrive is the default.
-                        +/-oeminfo - causes the /apps switch to capture or not
-                        the OEM specific help and support information.
-                        +oeminfo is the default.
-                        +/-appfiles - causes the /apps switch to capture or not
-                        the actual payload of applications. -appfiles is useful
-                        when one wants to capture only the system settings on a
-                        computer where applications were already captured.
-                        +appfiles is the default.
-                        /apps must be used with /ppkg unless /genconfig is used.
-                        /apps cannot be used with any /target switches.
-
-
-  /diff:FileName        Specifies the full path to a provisioning package that
-                        was previously captured using /apps on this system. The
-                        current run will use that previously captured package
-                        to determine objects that have already been captured in
-                        a previous run and should not be captured again.
-                        When using the /diff switch please make sure that the
-                        provisioning package specified by /diff is also applied
-                        together with the one currently being captured.
-                        /diff can only be used with /apps.
-
-  /l:FileName           Specifies the location and name of the log file.
-
-  /v:Level              Enables verbose output in the log file. Specify one
-                        of the following levels: 0, 1, 4, 5, 8, 9, 12, or 13.
-                        The default verbosity level is 0.
-
-  /progress:FileName    Specifies the location and name of the optional
-                        progress log file.
-
-  /c                    Specifies that the ScanState command continues to run
-                        even if there are non-fatal errors.
-
-  /r:TimesToRetry       Specifies the number of times to retry when an error
-                        occurs. The default value is 3 attempts.
-
-  /w:SecondsToWait      Specifies the time to wait, in seconds, before retrying
-                        a failed attempt. Default value is 1 second.
-
-  /ui:[Domain\]UserName Migrates the specified users. To migrate a local user,
-                        specify the UserName parameter only. The Domain and
-                        UserName parameters can contain wildcard characters
-                        (* or ?).
-
-  /ue:[Domain\]UserName Excludes the specified users. To exclude a local user,
-                        specify the UserName parameter only. The Domain and
-                        UserName parameters can contain wildcard characters
-                        (* or ?).
-
-  /uel:NumberOfDays|YYYY/MM/DD
-                        Specifies that the migration should exclude users that
-                        have not logged on within the specified time period.
-                        The NumberOfDays parameter can be 0 to exclude all
-                        users who are not currently logged on.
-
-  /i:FileName           Specifies the location and name of an .xml file that
-                        contains rules that define the settings and files
-                        to migrate.
-
-  /help or /?           Displays help at the command line.
-
-  /config:FileName      Specifies the Config.xml file that USMT should use.
-
-  /offlineWinDir:WinDir Specifies the path to the offline windows directory
-                        that USMT should use to gather user state.
-
-  /offlineWinOld:WinDir Specifies the path to the offline windows old directory
-                        that USMT should use to gather user state.
-
-  /offline:FileName     Specifies the Offline.xml file that USMT should use
-                        to gather user state.
-                        Note: This is an alternative to /offlineWinDir or
-                        /offlineWinOld
-
-  /vsc:OFF              Turns off volume shadow copy when a file is in use.
-                        For compatibility reasons /vsc is still supported, but
-                        volume shadow copy is now turned on by default.
-                        Specify /vsc:OFF to turn it off explicitly
-
-  /tel:ON|OFF           Turns on or off telemetry. If on, the tool will send
-                        data about USMT usage to Microsoft.
-                        Telemetry is currently ON by default.
-
-  /listfiles:FileName   Specifies the location and name of a file which will
-                        contain a list of all files gathered.
-
-Notes:
-
-  * For more information about these options, see the USMT User's Guide
-    (https://go.microsoft.com/fwlink/?LinkId=213336).
-  * You can specify the /i, /ui, /ue and /uel options more than once
-    if necessary.
-  * You cannot specify the /key and /keyfile options together.
-  * You cannot specify the /encrypt and /nocompress options together.
-  * You cannot specify the /encrypt and /ppkg options together.
-
-[gle=0x00000002]
-2019-08-13 22:55:07, Info                  [0x000000] USMT Completed at 2019/08/13:22:55:07.570[gle=0x00000002]
-2019-08-13 22:55:07, Info                  [0x000000] ----------------------------------- USMT ERROR SUMMARY -----------------------------------[gle=0x00000002]

tools/backup.bat

@@ -3,11 +3,32 @@ setlocal
 title Backup User Accounts on %COMPUTERNAME%
 color 0e
 
+rem --- Prompt for offline backup
+:prompt-offline
+cls
+echo.
+set OFFLINE_BACKUP=n
+set /p OFFLINE_BACKUP=Run offline? (y/n) [n]:
+if [%OFFLINE_BACKUP%]==[y] goto set-offline
+if [%OFFLINE_BACKUP%]==[Y] goto set-offline
+if [%OFFLINE_BACKUP%]==[n] goto set-online
+if [%OFFLINE_BACKUP%]==[N] goto set-online
+goto prompt-offline
+
+:set-offline
+echo.
+set /p OFFLINE_WIN_DIR=Enter the path to the Windows directory: 
+set OFFLINE=/offlineWinDir:%OFFLINE_WIN_DIR%
+goto prompt-backup-type
+
+:set-online
+set OFFLINE=""
+
 :prompt-backup-type
 cls
 echo.
 set BACKUP_TYPE=y
-set /p BACKUP_TYPE=Backup all users (y/n): 
+set /p BACKUP_TYPE=Backup all users? (y/n) [y]: 
 if [%BACKUP_TYPE%]==[y] goto set-all-users
 if [%BACKUP_TYPE%]==[Y] goto set-all-users
 if [%BACKUP_TYPE%]==[n] goto get-domain
@@ -20,8 +41,7 @@ set USMT_STORE=%~dp0..\usmt_store\%COMPUTERNAME%
 
 rem --- Set the command line args for performing the migration
 set SCANSTATE_USERS=/ue:*\Administrator /ue:*\ekadmin
-set SCANSTATE_XML=/i:"%USMT_STORE%\config\MigUser.xml" /i:"%USMT_STORE%\config\MigDocSystem.xml" /i:"%USMT_STORE%\config\MigCustom.xml"
+set SCANSTATE_XML=/i:"%USMT_STORE%\config\MigUser.xml" /i:"%USMT_STORE%\config\MigDocSystem.xml" /i:"%USMT_STORE%\config\MigCustom.xml" %OFFLINE%
-
 goto start
 
 rem --- Get domain to backup
@@ -46,7 +66,7 @@ set USMT_STORE=%~dp0..\usmt_store\%COMPUTERNAME%_%BACKUP_USER%
 
 rem --- Set the command line args for performing the migration
 set SCANSTATE_USERS=/ue:* /ui:%BACKUP_DOMAIN%\%BACKUP_USER%
-set SCANSTATE_XML=/i:"%USMT_STORE%\config\MigUser.xml" /i:"%USMT_STORE%\config\MigCustom.xml"
+set SCANSTATE_XML=/i:"%USMT_STORE%\config\MigUser.xml" /i:"%USMT_STORE%\config\MigCustom.xml" %OFFLINE%
 
 :start
 cls

tools/config/MigUser.xml

@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<migration urlid="http://www.microsoft.com/migration/1.0/migxmlext/miguser">
+
+    <_locDefinition>
+     <_locDefault _loc="locNone"/>
+     <_locTag _loc="locData">displayName</_locTag>
+    </_locDefinition>
+
+    <!-- This component migrates My Video files -->
+    <component type="Documents" context="User">
+        <displayName _locID="miguser.myvideo">My Video</displayName>
+        <paths>
+            <path type="File">%CSIDL_MYVIDEO%</path>
+        </paths>
+        <role role="Data">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_MYVIDEO%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_MYVIDEO%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_MYVIDEO% [desktop.ini]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Shared Video files -->
+    <component type="Documents" context="System">
+        <displayName _locID="miguser.sharedvideo">Shared Video</displayName>
+        <paths>
+            <path type="File">%CSIDL_COMMON_VIDEO%</path>
+        </paths>
+        <role role="Data">
+            <detects>
+                 <detect>
+                     <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_COMMON_VIDEO%")</condition>
+                 </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_VIDEO%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_VIDEO% [desktop.ini]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates My Music files -->
+    <component type="Documents" context="User">
+        <displayName _locID="miguser.mymusic">My Music</displayName>
+        <paths>
+            <path type="File">%CSIDL_MYMUSIC%</path>
+        </paths>
+        <role role="Data">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_MYMUSIC%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_MYMUSIC%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_MYMUSIC%\ [desktop.ini]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Shared Music files -->
+    <component type="Documents" context="System">
+        <displayName _locID="miguser.sharedmusic">Shared Music</displayName>
+        <paths>
+            <path type="File">%CSIDL_COMMON_MUSIC%</path>
+        </paths>
+        <role role="Data">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_COMMON_MUSIC%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_MUSIC%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_MUSIC%\ [desktop.ini]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Desktop files -->
+    <component type="Documents" context="User">
+        <displayName _locID="miguser.desktop">Desktop</displayName>
+        <paths>
+            <path type="File">%CSIDL_DESKTOP%</path>
+        </paths>
+        <role role="Settings">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_DESKTOP%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_DESKTOP%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_DESKTOP% [desktop.ini]</pattern>
+                        <pattern type="File">%CSIDL_DESKTOP%\* [*]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Shared Desktop files -->
+    <component type="Documents" context="System">
+        <displayName _locID="miguser.shareddesktop">Shared Desktop</displayName>
+        <paths>
+            <path type="File">%CSIDL_COMMON_DESKTOPDIRECTORY%</path>
+        </paths>
+        <role role="Settings">
+            <detects>
+                 <detect>
+                     <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_COMMON_DESKTOPDIRECTORY%")</condition>
+                 </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_DESKTOPDIRECTORY%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_DESKTOPDIRECTORY% [desktop.ini]</pattern>
+                        <pattern type="File">%CSIDL_COMMON_DESKTOPDIRECTORY%\* [*]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Start Menu files -->
+    <component type="System" context="User">
+        <displayName _locID="miguser.startmenu">Start Menu</displayName>
+        <paths>
+            <path type="File">%CSIDL_STARTMENU%</path>
+        </paths>
+        <role role="Settings">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_STARTMENU%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_STARTMENU%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_STARTMENU% [desktop.ini]</pattern>
+                        <pattern type="File">%CSIDL_STARTMENU%\* [*]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Shared Start Menu files -->
+    <component type ="System" context="System">
+        <displayName _locID="miguser.sharedstartmenu">Shared Start Menu</displayName>
+        <paths>
+            <path type="File">%CSIDL_COMMON_STARTMENU%</path>
+        </paths>
+        <role role="Settings">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_COMMON_STARTMENU%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_STARTMENU%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_STARTMENU% [desktop.ini]</pattern>
+                        <pattern type="File">%CSIDL_COMMON_STARTMENU%\* [*]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates My Documents files -->
+    <component type="Documents" context="User">
+        <displayName _locID="miguser.mydocs">My Documents</displayName>
+        <paths>
+            <path type="File">%CSIDL_PERSONAL%</path>
+        </paths>
+        <role role="Data">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_PERSONAL%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <exclude>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_MYMUSIC%\* [*]</pattern>
+                        <pattern type="File">%CSIDL_MYPICTURES%\* [*]</pattern>
+                        <pattern type="File">%CSIDL_MYVIDEO%\* [*]</pattern>
+                    </objectSet>
+                </exclude>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_PERSONAL%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_PERSONAL% [desktop.ini]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Shared My Documents files -->
+    <component type="Documents" context="System">
+        <displayName _locID="miguser.shareddocs">Shared Documents</displayName>
+        <paths>
+            <path type="File">%CSIDL_COMMON_DOCUMENTS%</path>
+        </paths>
+        <role role="Data">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_COMMON_DOCUMENTS%")</condition>
+                </detect>
+                <detect>
+                    <condition negation="Yes">MigXmlHelper.IsSameObject("File","%CSIDL_PERSONAL%", "%CSIDL_COMMON_DOCUMENTS%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <exclude>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_PICTURES%\* [*]</pattern>
+                        <pattern type="File">%CSIDL_COMMON_MUSIC%\* [*]</pattern>
+                        <pattern type="File">%CSIDL_COMMON_VIDEO%\* [*]</pattern>
+                    </objectSet>
+                </exclude>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_DOCUMENTS%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_DOCUMENTS% [desktop.ini]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates My Pictures files -->
+    <component type="Documents" context="User">
+        <displayName _locID="miguser.mypics">My Pictures</displayName>
+        <paths>
+            <path type="File">%CSIDL_MYPICTURES%</path>
+        </paths>
+        <role role="Data">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_MYPICTURES%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_MYPICTURES%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_MYPICTURES% [desktop.ini]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Shared Pictures files -->
+    <component type="Documents" context="System">
+        <displayName _locID="miguser.sharedpics">Shared Pictures</displayName>
+        <paths>
+            <path type="File">%CSIDL_COMMON_PICTURES%</path>
+        </paths>
+        <role role="Data">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_COMMON_PICTURES%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_PICTURES%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_PICTURES% [desktop.ini]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Favorites -->
+    <component type="System" context="User">
+        <displayName _locID="miguser.favs">Favorites</displayName>
+        <paths>
+            <path type="File">%CSIDL_FAVORITES%</path>
+        </paths>
+        <role role="Settings">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_FAVORITES%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_FAVORITES%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_FAVORITES% [desktop.ini]</pattern>
+                        <pattern type="File">%CSIDL_FAVORITES%\* [*]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Shared Favorites -->
+    <component type="System" context="System">
+        <displayName _locID="miguser.sharedfavs">Shared Favorites</displayName>
+        <paths>
+            <path type="File">%CSIDL_COMMON_FAVORITES%</path>
+        </paths>
+        <role role="Settings">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_COMMON_FAVORITES%")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_FAVORITES%\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_COMMON_FAVORITES% [desktop.ini]</pattern>
+                        <pattern type="File">%CSIDL_COMMON_FAVORITES%\* [*]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates Quick Launch files -->
+    <component type="System" context="User">
+        <displayName _locID="miguser.quicklaunch">Quick Launch</displayName>
+        <paths>
+            <path type="File">%CSIDL_APPDATA%\Microsoft\Internet Explorer\Quick Launch</path>
+        </paths>
+        <role role="Settings">
+            <detects>
+                <detect>
+                    <condition>MigXmlHelper.DoesObjectExist("File","%CSIDL_APPDATA%\Microsoft\Internet Explorer\Quick Launch")</condition>
+                </detect>
+            </detects>
+            <rules>
+                <include filter='MigXmlHelper.IgnoreIrrelevantLinks()'>
+                    <objectSet>
+                        <pattern type="File">%CSIDL_APPDATA%\Microsoft\Internet Explorer\Quick Launch\* [*]</pattern>
+                    </objectSet>
+                </include>
+                <merge script="MigXmlHelper.DestinationPriority()">
+                    <objectSet>
+                        <pattern type="File">%CSIDL_APPDATA%\Microsoft\Internet Explorer\Quick Launch [desktop.ini]</pattern>
+                        <pattern type="File">%CSIDL_APPDATA%\Microsoft\Internet Explorer\Quick Launch\* [*]</pattern>
+                    </objectSet>
+                </merge>
+            </rules>
+        </role>
+    </component>
+
+    <!-- This component migrates user files with known extension-->
+    <component type="Documents" context="System">
+        <displayName _locID="miguser.userdata">User Data</displayName>
+        <role role="Data">
+            <rules>
+                <include>
+                    <objectSet>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.qdf]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.qsd]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.qel]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.qph]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.doc*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.dot*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.rtf]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.mcw]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wps]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.scd]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wri]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wpd]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.xl*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.csv]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.iqy]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.dqy]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.oqy]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.rqy]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wk*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wq1]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.slk]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.dif]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.ppt*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pps*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pot*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.sh3]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.ch3]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pre]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.ppa]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.txt]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pst]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.one*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.vl*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.vsd]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.mpp]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.or6]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.accdb]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.mdb]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pub]", "Fixed")</script>
+                    </objectSet>
+                </include>
+<!-- Uncomment the following if you want all the files collected from the above rules to move to <systemDrive>:\data -->
+<!--            
+                <locationModify script="MigXmlHelper.Move('%SYSTEMDRIVE%\Data')">
+                    <objectSet>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.qdf]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.qsd]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.qel]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.qph]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.doc*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.dot*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.rtf]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.mcw]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wps]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.scd]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wri]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wpd]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.xl*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.csv]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.iqy]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.dqy]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.oqy]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.rqy]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wk*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.wq1]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.slk]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.dif]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.ppt*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pps*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pot*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.sh3]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.ch3]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pre]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.ppa]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.txt]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pst]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.one*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.vl*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.vsd]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.mpp]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.or6]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.accdb]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.mdb]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("* [*.pub]", "Fixed")</script>
+                    </objectSet>
+                </locationModify>
+-->
+                <exclude>
+                    <objectSet>
+                        <pattern type="File">%PROFILESFOLDER%\* [*]</pattern>
+                        <pattern type="File">%CSIDL_WINDOWS%\* [*]</pattern>
+                        <pattern type="File">%CSIDL_PROGRAM_FILES%\* [*]</pattern>
+                        <!--We are trying to remove system files from other windows installation on the same machine-->
+                        <!--This is the best guess we can come up with, in case of these folder name localized, we might not be
+                         to do whatever we have intended here-->
+                        <script>MigXmlHelper.GenerateDrivePatterns ("\Program Files\* [*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("\Winnt\* [*]", "Fixed")</script>
+                        <script>MigXmlHelper.GenerateDrivePatterns ("\Windows\* [*]", "Fixed")</script>
+                    </objectSet>
+                </exclude>
+            </rules>
+        </role>
+    </component>
+
+</migration>
+

tools/x86/Config_AppsAndSettings.xml

@@ -16,8 +16,10 @@
     <component displayname="Microsoft-Windows-AppX-Deployment-Server" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/Microsoft-Windows-AppX-Deployment-Server/settings"/>
     <component displayname="DiagTrack" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/DiagTrack/settings"/>
     <component displayname="Microsoft-OneCore-Bluetooth-Gatt" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/Microsoft-OneCore-Bluetooth-Gatt/settings"/>
+    <component displayname="Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer/Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer/settings"/>
     <component displayname="Microsoft-Windows-BrokerInfrastructure" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/microsoft-windows-brokerinfrastructure/microsoft-windows-brokerinfrastructure/settings"/>
     <component displayname="Microsoft-Windows-Security-NGC-PopKeySrv" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/microsoft-windows-security-ngc-popkeysrv/microsoft-windows-security-ngc-popkeysrv/settings"/>
+    <component displayname="Microsoft-Windows-WBioSrvc" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/Microsoft-Windows-WBioSrvc/Microsoft-Windows-WBioSrvc/settings"/>
   </WindowsComponents>
   <Policies>
     <ErrorControl>

tools/x86/Config_SettingsOnly.xml

@@ -18,8 +18,10 @@
     <component displayname="Microsoft-Windows-AppX-Deployment-Server" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/Microsoft-Windows-AppX-Deployment-Server/settings"/>
     <component displayname="DiagTrack" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/DiagTrack/settings"/>
     <component displayname="Microsoft-OneCore-Bluetooth-Gatt" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/offlineupgrade/Microsoft-OneCore-Bluetooth-Gatt/settings"/>
+    <component displayname="Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer/Microsoft-OneCore-LanguageOverlay-LanguageOverlayServer/settings"/>
     <component displayname="Microsoft-Windows-BrokerInfrastructure" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/microsoft-windows-brokerinfrastructure/microsoft-windows-brokerinfrastructure/settings"/>
     <component displayname="Microsoft-Windows-Security-NGC-PopKeySrv" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/microsoft-windows-security-ngc-popkeysrv/microsoft-windows-security-ngc-popkeysrv/settings"/>
+    <component displayname="Microsoft-Windows-WBioSrvc" migrate="no" ID="http://www.microsoft.com/migration/1.0/migxmlext/cmi/Microsoft-Windows-WBioSrvc/Microsoft-Windows-WBioSrvc/settings"/>
   </WindowsComponents>
   <Policies>
     <ErrorControl>

tools/x86/ReplacementManifests/International-Core-replacement.man

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes'?>
 
-<!-- replacement manifest for Vista, the original did not include the system default user keys -->
+<!-- replacement manifest for RS5, the original did not include the system default user keys -->
 <assembly
     xmlns="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -16,9 +16,8 @@
       />
   <migration
       scope="Upgrade,MigWiz,USMT"
-      replacementVersionRange="6.0-6.1"
       replacementSettingsVersionRange="0"
-      settingsVersion="0"
+      settingsVersion="1"
       >
     <machineSpecific>
       <migXml xmlns="">
@@ -36,7 +35,9 @@
               <!-- Custom keyboard layouts -->
               <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a* [*]</pattern>
               <!-- .Default settings -->
-              <pattern type="Registry">HKU\.Default\Control Panel\International\* [*]</pattern>
+              <!-- These are needed by lock screen and need better refactoring to comply with https://osgwiki.com/wiki/State_Separation#Compositional_State_Separation -->
+              <pattern type="Registry">HKU\.Default\Control Panel\International\User Profile\* [*]</pattern>
+              <pattern type="Registry">HKU\.Default\Control Panel\International\User Profile System Backup\* [*]</pattern>
             </objectSet>
           </include>
           <merge script="MigXmlHelper.SourcePriority()">
@@ -51,7 +52,9 @@
               <!-- Custom keyboard layouts -->
               <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a* [*]</pattern>
               <!-- .Default settings -->
-              <pattern type="Registry">HKU\.Default\Control Panel\International\* [*]</pattern>
+              <!-- These are needed by lock screen and need better refactoring to comply with https://osgwiki.com/wiki/State_Separation#Compositional_State_Separation -->
+              <pattern type="Registry">HKU\.Default\Control Panel\International\User Profile\* [*]</pattern>
+              <pattern type="Registry">HKU\.Default\Control Panel\International\User Profile System Backup\* [*]</pattern>
             </objectSet>
           </merge>
         </rules>
@@ -64,8 +67,10 @@
           <objectSet>
             <!-- Migrate custom locale files -->
             <pattern type="File">%windir%\Globalization [*.NLP]</pattern>
+            <pattern type="File">%windir%\Globalization [*.NLX]</pattern>
             <!-- Migrate custom locale reg keys -->
             <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CustomLocale\* [*]</pattern>
+            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\ExtendedLocale\* [*]</pattern>
           </objectSet>
         </include>
         <merge script="MigXmlHelper.SourcePriority()">
@@ -90,61 +95,6 @@
         </merge>
       </rules>
     </migXml>
-    <supportedComponents>
-      <supportedComponent>
-        <supportedComponentIdentity
-            buildFilter=""
-            buildType="$(build.buildType)"
-            language="neutral"
-            name="Microsoft-Windows-International-Core"
-            processorArchitecture="*"
-            publicKeyToken="$(Build.WindowsPublicKeyToken)"
-            settingsVersionRange="0"
-            type=""
-            versionScope="nonSxS"
-            />
-        <machineSpecific>
-          <migXml xmlns="">
-            <rules context="System">
-              <merge script="MigXmlHelper.SourcePriority()">
-                <objectSet>
-                  <!-- Locales -->
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\Language [Default]</pattern>
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\Locale [(Default)]</pattern>
-                  <!-- Codepages -->
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CodePage [ACP]</pattern>
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CodePage [OEMCP]</pattern>
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CodePage [MACCP]</pattern>
-                  <!-- Custom keyboard layouts -->
-                  <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a* [*]</pattern>
-                  <!-- .Default settings -->
-                  <pattern type="Registry">HKU\.Default\Control Panel\International\* [*]</pattern>
-                </objectSet>
-              </merge>
-            </rules>
-          </migXml>
-        </machineSpecific>
-        <migXml xmlns="">
-          <rules context="System">
-            <merge script="MigXmlHelper.SourcePriority()">
-              <objectSet>
-                <!-- Migrate custom locale files -->
-                <pattern type="File">%windir%\Globalization [*.NLP]</pattern>
-                <!-- Migrate custom locale reg keys -->
-                <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Nls\CustomLocale\* [*]</pattern>
-              </objectSet>
-            </merge>
-          </rules>
-          <rules context="User">
-            <merge script="MigXmlHelper.SourcePriority()">
-              <objectSet>
-                <pattern type="Registry">HKCU\Control Panel\International\* [*]</pattern>
-              </objectSet>
-            </merge>
-          </rules>
-        </migXml>
-      </supportedComponent>
-    </supportedComponents>
     <migrationDisplayID>Date_Time_Language_and_Region\Regional_Language_Options</migrationDisplayID>
   </migration>
 </assembly>

tools/x86/ReplacementManifests/TerminalServices-RDP-WinStationExtensions-Replacement.man

@@ -31,12 +31,9 @@
             <!--
                 Ignore values under WinStations key
                 as ConsoleSecurity and DefaultSecurity are created through 'Microsoft-Windows-TerminalServices-LocalSessionManager' assembly
-                and SelfSignedCertificate and SelfSignedCertStore are created programmatically.
             -->
             <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations [ConsoleSecurity]</pattern>
             <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations [DefaultSecurity]</pattern>
-            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations [SelfSignedCertificate]</pattern>
-            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations [SelfSignedCertStore]</pattern>
             <!--
                 EH-Tcp is created through 'Microsoft-Windows-ehome-devices-McrMgr' assembly.
             -->

tools/x86/ReplacementManifests/profsvcReplacement.man

@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes'?>
+<assembly
+    xmlns="urn:schemas-microsoft-com:asm.v3"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    manifestVersion="1.0"
+    >
+  <assemblyIdentity
+      language="neutral"
+      name="Microsoft-Windows-Profsvc"
+      processorArchitecture="*"
+      version="0.0.0.0"
+      />
+  <migration
+      scope="Upgrade,MigWiz,USMT"
+      settingsVersion="1"
+      replacementSettingsVersionRange="0"
+	  alwaysProcess="yes"
+      >
+    <migXml xmlns="">
+      <rules context="System">
+        <include>
+          <objectSet>
+            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Services\Profsvc\Parameters [UseProfilePathExtensionVersion]</pattern>
+            <pattern type="Registry">HKLM\SYSTEM\CurrentControlSet\Services\Profsvc\Parameters [UseProfilePathMinorExtensionVersion]</pattern>
+          </objectSet>
+        </include>
+      </rules>
+    </migXml>
+  </migration>
+</assembly>

tools/x86/ReplacementManifests/shmig-replacement.man

@@ -14,10 +14,12 @@
       versionScope="nonSxS"
       />
   <!-- The replacement manifest will allow this _new_ gather plugin to run in the Old OS -->
+  <!-- The settingsVersion below should be the same as in shmig.man -->
+  <!-- replacementSettingsVersionRange should be 0 to settingsVersion minus 1 -->
   <migration
-      replacementSettingsVersionRange="0-1"
+      replacementSettingsVersionRange="0-4"
       scope="Upgrade,MigWiz,USMT"
-      settingsVersion="2"
+      settingsVersion="5"
       >
     <machineSpecific>
       <migXml xmlns="">
@@ -31,6 +33,12 @@
             <objectSet>
               <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\PropertySystem\PropertySchema\* [*]</pattern>
               <pattern type="Registry">HKLM\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\PropertySystem\PropertySchema\* [*]</pattern>
+              <!-- Migrate Desktop NamespaceRestrictionHelper keys used in EDU SharedPC scenarios -->
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\AllowedEnumeration\* [*]</pattern>
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\AllowedNavigation\* [*]</pattern>
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\TWinUI\FilePicker [OverrideDefaultLocation]</pattern>
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32 [OverrideDefaultLocation]</pattern>
+              <pattern type="Registry">HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced [LaunchTo]</pattern>
             </objectSet>
           </include>
         </rules>
@@ -40,6 +48,7 @@
       <plugin
           classId="{050ed09e-a530-41e6-8ac9-a9a96e74a2c1}"
           file="Microsoft-Windows-shmig\shmig.dll"
+          offlineApply="yes"
           />
     </migXml>
   </migration>

tools/x86/ReplacementManifests/win32k-settings-repl.man

@@ -74,6 +74,7 @@
             <pattern type="Registry">HKLM\SOFTWARE\Microsoft\Palm [*]</pattern>
             <!-- Pen/touch settings -->
             <pattern type="Registry">HKLM\SOFTWARE\\System\CurrentControlSet\Control\TabletPC\* [*]</pattern>
+            <pattern type="Registry">HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Pen\* [*]</pattern>
           </objectSet>
         </include>
         <exclude>
@@ -104,8 +105,11 @@
             <pattern type="Registry">HKCU\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows [MenuDropAlignment]</pattern>
             <!-- Pen/touch settings -->
             <pattern type="Registry">HKCU\Software\Microsoft\Wisp\* [*]</pattern>
+            <pattern type="Registry">HKCU\Software\Microsoft\Windows NT\CurrentVersion\Windows\Pen\* [*]</pattern>
             <!-- Precision touch pad settings -->
             <pattern type="Registry">HKCU\Software\Microsoft\Windows\CurrentVersion\PrecisionTouchPad\* [*]</pattern>
+            <!-- Pen interaction model setting -->
+            <pattern type="Registry">HKCU\Software\Microsoft\Windows\CurrentVersion\Pen [LegacyPenInteractionModel]</pattern>
           </objectSet>
         </include>
         <!-- Prune out some Console-related registry settings that we want to override on upgrade from pre-Win10 OS's -->

tools/x86/SFPATRS1.INF

@@ -1243,6 +1243,8 @@
 "[microsoft.powershell.workflow.servicecore.resources, version=3.0.*]"
 "[microsoft.powershell.workflow.servicecore.resources, version=6.4.*]"
 "[microsoft.powershell.workflow.servicecore.resources, version=10.0.*]"
+"[microsoft.processmitigations.commands, version=10.0.*]"
+"[microsoft.processmitigations.commands.resources, version=10.0.*]"
 "[microsoft.rightsmanagementservices.admin, version=6.4.*]"
 "[microsoft.rightsmanagementservices.admin, version=10.0.*]"
 "[microsoft.rightsmanagementservices.admingui, version=6.4.*]"