Skip to content

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #51673

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
merged 22 commits into from
Nov 13, 2025
Merged

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #51673

Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
259b2c3
Update DockerRegistryManager.cs
baronfel Jul 8, 2025
4c71772
Merge branch 'release/8.0.1xx' into nagilson/acr-8.0.1xx
nagilson Jul 8, 2025
acb7df6
Fix Containers Issue in 8.0.1xx
nagilson Jul 8, 2025
f518095
Change StartAndPopulateDockerRegistry to synchronous
marcpopMSFT Oct 13, 2025
c61ffa9
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 21, 2025
d75e0e5
[release/8.0.1xx] Update dependencies from dotnet/templating (#51386)
SimonZhao888 Oct 21, 2025
0d2482d
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Oct 23, 2025
85f1183
Update branding to 8.0.123
vseanreesermsft Nov 4, 2025
0470904
Update branding to 8.0.123 (#51552)
nagilson Nov 4, 2025
7121915
[release/8.0.1xx] Update dependencies from dotnet/source-build-refere…
nagilson Nov 4, 2025
6b2462d
Update dependencies from https://github.com/dotnet/arcade build 20251…
dotnet-maestro[bot] Nov 7, 2025
03e67e5
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 7, 2025
6681bfd
Initial plan
Copilot Nov 7, 2025
a4a2cac
Backport PR #51558: Fix VS2022 rejecting preview SDKs
Copilot Nov 7, 2025
5bb4628
[release/8.0.1xx] Update dependencies from dotnet/arcade (#51603)
nagilson Nov 7, 2025
ae8164a
[release/8.0.1xx] Update dependencies from dotnet/templating (#51613)
nagilson Nov 7, 2025
efd08c1
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Nov 10, 2025
e586cf3
Backport #51558: Fix VS rejecting preview SDKs on Helix test machines…
nagilson Nov 10, 2025
b0f0df8
[release/8.0.1xx] Use new ACR for registry image (#49691)
nagilson Nov 10, 2025
184058a
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-1ceb41d3-704…
DonnaChen888 Nov 11, 2025
79f0513
[release/8.0.1xx] Update dependencies from dotnet/msbuild (#51639)
DonnaChen888 Nov 12, 2025
d4cf2a5
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
DonnaChen888 Nov 12, 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
5 changes: 3 additions & 2 deletions src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu
{
using TestLoggerFactory loggerFactory = new(testOutput);

if (!new DockerCli(loggerFactory).IsAvailable()) {
if (!new DockerCli(loggerFactory).IsAvailable())
{
throw new InvalidOperationException("Docker is not available, tests cannot run");
}

Expand Down Expand Up @@ -98,7 +99,7 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu
{
ContainerCli.StopCommand(testOutput, s_registryContainerId).Execute();
}
catch(Exception ex2)
catch (Exception ex2)
{
logger.LogError(ex2, "Failed to stop the registry {id}.", s_registryContainerId);
}
Expand Down
Loading