Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
402725e
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 16, 2025
8386d99
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 17, 2025
f858cfd
Adding compiler warning suppression for CS0414 to fix build failure
siagupta0202 Jan 18, 2025
6dd836c
Removing extra line
siagupta0202 Jan 18, 2025
87942c9
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 18, 2025
362e3fe
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 21, 2025
1c2ae8a
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 22, 2025
f72fd2e
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 23, 2025
6feffff
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 24, 2025
0e3f59c
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 25, 2025
0d93f46
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 27, 2025
69b1edf
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,25 +165,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25061.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25077.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
<Sha>79e2c58673f7995efcac816a0a41f108de386ca8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25061.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25077.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
<Sha>79e2c58673f7995efcac816a0a41f108de386ca8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25061.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25077.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
<Sha>79e2c58673f7995efcac816a0a41f108de386ca8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25061.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25077.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
<Sha>79e2c58673f7995efcac816a0a41f108de386ca8</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
<Uri>https://github.com/dotnet/sourcelink</Uri>
Expand Down
10 changes: 0 additions & 10 deletions eng/common/internal/Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,6 @@
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
</ItemGroup>
<PropertyGroup>
<RestoreSources></RestoreSources>
<RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
</RestoreSources>
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
$(RestoreSources);
https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
</RestoreSources>
</PropertyGroup>

<!-- Repository extensibility point -->
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }

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

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

Retry({
Write-Host "GET $uri"
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}

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

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

if [[ ! -a "$install_script" ]]; then
mkdir -p "$root"
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-alpha.1.24573.1",
"dotnet": "10.0.100-alpha.1.25077.2",
"runtimes": {
"dotnet": [
"2.1.7",
Expand All @@ -12,11 +12,11 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25077.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25077.3"
},
"sdk": {
"version": "10.0.100-alpha.1.24573.1"
"version": "10.0.100-alpha.1.25077.2"
},
"native-tools": {
"strawberry-perl": "5.38.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ internal int LineIndex
#region Private Fields

private double _defaultCharWidth;
#pragma warning disable CS0414 // Private field is assigned but its value is never used
private Uri _fontUri;
#pragma warning restore CS0414 // Private field is assigned but its value is never used
private CultureInfo _cultureInfo;
private bool _isSideways;
private int _bidiLevel;
Expand Down