Skip to content

Commit cf5a1ac

Browse files
JuditRoseJuditRose
committed
Merge branch 'master' into WFI-585-port-system-windows-forms-design-components
2 parents 3f6c9ee + 0924da5 commit cf5a1ac

File tree

203 files changed

+10667
-4755
lines changed

Some content is hidden

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

203 files changed

+10667
-4755
lines changed

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
6161
<Uri>https://github.com/dotnet/arcade</Uri>
6262
<Sha>443dea11f8649fe12fedf60cfab0a4b2b20bd153</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27518-72">
64+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27521-73">
6565
<Uri>https://github.com/dotnet/coreclr</Uri>
66-
<Sha>82f60c93d6677a6245446e72624723ee70254e4f</Sha>
66+
<Sha>f61314dab43e29eaa5c4323a890bc408be014f83</Sha>
6767
<SourceBuildId>5596</SourceBuildId>
6868
</Dependency>
69-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27518-72">
69+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27521-73">
7070
<Uri>https://github.com/dotnet/coreclr</Uri>
71-
<Sha>82f60c93d6677a6245446e72624723ee70254e4f</Sha>
71+
<Sha>f61314dab43e29eaa5c4323a890bc408be014f83</Sha>
7272
<SourceBuildId>5596</SourceBuildId>
7373
</Dependency>
7474
</ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727
<!-- CoreCLR-updated dependencies -->
2828
<PropertyGroup>
29-
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview4-27518-72</MicrosoftNETCoreILAsmPackageVersion>
29+
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview4-27521-73</MicrosoftNETCoreILAsmPackageVersion>
3030
</PropertyGroup>
3131
<!-- Arcade-updated dependencies -->
3232
<PropertyGroup>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"msbuild-sdks": {
1212
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19162.7",
1313
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19162.7",
14-
"Microsoft.NET.Sdk.IL": "3.0.0-preview4-27518-72"
14+
"Microsoft.NET.Sdk.IL": "3.0.0-preview4-27521-73"
1515
}
1616
}

‎src/System.Design/src/ApiCompatBaseline.netcoreapp.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionHeaderItem' do
1010
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionListsChangedEventArgs' does not exist in the implementation but it does exist in the contract.
1111
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionListsChangedEventHandler' does not exist in the implementation but it does exist in the contract.
1212
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionListsChangedType' does not exist in the implementation but it does exist in the contract.
13-
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionMethodItem' does not exist in the implementation but it does exist in the contract.
14-
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionPropertyItem' does not exist in the implementation but it does exist in the contract.
1513
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionService' does not exist in the implementation but it does exist in the contract.
1614
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionTextItem' does not exist in the implementation but it does exist in the contract.
1715
TypesMustExist : Type 'System.ComponentModel.Design.DesignerActionUIService' does not exist in the implementation but it does exist in the contract.

‎src/System.Windows.Forms.Design.Editors/src/System/ComponentModel/Design/CollectionEditor.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,6 @@ private void InitializeComponent()
13251325

