Skip to content

Commit 95405cd

Browse files
dotnet-maestro[bot]lonitra
dotnet-maestro[bot]
and
lonitra
authored
[release/9.0] Update dependencies from dotnet/arcade (#12484)
* Update dependencies from https://github.com/dotnet/arcade build 20241112.13 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.24516.2 -> To Version 9.0.0-beta.24562.13 * Update dependencies from https://github.com/dotnet/arcade build 20241122.2 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.24572.2 * fix variable name --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Loni Tra <[email protected]>
1 parent f9ea016 commit 95405cd

File tree

7 files changed

+25
-27
lines changed

7 files changed

+25
-27
lines changed

‎NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-9d5a6a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
109
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,7 +24,6 @@
2524
<clear />
2625
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2726
<!-- Begin: Package sources from dotnet-runtime -->
28-
<add key="darc-int-dotnet-runtime-9d5a6a9" value="true" />
2927
<!-- End: Package sources from dotnet-runtime -->
3028
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3129
</disabledPackageSources>

‎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="9.0.0-beta.24503.2">
194+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24572.2">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
196+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24503.2">
198+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24572.2">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
200+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24503.2">
202+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24572.2">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
204+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
205205
</Dependency>
206-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24503.2">
206+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24572.2">
207207
<Uri>https://github.com/dotnet/arcade</Uri>
208-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
208+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24503.2">
210+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24572.2">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
212+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24503.2">
214+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24572.2">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>beb827ded6acdff8c7333dfc6583cc984a8f2620</Sha>
216+
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
217217
</Dependency>
218218
</ToolsetDependencies>
219219
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
</PropertyGroup>
5858
<!-- Arcade -->
5959
<PropertyGroup>
60-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24503.2</MicrosoftDotNetGenFacadesPackageVersion>
61-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24503.2</MicrosoftDotNetRemoteExecutorVersion>
62-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24503.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
60+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetGenFacadesPackageVersion>
61+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24572.2</MicrosoftDotNetRemoteExecutorVersion>
62+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
6363
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6464
</PropertyGroup>
6565
<!-- 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.10.0-pre.4.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.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.10.0-pre.4.0
387-
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
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'
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": "9.0.100-rc.2.24474.11",
3+
"dotnet": "9.0.100",
44
"runtimes": {
55
"dotnet/x64": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -11,12 +11,12 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "9.0.100-rc.2.24474.11"
14+
"version": "9.0.100"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
18-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24516.2",
19-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2",
18+
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24572.2",
19+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24572.2",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "9.0.0"
2222
},

‎src/System.Windows.Forms/tests/UnitTests/NumericUpDownTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,8 +826,8 @@ public bool IsInitializing
826826
{
827827
get
828828
{
829-
var field = typeof(NumericUpDown).GetField("_initializing", BindingFlags.NonPublic | BindingFlags.Instance);
830-
return (bool)field.GetValue(this);
829+
var @field = typeof(NumericUpDown).GetField("_initializing", BindingFlags.NonPublic | BindingFlags.Instance);
830+
return (bool)@field.GetValue(this);
831831
}
832832
}
833833

0 commit comments

Comments
 (0)