[main] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -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="10.0.0-beta.25210.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25212.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
+      <Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25210.1">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25212.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
+      <Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25210.1">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25212.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
+      <Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25210.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25212.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
+      <Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25210.1">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25212.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
+      <Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25210.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25212.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
+      <Sha>87401be5731aa537bbf4cb71d7800d1c74d5e429</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -56,9 +56,9 @@
   </PropertyGroup>
   <!-- Arcade -->
   <PropertyGroup>
-    <MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25210.1</MicrosoftDotNetGenFacadesPackageVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25210.1</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25210.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
+    <MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetGenFacadesPackageVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25212.1</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25212.1</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 -->

eng/common/core-templates/steps/install-microbuild.yml

@@ -91,8 +91,18 @@ steps:
           script: |
             Write-Host "Copying Linux Path"
             $MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
-            $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', ''
-            $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build'
+            $MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '')
+
+            $versionRegex = '\d+\.\d+\.\d+'
+            $package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory |
+              Where-Object { $_.Name -match $versionRegex }
+
+            if ($package.Count -ne 1) {
+                Write-Host "There should be exactly one matching subfolder, but found $($package.Count)."
+                exit 1
+            }
+
+            $MBSIGN_APPFOLDER = $package[0].FullName + '/build'
             $MBSIGN_APPFOLDER | Write-Host
             $SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
             Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force

eng/common/sdl/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
+  <package id="Microsoft.Guardian.Cli" version="0.199.0"/>
 </packages>

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "10.0.100-preview.3.25167.3",
+    "dotnet": "10.0.100-preview.3.25201.16",
     "runtimes": {
       "dotnet/x64": [
         "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
@@ -11,12 +11,12 @@
     }
   },
   "sdk": {
-    "version": "10.0.100-preview.3.25167.3"
+    "version": "10.0.100-preview.3.25201.16"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25210.1",
-    "Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25210.1",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25210.1",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1",
+    "Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25212.1",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1",
     "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "10.0.0-preview.4.25210.5"
   },

src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj

@@ -19,9 +19,6 @@
       SYSLIB5005: System.Formats.Nrbf is experimental
     -->
     <NoWarn>$(NoWarn);CS3016;SYSLIB5005</NoWarn>
-    <!-- Reenable when SDK and dotnet Preview 4 versions flow into this repo and we are in sync with VMR. -->
-    <!-- tracking https://github.com/dotnet/winforms/issues/13261 -->
-    <NoWarn Condition="'$(DotNetBuild)' == 'true'">$(NoWarn);IDE0031</NoWarn>
     <Deterministic>true</Deterministic>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <UsePublicApiAnalyzers>false</UsePublicApiAnalyzers>

src/System.Private.Windows.Core/src/System/Private/Windows/Ole/FormatEnumerator.cs

@@ -56,10 +56,7 @@ public int Next(int celt, ComTypes.FORMATETC[] rgelt, int[]? pceltFetched)
     {
         if (_current >= _formats.Count || celt <= 0)
         {
-            if (pceltFetched is not null)
-            {
-                pceltFetched[0] = 0;
-            }
+            pceltFetched?[0] = 0;
 
             return (int)HRESULT.S_FALSE;
         }
@@ -74,10 +71,7 @@ public int Next(int celt, ComTypes.FORMATETC[] rgelt, int[]? pceltFetched)
             lindex = -1
         };
 
-        if (pceltFetched is not null)
-        {
-            pceltFetched[0] = 1;
-        }
+        pceltFetched?[0] = 1;
 
         _current++;
         return (int)HRESULT.S_OK;

src/System.Windows.Forms.Design/src/System.Windows.Forms.Design.csproj

@@ -15,9 +15,6 @@
     <NoWarn>$(NoWarn);IL2026;IL2046;IL2057;IL2067;IL2070;IL2072;IL2075;IL2094;IL2111</NoWarn>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <UsePublicApiAnalyzers>true</UsePublicApiAnalyzers>
-    <!-- Reenable when IDE0031 analyzer in this repo supports null-conditional assignment as it does in the VMR. -->
-    <!-- tracking https://github.com/dotnet/winforms/issues/13261 -->
-    <NoWarn Condition="'$(DotNetBuild)' == 'true'">$(NoWarn);IDE0031</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.FlyoutDialog.cs

