From eddd299c721882d099f76d4601c3ff32a3aa288a Mon Sep 17 00:00:00 2001
From: Kenneth Pouncey <kjpou@pt.lu>
Date: Fri, 19 Jul 2019 11:41:54 +0200
Subject: [PATCH] Add `Signing.props` file to `common` directory to be
 referenced from a common place

- Add the `Signing.props` to the `Directory.Build.props`
---
 sdks/wasm/common/Signing.props                                       | 5 +++++
 sdks/wasm/framework/src/Directory.Build.props                        | 1 +
 .../framework/src/WebAssembly.Bindings/WebAssembly.Bindings.csproj   | 1 -
 .../framework/src/WebAssembly.Net.Http/WebAssembly.Net.Http.csproj   | 1 -
 .../src/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj | 1 -
 sdks/wasm/sdk/Directory.Build.props                                  | 1 +
 sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.csproj   | 1 +
 .../sdk/Mono.WebAssembly.Framework/Mono.WebAssembly.Framework.csproj | 1 +
 .../Mono.WebAssembly.Runtime.csproj                                  | 1 +
 sdks/wasm/sdk/Mono.WebAssembly.Sdk/Mono.WebAssembly.Sdk.csproj       | 1 +
 .../sdk/WebAssembly.Bindings.Framework/WebAssembly.Bindings.csproj   | 1 +
 .../sdk/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj | 1 +
 12 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 sdks/wasm/common/Signing.props

diff --git a/sdks/wasm/common/Signing.props b/sdks/wasm/common/Signing.props
new file mode 100644
index 00000000000..b1c0a2bee4e
--- /dev/null
+++ b/sdks/wasm/common/Signing.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\..\mcs\class\Open.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/sdks/wasm/framework/src/Directory.Build.props b/sdks/wasm/framework/src/Directory.Build.props
index abe2cef18bf..19ac015b3fb 100644
--- a/sdks/wasm/framework/src/Directory.Build.props
+++ b/sdks/wasm/framework/src/Directory.Build.props
@@ -1,3 +1,4 @@
 <Project>
   <Import Project="$(MSBuildThisFileDirectory)..\..\common\Versions.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\common\Signing.props" />
 </Project>
diff --git a/sdks/wasm/framework/src/WebAssembly.Bindings/WebAssembly.Bindings.csproj b/sdks/wasm/framework/src/WebAssembly.Bindings/WebAssembly.Bindings.csproj
index cf1d3e3748a..6fd72408e03 100644
--- a/sdks/wasm/framework/src/WebAssembly.Bindings/WebAssembly.Bindings.csproj
+++ b/sdks/wasm/framework/src/WebAssembly.Bindings/WebAssembly.Bindings.csproj
@@ -4,7 +4,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>WebAssembly</RootNamespace>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\..\..\..\mcs\class\Open.snk</AssemblyOriginatorKeyFile>
     <Version>$(BindingsVersion)</Version>
   </PropertyGroup>
 
diff --git a/sdks/wasm/framework/src/WebAssembly.Net.Http/WebAssembly.Net.Http.csproj b/sdks/wasm/framework/src/WebAssembly.Net.Http/WebAssembly.Net.Http.csproj
index cecfcf8ae10..877ec150ca8 100644
--- a/sdks/wasm/framework/src/WebAssembly.Net.Http/WebAssembly.Net.Http.csproj
+++ b/sdks/wasm/framework/src/WebAssembly.Net.Http/WebAssembly.Net.Http.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\..\..\..\mcs\class\Open.snk</AssemblyOriginatorKeyFile>
     <Version>$(HttpHandlerVersion)</Version>
   </PropertyGroup>
 
diff --git a/sdks/wasm/framework/src/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj b/sdks/wasm/framework/src/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj
index 31fc6a69085..a5fbe9a3155 100644
--- a/sdks/wasm/framework/src/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj
+++ b/sdks/wasm/framework/src/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\..\..\..\mcs\class\Open.snk</AssemblyOriginatorKeyFile>
     <Version>$(ClientWebSocketVersion)</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/sdks/wasm/sdk/Directory.Build.props b/sdks/wasm/sdk/Directory.Build.props
