Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
efa449f
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Dec 20, 2025
78fd940
Update dependencies from https://github.com/dotnet/arcade build 20251…
dotnet-maestro[bot] Dec 27, 2025
4707fbb
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Dec 30, 2025
9a79557
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Dec 31, 2025
4bdeb7c
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Jan 3, 2026
584f9ea
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jan 6, 2026
0e18c1c
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Jan 6, 2026
7b8c079
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jan 7, 2026
e006c9a
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Jan 7, 2026
862582c
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Jan 8, 2026
84e4225
Fix warning
Youssef1313 Jan 8, 2026
1d1979f
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Jan 9, 2026
e3cae6b
Add dotnet11 feed
Youssef1313 Jan 9, 2026
3dd5b14
dotnet11
Youssef1313 Jan 9, 2026
1801d75
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jan 10, 2026
95451a4
Fix analyzer warning
Youssef1313 Jan 12, 2026
7e3d910
Fix warning
Youssef1313 Jan 12, 2026
558a557
dotnet11
Youssef1313 Jan 12, 2026
229e8a5
Combine consecutive Path.Combine
Evangelink Jan 12, 2026
7d8dd9f
Fix test
Youssef1313 Jan 12, 2026
1a24cab
Fix test
Youssef1313 Jan 12, 2026
84432ae
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Jan 13, 2026
14d37ad
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Jan 13, 2026
af28f8f
Update to 11.0.100-alpha.1.26062.101
Youssef1313 Jan 13, 2026
9f19b2e
Fix warnings
Youssef1313 Jan 14, 2026
7a16fae
Fix more warnings
Youssef1313 Jan 14, 2026
69e2ff0
Disable annoying analyzer
Youssef1313 Jan 14, 2026
155e93d
Merge branch 'main' into darc-main-e5b7fb88-ffc6-4df2-9bbc-7a22a08ca40a
Youssef1313 Jan 14, 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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ dotnet_diagnostic.IDE0270.severity = warning
dotnet_diagnostic.IDE0280.severity = warning

# IDE0370: Remove unnecessary suppression
dotnet_diagnostic.IDE0370.severity = warning
dotnet_diagnostic.IDE0370.severity = none

# IDE1005: Use conditional delegate call
dotnet_diagnostic.IDE1005.severity = warning
Expand Down
4 changes: 4 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
Expand Down Expand Up @@ -47,5 +48,8 @@
<packageSource key="dotnet10">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet11">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25617.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26062.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47a8a69721dfea57b82121ac1458d2f5bba6abd2</Sha>
<Sha>594f3bcba9361908a75c769c1d2d5668facc0dea</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25617.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26062.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47a8a69721dfea57b82121ac1458d2f5bba6abd2</Sha>
<Sha>594f3bcba9361908a75c769c1d2d5668facc0dea</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25617.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26062.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47a8a69721dfea57b82121ac1458d2f5bba6abd2</Sha>
<Sha>594f3bcba9361908a75c769c1d2d5668facc0dea</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.3.0-preview.25615.2">
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.0-preview.26062.2">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
<Sha>d6fad4ec212e65323a99f3367bc90ee840fac267</Sha>
<Sha>74ce4948abff2b900d035bf7fd3a09f4b76f4e62</Sha>
</Dependency>
<Dependency Name="MSTest" Version="4.1.0-preview.26063.3">
<Uri>https://github.com/microsoft/testfx</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup Label="MSTest prod dependencies - darc updated">
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25617.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>18.3.0-preview.25615.2</MicrosoftTestingExtensionsCodeCoverageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26062.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>18.4.0-preview.26062.2</MicrosoftTestingExtensionsCodeCoverageVersion>
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
<MSTestVersion>4.1.0-preview.26063.3</MSTestVersion>
<MicrosoftTestingPlatformVersion>2.1.0-preview.26063.3</MicrosoftTestingPlatformVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ parameters:
type: boolean

steps:
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
- task: MicroBuildSigningPluginPreview@4
displayName: Install Preview MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ steps:
workingDirectory: $(Agent.TempDirectory)

