Skip to content
This repository has been archived by the owner on Sep 13, 2022. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Update netstandard to use open key
The default key for things in the standard repo has been changed
to the OpenKey.

This also updates the incorrect keys for the net461 platform references.

Also switched the platform refs to get copied to a single output folder.
  • Loading branch information
weshaggard committed Nov 28, 2016
1 parent ec132d7 commit c4e9e93
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 0 deletions.
2 changes: 2 additions & 0 deletions dir.props
Expand Up @@ -69,6 +69,8 @@
<Platform>AnyCPU</Platform>
<OutputType>Library</OutputType>
<RunApiCompat>true</RunApiCompat>
<!-- Default to using the open public key -->
<AssemblyOriginatorKeyFile>$(ToolsDir)Open.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<!--
Expand Down
8 changes: 8 additions & 0 deletions platforms/dir.targets
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutDir>$(BaseOutputPath)ref/$(TargetGroup)/</OutDir>
<GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
</PropertyGroup>
<Import Condition="Exists('..\dir.targets')" Project="..\dir.targets" />
</Project>
1 change: 1 addition & 0 deletions platforms/net461/System.Drawing.csproj
Expand Up @@ -6,6 +6,7 @@
<OutputType>Library</OutputType>
<!-- disable obsolete warnings/errors -->
<NoWarn>$(NoWarn);0618;0619;0809</NoWarn>
<UseMSFTKey>true</UseMSFTKey>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="mscorlib.csproj" />
Expand Down
1 change: 1 addition & 0 deletions platforms/net461/System.Net.Http.csproj
Expand Up @@ -6,6 +6,7 @@
<OutputType>Library</OutputType>
<!-- disable obsolete warnings/errors -->
<NoWarn>$(NoWarn);0618;0619;0809</NoWarn>
<UseMSFTKey>true</UseMSFTKey>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="mscorlib.csproj" />
Expand Down
1 change: 1 addition & 0 deletions platforms/net461/System.Web.csproj
Expand Up @@ -6,6 +6,7 @@
<OutputType>Library</OutputType>
<!-- disable obsolete warnings/errors -->
<NoWarn>$(NoWarn);0618;0619;0809</NoWarn>
<UseMSFTKey>true</UseMSFTKey>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="mscorlib.csproj" />
Expand Down
9 changes: 9 additions & 0 deletions platforms/net461/dir.targets
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AssemblyOriginatorKeyFile>$(ToolsDir)ECMA.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile Condition="'$(UseMSFTKey)' == 'true'">$(ToolsDir)MSFT.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)\.., dir.targets))\dir.targets" />
</Project>

0 comments on commit c4e9e93

Please sign in to comment.