未验证 提交 8d9d1166 编写于 作者: V Vatsan Madhavan 提交者: GitHub

Ensure C/C++ .lib builds in dotnet-wpf-int will set DebugInformationFormat=oldStyle (#2547)

* Ensure that C/C+ .lib builds in dotnet-wpf-int get DebugInformationFormat=oldStyle

* Separate WpfSharedDir vs WpfTransportedSharedDir
上级 4032e7e1
<Project>
<PropertyGroup>
<!-- $(WpfSharedDir) is present in the current repository -->
<WpfSharedDir Condition="Exists('$(WpfSourceDir)shared\') And '$(RepositoryName)'!='dotnet-wpf-int'">$(WpfSourceDir)shared\</WpfSharedDir>
<WpfSharedDir Condition="'$(WpfSharedDir)'=='' And Exists('$(WpfSourceDir)shared\')">$(WpfSourceDir)shared\</WpfSharedDir>
<!-- Consume from NuGet cache -->
<WpfSharedDir Condition="'$(WpfSharedDir)'=='' And Exists('$(WpfArcadeSdkRoot)src\shared\')">$(WpfArcadeSdkRoot)src\shared\</WpfSharedDir>
<WpfTransportedSharedDir Condition="'$(WpfTransportedSharedDir)'=='' And Exists('$(WpfArcadeSdkRoot)src\shared\')">$(WpfArcadeSdkRoot)src\shared\</WpfTransportedSharedDir>
<!-- Consume from $(WpfTestArcadeWpfSdkPath) -->
<WpfSharedDir Condition="'$(WpfSharedDir)'=='' And Exists('$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Shared\')">$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Shared\</WpfSharedDir>
<WpfTransportedSharedDir Condition="'$(WpfTransportedSharedDir)'=='' And Exists('$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Shared\')">$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Shared\</WpfTransportedSharedDir>
<!-- $(WpfCommonDir) is present in the current repository -->
<WpfCommonDir Condition="Exists('$(WpfSourceDir)Common\') And '$(RepositoryName)'!='dotnet-wpf-int'">$(WpfSourceDir)Common\</WpfCommonDir>
<WpfCommonDir Condition="'$(WpfCommonDir)'=='' And Exists('$(WpfSourceDir)Common\') And '$(RepositoryName)'!='dotnet-wpf-int'">$(WpfSourceDir)Common\</WpfCommonDir>
<!-- Consume from NuGet cache -->
<WpfCommonDir Condition="'$(WpfCommonDir)'=='' And Exists('$(WpfArcadeSdkRoot)src\Common\')">$(WpfArcadeSdkRoot)src\Common\</WpfCommonDir>
<WpfTransportedCommonDir Condition="'$(WpfTransportedCommonDir)'=='' And Exists('$(WpfArcadeSdkRoot)src\Common\')">$(WpfArcadeSdkRoot)src\Common\</WpfTransportedCommonDir>
<!-- Consume from $(WpfTestArcadeWpfSdkPath) -->
<WpfCommonDir Condition="'$(WpfCommonDir)'=='' And Exists('$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Common\')">$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Common\</WpfCommonDir>
<WpfTransportedCommonDir Condition="'$(WpfTransportedCommonDir)'=='' And Exists('$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Common\')">$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Common\</WpfTransportedCommonDir>
<WpfTracingDir>$(WpfSharedDir)Tracing\</WpfTracingDir>
<WpfTracingDir Condition="'$(WpfTracingDir)' == '' And Exists('$(WpfSharedDir)Tracing\')">$(WpfSharedDir)Tracing\</WpfTracingDir>
<WpfTracingDir Condition="'$(WpfTracingDir)' == '' And Exists('$(WpfTransportedSharedDir)Tracing\')">$(WpfTransportedSharedDir)Tracing\</WpfTracingDir>
</PropertyGroup>
</Project>
......@@ -11,6 +11,10 @@
<ClCompile>
<AdditionalIncludeDirectories Condition="Exists('$(WpfSharedDir)inc\')">%(AdditionalIncludeDirectories);$(WpfSharedDir)inc\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="Exists('$(WpfCommonDir)inc\')">%(AdditionalIncludeDirectories);$(WpfCommonDir)inc\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="Exists('$(WpfTransportedSharedDir)inc\')">%(AdditionalIncludeDirectories);$(WpfTransportedSharedDir)inc\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="Exists('$(WpfTransportedCommonDir)inc\')">%(AdditionalIncludeDirectories);$(WpfTransportedCommonDir)inc\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(NativeVersionFileDirectory);$(WpfTracingDir)native\</AdditionalIncludeDirectories>
<ForcedIncludeFiles>$(WpfSharedDir)inc\ddbanned.h</ForcedIncludeFiles>
......@@ -20,12 +24,15 @@
dotnet-wpf-int repo
-->
<DebugInformationFormat Condition="'$(ManagedCxx)' != 'true' and
'$(RepoLocation)' == 'Internal'">oldStyle</DebugInformationFormat>
'$(ConfigurationType)' == '$(StaticLibrary)' and
'$(RepositoryName)' == 'dotnet-wpf-int'">oldStyle</DebugInformationFormat>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(NativeVersionFileDirectory)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<!--
Support for /linkrepro
......@@ -607,6 +614,24 @@ using namespace System::Runtime::Versioning;
<MakeDir Directories="$(IntermediateOutputPath)LinkRepro\" />
</Target>
<PropertyGroup>
<BeforeClCompileTargets>
UseOldStyleDebugInformationFormat;
$(BeforeClCompileTargets)
</BeforeClCompileTargets>
</PropertyGroup>
<Target Name="UseOldStyleDebugInformationFormat"
Condition="'$(RepositoryName)'=='dotnet-wpf-int' And
'$(ConfigurationType)' =='StaticLibrary' And
'$(ManagedCxx)' != 'true'">
<ItemGroup>
<ClCompile Update="@(ClCompile)">
<DebugInformationFormat>oldStyle</DebugInformationFormat>
</ClCompile>
</ItemGroup>
</Target>
<!-- Disable the portions of MSBuild that insist on a targeting pack directory to represent a target framework -->
<Import Project="..\targets\Microsoft.NET.DisableStandardFrameworkResolution.targets" Sdk="Microsoft.NET.Sdk"
Condition="'$(ManagedCxx)'=='true'" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册