@@ -182,9 +182,9 @@ protected override void WndProc(ref Message m)
                             // If it's a toolstrip dropdown let it know that we have a specific close reason.
                             dropDown.Close();
                         }
-                        else if (toplevel is not null)
+                        else
                         {
-                            toplevel.Visible = false;
+                            toplevel?.Visible = false;
                         }
                     }
 

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.cs

@@ -129,10 +129,7 @@ private unsafe void ActivateDropDown()
 
         private void CloseDropDown()
         {
-            if (_dropDownHolder is not null)
-            {
-                _dropDownHolder.Visible = false;
-            }
+            _dropDownHolder?.Visible = false;
         }
 
         protected override int GetTextBoxLeftPadding(int textBoxHeight)

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionUI.DesignerActionToolStripDropDown.cs

@@ -170,10 +170,7 @@ private void PanelResized(object? sender, EventArgs e)
             {
                 SuspendLayout();
                 Size = ctrl.Size;
-                if (_panel is not null)
-                {
-                    _panel.Size = ctrl.Size;
-                }
+                _panel?.Size = ctrl.Size;
 
                 _designerActionUI.UpdateDAPLocation(component: null, _relatedGlyph as DesignerActionGlyph);
                 ResumeLayout();

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerHost.cs

@@ -617,10 +617,7 @@ public override void Remove(IComponent? component)
             Site? site = component.Site as Site;
             RemoveWithoutUnsiting(component);
             RemoveFromContainerPostProcess(component);
-            if (site is not null)
-            {
-                site.Disposed = true;
-            }
+            site?.Disposed = true;
         }
     }
 

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/BasicDesignerLoader.cs

@@ -635,10 +635,7 @@ protected virtual void OnEndLoad(bool successful, ICollection? errors)
             if (!successful && !(TryGetService(out IDesignerLoaderHost2? lh2) && lh2.IgnoreErrorsDuringReload))
             {
                 // Can we even show the Continue Ignore errors in DTEL?
-                if (lh2 is not null)
-                {
-                    lh2.CanReloadWithErrors = LoaderHost.RootComponent is not null;
-                }
+                lh2?.CanReloadWithErrors = LoaderHost.RootComponent is not null;
 
                 UnloadDocument();
             }

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomDesignerLoader.cs

@@ -852,10 +852,7 @@ protected virtual void OnComponentRename(object component, string? oldName, stri
     {
         if (LoaderHost.RootComponent == component)
         {
-            if (_documentType is not null)
-            {
-                _documentType.Name = newName;
-            }
+            _documentType?.Name = newName;
 
             return;
         }

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs

@@ -1614,10 +1614,7 @@ private bool DeserializePropertyAssignStatement(IDesignerSerializationManager ma
                 }
                 catch
                 {
-                    if (relationships is not null)
-                    {
-                        relationships[lhs, p] = oldRelation;
-                    }
+                    relationships?[lhs, p] = oldRelation;
 
                     throw;
                 }

src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ToolStripContainerActionList.cs

@@ -58,10 +58,7 @@ private void ChangeProperty(Component component, string propertyName, object val
 
             if (!(bool)value)
             {
-                if (panel is not null)
-                {
-                    panel.Padding = new Padding(0);
-                }
+                panel?.Padding = new Padding(0);
 
                 if (panelDesigner?.ToolStripPanelSelectorGlyph is not null)
                 {

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.cs

@@ -546,10 +546,7 @@ private bool PropagateHitTest(Point pt)
             {
                 MenuCommand? menuCommand = menuService.FindCommand(commandID);
 
-                if (menuCommand is not null)
-                {
-                    menuCommand.Enabled = false;
-                }
+                menuCommand?.Enabled = false;
 
                 return menuCommand;
             }

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DesignBindingPicker.cs

@@ -487,10 +487,7 @@ private void CloseDropDown()
             if (_context?.Instance is BindingSource instance && _designerHost is not null)
             {
                 BindingSourceDesigner? designer = _designerHost.GetDesigner(instance) as BindingSourceDesigner;
-                if (designer is not null)
-                {
-                    designer.BindingUpdatedByUser = true;
-                }
+                designer?.BindingUpdatedByUser = true;
             }
 
             // Tell the editor service to close the dropdown

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DesignerExtenders.NameExtenderProvider.cs

@@ -91,10 +91,7 @@ public virtual bool CanExtend(object o)
         public static void SetName(IComponent comp, string newName)
         {
             ISite? site = comp.Site;
-            if (site is not null)
-            {
-                site.Name = newName;
-            }
+            site?.Name = newName;
         }
     }
 }

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.cs

@@ -77,10 +77,7 @@ private SizeF AutoScaleDimensions
         set
         {
             ContainerControl c = Control as ContainerControl;
-            if (c is not null)
-            {
-                c.AutoScaleDimensions = value;
-            }
+            c?.AutoScaleDimensions = value;
         }
     }
 
@@ -199,10 +196,7 @@ private bool TrayAutoArrange
         set
         {
             _trayAutoArrange = value;
-            if (_componentTray is not null)
-            {
-                _componentTray.AutoArrange = _trayAutoArrange;
-            }
+            _componentTray?.AutoArrange = _trayAutoArrange;
         }
     }
 
@@ -213,10 +207,7 @@ private bool TrayLargeIcon
         set
         {
             _trayLargeIcon = value;
-            if (_componentTray is not null)
-            {
-                _componentTray.ShowLargeIcons = _trayLargeIcon;
-            }
+            _componentTray?.ShowLargeIcons = _trayLargeIcon;
         }
     }
 
