Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release/10.0.1xx] Source code updates from dotnet/dotnet #50427

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 10 commits into from
Aug 28, 2025
Merged

[release/10.0.1xx] Source code updates from dotnet/dotnet #50427

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e7c5788
Backflow from https://github.com/dotnet/dotnet / 619d563 build 280198
dotnet-maestro[bot] Aug 22, 2025
9ad89d4
Update dependencies from https://github.com/dotnet/dotnet build 280198
dotnet-maestro[bot] Aug 22, 2025
0d62566
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-b4c17b4f-6…
SimonZhao888 Aug 22, 2025
4498c39
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-b4c17b4f-6…
SimonZhao888 Aug 22, 2025
2f4abd6
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-b4c17b4f-6…
SimonZhao888 Aug 25, 2025
0a0035b
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-b4c17b4f-6…
SimonZhao888 Aug 25, 2025
cd27b35
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-b4c17b4f-6…
SimonZhao888 Aug 26, 2025
f6e9db8
Clear out DOTNET_ROOT_<arch> in test expecting failure to find .NET
elinor-fung Aug 26, 2025
3121786
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-b4c17b4f-6…
SimonZhao888 Aug 27, 2025
b910144
Fix DOTNET_ROOT setting for `dotnet run`
jjonescz Aug 27, 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
Prev Previous commit
Next Next commit
Clear out DOTNET_ROOT_<arch> in test expecting failure to find .NET
  • Loading branch information
@elinor-fung
elinor-fung committed Aug 26, 2025
commit f6e9db8f5e97aec8259a616c3e0b1260b4136886
9 changes: 5 additions & 4 deletions test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,13 +1161,14 @@ public static void Main()
CopyDirectory(Path.Combine(TestContext.Current.ToolsetUnderTest.DotNetRoot, "shared", "Microsoft.NETCore.App"), Path.Combine(expectedRoot, "shared", "Microsoft.NETCore.App"));
break;
case "EnvironmentVariable":
// Set DOTNET_ROOT environment variable to the expected .NET root
// Set DOTNET_ROOT_<arch> environment variable to the expected .NET root
expectedRoot = TestContext.Current.ToolsetUnderTest.DotNetRoot;
runCommand = runCommand.WithEnvironmentVariable("DOTNET_ROOT", expectedRoot);
runCommand = runCommand.WithEnvironmentVariable($"DOTNET_ROOT_{RuntimeInformation.OSArchitecture.ToString().ToUpperInvariant()}", expectedRoot);
break;
default:
// Should fail - make sure DOTNET_ROOT is not set
runCommand = runCommand.WithEnvironmentVariable("DOTNET_ROOT", string.Empty);
// Should fail - make sure DOTNET_ROOT_<arch> and DOTNET_ROOT are not set
runCommand = runCommand.WithEnvironmentVariable($"DOTNET_ROOT", string.Empty);
runCommand = runCommand.WithEnvironmentVariable($"DOTNET_ROOT_{RuntimeInformation.OSArchitecture.ToString().ToUpperInvariant()}", string.Empty);
break;
}

Expand Down
Loading