diff --git a/DISMTools.vbproj b/DISMTools.vbproj index 2646b3b2..cfa5a60f 100644 --- a/DISMTools.vbproj +++ b/DISMTools.vbproj @@ -80,8 +80,8 @@ packages\Microsoft.Dism.3.1.0\lib\net40\Microsoft.Dism.dll - - packages\Scintilla5.NET.5.5.1\lib\net47\Scintilla.NET.dll + + packages\Scintilla5.NET.5.6.0\lib\net462\Scintilla.NET.dll True @@ -516,6 +516,12 @@ Form + + MUMAdditionDialog.vb + + + Form + RemPackage.vb @@ -916,6 +922,9 @@ AddPackage.vb + + MUMAdditionDialog.vb + RemPackage.vb @@ -1743,12 +1752,12 @@ IF EXIST tools ( rd tools /s /q ) - + Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + This dialog lets you add a Microsoft Update Manifest (MUM) file to the target image. You can only specify one at a time. + +Do note that this is for advanced use only and may compromise the target Windows image. + + + 17, 17 + + \ No newline at end of file diff --git a/Panels/Img_Ops/Pkgs/MUMAdditionDialog.vb b/Panels/Img_Ops/Pkgs/MUMAdditionDialog.vb new file mode 100644 index 00000000..351c239f --- /dev/null +++ b/Panels/Img_Ops/Pkgs/MUMAdditionDialog.vb @@ -0,0 +1,126 @@ +Imports System.Windows.Forms +Imports Microsoft.VisualBasic.ControlChars + +Public Class MUMAdditionDialog + + Public MUMFile As String + + Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click + Me.DialogResult = System.Windows.Forms.DialogResult.OK + Me.Close() + End Sub + + Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click + Me.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Close() + End Sub + + Private Sub MUMAdditionDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Select Case MainForm.Language + Case 0 + Select Case My.Computer.Info.InstalledUICulture.ThreeLetterWindowsLanguageName + Case "ENU", "ENG" + Text = "Add update manifest" + Label1.Text = "This dialog lets you add a Microsoft Update Manifest (MUM) file to the target image. You can only specify one at a time." & CrLf & CrLf & + "Do note that this is for advanced use only and may compromise the target Windows image." + Label2.Text = "Path of the manifest file to add:" + Button1.Text = "Browse..." + Cancel_Button.Text = "Cancel" + OK_Button.Text = "OK" + Case "ESN" + Text = "Añadir manifiesto de actualización" + Label1.Text = "Este diálogo le permite añadir un archivo de manifiesto de actualización de Microsoft (MUM) a la imagen de destino. Solo puede especificar uno a la vez." & CrLf & CrLf & + "Dese cuenta de que esto es solo para usos avanzados y que podría dañar la imagen de Windows de destino." + Label2.Text = "Ubicación del archivo de manifesto a añadir:" + Button1.Text = "Examinar..." + Cancel_Button.Text = "Cancelar" + OK_Button.Text = "Aceptar" + Case "FRA" + Text = "Ajouter un manifeste de mise à jour" + Label1.Text = "Cette boîte de dialogue vous permet d'ajouter un fichier Microsoft Update Manifest (MUM) à l'image cible. Vous ne pouvez en spécifier qu'un seul à la fois." & CrLf & CrLf & + "Notez que cette opération est réservée à un usage avancé et qu'elle peut compromettre l'image Windows cible." + Label2.Text = "Chemin du fichier manifeste à ajouter :" + Button1.Text = "Parcourir..." + Cancel_Button.Text = "Annuler" + OK_Button.Text = "OK" + Case "PTB", "PTG" + Text = "Adicionar manifesto de atualização" + Label1.Text = "Esta caixa de diálogo permite-lhe adicionar um ficheiro Microsoft Update Manifest (MUM) à imagem de destino. Só pode especificar um de cada vez." & CrLf & CrLf & + "Tenha em atenção que isto é apenas para utilização avançada e pode comprometer a imagem de destino do Windows." + Label2.Text = "Caminho do ficheiro de manifesto a adicionar:" + Button1.Text = "Procurar..." + Cancel_Button.Text = "Cancelar" + OK_Button.Text = "OK" + Case "ITA" + Text = "Aggiungi manifesto di aggiornamento" + Label1.Text = "Questa finestra di dialogo consente di aggiungere un file Microsoft Update Manifest (MUM) all'immagine di destinazione. È possibile specificarne solo uno alla volta." & CrLf & CrLf & + "Si noti che questa operazione è riservata a un uso avanzato e può compromettere l'immagine di Windows di destinazione." + Label2.Text = "Percorso del file manifest da aggiungere:" + Button1.Text = "Sfoglia..." + Cancel_Button.Text = "Annullare" + OK_Button.Text = "OK" + End Select + Case 1 + Text = "Add update manifest" + Label1.Text = "This dialog lets you add a Microsoft Update Manifest (MUM) file to the target image. You can only specify one at a time." & CrLf & CrLf & + "Do note that this is for advanced use only and may compromise the target Windows image." + Label2.Text = "Path of the manifest file to add:" + Button1.Text = "Browse..." + Cancel_Button.Text = "Cancel" + OK_Button.Text = "OK" + Case 2 + Text = "Añadir manifiesto de actualización" + Label1.Text = "Este diálogo le permite añadir un archivo de manifiesto de actualización de Microsoft (MUM) a la imagen de destino. Solo puede especificar uno a la vez." & CrLf & CrLf & + "Dese cuenta de que esto es solo para usos avanzados y que podría dañar la imagen de Windows de destino." + Label2.Text = "Ubicación del archivo de manifesto a añadir:" + Button1.Text = "Examinar..." + Cancel_Button.Text = "Cancelar" + OK_Button.Text = "Aceptar" + Case 3 + Text = "Ajouter un manifeste de mise à jour" + Label1.Text = "Cette boîte de dialogue vous permet d'ajouter un fichier Microsoft Update Manifest (MUM) à l'image cible. Vous ne pouvez en spécifier qu'un seul à la fois." & CrLf & CrLf & + "Notez que cette opération est réservée à un usage avancé et qu'elle peut compromettre l'image Windows cible." + Label2.Text = "Chemin du fichier manifeste à ajouter :" + Button1.Text = "Parcourir..." + Cancel_Button.Text = "Annuler" + OK_Button.Text = "OK" + Case 4 + Text = "Adicionar manifesto de atualização" + Label1.Text = "Esta caixa de diálogo permite-lhe adicionar um ficheiro Microsoft Update Manifest (MUM) à imagem de destino. Só pode especificar um de cada vez." & CrLf & CrLf & + "Tenha em atenção que isto é apenas para utilização avançada e pode comprometer a imagem de destino do Windows." + Label2.Text = "Caminho do ficheiro de manifesto a adicionar:" + Button1.Text = "Procurar..." + Cancel_Button.Text = "Cancelar" + OK_Button.Text = "OK" + Case 5 + Text = "Aggiungi manifesto di aggiornamento" + Label1.Text = "Questa finestra di dialogo consente di aggiungere un file Microsoft Update Manifest (MUM) all'immagine di destinazione. È possibile specificarne solo uno alla volta." & CrLf & CrLf & + "Si noti che questa operazione è riservata a un uso avanzato e può compromettere l'immagine di Windows di destinazione." + Label2.Text = "Percorso del file manifest da aggiungere:" + Button1.Text = "Sfoglia..." + Cancel_Button.Text = "Annullare" + OK_Button.Text = "OK" + End Select + If MainForm.BackColor = Color.FromArgb(48, 48, 48) Then + BackColor = Color.FromArgb(31, 31, 31) + ForeColor = Color.White + TextBox1.BackColor = Color.FromArgb(31, 31, 31) + ElseIf MainForm.BackColor = Color.FromArgb(239, 239, 242) Then + BackColor = Color.FromArgb(238, 238, 242) + ForeColor = Color.Black + TextBox1.BackColor = Color.FromArgb(238, 238, 242) + End If + TextBox1.ForeColor = ForeColor + Dim handle As IntPtr = MainForm.GetWindowHandle(Me) + If MainForm.IsWindowsVersionOrGreater(10, 0, 18362) Then MainForm.EnableDarkTitleBar(handle, MainForm.BackColor = Color.FromArgb(48, 48, 48)) + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + OpenFileDialog1.ShowDialog() + End Sub + + Private Sub OpenFileDialog1_FileOk(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles OpenFileDialog1.FileOk + MUMFile = OpenFileDialog1.FileName + TextBox1.Text = OpenFileDialog1.FileName + End Sub +End Class diff --git a/Updater/DISMTools-UCS/update-bin/preview.ini b/Updater/DISMTools-UCS/update-bin/preview.ini index 111861e3..ee2b4012 100644 --- a/Updater/DISMTools-UCS/update-bin/preview.ini +++ b/Updater/DISMTools-UCS/update-bin/preview.ini @@ -1,6 +1,6 @@ [Version] -LatestVer = 0.5.1.2471 -ReleaseTag = v0.5.1_pre_2471 +LatestVer = 0.5.1.2472 +ReleaseTag = v0.5.1_pre_2472 [Options] MigrateSettings = False diff --git a/Updater/DISMTools-UCS/verinfo/preview.ini b/Updater/DISMTools-UCS/verinfo/preview.ini index 111861e3..ee2b4012 100644 --- a/Updater/DISMTools-UCS/verinfo/preview.ini +++ b/Updater/DISMTools-UCS/verinfo/preview.ini @@ -1,6 +1,6 @@ [Version] -LatestVer = 0.5.1.2471 -ReleaseTag = v0.5.1_pre_2471 +LatestVer = 0.5.1.2472 +ReleaseTag = v0.5.1_pre_2472 [Options] MigrateSettings = False diff --git a/packages.config b/packages.config index 5183b1a0..36115003 100644 --- a/packages.config +++ b/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/pkgsrc/Scintilla5.NET.5.5.1/lib/net47/Scintilla.NET.dll b/pkgsrc/Scintilla5.NET.5.5.1/lib/net47/Scintilla.NET.dll deleted file mode 100644 index 9278ecd6..00000000 Binary files a/pkgsrc/Scintilla5.NET.5.5.1/lib/net47/Scintilla.NET.dll and /dev/null differ diff --git a/pkgsrc/Scintilla5.NET.5.5.1/lib/net6.0-windows7.0/Scintilla.NET.dll b/pkgsrc/Scintilla5.NET.5.5.1/lib/net6.0-windows7.0/Scintilla.NET.dll deleted file mode 100644 index f9483162..00000000 Binary files a/pkgsrc/Scintilla5.NET.5.5.1/lib/net6.0-windows7.0/Scintilla.NET.dll and /dev/null differ diff --git a/pkgsrc/Scintilla5.NET.5.5.1/.signature.p7s b/pkgsrc/Scintilla5.NET.5.6.0/.signature.p7s similarity index 86% rename from pkgsrc/Scintilla5.NET.5.5.1/.signature.p7s rename to pkgsrc/Scintilla5.NET.5.6.0/.signature.p7s index ac949d6c..d21cfec4 100644 Binary files a/pkgsrc/Scintilla5.NET.5.5.1/.signature.p7s and b/pkgsrc/Scintilla5.NET.5.6.0/.signature.p7s differ diff --git a/pkgsrc/Scintilla5.NET.5.5.1/README.md b/pkgsrc/Scintilla5.NET.5.6.0/README.md similarity index 100% rename from pkgsrc/Scintilla5.NET.5.5.1/README.md rename to pkgsrc/Scintilla5.NET.5.6.0/README.md diff --git a/pkgsrc/Scintilla5.NET.5.5.1/build/scintilla5.net.targets b/pkgsrc/Scintilla5.NET.5.6.0/build/scintilla5.net.targets similarity index 100% rename from pkgsrc/Scintilla5.NET.5.5.1/build/scintilla5.net.targets rename to pkgsrc/Scintilla5.NET.5.6.0/build/scintilla5.net.targets diff --git a/pkgsrc/Scintilla5.NET.5.5.1/icon.png b/pkgsrc/Scintilla5.NET.5.6.0/icon.png similarity index 100% rename from pkgsrc/Scintilla5.NET.5.5.1/icon.png rename to pkgsrc/Scintilla5.NET.5.6.0/icon.png diff --git a/pkgsrc/Scintilla5.NET.5.6.0/lib/net462/Scintilla.NET.dll b/pkgsrc/Scintilla5.NET.5.6.0/lib/net462/Scintilla.NET.dll new file mode 100644 index 00000000..688600c3 Binary files /dev/null and b/pkgsrc/Scintilla5.NET.5.6.0/lib/net462/Scintilla.NET.dll differ diff --git a/pkgsrc/Scintilla5.NET.5.5.1/lib/net47/Scintilla.NET.xml b/pkgsrc/Scintilla5.NET.5.6.0/lib/net462/Scintilla.NET.xml similarity index 99% rename from pkgsrc/Scintilla5.NET.5.5.1/lib/net47/Scintilla.NET.xml rename to pkgsrc/Scintilla5.NET.5.6.0/lib/net462/Scintilla.NET.xml index 220317a3..6deb5631 100644 --- a/pkgsrc/Scintilla5.NET.5.5.1/lib/net47/Scintilla.NET.xml +++ b/pkgsrc/Scintilla5.NET.5.6.0/lib/net462/Scintilla.NET.xml @@ -4240,6 +4240,18 @@ The command to perform. + + + Search text in document without changing the current selection. + The argument controls the search type, which includes regular expression searches. + You can search backwards to find the previous occurrence of a search string by setting the end of the search range before the start. + + Specifies the how patterns are matched when performing the search. + String to search for. + Beginning of + + The position of the found text if it succeeds or -1 if the search fails. + Performs the specified fold action on the entire document. @@ -6614,7 +6626,7 @@ - Matches every instance of the search string. + Case-insensitive literal match. @@ -6624,23 +6636,25 @@ - A match only occurs if the characters before and after are not word characters. + A match only occurs if the characters before and after are not word characters as defined by . - A match only occurs if the character before is not a word character. + A match only occurs if the character before is not a word character as defined by . The search string should be interpreted as a regular expression. + Uses Scintilla's base implementation unless combined with . Regular expressions will only match ranges within a single line, never matching over multiple lines. Treat regular expression in a more POSIX compatible manner by interpreting bare '(' and ')' for tagged sections rather than "\(" and "\)". + Has no effect when is set. @@ -6649,6 +6663,7 @@ The property can queried to determine if the regular expression is invalid. The ECMAScript flag is set on the regex object and documents will exhibit Unicode-compliant behaviour. Regular expressions will only match ranges within a single line, never matching over multiple lines. + Must also have set. diff --git a/pkgsrc/Scintilla5.NET.5.6.0/lib/net6.0-windows7.0/Scintilla.NET.dll b/pkgsrc/Scintilla5.NET.5.6.0/lib/net6.0-windows7.0/Scintilla.NET.dll new file mode 100644 index 00000000..e06aa614 Binary files /dev/null and b/pkgsrc/Scintilla5.NET.5.6.0/lib/net6.0-windows7.0/Scintilla.NET.dll differ diff --git a/pkgsrc/Scintilla5.NET.5.5.1/lib/net6.0-windows7.0/Scintilla.NET.xml b/pkgsrc/Scintilla5.NET.5.6.0/lib/net6.0-windows7.0/Scintilla.NET.xml similarity index 99% rename from pkgsrc/Scintilla5.NET.5.5.1/lib/net6.0-windows7.0/Scintilla.NET.xml rename to pkgsrc/Scintilla5.NET.5.6.0/lib/net6.0-windows7.0/Scintilla.NET.xml index 220317a3..6deb5631 100644 --- a/pkgsrc/Scintilla5.NET.5.5.1/lib/net6.0-windows7.0/Scintilla.NET.xml +++ b/pkgsrc/Scintilla5.NET.5.6.0/lib/net6.0-windows7.0/Scintilla.NET.xml @@ -4240,6 +4240,18 @@ The command to perform. + + + Search text in document without changing the current selection. + The argument controls the search type, which includes regular expression searches. + You can search backwards to find the previous occurrence of a search string by setting the end of the search range before the start. + + Specifies the how patterns are matched when performing the search. + String to search for. + Beginning of + + The position of the found text if it succeeds or -1 if the search fails. + Performs the specified fold action on the entire document. @@ -6614,7 +6626,7 @@ - Matches every instance of the search string. + Case-insensitive literal match. @@ -6624,23 +6636,25 @@ - A match only occurs if the characters before and after are not word characters. + A match only occurs if the characters before and after are not word characters as defined by . - A match only occurs if the character before is not a word character. + A match only occurs if the character before is not a word character as defined by . The search string should be interpreted as a regular expression. + Uses Scintilla's base implementation unless combined with . Regular expressions will only match ranges within a single line, never matching over multiple lines. Treat regular expression in a more POSIX compatible manner by interpreting bare '(' and ')' for tagged sections rather than "\(" and "\)". + Has no effect when is set. @@ -6649,6 +6663,7 @@ The property can queried to determine if the regular expression is invalid. The ECMAScript flag is set on the regex object and documents will exhibit Unicode-compliant behaviour. Regular expressions will only match ranges within a single line, never matching over multiple lines. + Must also have set. diff --git a/pkgsrc/Scintilla5.NET.5.5.1/runtimes/win-x64/native/Lexilla.dll b/pkgsrc/Scintilla5.NET.5.6.0/runtimes/win-x64/native/Lexilla.dll similarity index 100% rename from pkgsrc/Scintilla5.NET.5.5.1/runtimes/win-x64/native/Lexilla.dll rename to pkgsrc/Scintilla5.NET.5.6.0/runtimes/win-x64/native/Lexilla.dll diff --git a/pkgsrc/Scintilla5.NET.5.5.1/runtimes/win-x64/native/Scintilla.dll b/pkgsrc/Scintilla5.NET.5.6.0/runtimes/win-x64/native/Scintilla.dll similarity index 100% rename from pkgsrc/Scintilla5.NET.5.5.1/runtimes/win-x64/native/Scintilla.dll rename to pkgsrc/Scintilla5.NET.5.6.0/runtimes/win-x64/native/Scintilla.dll diff --git a/pkgsrc/Scintilla5.NET.5.5.1/runtimes/win-x86/native/Lexilla.dll b/pkgsrc/Scintilla5.NET.5.6.0/runtimes/win-x86/native/Lexilla.dll similarity index 100% rename from pkgsrc/Scintilla5.NET.5.5.1/runtimes/win-x86/native/Lexilla.dll rename to pkgsrc/Scintilla5.NET.5.6.0/runtimes/win-x86/native/Lexilla.dll diff --git a/pkgsrc/Scintilla5.NET.5.5.1/runtimes/win-x86/native/Scintilla.dll b/pkgsrc/Scintilla5.NET.5.6.0/runtimes/win-x86/native/Scintilla.dll similarity index 100% rename from pkgsrc/Scintilla5.NET.5.5.1/runtimes/win-x86/native/Scintilla.dll rename to pkgsrc/Scintilla5.NET.5.6.0/runtimes/win-x86/native/Scintilla.dll