From fa544b90b51e151180b1001cb169221145344e16 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 4 Aug 2021 11:01:01 -0700
Subject: [PATCH] Revert "Fix GetEntryAssemblyLocation Uri (#4799)"

This reverts commit 9cdfdc38196a18d6b1a31d6db1ae8cc0df62a213.
---
 .../MS/Internal/AppModel/ContentFilePart.cs                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ContentFilePart.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ContentFilePart.cs
index b5f30f6fcbd..02838d46d4f 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ContentFilePart.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ContentFilePart.cs
@@ -73,7 +73,8 @@ protected override Stream GetStreamCore(FileMode mode, FileAccess access)
                 BaseUriHelper.GetAssemblyNameAndPart(Uri, out filePath, out assemblyName, out assemblyVersion, out assemblyKey);
 
                 // filePath should not have leading slash.  GetAssemblyNameAndPart( ) can guarantee it.
-                _fullPath = System.IO.Path.Combine(codeBase.LocalPath, filePath);
+                Uri file = new Uri(codeBase, filePath);
+                _fullPath = file.LocalPath;
             }
 
             stream = CriticalOpenFile(_fullPath);