Skip to content

Commit b12db54

Browse files
[main] Update dependencies from dotnet/arcade (dotnet#7368)
* Update dependencies from https://github.com/dotnet/arcade build 20250117.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25067.3 * fixing formatting issue --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Sharp <[email protected]>
1 parent 192db82 commit b12db54

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25061.1">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25067.3">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
12+
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25061.1">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25067.3">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
16+
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25061.1">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25067.3">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
20+
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25061.1">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25067.3">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
24+
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25061.1">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25067.3">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
33+
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25061.1">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25067.3">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
37+
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25061.1">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25067.3">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
41+
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9595
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
9696
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
97-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25061.1</MicrosoftDotNetXUnitExtensionsVersion>
97+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25067.3</MicrosoftDotNetXUnitExtensionsVersion>
9898
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
9999
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
100100
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
45+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

eng/common/tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
57+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-alpha.1.24573.1",
3+
"dotnet": "10.0.100-alpha.1.25064.3",
44
"runtimes": {
55
"dotnet": [
66
"$(DotNetRuntime60Version)",
@@ -13,8 +13,8 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1",
17-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25067.3",
17+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25067.3",
1818
"Microsoft.Build.NoTargets": "3.7.0",
1919
"Microsoft.Build.Traversal": "3.2.0"
2020
}

src/Microsoft.ML.Tokenizers/Model/Word.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void Add(int c, int charLength)
9292
}
9393

9494
i += 1;
95-
};
95+
}
9696

9797
return changes;
9898
}

test/Microsoft.ML.Tests/Transformers/HashTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ ValueGetter<TType> hashGetter<TType>(HashingEstimator.ColumnOptions colInfo)
143143
var outRow = mapper.GetRow(inRow, col);
144144

145145
return outRow.GetGetter<TType>(col);
146-
};
146+
}
147147

148148
// First do an unordered hash.
149149
var info = new HashingEstimator.ColumnOptions("Bar", "Foo", numberOfBits: bits);

0 commit comments

Comments
 (0)