Skip to content

Fix GetStreamCore in ContentFilePart #5066

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 2 commits into from
Oct 26, 2022
Merged

Fix GetStreamCore in ContentFilePart #5066

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31c499d
Fix GetStreamCore in ContentFilePart
lindexi Aug 12, 2021
a71e6a0
Rename the variable and remove the unuse comment.
lindexi Aug 15, 2021
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
13 changes: 5 additions & 8 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ContentFilePart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected override Stream GetStreamCore(FileMode mode, FileAccess access)
// File name will be a path relative to the applications directory.
// - We do not want to use SiteOfOriginContainer.SiteOfOrigin because
// for deployed files the <Content> files are deployed with the application.
Uri codeBase = GetEntryAssemblyLocation();
string location = GetEntryAssemblyLocation();

string assemblyName, assemblyVersion, assemblyKey;
string filePath;
Expand All @@ -73,8 +73,7 @@ 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.
Uri file = new Uri(codeBase, filePath);
_fullPath = file.LocalPath;
_fullPath = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(location), filePath);
}

stream = CriticalOpenFile(_fullPath);
Expand Down Expand Up @@ -103,15 +102,13 @@ protected override string GetContentTypeCore()
#region Private Methods


private Uri GetEntryAssemblyLocation()
private string GetEntryAssemblyLocation()
{
Uri entryLocation = null;
string entryLocation = null;

try
{
#pragma warning disable // Type or member is obsolete
entryLocation = new Uri(Application.ResourceAssembly.CodeBase);
#pragma warning restore // Type or member is obsolete
entryLocation = Application.ResourceAssembly.Location;
}
catch (Exception ex)
{
Expand Down