Skip to content

[release/8.x] Update Azure Versions #9073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wiktork merged 3 commits into from
Mar 24, 2026
Merged

[release/8.x] Update Azure Versions #9073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f6e871
Using net10 versions with Azure packages
kkeirstead Mar 13, 2026
e40858e
Schema change for .net 9
kkeirstead Mar 19, 2026
0ce815d
Attempting to stabilize flaky test
kkeirstead Mar 23, 2026
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
10 changes: 10 additions & 0 deletions documentation/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2718,12 +2718,22 @@
"Indented": {
"type": "boolean"
},
"IndentCharacter": {
Comment thread
wiktork marked this conversation as resolved.
"type": "string"
},
"IndentSize": {
"type": "integer",
"format": "int32"
},
"MaxDepth": {
"type": "integer",
"format": "int32"
},
"SkipValidation": {
"type": "boolean"
},
"NewLine": {
"type": "string"
}
}
},
Expand Down
10 changes: 7 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,15 @@
<PropertyGroup Label=".NET 8 Dependent" Condition=" '$(TargetFramework)' == 'net8.0' ">
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp80Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp80Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions80Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
<!--
Azure SDK dependencies require .NET 10 versions of these packages to avoid package downgrade errors.
Using 100 versions for packages that have transitive dependencies from Azure.Core and Azure.Identity.
-->
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions100Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging80Version)</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions80Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions100Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole80Version)</MicrosoftExtensionsLoggingConsoleVersion>
<SystemTextJsonVersion>$(SystemTextJson80Version)</SystemTextJsonVersion>
<SystemTextJsonVersion>$(SystemTextJson100Version)</SystemTextJsonVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(UseMicrosoftDiagnosticsMonitoringShippedVersion)' == 'true'">
<MicrosoftDiagnosticsMonitoringLibraryVersion>$(MicrosoftDiagnosticsMonitoringShippedVersion)</MicrosoftDiagnosticsMonitoringLibraryVersion>
Expand Down
1 change: 1 addition & 0 deletions eng/dependabot/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<Import Project="independent/Versions.props" />
<Import Project="nuget.org/Versions.props" />
<Import Project="net8.0/Versions.props" />
<Import Project="net10.0/Versions.props" />
</Project>
4 changes: 2 additions & 2 deletions eng/dependabot/independent/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- Import references updated by Dependabot. -->

<PropertyGroup>
<AzureCoreVersion>1.50.0</AzureCoreVersion>
<AzureIdentityVersion>1.17.1</AzureIdentityVersion>
<AzureCoreVersion>1.51.1</AzureCoreVersion>
<AzureIdentityVersion>1.18.0</AzureIdentityVersion>
<AzureStorageBlobsVersion>12.27.0</AzureStorageBlobsVersion>
<AzureStorageQueuesVersion>12.25.0</AzureStorageQueuesVersion>
<MicrosoftIdentityWebVersion>4.3.0</MicrosoftIdentityWebVersion>
Expand Down
5 changes: 5 additions & 0 deletions eng/dependabot/net10.0/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
<Import Project="Versions.props" />
<Import Project="Packages.props" />
</Project>
19 changes: 19 additions & 0 deletions eng/dependabot/net10.0/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project>
<!--
Packages in this file have versions updated periodically by Dependabot specifically for .NET 10.
These versions are also used to satisfy Azure SDK transitive dependencies that require .NET 10 packages.
-->
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractions100Version)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLogging100Version)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractions100Version)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsole100Version)" />
<!--
We want to update "Microsoft.NETCore.App.Runtime.*" but those packages are considered platform packages and cannot be added
as a package reference. Use Microsoft.NETCore.DotNetAppHost instead which is released in lockstep with the runtime packages and
with the same version number.
-->
<PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp100Version)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJson100Version)" />
</ItemGroup>
</Project>
17 changes: 17 additions & 0 deletions eng/dependabot/net10.0/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<!-- Import references updated by Dependabot. -->
<PropertyGroup>
<!-- Microsoft.Extensions.Configuration.Abstractions -->
<MicrosoftExtensionsConfigurationAbstractions100Version>10.0.3</MicrosoftExtensionsConfigurationAbstractions100Version>
<!-- Microsoft.Extensions.Logging -->
<MicrosoftExtensionsLogging100Version>10.0.3</MicrosoftExtensionsLogging100Version>
<!-- Microsoft.Extensions.Logging.Abstractions -->
<MicrosoftExtensionsLoggingAbstractions100Version>10.0.3</MicrosoftExtensionsLoggingAbstractions100Version>
<!-- Microsoft.Extensions.Logging.Console -->
<MicrosoftExtensionsLoggingConsole100Version>10.0.3</MicrosoftExtensionsLoggingConsole100Version>
<!-- Microsoft.NETCore.App -->
<MicrosoftNETCoreApp100Version>10.0.3</MicrosoftNETCoreApp100Version>
<!-- System.Text.Json -->
<SystemTextJson100Version>10.0.1</SystemTextJson100Version>
</PropertyGroup>
</Project>
6 changes: 6 additions & 0 deletions eng/dependabot/net10.0/dependabot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!-- This isn't a real project, but Dependabot requires a project. -->
Comment thread
wiktork marked this conversation as resolved.
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
</Project>
13 changes: 10 additions & 3 deletions src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DiagnosticPortTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.Diagnostics.Monitoring.WebApi;
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
Expand Down Expand Up @@ -80,7 +81,7 @@ public async Task DefaultDiagnosticPort_Supported_ListenModeOnNonWindows()

await toolRunner.StartAsync();

AssertDefaultDiagnosticPortExists(defaultSharedTempDir);
await AssertDefaultDiagnosticPortExistsAsync(defaultSharedTempDir);
}

/// <summary>
Expand All @@ -107,10 +108,16 @@ private static string GetDefaultSharedSocketPath(string defaultSharedPath)
return Path.Combine(defaultSharedPath, ToolIdentifiers.DefaultSocketName);
}

private static void AssertDefaultDiagnosticPortExists(TemporaryDirectory dir)
private static async Task AssertDefaultDiagnosticPortExistsAsync(TemporaryDirectory dir)
{
string diagnosticPort = GetDefaultSharedSocketPath(dir.FullName);
Assert.True(File.Exists(diagnosticPort), $"Expected socket to exist at '{diagnosticPort}'.");

using CancellationTokenSource cancellationSource = new CancellationTokenSource(CommonTestTimeouts.GeneralTimeout);

while (!File.Exists(diagnosticPort))
{
await Task.Delay(TimeSpan.FromMilliseconds(50), cancellationSource.Token);
}
}

private static void AssertDefaultDiagnosticPortNotExists(TemporaryDirectory dir)
Expand Down
2 changes: 2 additions & 0 deletions src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,13 @@ private static IHostBuilder Configure(this IHostBuilder builder, StartupAuthenti
ServerUrlsBlockingConfigurationManager? manager =
context.Properties[typeof(ServerUrlsBlockingConfigurationManager)] as ServerUrlsBlockingConfigurationManager;
Debug.Assert(null != manager, $"Expected {typeof(ServerUrlsBlockingConfigurationManager).FullName} to be a {typeof(HostBuilderContext).FullName} property.");
#pragma warning disable IDE0031 // Use null propagation
if (null != manager)
{
// Block reading of the Urls option so that Kestrel is unable to read it from the composed configuration.
manager.IsBlocking = true;
}
#pragma warning restore IDE0031 // Use null propagation
});
}

Expand Down