Skip to content

[release/9.0-staging] Revert change to follow symlinks of dotnet host #116244

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
Jun 7, 2025
Merged

[release/9.0-staging] Revert change to follow symlinks of dotnet host #116244

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e4a9acd
Revert change to follow symlinks of dotnet host
agocke May 2, 2025
99fd837
Adapt symbolic link tests
agocke May 5, 2025
ed2e7b4
Conditional behavior based on OS
agocke May 6, 2025
a6c282a
Add unit test for success with symlinks
agocke May 13, 2025
381ed56
Add self-contained test as well
agocke May 13, 2025
0d73fbc
Add test with split files
agocke May 28, 2025
c2f5e15
Simplify dir handling
agocke May 28, 2025
20e7f77
Simplify test code
agocke Jun 3, 2025
a2c2fc9
Merge branch 'release/9.0-staging' into backport/pr-115315-to-release…
agocke Jun 6, 2025
d70a438
Remove debugging line
agocke Jun 7, 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
Simplify dir handling
  • Loading branch information
@agocke
agocke authored and github-actions committed Jun 3, 2025
commit c2f5e15e40bc8365ea476a276c675d33cfbf8ed6
8 changes: 4 additions & 4 deletions src/installer/tests/HostActivation.Tests/SymbolicLinks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,23 @@ public void Symlink_split_files_fx(string symlinkRelativePath)
}

// Symlink all of the above into a single directory
var targetPath = Path.Combine(testDir.Location, Path.GetDirectoryName(symlinkRelativePath));
var targetPath = Path.Combine(testDir.Location, symlinkRelativePath);
Directory.CreateDirectory(targetPath);
var symlinks = new List<SymLink>();
try
{
foreach (var file in Directory.EnumerateFiles(appFilesDir))
{
var fileName = Path.GetFileName(file);
var symlinkPath = Path.Combine(targetPath, symlinkRelativePath, fileName);
var symlinkPath = Path.Combine(targetPath, fileName);
Directory.CreateDirectory(Path.GetDirectoryName(symlinkPath));
symlinks.Add(new SymLink(file, symlinkPath));
}
symlinks.Add(new SymLink(
Path.Combine(appHostDir, Path.GetFileName(sharedTestState.FrameworkDependentApp.AppExe)),
Path.Combine(targetPath, symlinkRelativePath, Path.GetFileName(sharedTestState.FrameworkDependentApp.AppExe))));
Path.Combine(targetPath, Path.GetFileName(sharedTestState.FrameworkDependentApp.AppExe))));

var result = Command.Create(Path.Combine(testDir.Location, symlinkRelativePath, Path.GetFileName(sharedTestState.FrameworkDependentApp.AppExe)))
var result = Command.Create(Path.Combine(targetPath, Path.GetFileName(sharedTestState.FrameworkDependentApp.AppExe)))
.CaptureStdErr()
.CaptureStdOut()
.DotNetRoot(TestContext.BuiltDotNet.BinPath)
Expand Down