This commit is contained in:
2020-05-29 23:54:35 -04:00
parent af3735c902
commit eff317f1f8
70 changed files with 674 additions and 261 deletions
@@ -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>
@@ -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.
-->
@@ -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>
@@ -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>
@@ -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 -->