diff --git a/Wrapper/Config/config_Windows_10.json b/Wrapper/Config/config_Windows_10.json index 16114bc4..f7b658ed 100644 --- a/Wrapper/Config/config_Windows_10.json +++ b/Wrapper/Config/config_Windows_10.json @@ -1629,10 +1629,25 @@ "Region": "System", "Control": "chk", "Required": "false", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", "Arg": { "Zero": { - "Tag": "" + "Tag": "NET6x86" + }, + "One": { + "Tag": "NET6x64" + }, + "Two": { + "Tag": "NET7x86" + }, + "Three": { + "Tag": "NET7x64" + }, + "Four": { + "Tag": "NET8x86" + }, + "Five": { + "Tag": "NET8x64" } }, "Preset": "", diff --git a/Wrapper/Config/config_Windows_10_LTSC.json b/Wrapper/Config/config_Windows_10_LTSC.json index d2f784c5..c40500b0 100644 --- a/Wrapper/Config/config_Windows_10_LTSC.json +++ b/Wrapper/Config/config_Windows_10_LTSC.json @@ -1556,10 +1556,25 @@ "Region": "System", "Control": "chk", "Required": "false", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", "Arg": { "Zero": { - "Tag": "" + "Tag": "NET6x86" + }, + "One": { + "Tag": "NET6x64" + }, + "Two": { + "Tag": "NET7x86" + }, + "Three": { + "Tag": "NET7x64" + }, + "Four": { + "Tag": "NET8x86" + }, + "Five": { + "Tag": "NET8x64" } }, "Preset": "", diff --git a/Wrapper/Config/config_Windows_11.json b/Wrapper/Config/config_Windows_11.json index a725f518..069edb1c 100644 --- a/Wrapper/Config/config_Windows_11.json +++ b/Wrapper/Config/config_Windows_11.json @@ -1555,13 +1555,28 @@ "Region": "System", "Control": "chk", "Required": "false", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", "Arg": { "Zero": { - "Tag": "" + "Tag": "NET6x86" + }, + "One": { + "Tag": "NET6x64" + }, + "Two": { + "Tag": "NET7x86" + }, + "Three": { + "Tag": "NET7x64" + }, + "Four": { + "Tag": "NET8x86" + }, + "Five": { + "Tag": "NET8x64" } }, - "Preset": "", + "Preset": "012345", "WindowsDefault": "" }, { diff --git a/Wrapper/Localizations/de-DE/tooltip_Windows_10.json b/Wrapper/Localizations/de-DE/tooltip_Windows_10.json index ef33586a..23e4f734 100644 --- a/Wrapper/Localizations/de-DE/tooltip_Windows_10.json +++ b/Wrapper/Localizations/de-DE/tooltip_Windows_10.json @@ -1434,11 +1434,32 @@ }, { "Region": "System", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", + "ToolTip": "Installieren Sie die neueste .NET Desktop Runtime 6, 7, 8 (x86/x64).", "Arg": { "Zero": { - "Tag": "", - "ToolTip": "Installieren Sie die neueste .NET Desktop Runtime 6, 7 (x86/x64)." + "Tag": "NET6x86", + "ToolTip": ".NET Desktop Runtime 6 x86." + }, + "One": { + "Tag": "NET6x64", + "ToolTip": ".NET Desktop Runtime 6 x64." + }, + "Two": { + "Tag": "NET7x86", + "ToolTip": ".NET Desktop Runtime 7 x86." + }, + "Three": { + "Tag": "NET7x64", + "ToolTip": ".NET Desktop Runtime 7 x64." + }, + "Four": { + "Tag": "NET8x86", + "ToolTip": ".NET Desktop Runtime 8 x86." + }, + "Five": { + "Tag": "NET8x64", + "ToolTip": ".NET Desktop Runtime 8 x64." } } }, diff --git a/Wrapper/Localizations/de-DE/tooltip_Windows_11.json b/Wrapper/Localizations/de-DE/tooltip_Windows_11.json index 66f0f9c9..90bb3cca 100644 --- a/Wrapper/Localizations/de-DE/tooltip_Windows_11.json +++ b/Wrapper/Localizations/de-DE/tooltip_Windows_11.json @@ -1372,11 +1372,32 @@ }, { "Region": "System", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", + "ToolTip": "Installieren Sie die neueste .NET Desktop Runtime 6, 7, 8 (x86/x64).", "Arg": { "Zero": { - "Tag": "", - "ToolTip": "Installieren der neuesten .NET Desktop Runtime 6, 7 (x86/x64)." + "Tag": "NET6x86", + "ToolTip": ".NET Desktop Runtime 6 x86." + }, + "One": { + "Tag": "NET6x64", + "ToolTip": ".NET Desktop Runtime 6 x64." + }, + "Two": { + "Tag": "NET7x86", + "ToolTip": ".NET Desktop Runtime 7 x86." + }, + "Three": { + "Tag": "NET7x64", + "ToolTip": ".NET Desktop Runtime 7 x64." + }, + "Four": { + "Tag": "NET8x86", + "ToolTip": ".NET Desktop Runtime 8 x86." + }, + "Five": { + "Tag": "NET8x64", + "ToolTip": ".NET Desktop Runtime 8 x64." } } }, diff --git a/Wrapper/Localizations/en-US/tooltip_Windows_10.json b/Wrapper/Localizations/en-US/tooltip_Windows_10.json index 19d71bc7..5466ecd8 100644 --- a/Wrapper/Localizations/en-US/tooltip_Windows_10.json +++ b/Wrapper/Localizations/en-US/tooltip_Windows_10.json @@ -1434,11 +1434,32 @@ }, { "Region": "System", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", + "ToolTip": "Install the latest .NET Desktop Runtime 6, 7, 8 (x86/x64).", "Arg": { "Zero": { - "Tag": "", - "ToolTip": "Install the latest .NET Desktop Runtime 6, 7 (x86/x64)." + "Tag": "NET6x86", + "ToolTip": ".NET Desktop Runtime 6 x86." + }, + "One": { + "Tag": "NET6x64", + "ToolTip": ".NET Desktop Runtime 6 x64." + }, + "Two": { + "Tag": "NET7x86", + "ToolTip": ".NET Desktop Runtime 7 x86." + }, + "Three": { + "Tag": "NET7x64", + "ToolTip": ".NET Desktop Runtime 7 x64." + }, + "Four": { + "Tag": "NET8x86", + "ToolTip": ".NET Desktop Runtime 8 x86." + }, + "Five": { + "Tag": "NET8x64", + "ToolTip": ".NET Desktop Runtime 8 x64." } } }, diff --git a/Wrapper/Localizations/en-US/tooltip_Windows_11.json b/Wrapper/Localizations/en-US/tooltip_Windows_11.json index f56cdee8..09fa903f 100644 --- a/Wrapper/Localizations/en-US/tooltip_Windows_11.json +++ b/Wrapper/Localizations/en-US/tooltip_Windows_11.json @@ -1372,11 +1372,32 @@ }, { "Region": "System", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", + "ToolTip": "Install the latest .NET Desktop Runtime 6, 7, 8 (x86/x64).", "Arg": { "Zero": { - "Tag": "", - "ToolTip": "Install the latest .NET Desktop Runtime 6, 7 (x86/x64)." + "Tag": "NET6x86", + "ToolTip": ".NET Desktop Runtime 6 x86." + }, + "One": { + "Tag": "NET6x64", + "ToolTip": ".NET Desktop Runtime 6 x64." + }, + "Two": { + "Tag": "NET7x86", + "ToolTip": ".NET Desktop Runtime 7 x86." + }, + "Three": { + "Tag": "NET7x64", + "ToolTip": ".NET Desktop Runtime 7 x64." + }, + "Four": { + "Tag": "NET8x86", + "ToolTip": ".NET Desktop Runtime 8 x86." + }, + "Five": { + "Tag": "NET8x64", + "ToolTip": ".NET Desktop Runtime 8 x64." } } }, diff --git a/Wrapper/Localizations/ru-RU/tooltip_Windows_10.json b/Wrapper/Localizations/ru-RU/tooltip_Windows_10.json index 08db6c74..299dc31a 100644 --- a/Wrapper/Localizations/ru-RU/tooltip_Windows_10.json +++ b/Wrapper/Localizations/ru-RU/tooltip_Windows_10.json @@ -1434,11 +1434,32 @@ }, { "Region": "System", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", + "ToolTip": "Установить последнюю версию .NET Desktop Runtime 6, 7, 8 (x86/x64).", "Arg": { "Zero": { - "Tag": "", - "ToolTip": "Установить последнюю версию .NET Desktop Runtime 6, 7 (x86/x64)." + "Tag": "NET6x86", + "ToolTip": ".NET Desktop Runtime 6 x86." + }, + "One": { + "Tag": "NET6x64", + "ToolTip": ".NET Desktop Runtime 6 x64." + }, + "Two": { + "Tag": "NET7x86", + "ToolTip": ".NET Desktop Runtime 7 x86." + }, + "Three": { + "Tag": "NET7x64", + "ToolTip": ".NET Desktop Runtime 7 x64." + }, + "Four": { + "Tag": "NET8x86", + "ToolTip": ".NET Desktop Runtime 8 x86." + }, + "Five": { + "Tag": "NET8x64", + "ToolTip": ".NET Desktop Runtime 8 x64." } } }, diff --git a/Wrapper/Localizations/ru-RU/tooltip_Windows_11.json b/Wrapper/Localizations/ru-RU/tooltip_Windows_11.json index 638e7a2b..a018568b 100644 --- a/Wrapper/Localizations/ru-RU/tooltip_Windows_11.json +++ b/Wrapper/Localizations/ru-RU/tooltip_Windows_11.json @@ -1372,11 +1372,32 @@ }, { "Region": "System", - "Function": "InstallDotNetRuntimes", + "Function": "InstallDotNetRuntimes -Runtimes", + "ToolTip": "Установить последнюю версию .NET Desktop Runtime 6, 7, 8 (x86/x64).", "Arg": { "Zero": { - "Tag": "", - "ToolTip": "Установить последнюю версию .NET Desktop Runtime 6, 7 (x86/x64)." + "Tag": "NET6x86", + "ToolTip": ".NET Desktop Runtime 6 x86." + }, + "One": { + "Tag": "NET6x64", + "ToolTip": ".NET Desktop Runtime 6 x64." + }, + "Two": { + "Tag": "NET7x86", + "ToolTip": ".NET Desktop Runtime 7 x86." + }, + "Three": { + "Tag": "NET7x64", + "ToolTip": ".NET Desktop Runtime 7 x64." + }, + "Four": { + "Tag": "NET8x86", + "ToolTip": ".NET Desktop Runtime 8 x86." + }, + "Five": { + "Tag": "NET8x64", + "ToolTip": ".NET Desktop Runtime 8 x64." } } }, diff --git a/Wrapper/SophiaScriptWrapper.exe b/Wrapper/SophiaScriptWrapper.exe index dd9abb79..290db5b7 100644 Binary files a/Wrapper/SophiaScriptWrapper.exe and b/Wrapper/SophiaScriptWrapper.exe differ diff --git a/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 index e74dd5fd..f1a468cf 100644 --- a/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 @@ -11626,8 +11626,8 @@ function UninstallUWPApps #region Variables # The following UWP apps will have their checkboxes unchecked $UncheckedAppxPackages = @( - # Sticky Notes - "Microsoft.MicrosoftStickyNotes", + # Windows Media Player + "Microsoft.ZuneMusic", # Screen Sketch "Microsoft.ScreenSketch", diff --git a/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 index d952e565..02dbe13b 100644 --- a/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 @@ -11625,8 +11625,8 @@ function UninstallUWPApps #region Variables # The following UWP apps will have their checkboxes unchecked $UncheckedAppxPackages = @( - # Sticky Notes - "Microsoft.MicrosoftStickyNotes", + # Windows Media Player + "Microsoft.ZuneMusic", # Screen Sketch "Microsoft.ScreenSketch", diff --git a/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 index 3a202414..9fcbef6e 100644 --- a/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 @@ -10910,8 +10910,8 @@ function UninstallUWPApps #region Variables # The following UWP apps will have their checkboxes unchecked $UncheckedAppxPackages = @( - # Sticky Notes - "Microsoft.MicrosoftStickyNotes", + # Windows Media Player + "Microsoft.ZuneMusic", # Screen Sketch "Microsoft.ScreenSketch", diff --git a/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 index 751ec6f3..c1b22c28 100644 --- a/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 @@ -10904,8 +10904,8 @@ function UninstallUWPApps #region Variables # The following UWP apps will have their checkboxes unchecked $UncheckedAppxPackages = @( - # Sticky Notes - "Microsoft.MicrosoftStickyNotes", + # Windows Media Player + "Microsoft.ZuneMusic", # Screen Sketch "Microsoft.ScreenSketch",