index 9dd3a08e21b..5933443996c 100644
--- a/sdks/wasm/sdk/Directory.Build.props
+++ b/sdks/wasm/sdk/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <Import Project="$(MSBuildThisFileDirectory)..\common\Versions.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\common\Signing.props" />
   <PropertyGroup Condition="!$(MSBuildProjectName.Contains('Sample'))">
     <Version>$(SDKPackageVersion)</Version>
     <PackageTags>WebAssembly Wasm Mono Sdk</PackageTags>
diff --git a/sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.csproj b/sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.csproj
index ed303dbc653..e6fb65e3d1c 100644
--- a/sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.csproj
+++ b/sdks/wasm/sdk/Mono.WebAssembly.Build/Mono.WebAssembly.Build.csproj
@@ -4,6 +4,7 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Description>Mono.WebAssembly build targets. This package is not intended to be referenced directly.</Description>
     <BuildOutputTargetFolder>build</BuildOutputTargetFolder>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" PrivateAssets="all" />
diff --git a/sdks/wasm/sdk/Mono.WebAssembly.Framework/Mono.WebAssembly.Framework.csproj b/sdks/wasm/sdk/Mono.WebAssembly.Framework/Mono.WebAssembly.Framework.csproj
index 95fb8a6035a..9c38505c96a 100644
--- a/sdks/wasm/sdk/Mono.WebAssembly.Framework/Mono.WebAssembly.Framework.csproj
+++ b/sdks/wasm/sdk/Mono.WebAssembly.Framework/Mono.WebAssembly.Framework.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Mono.WebAssembly framework assemblies. This package is not intended to be referenced directly.</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SignAssembly>true</SignAssembly>
     <!-- get rid of warnings about assemblies not in lib -->
     <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
diff --git a/sdks/wasm/sdk/Mono.WebAssembly.Runtime.Framework/Mono.WebAssembly.Runtime.csproj b/sdks/wasm/sdk/Mono.WebAssembly.Runtime.Framework/Mono.WebAssembly.Runtime.csproj
index 86fae87c921..3884012c304 100644
--- a/sdks/wasm/sdk/Mono.WebAssembly.Runtime.Framework/Mono.WebAssembly.Runtime.csproj
+++ b/sdks/wasm/sdk/Mono.WebAssembly.Runtime.Framework/Mono.WebAssembly.Runtime.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Mono.WebAssembly runtime libraries. This package is not intended to be referenced directly.</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SignAssembly>true</SignAssembly>
     <!-- get rid of warnings about assemblies not in lib -->
     <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
diff --git a/sdks/wasm/sdk/Mono.WebAssembly.Sdk/Mono.WebAssembly.Sdk.csproj b/sdks/wasm/sdk/Mono.WebAssembly.Sdk/Mono.WebAssembly.Sdk.csproj
index 9313c3f8c17..c812934da47 100644
--- a/sdks/wasm/sdk/Mono.WebAssembly.Sdk/Mono.WebAssembly.Sdk.csproj
+++ b/sdks/wasm/sdk/Mono.WebAssembly.Sdk/Mono.WebAssembly.Sdk.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>MSBuild SDK for Mono.WebAssembly projects.</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <None Update="sdk\Sdk.props" PackagePath="sdk\Sdk.props" Pack="true" />
diff --git a/sdks/wasm/sdk/WebAssembly.Bindings.Framework/WebAssembly.Bindings.csproj b/sdks/wasm/sdk/WebAssembly.Bindings.Framework/WebAssembly.Bindings.csproj
index 4da34caacc7..5756ef3d4a4 100644
--- a/sdks/wasm/sdk/WebAssembly.Bindings.Framework/WebAssembly.Bindings.csproj
+++ b/sdks/wasm/sdk/WebAssembly.Bindings.Framework/WebAssembly.Bindings.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Mono.WebAssembly bindings. This package is not intended to be referenced directly.</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SignAssembly>true</SignAssembly>
     <!-- get rid of warnings about assemblies not in lib -->
     <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
diff --git a/sdks/wasm/sdk/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj b/sdks/wasm/sdk/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj
index 5edfe69cdb7..3f56ed6f463 100644
--- a/sdks/wasm/sdk/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj
+++ b/sdks/wasm/sdk/WebAssembly.Net.WebSockets/WebAssembly.Net.WebSockets.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Mono.WebAssembly ClientWebSocket implementation. This package is not intended to be referenced directly.</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SignAssembly>true</SignAssembly>
     <!-- get rid of warnings about assemblies not in lib -->
     <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
-- 
2.11.4.GIT