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

.NET Core WPF Build error on custom BaseIntermediateOutputPath #1718 #3120

Merged
merged 10 commits into from
Sep 17, 2020
Merged

.NET Core WPF Build error on custom BaseIntermediateOutputPath #1718 #3120

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b26323d
Adding a default 'true' for unset properties owned by WPF
ryalanms Jul 17, 2019
9ee6f97
Merge branch 'master' into dev/ryalanms/GeneratedFilesRelativePathFix
ryalanms Sep 30, 2019
8a777ad
Add CoreFX GetRelativePath implementation for .NET Framework code gen…
ryalanms Sep 30, 2019
900b82d
Use more robust relative path calculation in markup code generation
ryalanms Sep 30, 2019
aa5685d
Merge branch 'master' into dev/ryalanms/GeneratedFilesRelativePathFix
ryalanms Jun 10, 2020
0eaf8c8
Revive 2019 fix
ryalanms Jun 10, 2020
bdf5c57
Merge branch 'master' into test
ryalanms Sep 9, 2020
94d96b1
Address PR feedback
ryalanms Sep 9, 2020
484790e
Address PR feedback
ryalanms Sep 9, 2020
e70e971
PR feedback
ryalanms Sep 9, 2020
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
18 changes: 5 additions & 13 deletions ...rosoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,19 +1575,11 @@ private string ParentFolderPrefix
{
get
{
string parentFolderPrefix = string.Empty;
if (TargetPath.StartsWith(SourceFileInfo.SourcePath, StringComparison.OrdinalIgnoreCase))
{
string relPath = TargetPath.Substring(SourceFileInfo.SourcePath.Length);
relPath += SourceFileInfo.RelativeSourceFilePath;
string[] dirs = relPath.Split(new Char[] { Path.DirectorySeparatorChar });
for (int i = 1; i < dirs.Length; i++)
{
parentFolderPrefix += PARENTFOLDER;
}
}

return parentFolderPrefix;
#if NETFX && !NETCOREAPP
ryalanms marked this conversation as resolved.
Show resolved Hide resolved
return PathInternal.GetRelativePath(TargetPath, SourceFileInfo.SourcePath, StringComparison.OrdinalIgnoreCase);
#else
return Path.GetRelativePath(TargetPath, SourceFileInfo.SourcePath);
#endif
}
}

Expand Down
Loading