File tree Expand file tree Collapse file tree 5 files changed +37
-19
lines changed
packaging/Microsoft.NET.Sdk.WindowsDesktop/targets
src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks Expand file tree Collapse file tree 5 files changed +37
-19
lines changed Original file line number Diff line number Diff line change 11<Project >
22 <PropertyGroup >
3+ <LocalMicrosoftWinFXProps >$(RepoRoot)src\Microsoft.DotNet.Wpf\src\PresentationBuildTasks\Microsoft.WinFX.props</LocalMicrosoftWinFXProps >
34 <LocalMicrosoftWinFXTargets >$(RepoRoot)src\Microsoft.DotNet.Wpf\src\PresentationBuildTasks\Microsoft.WinFX.targets</LocalMicrosoftWinFXTargets >
45 </PropertyGroup >
56
3435 Project="../targets/Microsoft.NET.Sdk.WindowsDesktop.props"
3536 Condition="!Exists('$(LocalMicrosoftWinFXTargets)') And '$(InternalMarkupCompilation)'=='true'"/>
3637
38+ We need Microsoft.WinFx.props though, so that's imported here specifically.
39+
3740 The use of Microsoft.NET.Sdk.WindowsDesktop doesn't break the source-build promise.
3841 - Microsoft.NET.Sdk.WindowsDesktop is built from sources
3942 - It is used for compilation of assemblies in dotnet-wpf-int (the internal WPF repo), and serves as a
4245 fall back to use local PBT project outputs for their compilation (instead of using WindowsDesktop Sdk package
4346 as a convenient 'transport package').
4447 -->
48+
49+ <!--
50+ If local PresentationBuildTasks project is present, then import WinFX.props from local sources;
51+ otherwise import Microsoft.NET.Sdk.WindowsDesktop.props from Microsoft.NET.Sdk.WindowsDesktop
52+
53+ We can not really test for $(InternalMarkupCompilation)==true here. It is usually defined
54+ in the csproj - which is included after props (but before targets).
55+ -->
56+ <Import Project =" $(WpfSourceDir)PresentationBuildTasks\Microsoft.WinFX.props"
57+ Condition =" Exists('$(LocalMicrosoftWinFXProps)') " />
58+
59+ <Import Sdk =" Microsoft.NET.Sdk.WindowsDesktop"
60+ Project =" ../targets/Microsoft.WinFx.props"
61+ Condition =" !Exists('$(LocalMicrosoftWinFXProps)')" />
4562</Project >
Original file line number Diff line number Diff line change 204204
205205 <SupportedTargetFramework Remove =" @(_UnsupportedNETCoreAppTargetFramework);@(_UnsupportedNETStandardTargetFramework);@(_UnsupportedNETFrameworkTargetFramework)" />
206206 </ItemGroup >
207+
208+ <Import Project =" Microsoft.WinFX.props" />
207209</Project >
Original file line number Diff line number Diff line change 1+ <Project >
2+ <PropertyGroup >
3+ <_PresentationBuildTasksTfm Condition =" '$(MSBuildRuntimeType)' == 'Core'" >netcoreapp2.1</_PresentationBuildTasksTfm >
4+ <_PresentationBuildTasksTfm Condition =" '$(MSBuildRuntimeType)' != 'Core'" >net472</_PresentationBuildTasksTfm >
5+ <_PresentationBuildTasksAssembly Condition =" '$(_PresentationBuildTasksAssembly)'==''" >$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\$(_PresentationBuildTasksTfm)\PresentationBuildTasks.dll'))</_PresentationBuildTasksAssembly >
6+ </PropertyGroup >
7+
8+ <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.MarkupCompilePass1" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
9+ <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.UidManager" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
10+ <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.ResourcesGenerator" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
11+ <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.FileClassifier" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
12+ <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.MarkupCompilePass2" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
13+ <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.GenerateTemporaryTargetAssembly" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
14+ <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.MergeLocalizationDirectives" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
15+
16+ </Project >
Original file line number Diff line number Diff line change 11<Project xmlns =" http://schemas.microsoft.com/developer/msbuild/2003" >
2-
32 <PropertyGroup >
4-
5- <_PresentationBuildTasksTfm Condition =" '$(MSBuildRuntimeType)' == 'Core'" >netcoreapp2.1</_PresentationBuildTasksTfm >
6- <_PresentationBuildTasksTfm Condition =" '$(MSBuildRuntimeType)' != 'Core'" >net472</_PresentationBuildTasksTfm >
7- <_PresentationBuildTasksAssembly Condition =" '$(_PresentationBuildTasksAssembly)'==''" >$(MSBuildThisFileDirectory)..\tools\$(_PresentationBuildTasksTfm)\PresentationBuildTasks.dll</_PresentationBuildTasksAssembly >
8-
93 <AlwaysCompileMarkupFilesInSeparateDomain Condition =" '$(BuildingInsideVisualStudio)' == 'true' and '$(AlwaysCompileMarkupFilesInSeparateDomain)' == ''" >true</AlwaysCompileMarkupFilesInSeparateDomain >
10-
114 <AlwaysCompileMarkupFilesInSeparateDomain Condition =" '$(AlwaysCompileMarkupFilesInSeparateDomain)' == '' " >true</AlwaysCompileMarkupFilesInSeparateDomain >
12-
135 <LocalizationDirectivesToLocFile Condition =" '$(LocalizationDirectivesToLocFile)' == ''" >None</LocalizationDirectivesToLocFile >
14-
156 </PropertyGroup >
16-
17- <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.MarkupCompilePass1" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
18- <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.UidManager" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
19- <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.ResourcesGenerator" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
20- <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.FileClassifier" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
21- <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.MarkupCompilePass2" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
22- <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.GenerateTemporaryTargetAssembly" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
23- <UsingTask TaskName =" Microsoft.Build.Tasks.Windows.MergeLocalizationDirectives" AssemblyFile =" $(_PresentationBuildTasksAssembly)" />
24-
25-
7+
268 <!-- Some Default Settings -->
279 <PropertyGroup >
2810
Original file line number Diff line number Diff line change 4444 content\targets\
4545 -->
4646 <ItemGroup >
47+ <PackagingContent Include =" $(MSBuildThisFileDirectory)Microsoft.WinFx.props" SubFolder =" root\targets" />
4748 <PackagingContent Include =" $(MSBuildThisFileDirectory)Microsoft.WinFx.targets" SubFolder =" root\targets" />
4849 </ItemGroup >
4950
You can’t perform that action at this time.
0 commit comments