@@ -227,10 +218,7 @@ private int TrayHeight
         set
         {
             _trayHeight = value;
-            if (_componentTray is not null)
-            {
-                _componentTray.Height = _trayHeight;
-            }
+            _componentTray?.Height = _trayHeight;
         }
     }
 

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ParentControlDesigner.cs

@@ -2482,11 +2482,8 @@ bool IOleDragClient.IsDropOk(IComponent component)
             {
                 designer = TypeDescriptor.CreateDesigner(component, typeof(IDesigner));
                 ControlDesigner cd = designer as ControlDesigner;
-                if (cd is not null)
-                {
-                    // Make sure the component doesn't get set to Visible
-                    cd.ForceVisible = false;
-                }
+                // Make sure the component doesn't get set to Visible
+                cd?.ForceVisible = false;
 
                 designer.Initialize(component);
                 disposeDesigner = true;

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/StyleEditorForm.cs

@@ -801,10 +801,7 @@ private void ClearAndSetSelectionAndFocus(int index)
         {
             _columnsAndRowsListView.BeginUpdate();
             _columnsAndRowsListView.Focus();
-            if (_columnsAndRowsListView.FocusedItem is not null)
-            {
-                _columnsAndRowsListView.FocusedItem.Focused = false;
-            }
+            _columnsAndRowsListView.FocusedItem?.Focused = false;
 
             _columnsAndRowsListView.SelectedItems.Clear();
             _columnsAndRowsListView.Items[index].Selected = true;

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/TabControlDesigner.cs

@@ -101,10 +101,8 @@ public override void InitializeNewComponent(IDictionary defaultValues)
         RaiseComponentChanged(member, null, null);
 
         TabControl tc = (TabControl)Component;
-        if (tc is not null)
-        { // always Select the First Tab on Initializing the component...
-            tc.SelectedIndex = 0;
-        }
+        // Always select the first tab on initializing the component.
+        tc?.SelectedIndex = 0;
     }
 
     // If the TabControl already contains the control we are dropping then don't allow the drop.
@@ -113,10 +111,7 @@ public override void InitializeNewComponent(IDictionary defaultValues)
 
     private void CheckVerbStatus()
     {
-        if (_removeVerb is not null)
-        {
-            _removeVerb.Enabled = Control.Controls.Count > 0;
-        }
+        _removeVerb?.Enabled = Control.Controls.Count > 0;
     }
 
     protected override IComponent[] CreateToolCore(ToolboxItem tool, int x, int y, int width, int height, bool hasLocation, bool hasSize)