diff options
| author | Matt Ellis <matell@microsoft.com> | 2015-10-14 04:15:56 +0300 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2015-10-14 04:22:19 +0300 |
| commit | 11395b20dac9dff22be141b2a78c394268ab146e (patch) | |
| tree | a153a94855fff1fdc2ae2c632d123b062cc7f0f2 /src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj | |
| parent | 4e8cae99fb904cc625472a63307e02b4f7dd2d36 (diff) | |
Don't override dir.props' ECMA Key setting
Due to https://github.com/dotnet/roslyn/issues/2444, we have disabled
ECMA signing when the host platform for our build is not Windows. This
is done by explicitly setting the property in our top level dir.props.
Some of the reference assemblies explicitly set UseECMAKey to true,
overwriting this value which leads to build breaks when building on non
Windows platforms.
Guard the setting of this property so that we don't override it if it
already set.
Fixes #3739
Diffstat (limited to 'src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj')
| -rw-r--r-- | src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj index 23d8734c29..ca4e62d2e5 100644 --- a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <UseECMAKey>true</UseECMAKey> + <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey> <!-- NOTE: Suppress false positive warning for the special case where we're building System.Runtime.WindowsRuntime itself at a version other than 4.0.0.0, which is referenced indirectly via the mscorlib.dll design-time facade, which @@ -28,4 +28,4 @@ <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> |