13261326
private void UpdateItemWidths(ListItem item)
13271327
{
1328-
// VSWhidbey#384112: Its neither safe nor accurate to perform these width calculations prior to normal listbox handle creation. So we nop in this case now.
13291328
if (!_listbox.IsHandleCreated)
13301329
{
13311330
return;
@@ -1485,8 +1484,6 @@ private void Listbox_selectedIndexChanged(object sender, EventArgs e)
14851484
/// </summary>
14861485
private void Listbox_handleCreated(object sender, EventArgs e)
14871486
{
1488-
// VSWhidbey#384112: Since we no longer perform width calculations prior to handle
1489-
// creation now, we need to ensure we do it at least once after handle creation.
14901487
UpdateItemWidths(null);
14911488
}
14921489

‎src/System.Windows.Forms.Design/src/Resources/SR.resx‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,4 +324,91 @@
324324
<data name="DragDropSizeComponents" xml:space="preserve">
325325
<value>Size {0} components</value>
326326
</data>
327+
<data name="DesignerActionPanel_CouldNotFindMethod" xml:space="preserve">
328+
<value>Could not find method '{0}'</value>
329+
</data>
330+
<data name="UndoEngineComponentAdd0" xml:space="preserve">
331+
<value>Add Component</value>
332+
</data>
333+
<data name="UndoEngineComponentAdd1" xml:space="preserve">
334+
<value>Add {0}</value>
335+
</data>
336+
<data name="UndoEngineComponentChange0" xml:space="preserve">
337+
<value>Change Component</value>
338+
</data>
339+
<data name="UndoEngineComponentChange1" xml:space="preserve">
340+
<value>Change {0}</value>
341+
</data>
342+
<data name="UndoEngineComponentChange2" xml:space="preserve">
343+
<value>Change {0}.{1}</value>
344+
</data>
345+
<data name="UndoEngineComponentRemove0" xml:space="preserve">
346+
<value>Remove Component</value>
347+
</data>
348+
<data name="UndoEngineComponentRemove1" xml:space="preserve">
349+
<value>Remove {0}</value>
350+
</data>
351+
<data name="UndoEngineComponentRename" xml:space="preserve">
352+
<value>Rename {0} to {1}</value>
353+
</data>
354+
<data name="UndoEngineMissingService" xml:space="preserve">
355+
<value>The service {0} is required but could not be found. If you have removed this service ensure that you provide a replacement.</value>
356+
</data>
357+
<data name="DesignerHostCantDestroyInheritedComponent" xml:space="preserve">
358+
<value>Cannot remove or destroy inherited component '{0}'.</value>
359+
</data>
360+
<data name="DesignerHostCyclicAdd" xml:space="preserve">
361+
<value>Cannot add an instance of {0} to the designer because it would create a circular dependency. Make sure that the type does not have the same namespace and type name as the root component {1}.</value>
362+
</data>
363+
<data name="DesignerHostDesignerNeedsComponent" xml:space="preserve">
364+
<value>Failure initializing the designer. It has no Component member.</value>
365+
</data>
366+
<data name="DesignerHostDestroyComponentTransaction" xml:space="preserve">
367+
<value>Deleting '{0}'.</value>
368+
</data>
369+
<data name="DesignerHostDuplicateName" xml:space="preserve">
370+
<value>The name {0} is already in use by another component.</value>
371+
</data>
372+
<data name="DesignerHostFailedComponentCreate" xml:space="preserve">
373+
<value>Component of type {0} could not be created. Make sure the type implements IComponent and provides an appropriate public constructor. Appropriate constructors either take no parameters or take a single IContainer parameter.</value>
374+
</data>
375+
<data name="DesignerHostGenericTransactionName" xml:space="preserve">
376+
<value>No Description Available</value>
377+
</data>
378+
<data name="DesignerHostLoaderSpecified" xml:space="preserve">
379+
<value>A designer loader has already been configured for this design surface.</value>
380+
</data>
381+
<data name="DesignerHostNestedTransaction" xml:space="preserve">
382+
<value>The designer transaction '{0}' cannot be committed or canceled because nested transaction '{1}' is still active. Commit or cancel the nested transaction first.</value>
383+
</data>
384+
<data name="DesignerHostNoBaseClass" xml:space="preserve">
385+
<value>Cannot open a designer for the file because the class within it does not inherit from a class that can be visually designed.</value>
386+
</data>
387+
<data name="DesignerHostNoTopLevelDesigner" xml:space="preserve">
388+
<value>There is no designer for the class {0}.</value>
389+
</data>
390+
<data name="DesignerHostUnloading" xml:space="preserve">
391+
<value>New components cannot be added while a designer is unloading.</value>
392+
</data>
393+
<data name="DesignSurfaceContainerDispose" xml:space="preserve">
394+
<value>The container cannot be disposed at design time.</value>
395+
</data>
396+
<data name="DesignSurfaceDesignerNotLoaded" xml:space="preserve">
397+
<value>Cannot create a view for this design surface because the designer is not loaded.</value>
398+
</data>
399+
<data name="DesignSurfaceFatalError" xml:space="preserve">
400+
<value>An error occurred while loading the document. Fix the error, and then try loading the document again. The error message follows:\r\n\r\n{0}</value>
401+
</data>
402+
<data name="DesignSurfaceNoRootComponent" xml:space="preserve">
403+
<value>The designer loader did not provide a root component but has not indicated why.</value>
404+
</data>
405+
<data name="DesignSurfaceNoSupportedTechnology" xml:space="preserve">
406+
<value>The designer loaded, but it does not offer a view compatible with this design surface.</value>
407+
</data>
408+
<data name="DesignSurfaceServiceIsFixed" xml:space="preserve">
409+
<value>The service {0} cannot be removed from the service container.</value>
410+
</data>
411+
<data name="ExtenderProviderServiceDuplicateProvider" xml:space="preserve">
412+
<value>The extender provider {0} has already been added as an extender. Adding another would result in duplicate properties.</value>
413+
</data>
327414
</root>

‎src/System.Windows.Forms.Design/src/Resources/xlf/SR.cs.xlf‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,101 @@
142142
<target state="new">Inherited control (Private)</target>
143143
<note />
144144
</trans-unit>
145+
<trans-unit id="DesignSurfaceContainerDispose">
146+
<source>The container cannot be disposed at design time.</source>
147+
<target state="new">The container cannot be disposed at design time.</target>
148+
<note />
149+
</trans-unit>
150+
<trans-unit id="DesignSurfaceDesignerNotLoaded">
151+
<source>Cannot create a view for this design surface because the designer is not loaded.</source>
152+
<target state="new">Cannot create a view for this design surface because the designer is not loaded.</target>
153+
<note />
154+
</trans-unit>
155+
<trans-unit id="DesignSurfaceFatalError">
156+
<source>An error occurred while loading the document. Fix the error, and then try loading the document again. The error message follows:\r\n\r\n{0}</source>
157+
<target state="new">An error occurred while loading the document. Fix the error, and then try loading the document again. The error message follows:\r\n\r\n{0}</target>
158+
<note />
159+
</trans-unit>
160+
<trans-unit id="DesignSurfaceNoRootComponent">
161+
<source>The designer loader did not provide a root component but has not indicated why.</source>
162+
<target state="new">The designer loader did not provide a root component but has not indicated why.</target>
163+
<note />
164+
</trans-unit>
165+
<trans-unit id="DesignSurfaceNoSupportedTechnology">
166+
<source>The designer loaded, but it does not offer a view compatible with this design surface.</source>
167+
<target state="new">The designer loaded, but it does not offer a view compatible with this design surface.</target>
168+
<note />
169+
</trans-unit>
170+
<trans-unit id="DesignSurfaceServiceIsFixed">
171+
<source>The service {0} cannot be removed from the service container.</source>
172+
<target state="new">The service {0} cannot be removed from the service container.</target>
173+
<note />
174+
</trans-unit>
175+
<trans-unit id="DesignerActionPanel_CouldNotFindMethod">
176+
<source>Could not find method '{0}'</source>
177+
<target state="new">Could not find method '{0}'</target>
178+
<note />
179+
</trans-unit>
180+
<trans-unit id="DesignerHostCantDestroyInheritedComponent">
181+
<source>Cannot remove or destroy inherited component '{0}'.</source>
182+
<target state="new">Cannot remove or destroy inherited component '{0}'.</target>
183+
<note />
184+
</trans-unit>
185+
<trans-unit id="DesignerHostCyclicAdd">
186+
<source>Cannot add an instance of {0} to the designer because it would create a circular dependency. Make sure that the type does not have the same namespace and type name as the root component {1}.</source>
187+
<target state="new">Cannot add an instance of {0} to the designer because it would create a circular dependency. Make sure that the type does not have the same namespace and type name as the root component {1}.</target>
188+
<note />
189+
</trans-unit>
190+
<trans-unit id="DesignerHostDesignerNeedsComponent">
191+
<source>Failure initializing the designer. It has no Component member.</source>
192+
<target state="new">Failure initializing the designer. It has no Component member.</target>
193+
<note />
194+
</trans-unit>
195+
<trans-unit id="DesignerHostDestroyComponentTransaction">
196+
<source>Deleting '{0}'.</source>
197+
<target state="new">Deleting '{0}'.</target>
198+
<note />
199+
</trans-unit>
200+
<trans-unit id="DesignerHostDuplicateName">
201+
<source>The name {0} is already in use by another component.</source>
202+
<target state="new">The name {0} is already in use by another component.</target>
203+
<note />
204+
</trans-unit>
205+
<trans-unit id="DesignerHostFailedComponentCreate">
206+
<source>Component of type {0} could not be created. Make sure the type implements IComponent and provides an appropriate public constructor. Appropriate constructors either take no parameters or take a single IContainer parameter.</source>
207+
<target state="new">Component of type {0} could not be created. Make sure the type implements IComponent and provides an appropriate public constructor. Appropriate constructors either take no parameters or take a single IContainer parameter.</target>
208+
<note />
209+
</trans-unit>
210+
<trans-unit id="DesignerHostGenericTransactionName">
211+
<source>No Description Available</source>
212+
<target state="new">No Description Available</target>
213+
<note />
214+
</trans-unit>
215+
<trans-unit id="DesignerHostLoaderSpecified">
216+
<source>A designer loader has already been configured for this design surface.</source>
217+
<target state="new">A designer loader has already been configured for this design surface.</target>
218+
<note />
219+
</trans-unit>
220+
<trans-unit id="DesignerHostNestedTransaction">
221+
<source>The designer transaction '{0}' cannot be committed or canceled because nested transaction '{1}' is still active. Commit or cancel the nested transaction first.</source>
222+
<target state="new">The designer transaction '{0}' cannot be committed or canceled because nested transaction '{1}' is still active. Commit or cancel the nested transaction first.</target>
223+
<note />
224+
</trans-unit>
225+
<trans-unit id="DesignerHostNoBaseClass">
226+
<source>Cannot open a designer for the file because the class within it does not inherit from a class that can be visually designed.</source>
227+
<target state="new">Cannot open a designer for the file because the class within it does not inherit from a class that can be visually designed.</target>
228+
<note />
229+
</trans-unit>
230+
<trans-unit id="DesignerHostNoTopLevelDesigner">
231+
<source>There is no designer for the class {0}.</source>
232+
<target state="new">There is no designer for the class {0}.</target>
233+
<note />
234+
</trans-unit>
235+
<trans-unit id="DesignerHostUnloading">
236+
<source>New components cannot be added while a designer is unloading.</source>
237+
<target state="new">New components cannot be added while a designer is unloading.</target>
238+
<note />
239+
</trans-unit>
145240
<trans-unit id="DesignerOptions_CodeGenDisplay">
146241
<source>Optimized Code Generation</source>
147242
<target state="translated">Generování optimalizovaného kódu</target>
@@ -257,6 +352,11 @@
257352
<target state="translated">Tento objekt IDataObject nepodporuje funkci SetData.</target>
258353
<note />
259354
</trans-unit>
355+
<trans-unit id="ExtenderProviderServiceDuplicateProvider">
356+
<source>The extender provider {0} has already been added as an extender. Adding another would result in duplicate properties.</source>
357+
<target state="new">The extender provider {0} has already been added as an extender. Adding another would result in duplicate properties.</target>
358+
<note />
359+
</trans-unit>
260360
<trans-unit id="InheritanceServiceReadOnlyCollection">
261361
<source>Read-Only</source>
262362
<target state="new">Read-Only</target>
@@ -307,6 +407,51 @@
307407
<target state="new">Data type {0} is not serializable. Items added to a property dictionary must be serializable.</target>
308408
<note />
309409
</trans-unit>
410+
<trans-unit id="UndoEngineComponentAdd0">
411+
<source>Add Component</source>
412+
<target state="new">Add Component</target>
413+
<note />
414+
</trans-unit>
415+
<trans-unit id="UndoEngineComponentAdd1">
416+
<source>Add {0}</source>
417+
<target state="new">Add {0}</target>
418+
<note />
419+
</trans-unit>
420+
<trans-unit id="UndoEngineComponentChange0">
421+
<source>Change Component</source>
422+
<target state="new">Change Component</target>
423+
<note />
424+
</trans-unit>
425+
<trans-unit id="UndoEngineComponentChange1">
426+
<source>Change {0}</source>
427+
<target state="new">Change {0}</target>
428+
<note />
429+
</trans-unit>
430+
<trans-unit id="UndoEngineComponentChange2">
431+
<source>Change {0}.{1}</source>
432+
<target state="new">Change {0}.{1}</target>
433+
<note />
434+
</trans-unit>
435+
<trans-unit id="UndoEngineComponentRemove0">
436+
<source>Remove Component</source>
437+
<target state="new">Remove Component</target>
438+
<note />
439+
</trans-unit>
440+
<trans-unit id="UndoEngineComponentRemove1">
441+
<source>Remove {0}</source>
442+
<target state="new">Remove {0}</target>
443+
<note />
444+
</trans-unit>
445+
<trans-unit id="UndoEngineComponentRename">
446+
<source>Rename {0} to {1}</source>
447+
<target state="new">Rename {0} to {1}</target>
448+
<note />
449+
</trans-unit>
450+
<trans-unit id="UndoEngineMissingService">
451+
<source>The service {0} is required but could not be found. If you have removed this service ensure that you provide a replacement.</source>
452+
<target state="new">The service {0} is required but could not be found. If you have removed this service ensure that you provide a replacement.</target>
453+
<note />
454+
</trans-unit>
310455
<trans-unit id="TrayAutoArrange">
311456
<source>Auto Arrange Tray Icons</source>
312457
<target state="new">Auto Arrange Tray Icons</target>

0 commit comments

Comments
 (0)