Skip to content

[main] Source code updates from dotnet/dotnet #14226

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
ViktorHofer merged 3 commits into from
Jul 3, 2026
Merged

[main] Source code updates from dotnet/dotnet #14226

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
7eadba1
Initial commit for subscription 91fa59f1-1864-46b1-b482-87955691317c
dotnet-maestro[bot] Jul 3, 2026
6f11cf6
Resolve codeflow conflicts by keeping current branch changes
AlesProkop Jul 3, 2026
517cc86
Fix mojibake encoding corruption in BinaryLogger_Tests.cs
AlesProkop Jul 3, 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
4 changes: 4 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,8 @@
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
<auditSources>
<clear />
<add key="nuget.org" value="https://data.nuget.org/v3/index.json" />
</auditSources>
</configuration>
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="075b33c13177aed004ddbb1439410cc970601273" BarId="317615" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="bcaa8d44d57494224d443dba7c1dfed381ad5528" BarId="321265" />
<ProductDependencies>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.CodeDom" Version="10.0.8">
Expand Down
4 changes: 4 additions & 0 deletions src/Build.UnitTests/BackEnd/BuildManager_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,13 +1511,15 @@ public void CancelledBuildWithUnexecutedSubmission()

#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously: needs to be async for xunit's timeout system
#pragma warning disable IDE0390 // Method can be made synchronous
#pragma warning disable xUnit1069 // Test method 'CancelledBuild' has a Timeout but does not reference TestContext.Current.CancellationToken
/// <summary>
/// A canceled build
/// </summary>
[Fact(Timeout = 20_000)]
public async System.Threading.Tasks.Task CancelledBuild()
#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
#pragma warning restore IDE0390 // Method can be made synchronous
#pragma warning restore xUnit1069 // Test method 'CancelledBuild' has a Timeout but does not reference TestContext.Current.CancellationToken
{
Console.WriteLine("Starting CancelledBuild test that is known to hang.");
string contents = CleanupFileContents(@"
Expand Down Expand Up @@ -4711,8 +4713,10 @@ public void MultiThreadedBuild_SharedConfiguration_DoesNotCrash()
/// The fix uses a static lock across all engine instances so a single trace file is safe,
/// and catches non-critical exceptions so trace failures can never crash the build engine.
/// </summary>
#pragma warning disable xUnit1069 // Test method 'MultiThreadedBuild_WithDebugSchedulerTracing_DoesNotDeadlock' has a Timeout but does not reference TestContext.Current.CancellationToken
[Fact(Timeout = 30_000)]
public async System.Threading.Tasks.Task MultiThreadedBuild_WithDebugSchedulerTracing_DoesNotDeadlock()
#pragma warning restore xUnit1069 // Test method 'MultiThreadedBuild_WithDebugSchedulerTracing_DoesNotDeadlock' has a Timeout but does not reference TestContext.Current.CancellationToken
{
await System.Threading.Tasks.Task.Run(() =>
{
Expand Down
2 changes: 1 addition & 1 deletion src/MSBuild.Bootstrap.Utils/Tasks/InstallDotNetCoreTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private void MakeScriptExecutable(string scriptPath)
{
if (!IsWindows)
{
int exitCode = ExecuteTool("/bin/chmod", string.Empty, $"+x {scriptPath}");
int exitCode = ExecuteTool("/bin/chmod", string.Empty, $"+x \"{scriptPath}\"");
if (exitCode != 0)
{
Log.LogError($"Install-scripts can not be made executable due to the errors reported above.");
Expand Down
Loading