Skip to content

Commit 23300c3

Browse files
dotnet-maestro[bot]LeafShi1
dotnet-maestro[bot]
authored and
LeafShi1
committed
[main] Update dependencies from dotnet/arcade (dotnet#12985)
[main] Update dependencies from dotnet/arcade - Fixes dotnet#12881 - Fixed instances of IDE0059 - False positive case of IDE0059, fix is on the way dotnet/roslyn#77297
1 parent b4a35db commit 23300c3

File tree

11 files changed

+28
-66
lines changed

11 files changed

+28
-66
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
191191
</ProductDependencies>
192192
<ToolsetDependencies>
193193
<!-- Arcade -->
194-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
194+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25119.2">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
196+
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25113.2">
198+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25119.2">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
200+
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25113.2">
202+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25119.2">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
204+
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
205205
</Dependency>
206-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
206+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25119.2">
207207
<Uri>https://github.com/dotnet/arcade</Uri>
208-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
208+
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25113.2">
210+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25119.2">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
212+
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
214+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25119.2">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
216+
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
217217
</Dependency>
218218
</ToolsetDependencies>
219219
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25113.2</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25113.2</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25119.2</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25119.2</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25119.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
383383

384384
# If the version of msbuild is going to be xcopied,
385385
# use this version. Version matches a package here:
386-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
387-
$defaultXCopyMSBuildVersion = '17.12.0'
386+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
387+
$defaultXCopyMSBuildVersion = '17.13.0'
388388

389389
if (!$vsRequirements) {
390390
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-alpha.1.25077.2",
3+
"dotnet": "10.0.100-preview.2.25118.3",
44
"runtimes": {
55
"dotnet/x64": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
@@ -11,12 +11,12 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "10.0.100-alpha.1.25077.2"
14+
"version": "10.0.100-preview.2.25118.3"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
18-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25113.2",
19-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25119.2",
18+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25119.2",
19+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25119.2",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "10.0.0-preview.3.25120.10"
2222
},

‎src/System.Private.Windows.Core/src/System/Private/Windows/Nrbf/SerializationRecordExtensions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,7 @@ static bool Get(SerializationRecord record, [NotNullWhen(true)] out object? list
325325
|| !classInfo.HasMember("_size")
326326
|| classInfo.GetRawValue("_size") is not int size
327327
|| !classInfo.TypeName.IsConstructedGenericType
328-
#pragma warning disable IDE0082 // 'typeof' can be converted to 'nameof' - but not for generics, waiting for a fix - https://github.com/dotnet/roslyn/pull/76920
329328
|| classInfo.TypeName.GetGenericTypeDefinition().Name != typeof(List<>).Name
330-
#pragma warning restore IDE0082
331329
|| classInfo.TypeName.GetGenericArguments().Length != 1
332330
|| classInfo.GetRawValue("_items") is not ArrayRecord arrayRecord
333331
|| !IsPrimitiveArrayRecord(arrayRecord))

‎src/System.Private.Windows.Core/src/System/SpanHelpers.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public static void CopyAndTerminate(this ReadOnlySpan<char> source, Span<char> d
2222
source.CopyTo(destination);
2323

2424
// Null terminate the string
25+
#pragma warning disable IDE0059 // Unnecessary assignment of a value
2526
destination[source.Length] = '\0';
27+
#pragma warning restore IDE0059
2628
}
2729

2830
/// <summary>

‎src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/SelectionUIHandler.cs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,36 +48,6 @@ public virtual bool BeginDrag(object[] components, SelectionRules rules, int ini
4848
Debug.Assert(_dragControls[i] is not null, "Everyone must have a control");
4949
}
5050

51-
// allow the cliprect to go just beyond the window by one grid. This helps with round off
52-
// problems. We can only do this if the container itself is not in the selection. Also,
53-
// if the container is a form and it has autoscroll turned on, we allow a drag beyond the
54-
// container boundary on the width and height, but not top and left.
55-
//
56-
bool containerSelected = false;
57-
IComponent container = GetComponent();
58-
for (int i = 0; i < components.Length; i++)
59-
{
60-
if (components[i] == container)
61-
{
62-
containerSelected = true;
63-
break;
64-
}
65-
}
66-
67-
if (!containerSelected)
68-
{
69-
Control containerControl = GetControl();
70-
Size snapSize = GetCurrentSnapSize();
71-
Rectangle containerRect = containerControl.RectangleToScreen(containerControl.ClientRectangle);
72-
containerRect.Inflate(snapSize.Width, snapSize.Height);
73-
if (GetControl() is ScrollableControl sc && sc.AutoScroll)
74-
{
75-
Rectangle screen = SystemInformation.VirtualScreen;
76-
containerRect.Width = screen.Width;
77-
containerRect.Height = screen.Height;
78-
}
79-
}
80-
8151
return true;
8252
}
8353

‎src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripSystemRenderer.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,6 @@ protected override void OnRenderSplitButtonBackground(ToolStripItemRenderEventAr
527527
VisualStyleElement splitButtonDropDownPart = rightToLeft ? VisualStyleElement.ToolBar.SplitButton.Normal : VisualStyleElement.ToolBar.SplitButtonDropDown.Normal;
528528
VisualStyleElement splitButtonPart = rightToLeft ? VisualStyleElement.ToolBar.DropDownButton.Normal : VisualStyleElement.ToolBar.SplitButton.Normal;
529529

530-
Rectangle bounds = new(Point.Empty, splitButton.Size);
531-
532530
if (ToolStripManager.VisualStylesEnabled
533531
&& VisualStyleRenderer.IsElementDefined(splitButtonDropDownPart)
534532
&& VisualStyleRenderer.IsElementDefined(splitButtonPart))
@@ -582,7 +580,6 @@ protected override void OnRenderSplitButtonBackground(ToolStripItemRenderEventAr
582580
(state == ToolBarState.Hot || state == ToolBarState.Pressed || state == ToolBarState.Checked))
583581
{
584582
var clientBounds = item.ClientBounds;
585-
bounds.Height -= 1;
586583
ControlPaint.DrawBorderSimple(g, clientBounds, SystemColors.Highlight);
587584
using var brush = SystemColors.Highlight.GetCachedSolidBrushScope();
588585
g.FillRectangle(brush, item.SplitterBounds);
@@ -595,6 +592,8 @@ protected override void OnRenderSplitButtonBackground(ToolStripItemRenderEventAr
595592

596593
if (splitButton.BackgroundImage is not null)
597594
{
595+
Rectangle bounds = new(Point.Empty, splitButton.Size);
596+
598597
// fill in the background image
599598
Rectangle fillRect = splitButton.Selected ? splitButton.ContentRectangle : bounds;
600599
if (splitButton.BackgroundImage is not null)

‎src/System.Windows.Forms/src/System/Windows/Forms/Rendering/ControlPaint.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,6 @@ private static void DrawFlatCheckBox(
13811381

13821382
rectangle.X += 1;
13831383
DrawImageColorized(graphics, t_checkImage, rectangle, foreground);
1384-
rectangle.X -= 1;
13851384
}
13861385

13871386
// Surrounding border. We inset this by one pixel so we match how the 3D checkbox is drawn.

0 commit comments

Comments
 (0)