Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit efdc7df

Browse files
author
gumme
committed
Merge remote-tracking branch 'remotes/upstream/master'
Conflicts: src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGrid.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/NameScopeHelper.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/WpfDesign.XamlDom.csproj src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlConstants.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyGrid/PropertyNode.cs All conflicts resolved using remote version of the files.
2 parents 16d9108 + 21a4a33 commit efdc7df

262 files changed

Lines changed: 6958 additions & 2474 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎data/resources/StringResources.de.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2496,7 +2496,7 @@ Wollen Sie die neue Datei zum Projekt ${CurrentProjectName} hinzufügen?</value>
24962496
<value>Referenzpfade</value>
24972497
</data>
24982498
<data name="Dialog.ProjectOptions.ReferencePaths.AddPath" xml:space="preserve">
2499-
<value>Pfad hinzufügem</value>
2499+
<value>Pfad hinzufügen</value>
25002500
</data>
25012501
<data name="Dialog.ProjectOptions.RunPostBuildEvent.Always" xml:space="preserve">
25022502
<value>Immer</value>

‎data/resources/StringResources.fr.resx‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,146 @@ Téléchargez un AddIn depuis l'Internet, cliquez ensuite sur 'Installer un AddI
229229
<data name="AddInManager.UnknownFileFormat" xml:space="preserve">
230230
<value>Format de fichier inconnu:</value>
231231
</data>
232+
<data name="AddInManager2.AddInsView.InstallFromArchive" xml:space="preserve">
233+
<value>Installer depuis un fichier...</value>
234+
</data>
235+
<data name="AddInManager2.AddInsView.Repository" xml:space="preserve">
236+
<value>Dépôt:</value>
237+
</data>
238+
<data name="AddInManager2.AddInsView.Search" xml:space="preserve">
239+
<value>Rechercher:</value>
240+
</data>
241+
<data name="AddInManager2.AddInsView.ShowPreinstalledAddIns" xml:space="preserve">
242+
<value>Voir les Add-Ins pré-installés</value>
243+
</data>
244+
<data name="AddInManager2.AddInsView.ShowPrereleaseAddIns" xml:space="preserve">
245+
<value>Voir les pré-releases</value>
246+
</data>
247+
<data name="AddInManager2.CannotRemoveAddInManager" xml:space="preserve">
248+
<value>Impossible de désinstaller le gestionnaire d'Add-In, car il est nécessaire pour ré-installer des Add-Ins.</value>
249+
</data>
250+
<data name="AddInManager2.DefaultRepository" xml:space="preserve">
251+
<value>Dépôt des Add-Ins SharpDevelop</value>
252+
</data>
253+
<data name="AddInManager2.Details.CreatedBy" xml:space="preserve">
254+
<value>Auteur:</value>
255+
</data>
256+
<data name="AddInManager2.Details.Dependencies" xml:space="preserve">
257+
<value>Dépendances:</value>
258+
</data>
259+
<data name="AddInManager2.Details.DownloadCount" xml:space="preserve">
260+
<value>Téléchargements:</value>
261+
</data>
262+
<data name="AddInManager2.Details.FileName" xml:space="preserve">
263+
<value>Nom de fichier:</value>
264+
</data>
265+
<data name="AddInManager2.Details.InstalledVersion" xml:space="preserve">
266+
<value>Version installée:</value>
267+
</data>
268+
<data name="AddInManager2.Details.LastUpdated" xml:space="preserve">
269+
<value>Dernière mise à jour:</value>
270+
</data>
271+
<data name="AddInManager2.Details.MoreInformation" xml:space="preserve">
272+
<value>Plus d'informations</value>
273+
</data>
274+
<data name="AddInManager2.Details.NewVersion" xml:space="preserve">
275+
<value>Nouvelle version:</value>
276+
</data>
277+
<data name="AddInManager2.Details.Rating" xml:space="preserve">
278+
<value>Evaluation:</value>
279+
</data>
280+
<data name="AddInManager2.Details.ReportAbuse" xml:space="preserve">
281+
<value>Signaler un abus</value>
282+
</data>
283+
<data name="AddInManager2.Details.Version" xml:space="preserve">
284+
<value>Version:</value>
285+
</data>
286+
<data name="AddInManager2.Details.ViewLicenseTerms" xml:space="preserve">
287+
<value>Voir le contrat de license</value>
288+
</data>
289+
<data name="AddInManager2.DisableDependentWarning" xml:space="preserve">
290+
<value>Les Add-Ins installés suivant sont dépendant de "{0}"
291+
292+
{1}
293+
294+
Ils ne fonctionneront plus si vous désactivez cet Add-In! Souhaitez-vous continuer?</value>
295+
</data>
296+
<data name="AddInManager2.InstallDependentMessage" xml:space="preserve">
297+
<value>Package "{0}" nécessite au moins une dépendance:
298+
299+
{1}
300+
301+
L'application va essayer de les télécharger et de les installer. Souhaitez-vous continuer?</value>
302+
</data>
303+
<data name="AddInManager2.InvalidPackage" xml:space="preserve">
304+
<value>Le package sélectionné ne contient pas un Add-In SharpDevelop.</value>
305+
</data>
306+
<data name="AddInManager2.LicenseAcceptance.AcceptButton" xml:space="preserve">
307+
<value>J'&amp;Accepte</value>
308+
</data>
309+
<data name="AddInManager2.LicenseAcceptance.DeclineButton" xml:space="preserve">
310+
<value>Je &amp;Décline</value>
311+
</data>
312+
<data name="AddInManager2.LicenseAcceptance.Explanation.Package" xml:space="preserve">
313+
<value>En cliquant "J'accepte", vous êtes d'accord pour la license du package suivant.
314+
Si vous ne le souhaitez pas, veuillez cliquer "Je décline".</value>
315+
</data>
316+
<data name="AddInManager2.LicenseAcceptance.Explanation.Packages" xml:space="preserve">
317+
<value>En cliquant "J'accepte", vous êtes d'accord pour la license des packages suivant.
318+
Si vous ne le souhaitez pas, veuillez cliquer "Je décline".</value>
319+
</data>
320+
<data name="AddInManager2.LicenseAcceptance.Introduction.Package" xml:space="preserve">
321+
<value>Le package suivant nécessite que vous acceptiez sa license:</value>
322+
</data>
323+
<data name="AddInManager2.LicenseAcceptance.Introduction.Packages" xml:space="preserve">
324+
<value>Le package suivant nécessite que vous acceptiez sa license:</value>
325+
</data>
326+
<data name="AddInManager2.LicenseAcceptance.Title" xml:space="preserve">
327+
<value>Contrat de license</value>
328+
</data>
329+
<data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
330+
<value>Ajouter</value>
331+
</data>
332+
<data name="AddInManager2.OptionPanel.MoveDown" xml:space="preserve">
333+
<value>Descendre</value>
334+
</data>
335+
<data name="AddInManager2.OptionPanel.MoveUp" xml:space="preserve">
336+
<value>Monter</value>
337+
</data>
338+
<data name="AddInManager2.OptionPanel.Name" xml:space="preserve">
339+
<value>Nom:</value>
340+
</data>
341+
<data name="AddInManager2.OptionPanel.Remove" xml:space="preserve">
342+
<value>Supprimer</value>
343+
</data>
344+
<data name="AddInManager2.OptionPanel.Source" xml:space="preserve">
345+
<value>Source:</value>
346+
</data>
347+
<data name="AddInManager2.OptionPanel.Tree.AddIns" xml:space="preserve">
348+
<value>Add-Ins</value>
349+
</data>
350+
<data name="AddInManager2.OptionPanel.Tree.Repositories" xml:space="preserve">
351+
<value>Dépots</value>
352+
</data>
353+
<data name="AddInManager2.RemoveDependentWarning" xml:space="preserve">
354+
<value>Les Add-Ins installés suivant sont dépendant de "{0}"
355+
356+
{1}
357+
358+
Ils ne fonctionneront plus si vous désinstallez cet Add-In! Souhaitez-vous continuer?</value>
359+
</data>
360+
<data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
361+
<value>SharpDevelop Add-Ins|*.sdaddin;*.addin|Tous les fichiers|*.*</value>
362+
</data>
363+
<data name="AddInManager2.Views.Available" xml:space="preserve">
364+
<value>Disponible</value>
365+
</data>
366+
<data name="AddInManager2.Views.Installed" xml:space="preserve">
367+
<value>Installées</value>
368+
</data>
369+
<data name="AddInManager2.Views.Updates" xml:space="preserve">
370+
<value>Mises à jour</value>
371+
</data>
232372
<data name="AddIns.AvalonEdit.InconsistentNewlines.Description" xml:space="preserve">
233373
<value>Ce fichier contient des retour-chariots inconsistents.</value>
234374
</data>
@@ -4467,6 +4607,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
44674607
<data name="ICSharpCode.WixBinding.WixNetFxExtensionTitle" xml:space="preserve">
44684608
<value>Extension du framework .NET</value>
44694609
</data>
4610+
<data name="ICSharpCode.WixBinding.WixNotInstalled" xml:space="preserve">
4611+
<value>WiX n'est pas installé. Téléchargez le depuis http://wixtoolset.org/</value>
4612+
</data>
44704613
<data name="ICSharpCode.WixBinding.WixPackageFilesDiffControl.NoDiffFound" xml:space="preserve">
44714614
<value>Aucune différence n'a été trouvée.</value>
44724615
</data>
@@ -5745,6 +5888,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
57455888
<data name="ResourceEditor.ResourceCodeGeneratorTool.CouldNotGenerateResourceProperty" xml:space="preserve">
57465889
<value>Générateur de code ressource: aucune propriété de ressource ne peut être générée pour la ressource '{0}'.</value>
57475890
</data>
5891+
<data name="ResourceEditor.ResourceEdit.CommentColumn" xml:space="preserve">
5892+
<value>Commentaire</value>
5893+
</data>
57485894
<data name="ResourceEditor.ResourceEdit.ContentColumn" xml:space="preserve">
57495895
<value>Contenu</value>
57505896
</data>
@@ -5757,6 +5903,12 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
57575903
<data name="ResourceEditor.ResourceEdit.ContextMenu.CopyResourceName" xml:space="preserve">
57585904
<value>Copier le nom de la ressource</value>
57595905
</data>
5906+
<data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
5907+
<value>Editer le commentaire</value>
5908+
</data>
5909+
<data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
5910+
<value>Saisissez le nouveau texte pour le commentaire de cette ressource:</value>
5911+
</data>
57605912
<data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
57615913
<value>&amp;Renommer</value>
57625914
</data>
@@ -5772,6 +5924,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
57725924
<data name="SharpDevelop.FileFilter.AllFiles" xml:space="preserve">
57735925
<value>Tous les fichiers (*.*)</value>
57745926
</data>
5927+
<data name="SharpDevelop.FileFilter.AllKnownFiles" xml:space="preserve">
5928+
<value>Toutes les extensions connues</value>
5929+
</data>
57755930
<data name="SharpDevelop.FileFilter.AssemblyFiles" xml:space="preserve">
57765931
<value>Fichiers d'Assemblies (*.exe;*.dll)</value>
57775932
</data>