- script: |
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
displayName: "Source Index: Download netsourceindex Tools"
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
workingDirectory: $(Agent.TempDirectory)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ case "$os" in
libssl-dev libkrb5-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "amzn" ]; then
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.102",
"dotnet": "11.0.100-alpha.1.26062.101",
"runtimes": {
"dotnet": [
"8.0.18",
Expand All @@ -24,7 +24,7 @@
}
},
"sdk": {
"version": "10.0.102",
"version": "11.0.100-alpha.1.26062.101",
"paths": [
".dotnet",
"$host$"
Expand All @@ -37,7 +37,7 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25617.1",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.1",
"MSBuild.Sdk.Extras": "3.0.44"
}
}
2 changes: 1 addition & 1 deletion src/Adapter/MSTest.Engine/Engine/TestArgumentsManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static void ExpandNodeWithArguments(TestNode testNode, object arguments, ref int
if (arguments is not ITestArgumentsEntry testArgumentsEntry)
{
shouldWrapInParenthesis = !isIndexArgumentPropertiesProvider;
testArgumentsEntry = argumentPropertiesProvider(new(arguments, testNode))!;
testArgumentsEntry = argumentPropertiesProvider(new(arguments, testNode));
}

string argumentFragmentUid = GetArgumentFragmentUid(testArgumentsEntry, shouldWrapInParenthesis);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ internal virtual List<string> GetSatelliteAssemblies(string assemblyPath)
{
// extension contains leading dot.
string satellite = Path.ChangeExtension(assemblyFileName, "resources" + extension);
string satellitePath = Path.Combine(assemblyDir, Path.Combine(dir, satellite));
string satellitePath = Path.Combine(assemblyDir, dir, satellite);

// We don't use Assembly.LoadFrom/Assembly.GetSatelliteAssemblies because this is rather slow
// (1620ms for 266 cultures when directories do not exist).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private static BlockSyntax TransformMethodBody(BlockSyntax body)
{
// Transform all return statements to return Task.FromResult<TestResult[]>(...)
var transformer = new ReturnStatementTransformer();
return (BlockSyntax)transformer.Visit(body)!;
return (BlockSyntax)transformer.Visit(body);
}

private static ArrowExpressionClauseSyntax TransformExpressionBody(ArrowExpressionClauseSyntax expressionBody)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public static void ReportNoLocationDiagnostic(
else
{
RoslynDebug.Assert(s_syntaxTreeDiagnosticOptionsProperty != null);
var options = (ImmutableDictionary<string, ReportDiagnostic>)s_syntaxTreeDiagnosticOptionsProperty.GetValue(tree)!;
var options = (ImmutableDictionary<string, ReportDiagnostic>)s_syntaxTreeDiagnosticOptionsProperty.GetValue(tree);
if (options.TryGetValue(rule.Id, out ReportDiagnostic value))
{
configuredValue = value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public Task<IChatClient> CreateChatClientAsync(CancellationToken cancellationTok
}

var client = new AzureOpenAIClient(
new Uri(endpoint!),
new ApiKeyCredential(apiKey!));
new Uri(endpoint),
new ApiKeyCredential(apiKey));

return Task.FromResult(client.GetChatClient(deploymentName).AsIChatClient());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public async Task<bool> ShouldRunAsync(Task? waitExecutionCompletion, Cancellati
if (waitExecutionCompletion is not null)
{
await waitExecutionCompletion.ConfigureAwait(false);
await _outputDevice!.DisplayAsync(_outputDeviceDataProducer, new TextOutputDeviceData(ExtensionResources.HotReloadSessionCompleted), cancellationToken).ConfigureAwait(false);
await _outputDevice.DisplayAsync(_outputDeviceDataProducer, new TextOutputDeviceData(ExtensionResources.HotReloadSessionCompleted), cancellationToken).ConfigureAwait(false);
}

try
Expand All @@ -100,7 +100,7 @@ public async Task<bool> ShouldRunAsync(Task? waitExecutionCompletion, Cancellati

if (!IsClearNotSupported())
{
_console!.Clear();
_console.Clear();
}

await _outputDevice.DisplayAsync(_outputDeviceDataProducer, new TextOutputDeviceData(ExtensionResources.HotReloadSessionStarted), cancellationToken).ConfigureAwait(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ internal sealed class OpenTelemetryPlatformService : IPlatformOpenTelemetryServi

public ICounter<T> CreateCounter<T>(string name, string? unit = null, string? description = null, IEnumerable<KeyValuePair<string, object?>>? tags = null)
where T : struct
=> new CounterWrapper<T>(_meter.CreateCounter<T>(name, unit, description, tags!));
=> new CounterWrapper<T>(_meter.CreateCounter<T>(name, unit, description, tags));

public IHistogram<T> CreateHistogram<T>(string name, string? unit = null, string? description = null, IEnumerable<KeyValuePair<string, object?>>? tags = null)
where T : struct
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ internal bool Evaluate(Func<string, object?> propertyValueProvider)
string? result = null;
if (PropertyValueRegexReplacement == null)
{
Match match = PropertyValueRegex!.Match(value);
Match match = PropertyValueRegex.Match(value);
if (match.Success)
{
result = match.Value;
}
}
else
{
result = PropertyValueRegex!.Replace(value, PropertyValueRegexReplacement);
result = PropertyValueRegex.Replace(value, PropertyValueRegexReplacement);
}

return result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,9 @@ protected override string GenerateCommandLineCommands()
// If we are not "dotnet.exe" and not "mono", then we are given an executable from user and we are running on Windows.
builder.AppendSwitchIfNotNull($"--{MSBuildConstants.MSBuildNodeOptionKey} ", _pipeNameDescription.Name);

if (!string.IsNullOrEmpty(TestingPlatformCommandLineArguments?.ItemSpec))
if (!RoslynString.IsNullOrEmpty(TestingPlatformCommandLineArguments?.ItemSpec))
{
builder.AppendTextUnquoted($" {TestingPlatformCommandLineArguments!.ItemSpec} ");
builder.AppendTextUnquoted($" {TestingPlatformCommandLineArguments.ItemSpec} ");
}

if (VSTestCLIRunSettings?.Length > 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public bool Any<TProperty>()
return default;
}

TProperty property = enumerator.Current!;
TProperty property = enumerator.Current;
return enumerator.MoveNext()
? throw new InvalidOperationException($"Found multiple properties of type '{typeof(TProperty)}'.")
: property;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public TestProgressState(long id, string assembly, string? targetFramework, stri
TargetFramework = targetFramework;
Architecture = architecture;
Stopwatch = stopwatch;
AssemblyName = Path.GetFileName(assembly)!;
AssemblyName = Path.GetFileName(assembly);
IsDiscovery = isDiscovery;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public async Task<bool> ConnectAsync()
// Log the message
if (_logger.IsEnabled(LogLevel.Trace))
{
await _logger.LogTraceAsync(message!.ToString()).ConfigureAwait(false);
await _logger.LogTraceAsync(message.ToString()).ConfigureAwait(false);
}

var requestMessage = (RequestMessage)message;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public static void IsExactInstanceOfType([NotNull] object? value, [NotNull] Type
public static T IsExactInstanceOfType<T>([NotNull] object? value, string? message = "", [CallerArgumentExpression(nameof(value))] string valueExpression = "")
{
IsExactInstanceOfType(value, typeof(T), message, valueExpression);
return (T)value!;
return (T)value;
}

/// <inheritdoc cref="IsExactInstanceOfType{T}(object?, string, string)" />
Expand Down
4 changes: 3 additions & 1 deletion src/TestFramework/TestFramework/Assertions/Assert.That.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ public static void That(Expression<Func<bool>> condition, string? message = null
}
}

#pragma warning disable IDE0051 // Remove unused private members - false positive
private static string ExtractDetails(Expression expr)
#pragma warning restore IDE0051 // Remove unused private members
{
var details = new Dictionary<string, object?>();
ExtractVariablesFromExpression(expr, details);
Expand Down Expand Up @@ -691,7 +693,7 @@ private static string CleanExcessiveParentheses(string input)

// Keep at most 2 consecutive parentheses
int keepCount = Math.Min(count, 2);
result.Append(new string(currentChar, keepCount));
result.Append(currentChar, keepCount);
i += count;
}
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private static bool TryGetData(object dataSource, [NotNullWhen(true)] out IEnume
List<object[]> objects = [];
foreach (object? entry in enumerable)
{
objects.Add([entry!]);
objects.Add([entry]);
}

data = objects;
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/TestFramework/Logger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static void LogMessage(string format, params object?[] args)
{
try
{
invoker.GetMethodInfo()!.Invoke(invoker.Target, parameters);
invoker.GetMethodInfo().Invoke(invoker.Target, parameters);
}
catch (Exception)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ public async Task HangDump_WithDotnetTest_CreateDump()
failIfReturnValueIsNotZero: false,
cancellationToken: TestContext.CancellationToken);

// This should be TestHostProcessExitedNonGracefully instead of GenericFailure. This will likely be fixed by https://github.com/dotnet/sdk/pull/51857
testResult.AssertExitCodeIs(ExitCodes.GenericFailure);
testResult.AssertExitCodeIs(ExitCodes.TestHostProcessExitedNonGracefully);
string[] dumpFiles = Directory.GetFiles(resultDirectory, "HangDump*.dmp", SearchOption.AllDirectories);
Assert.ContainsSingle(dumpFiles, $"Expected single dump file. Found: {Environment.NewLine}{string.Join(Environment.NewLine, dumpFiles)}{Environment.NewLine}{testResult}");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public async Task Trx_WhenTestHostCrash_RunningUnderDotnetTest_ErrorIsDisplayedI
failIfReturnValueIsNotZero: false,
cancellationToken: TestContext.CancellationToken);

// This should be TestHostProcessExitedNonGracefully instead of GenericFailure. This will likely be fixed by https://github.com/dotnet/sdk/pull/51857
result.AssertExitCodeIs(ExitCodes.GenericFailure);
result.AssertExitCodeIs(ExitCodes.TestHostProcessExitedNonGracefully);

string trxFile = Directory.GetFiles(testResultsPath, $"{fileName}.trx", SearchOption.AllDirectories).Single();
string trxContent = File.ReadAllText(trxFile);
Expand Down
Loading
Loading