Skip to content

Commit fa544b9

Browse files
committed
Revert "Fix GetEntryAssemblyLocation Uri (#4799)"
This reverts commit 9cdfdc3.
1 parent dac3c0c commit fa544b9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ContentFilePart.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ protected override Stream GetStreamCore(FileMode mode, FileAccess access)
7373
BaseUriHelper.GetAssemblyNameAndPart(Uri, out filePath, out assemblyName, out assemblyVersion, out assemblyKey);
7474

7575
// filePath should not have leading slash. GetAssemblyNameAndPart( ) can guarantee it.
76-
_fullPath = System.IO.Path.Combine(codeBase.LocalPath, filePath);
76+
Uri file = new Uri(codeBase, filePath);
77+
_fullPath = file.LocalPath;
7778
}
7879

7980
stream = CriticalOpenFile(_fullPath);

0 commit comments

Comments
 (0)