‎data/resources/StringResources.it.resx‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,69 @@ Scaricare un componente da internet, poi cliccare 'Install AddIn' e selezionare
229229
<data name="AddInManager.UnknownFileFormat" xml:space="preserve">
230230
<value>Formato file sconosciuto:</value>
231231
</data>
232+
<data name="AddInManager2.AddInsView.InstallFromArchive" xml:space="preserve">
233+
<value>Installa da archivio...</value>
234+
</data>
235+
<data name="AddInManager2.AddInsView.Repository" xml:space="preserve">
236+
<value>Repository:</value>
237+
</data>
238+
<data name="AddInManager2.AddInsView.Search" xml:space="preserve">
239+
<value>Cerca:</value>
240+
</data>
241+
<data name="AddInManager2.Details.CreatedBy" xml:space="preserve">
242+
<value>Creato da:</value>
243+
</data>
244+
<data name="AddInManager2.Details.Dependencies" xml:space="preserve">
245+
<value>Dipendenze:</value>
246+
</data>
247+
<data name="AddInManager2.Details.FileName" xml:space="preserve">
248+
<value>Nome file:</value>
249+
</data>
250+
<data name="AddInManager2.Details.InstalledVersion" xml:space="preserve">
251+
<value>Versione installata:</value>
252+
</data>
253+
<data name="AddInManager2.Details.MoreInformation" xml:space="preserve">
254+
<value>Più informazioni</value>
255+
</data>
256+
<data name="AddInManager2.Details.NewVersion" xml:space="preserve">
257+
<value>Nuova versione:</value>
258+
</data>
259+
<data name="AddInManager2.Details.Version" xml:space="preserve">
260+
<value>Versione:</value>
261+
</data>
262+
<data name="AddInManager2.Details.ViewLicenseTerms" xml:space="preserve">
263+
<value>Mostra i Termini di Licenza</value>
264+
</data>
265+
<data name="AddInManager2.LicenseAcceptance.AcceptButton" xml:space="preserve">
266+
<value>&amp;Accetto</value>
267+
</data>
268+
<data name="AddInManager2.LicenseAcceptance.DeclineButton" xml:space="preserve">
269+
<value>&amp;Rifiuto</value>
270+
</data>
271+
<data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
272+
<value>Aggiungi</value>
273+
</data>
274+
<data name="AddInManager2.OptionPanel.Name" xml:space="preserve">
275+
<value>Nome:</value>
276+
</data>
277+
<data name="AddInManager2.OptionPanel.Remove" xml:space="preserve">
278+
<value>Elimina</value>
279+
</data>
280+
<data name="AddInManager2.OptionPanel.Source" xml:space="preserve">
281+
<value>Sorgente:</value>
282+
</data>
283+
<data name="AddInManager2.OptionPanel.Tree.Repositories" xml:space="preserve">
284+
<value>Repositories</value>
285+
</data>
286+
<data name="AddInManager2.Views.Available" xml:space="preserve">
287+
<value>Disponibile</value>
288+
</data>
289+
<data name="AddInManager2.Views.Installed" xml:space="preserve">
290+
<value>Installato</value>
291+
</data>
292+
<data name="AddInManager2.Views.Updates" xml:space="preserve">
293+
<value>Aggiornamenti</value>
294+
</data>
232295
<data name="AddIns.AvalonEdit.InconsistentNewlines.Description" xml:space="preserve">
233296
<value>Questo file contiene dei ritorni a capo inconsistenti.</value>
234297
</data>
@@ -5760,6 +5823,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
57605823
<data name="ResourceEditor.ResourceEdit.ContextMenu.CopyResourceName" xml:space="preserve">
57615824
<value>Copia nome risorsa</value>
57625825
</data>
5826+
<data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
5827+
<value>Modifica descrizione</value>
5828+
</data>
57635829
<data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
57645830
<value>&amp;Rinomina</value>
57655831
</data>

