Skip to content

Merge main into live #12838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gewarren merged 4 commits into from
Jun 29, 2026
Merged

Merge main into live #12838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65956b1
Upgrade projects to .NET 10 (System namespace A-L) (#12809)
gewarren Jun 29, 2026
26f9d27
Update MemberGroup elements (Microsoft* namespaces) (#12817)
gewarren Jun 29, 2026
82f7b91
Upgrade projects to .NET 10 (System.Drawing) (#12799)
gewarren Jun 29, 2026
683bcae
CI Update (#12836)
gewarren Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Design/BitmapEditor/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions snippets/csharp/System.Drawing.Design/BitmapEditor/Overview/usercontrol1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class UserControl1 : System.Windows.Forms.UserControl
//<Snippet1>
[EditorAttribute(typeof(System.Drawing.Design.BitmapEditor),
typeof(System.Drawing.Design.UITypeEditor))]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Bitmap testBitmap
{
get
Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Design/CategoryNameCollection/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Design/IPropertyValueUIService/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
3 changes: 3 additions & 0 deletions ...pets/csharp/System.Drawing.Design/IPropertyValueUIService/Overview/propertyuicomponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//<Snippet1>
using System.Collections;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Design;
using System.Windows.Forms;
Expand All @@ -14,9 +15,11 @@ namespace PropertyValueUIServiceExample
public class PropertyUIComponent : System.ComponentModel.Component
{
// Example property for which to provide a PropertyValueUIItem.
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public int HorizontalMargin { get; set; }

// Example property for which to provide a PropertyValueUIItem.
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public int VerticalMargin { get; set; }

// Field storing the value of the VerticalMargin property.
Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Design/IToolboxService/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Design/ToolboxItemCollection/.ctor/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Design/UITypeEditor/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions snippets/csharp/System.Drawing.Design/UITypeEditor/Overview/angleeditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ public class AngleEditorTestControl : System.Windows.Forms.UserControl

[BrowsableAttribute(true)]
[EditorAttribute(typeof(AngleEditor), typeof(System.Drawing.Design.UITypeEditor))]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public double Angle
{
get
Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Design/UITypeEditorEditStyle/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
1 change: 1 addition & 0 deletions ...csharp/System.Drawing.Design/UITypeEditorEditStyle/Overview/lightshapeselectioncontrol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ protected override void Dispose( bool disposing )
// <snippet360>
// LightShape is the property for which this control provides
// a custom user interface in the Properties window.
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public MarqueeLightShape LightShape
{
get
Expand Down
8 changes: 8 additions & 0 deletions snippets/csharp/System.Drawing.Design/UITypeEditorEditStyle/Overview/marqueeborder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public virtual void StopMarquee()

[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public virtual int UpdatePeriod
{
get
Expand Down Expand Up @@ -161,6 +162,7 @@ public virtual int UpdatePeriod
// <snippet60>
[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public int LightSize
{
get
Expand All @@ -184,6 +186,7 @@ public int LightSize

[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public int LightPeriod
{
get
Expand All @@ -206,6 +209,7 @@ public int LightPeriod

[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color LightColor
{
get
Expand All @@ -229,6 +233,7 @@ public Color LightColor

[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color DarkColor
{
get
Expand All @@ -252,6 +257,7 @@ public Color DarkColor

[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public int LightSpacing
{
get
Expand All @@ -276,6 +282,7 @@ public int LightSpacing
[Browsable(true)]
[EditorAttribute(typeof(LightShapeEditor),
typeof(System.Drawing.Design.UITypeEditor))]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public MarqueeLightShape LightShape
{
get
Expand All @@ -291,6 +298,7 @@ public MarqueeLightShape LightShape

[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public MarqueeSpinDirection SpinDirection
{
get
Expand Down
3 changes: 3 additions & 0 deletions snippets/csharp/System.Drawing.Design/UITypeEditorEditStyle/Overview/marqueetext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public virtual void StopMarquee()

[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public int UpdatePeriod
{
get
Expand Down Expand Up @@ -99,6 +100,7 @@ public int UpdatePeriod
// <snippet160>
[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color LightColor
{
get
Expand All @@ -121,6 +123,7 @@ public Color LightColor

[Category("Marquee")]
[Browsable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color DarkColor
{
get
Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/AdjustableArrowCap/.ctor/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/FillMode/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/GraphicsPath/AddArc/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/GraphicsPathIterator/CopyData/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/HatchBrush/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/LinearGradientBrush/Clone/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/LinearGradientBrush/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/Matrix/Multiply/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/Matrix/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Drawing2D/PathGradientBrush/MultiplyTransform/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/ColorMatrix/.ctor/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/ColorMatrix/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/Encoder/ColorDepth/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/Encoder/Compression/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/Encoder/SaveFlag/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/Encoder/Transformation/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/EncoderParameter/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/ImageAttributes/SetBrushRemapTable/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Imaging/ImageCodecInfo/GetImageEncoders/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Printing/Margins/Bottom/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Printing/Margins/Overview/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/System.Drawing.Printing/PageSettings/Color/Project.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
Loading
Loading