Skip to content

Commit b91c5d1

Browse files
dotnet-maestro[bot]siagupta0202
dotnet-maestro[bot]
and
siagupta0202
authored
[main] Update dependencies from dotnet/arcade (#10291)
* Update dependencies from https://github.com/dotnet/arcade build 20250115.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25065.4 * Update dependencies from https://github.com/dotnet/arcade build 20250116.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25066.1 * Adding compiler warning suppression for CS0414 to fix build failure * Removing extra line * Update dependencies from https://github.com/dotnet/arcade build 20250117.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25067.3 * Update dependencies from https://github.com/dotnet/arcade build 20250120.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25070.2 * Update dependencies from https://github.com/dotnet/arcade build 20250121.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25071.3 * Update dependencies from https://github.com/dotnet/arcade build 20250122.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25072.2 * Update dependencies from https://github.com/dotnet/arcade build 20250123.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25073.5 * Update dependencies from https://github.com/dotnet/arcade build 20250124.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25074.4 * Update dependencies from https://github.com/dotnet/arcade build 20250126.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25076.1 * Update dependencies from https://github.com/dotnet/arcade build 20250127.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25061.1 -> To Version 10.0.0-beta.25077.3 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Sia Gupta <siagupta@microsoft.com>
1 parent 2ff7cad commit b91c5d1

File tree

6 files changed

+18
-26
lines changed

6 files changed

+18
-26
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25061.1">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25077.3">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
170+
<Sha>79e2c58673f7995efcac816a0a41f108de386ca8</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25061.1">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25077.3">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
174+
<Sha>79e2c58673f7995efcac816a0a41f108de386ca8</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25061.1">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25077.3">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
178+
<Sha>79e2c58673f7995efcac816a0a41f108de386ca8</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25061.1">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25077.3">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
186+
<Sha>79e2c58673f7995efcac816a0a41f108de386ca8</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/common/internal/Tools.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@
1515
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
1616
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
1717
</ItemGroup>
18-
<PropertyGroup>
19-
<RestoreSources></RestoreSources>
20-
<RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
21-
https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
22-
</RestoreSources>
23-
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
24-
$(RestoreSources);
25-
https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
26-
</RestoreSources>
27-
</PropertyGroup>
2818

2919
<!-- Repository extensibility point -->
3020
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />

‎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: 4 additions & 4 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.25077.2",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1",
16-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25077.3",
16+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25077.3"
1717
},
1818
"sdk": {
19-
"version": "10.0.100-alpha.1.24573.1"
19+
"version": "10.0.100-alpha.1.25077.2"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.38.0.1",

‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedSOMTextRun.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,9 @@ internal int LineIndex
411411
#region Private Fields
412412

413413
private double _defaultCharWidth;
414+
#pragma warning disable CS0414 // Private field is assigned but its value is never used
414415
private Uri _fontUri;
416+
#pragma warning restore CS0414 // Private field is assigned but its value is never used
415417
private CultureInfo _cultureInfo;
416418
private bool _isSideways;
417419
private int _bidiLevel;

0 commit comments

Comments
 (0)