Skip to content
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

Update CreateSlimBuilder to use Host.CreateEmptyApplicationBuilder. #46579

Merged
merged 3 commits into from
Feb 16, 2023
Merged

Update CreateSlimBuilder to use Host.CreateEmptyApplicationBuilder. #46579

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de2b448
Update CreateSlimBuilder to use Host.CreateEmptyApplicationBuilder.
eerhardt Feb 11, 2023
925928d
Fix macOS tests
eerhardt Feb 13, 2023
e28f8e7
Fix macOS test
eerhardt Feb 13, 2023
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
Fix macOS tests
  • Loading branch information
@eerhardt
eerhardt committed Feb 13, 2023
commit 925928dc0bfbd7a2e88f9178c5df770b7c18a374
6 changes: 4 additions & 2 deletions src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,11 +565,13 @@ private static string NormalizePath(string unnormalizedPath) =>
public void ContentRootIsDefaultedToCurrentDirectory()
{
var tmpDir = Directory.CreateTempSubdirectory();
// On macOS /tmp is a symlink to /private/tmp. Resolve any links so the path comparison works correctly.
var tmpDirectoryPath = tmpDir.LinkTarget ?? tmpDir.FullName;

try
{
var options = new RemoteInvokeOptions();
options.StartInfo.WorkingDirectory = tmpDir.FullName;
options.StartInfo.WorkingDirectory = tmpDirectoryPath;

using var remoteHandle = RemoteExecutor.Invoke(static (string currentDirectory) =>
{
Expand All @@ -580,7 +582,7 @@ public void ContentRootIsDefaultedToCurrentDirectory()

Assert.Equal(NormalizePath(currentDirectory), NormalizePath(builder.Environment.ContentRootPath));
}
}, tmpDir.FullName, options);
}, tmpDirectoryPath, options);
}
finally
{
Expand Down