Skip to content

Commit 6e225a8

Browse files
committed
Remove WPF workarounds for bugs fixed years ago
1 parent 8028bf7 commit 6e225a8

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

Directory.Build.props

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,4 @@
5555
<PackageReleaseNotes Condition="'$(PackageProjectUrl)'!=''">$(PackageProjectUrl)/releases/tag/v$(Version)</PackageReleaseNotes>
5656
</PropertyGroup>
5757
</Target>
58-
59-
<PropertyGroup Condition="'$(IsWpfTempProject)' == ''">
60-
<IsWpfTempProject>false</IsWpfTempProject>
61-
<IsWpfTempProject Condition="$(MSBuildProjectName.EndsWith('_wpftmp'))">true</IsWpfTempProject>
62-
</PropertyGroup>
63-
64-
<!--
65-
Inspired by https://github.com/dotnet/arcade/blob/cbfa29d4e859622ada3d226f90f103f659665d31/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props#L14-L31
66-
67-
Disable Source Link and Xliff in WPF temp projects to avoid generating non-deterministic file names to obj dir.
68-
The project name is non-deterministic and is included in the Source Link json file name and xlf directory names.
69-
It's also not necessary to generate these assets.
70-
-->
71-
<PropertyGroup Condition="'$(IsWpfTempProject)' == 'true'">
72-
<EnableSourceLink>false</EnableSourceLink>
73-
<EmbedUntrackedSources>false</EmbedUntrackedSources>
74-
<DeterministicSourcePaths>false</DeterministicSourcePaths>
75-
<EnableXlfLocalization>false</EnableXlfLocalization>
76-
</PropertyGroup>
7758
</Project>

Directory.Build.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
3-
<PropertyGroup>
4-
<!-- Workaround https://github.com/dotnet/wpf/issues/1718 -->
5-
<EmbedUntrackedSources Condition=" '$(UseWPF)' == 'true' ">false</EmbedUntrackedSources>
6-
</PropertyGroup>
7-
83
<ItemGroup>
94
<!-- Avoid compile error about missing namespace when combining ImplicitUsings with .NET Framework target frameworks. -->
105
<Using Remove="System.Net.Http" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />

0 commit comments

Comments
 (0)