‎data/resources/StringResources.nl.resx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,12 @@ Deze stoppen met werken na verwijderen van deze AddIn.</value>
358358
<data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
359359
<value>SharpDevelop AddIns|*.sdaddin;*.addin|Alle bestanden|*.*</value>
360360
</data>
361+
<data name="AddInManager2.UpdateNotifier.BubbleText" xml:space="preserve">
362+
<value>Hier klikken om de updates te zien.</value>
363+
</data>
364+
<data name="AddInManager2.UpdateNotifier.BubbleTitle" xml:space="preserve">
365+
<value>Er zijn updates voor SharpDevelop beschikbaar.</value>
366+
</data>
361367
<data name="AddInManager2.Views.Available" xml:space="preserve">
362368
<value>Beschikbaar</value>
363369
</data>
@@ -4608,6 +4614,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
46084614
<data name="ICSharpCode.WixBinding.WixNetFxExtensionTitle" xml:space="preserve">
46094615
<value>.NET Raamwerk uitbreiding</value>
46104616
</data>
4617+
<data name="ICSharpCode.WixBinding.WixNotInstalled" xml:space="preserve">
4618+
<value>WiX is niet geïnstalleerd. Download a.u.b. WiX van http://wixtoolset.org/</value>
4619+
</data>
46114620
<data name="ICSharpCode.WixBinding.WixPackageFilesDiffControl.NoDiffFound" xml:space="preserve">
46124621
<value>Geen verschil gevonden.</value>
46134622
</data>
@@ -5886,6 +5895,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
58865895
<data name="ResourceEditor.ResourceCodeGeneratorTool.CouldNotGenerateResourceProperty" xml:space="preserve">
58875896
<value>Hulpbron code generator: er kon geen eigenschap gegenereerd worden voor hulpbron '{0}',</value>
58885897
</data>
5898+
<data name="ResourceEditor.ResourceEdit.CommentColumn" xml:space="preserve">
5899+
<value>Commentaar</value>
5900+
</data>
58895901
<data name="ResourceEditor.ResourceEdit.ContentColumn" xml:space="preserve">
58905902
<value>Inhoud</value>
58915903
</data>
@@ -5898,6 +5910,12 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
58985910
<data name="ResourceEditor.ResourceEdit.ContextMenu.CopyResourceName" xml:space="preserve">
58995911
<value>Kopieer naam van hulpbron</value>
59005912
</data>
5913+
<data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
5914+
<value>Commentaar redigeren</value>
5915+
</data>
5916+
<data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
5917+
<value>Voer de nieuwe tekst voor het hulpbron commentaar in:</value>
5918+
</data>
59015919
<data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
59025920
<value>&amp;Hernoemen</value>
59035921
</data>

