Skip to content

Commit

Permalink
[release/9.0] Update dependencies from dotnet/arcade (#12299)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20241008.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24503.2 -> To Version 9.0.0-beta.24508.3

* Update dependencies from https://github.com/dotnet/arcade build 20241009.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24508.3 -> To Version 9.0.0-beta.24509.3

* Fix IDE0300 errors

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Loni Tra <lonitra@microsoft.com>
  • Loading branch information
3 people authored Oct 11, 2024
1 parent d16f088 commit 48131d2
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 44 deletions.
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24503.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24509.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
<Sha>05c72bb3c9b38138276a8029017f2ef905dcc7fa</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24503.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24503.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24503.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24509.3</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24509.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24509.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ function IsWindowsPlatform() {
}

function Get-Darc($version) {
$darcPath = "$TempDir\darc\$(New-Guid)"
$darcPath = "$TempDir\darc\$([guid]::NewGuid())"
if ($version -ne $null) {
& $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
} else {
Expand Down
10 changes: 5 additions & 5 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100-rc.1.24452.12",
"dotnet": "9.0.100-rc.2.24474.11",
"runtimes": {
"dotnet/x64": [
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
Expand All @@ -11,12 +11,12 @@
}
},
"sdk": {
"version": "9.0.100-rc.1.24452.12"
"version": "9.0.100-rc.2.24474.11"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24503.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24503.2",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24509.3",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24510.3"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,13 @@ private void InitializeComponent()

// absoluteNumericUpDown
resources.ApplyResources(_absoluteNumericUpDown, "absoluteNumericUpDown");
_absoluteNumericUpDown.Maximum = new decimal(new int[]
{
_absoluteNumericUpDown.Maximum = new decimal(
[
99999,
0,
0,
0
});
]);
_absoluteNumericUpDown.Name = "absoluteNumericUpDown";
_absoluteNumericUpDown.Margin = new Padding(_scaledUpDownLeftMargin, _scaledUpDownTopMargin, 0, 0);
_absoluteNumericUpDown.AutoScaleMode = AutoScaleMode.Font;
Expand Down Expand Up @@ -435,13 +435,13 @@ private void InitializeComponent()
// percentNumericUpDown
resources.ApplyResources(_percentNumericUpDown, "percentNumericUpDown");
_percentNumericUpDown.DecimalPlaces = 2;
_percentNumericUpDown.Maximum = new decimal(new int[]
{
_percentNumericUpDown.Maximum = new decimal(
[
9999,
0,
0,
0
});
]);
_percentNumericUpDown.Name = "percentNumericUpDown";
_percentNumericUpDown.Margin = new Padding(_scaledUpDownLeftMargin, _scaledUpDownTopMargin, 0, 0);
_percentNumericUpDown.AutoScaleMode = AutoScaleMode.Font;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,11 @@ protected virtual void DrawFlatComboDropDown(ComboBox comboBox, Graphics g, Rect

g.FillPolygon(
brush,
new Point[]
{
[
new(middle.X - s_offsetPixels, middle.Y - 1),
new(middle.X + s_offsetPixels + 1, middle.Y - 1),
new(middle.X, middle.Y + s_offsetPixels)
});
]);
}

protected virtual Color GetOuterBorderColor(ComboBox comboBox)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2260,12 +2260,12 @@ private Rectangle PaintPrivate(
// if the height is odd - favor pushing it over one pixel down.
middle.Y += (dropRect.Height % 2);

g.FillPolygon(SystemBrushes.ControlText, new Point[]
{
g.FillPolygon(SystemBrushes.ControlText,
[
new(middle.X - s_offset2X, middle.Y - 1),
new(middle.X + s_offset2X + 1, middle.Y - 1),
new(middle.X, middle.Y + s_offset2Y)
});
]);
}
else if (!paintXPThemes)
{
Expand All @@ -2283,7 +2283,7 @@ private Rectangle PaintPrivate(
middle.Y += (dropRect.Height % 2);
Point pt1 = new(middle.X - (s_nonXPTriangleWidth - 1) / 2, middle.Y - s_nonXPTriangleHeight);
Point pt2 = new(middle.X + (s_nonXPTriangleWidth - 1) / 2, middle.Y - s_nonXPTriangleHeight);
g.FillPolygon(SystemBrushes.ControlText, new Point[] { pt1, pt2, middle });
g.FillPolygon(SystemBrushes.ControlText, [pt1, pt2, middle]);
// quirk in GDI+ : if we don't draw the line below then the top right most pixel of the DropDown triangle will not paint
// Would think that g.FillPolygon would have painted that...
g.DrawLine(SystemPens.ControlText, pt1.X, pt1.Y, pt2.X, pt2.Y);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@ private bool FilterReadOnlyEditKeyPress(char keyChar)
int index = GetCurrentValueIndex(gridEntry);

object[] values = gridEntry.GetPropertyValueList();
string letter = new(new char[] { keyChar });
string letter = new([keyChar]);
for (int i = 0; i < values.Length; i++)
{
object currentValue = values[(i + index + 1) % values.Length];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3893,21 +3893,21 @@ internal void PaintInsertionMark(Graphics g)
int verticalBeamStart = start + 2;

// Draw vertical lines.
g.DrawLines(SystemPens.ControlText, (ReadOnlySpan<Point>)
g.DrawLines(SystemPens.ControlText,
[
new(verticalBeamStart, _lastInsertionMarkRect.Y), new(verticalBeamStart, _lastInsertionMarkRect.Bottom - 1),
new(verticalBeamStart + 1, _lastInsertionMarkRect.Y), new(verticalBeamStart + 1, _lastInsertionMarkRect.Bottom - 1)
]);

// Draw top horizontal lines.
g.DrawLines(SystemPens.ControlText, (ReadOnlySpan<Point>)
g.DrawLines(SystemPens.ControlText,
[
new(start, _lastInsertionMarkRect.Bottom - 1), new(start + widthOfBeam - 1, _lastInsertionMarkRect.Bottom - 1),
new(start + 1, _lastInsertionMarkRect.Bottom - 2), new(start + widthOfBeam - 2, _lastInsertionMarkRect.Bottom - 2)
]);

// Draw bottom horizontal lines.
g.DrawLines(SystemPens.ControlText, (ReadOnlySpan<Point>)
g.DrawLines(SystemPens.ControlText,
[
new(start, _lastInsertionMarkRect.Y), new(start + widthOfBeam - 1, _lastInsertionMarkRect.Y),
new(start + 1, _lastInsertionMarkRect.Y + 1), new(start + widthOfBeam - 2, _lastInsertionMarkRect.Y + 1)
Expand All @@ -3920,21 +3920,21 @@ internal void PaintInsertionMark(Graphics g)
int horizontalBeamStart = start + 2;

// Draw horizontal lines.
g.DrawLines(SystemPens.ControlText, (ReadOnlySpan<Point>)
g.DrawLines(SystemPens.ControlText,
[
new(_lastInsertionMarkRect.X, horizontalBeamStart), new(_lastInsertionMarkRect.Right - 1, horizontalBeamStart),
new(_lastInsertionMarkRect.X, horizontalBeamStart + 1), new(_lastInsertionMarkRect.Right - 1, horizontalBeamStart + 1)
]);

// Draw left vertical lines.
g.DrawLines(SystemPens.ControlText, (ReadOnlySpan<Point>)
g.DrawLines(SystemPens.ControlText,
[
new(_lastInsertionMarkRect.X, start), new(_lastInsertionMarkRect.X, start + widthOfBeam - 1),
new(_lastInsertionMarkRect.X + 1, start + 1), new(_lastInsertionMarkRect.X + 1, start + widthOfBeam - 2)
]);

// Draw right vertical lines.
g.DrawLines(SystemPens.ControlText, (ReadOnlySpan<Point>)
g.DrawLines(SystemPens.ControlText,
[
new(_lastInsertionMarkRect.Right - 1, start), new(_lastInsertionMarkRect.Right - 1, start + widthOfBeam - 1),
new(_lastInsertionMarkRect.Right - 2, start + 1), new(_lastInsertionMarkRect.Right - 2, start + widthOfBeam - 2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ protected override void DrawFlatComboDropDown(ComboBox comboBox, Graphics g, Rec

// If the width is odd - favor pushing it over one pixel right.
middle.X += (dropDownRect.Width % 2);
g.FillPolygon(brush, new Point[]
{
g.FillPolygon(brush,
[
new(middle.X - s_offsetPixels, middle.Y - 1),
new(middle.X + s_offsetPixels + 1, middle.Y - 1),
new(middle.X, middle.Y + s_offsetPixels)
});
]);
}
}
}
Expand Down

0 comments on commit 48131d2

Please sign in to comment.