‎data/resources/StringResources.resx‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,12 @@ They will stop working after removing this AddIn! Are you sure you want to conti
360360
<data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
361361
<value>SharpDevelop AddIns|*.sdaddin;*.addin|All files|*.*</value>
362362
</data>
363+
<data name="AddInManager2.UpdateNotifier.BubbleText" xml:space="preserve">
364+
<value>Click here to see the updates.</value>
365+
</data>
366+
<data name="AddInManager2.UpdateNotifier.BubbleTitle" xml:space="preserve">
367+
<value>Updates for SharpDevelop are available</value>
368+
</data>
363369
<data name="AddInManager2.Views.Available" xml:space="preserve">
364370
<value>Available</value>
365371
</data>
@@ -3904,6 +3910,12 @@ has been changed externally. Do you want to reload it?</value>
39043910
<data name="ICSharpCode.SharpDevelop.DefaultEditor.IncrementalSearch.ReverseSearchStatusBarMessage" xml:space="preserve">
39053911
<value>Reverse Incremental Search:</value>
39063912
</data>
3913+
<data name="ICSharpCode.SharpDevelop.Dom.AssemblyInvalid" xml:space="preserve">
3914+
<value>{0} is not a valid .NET assembly.</value>
3915+
</data>
3916+
<data name="ICSharpCode.SharpDevelop.Dom.AssemblyNotAccessible" xml:space="preserve">
3917+
<value>{0} is not accessible or doesn't exist anymore.</value>
3918+
</data>
39073919
<data name="ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation" xml:space="preserve">
39083920
<value>Error loading code-completion information for ${Assembly} from ${Filename}:</value>
39093921
</data>
@@ -4879,6 +4891,9 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs</comment>
48794891
<data name="ICSharpCode.WixBinding.WixVisualStudioExtensionTitle" xml:space="preserve">
48804892
<value>Visual Studio Extension</value>
48814893
</data>
4894+
<data name="ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad" xml:space="preserve">
4895+
<value>WPF Designer Thumbnail View</value>
4896+
</data>
48824897
<data name="ICSharpCode.WPFDesigner.ContextMenu.Copy" xml:space="preserve">
48834898
<value>Copy</value>
48844899
</data>
@@ -6242,6 +6257,12 @@ Removed the end part of the original message ", reason '${Message}'" since this
62426257
<value>Copy resource name</value>
62436258
<comment>Context menu item; copies the name of the currently selcted resource item to the clipboard</comment>
62446259
</data>
6260+
<data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
6261+
<value>Edit comment</value>
6262+
</data>
6263+
<data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
6264+
<value>Enter the new text for the resource comment:</value>
6265+
</data>
62456266
<data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
62466267
<value>&amp;Rename</value>
62476268
</data>

‎samples/XamlDesigner/Document.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,14 @@ void UpdateDesign()
206206
{
207207
OutlineRoot = null;
208208
using (var xmlReader = XmlReader.Create(new StringReader(Text))) {
209-
DesignSurface.LoadDesigner(xmlReader, null);
209+
XamlLoadSettings settings = new XamlLoadSettings();
210+
foreach (var assNode in Toolbox.Instance.AssemblyNodes)
211+
{
212+
settings.DesignerAssemblies.Add(assNode.Assembly);
213+
}
214+
settings.TypeFinder = MyTypeFinder.Instance;
215+
216+
DesignSurface.LoadDesigner(xmlReader, settings);
210217
}
211218
if (DesignContext.RootItem != null) {
212219
OutlineRoot = OutlineNode.Create(DesignContext.RootItem);

0 commit comments

Comments
 (0)