Share common props file for manual shims

Share common props file for the manual shims.

Add GenFacadesForceZeroVersionSeeds=true so that the assembly references
for the shims are set to 0.0.0.0 so that they will correctly unify
up and support multiple versions of OOB packages like SqlClient.

4 files changed, 27 insertions, 54 deletions

diff --git a/src/shims/manual/System.Data.csproj b/src/shims/manual/System.Data.csproj
index 3807fda917..445f060ba7 100644
--- a/src/shims/manual/System.Data.csproj
+++ b/src/shims/manual/System.Data.csproj
@@ -1,24 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="dir.props" />
   <PropertyGroup>
-    <BuildConfigurations>
-      netcoreapp;
-      uap;
-    </BuildConfigurations>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-  <!-- need to by-pass the dir.props in the shims directory for this project -->
-  <Import Project="..\..\..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <AssemblyKey>ECMA</AssemblyKey>
-    <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <HasMatchingContract>true</HasMatchingContract>
-    <ContractAssemblyPath>$(NetFxRefPath)System.Data.dll</ContractAssemblyPath>
-    <GenFacadesIgnoreMissingTypes>true</GenFacadesIgnoreMissingTypes>
-    <IsRuntimeAssembly>true</IsRuntimeAssembly>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp</DefineConstants>
     <ProjectGuid>{5E51460E-C9DC-4B6B-B87E-0ED742FC6733}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/shims/manual/System.csproj b/src/shims/manual/System.csproj
index 84ff025bf7..09bc263d27 100644
--- a/src/shims/manual/System.csproj
+++ b/src/shims/manual/System.csproj
@@ -1,24 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="dir.props" />
   <PropertyGroup>
-    <BuildConfigurations>
-      netcoreapp;
-      uap;
-    </BuildConfigurations>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-  <!-- need to by-pass the dir.props in the shims directory for this project -->
-  <Import Project="..\..\..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <AssemblyKey>ECMA</AssemblyKey>
-    <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <HasMatchingContract>true</HasMatchingContract>
-    <ContractAssemblyPath>$(NetFxRefPath)System.dll</ContractAssemblyPath>
-    <GenFacadesIgnoreMissingTypes>true</GenFacadesIgnoreMissingTypes>
-    <IsRuntimeAssembly>true</IsRuntimeAssembly>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp</DefineConstants>
     <ProjectGuid>{1FB7650D-7165-49B9-98B0-E345D56983DB}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/shims/manual/dir.props b/src/shims/manual/dir.props
new file mode 100644
index 0000000000..03a82d2305
--- /dev/null
+++ b/src/shims/manual/dir.props
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <BuildConfigurations>
+      netcoreapp;
+      uap;
+    </BuildConfigurations>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+  <!-- need to by-pass the dir.props in the shims directory for this project -->
+  <Import Project="..\..\..\dir.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <AssemblyKey>ECMA</AssemblyKey>
+    <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
+    <GenFacadesForceZeroVersionSeeds>true</GenFacadesForceZeroVersionSeeds>
+    <GenFacadesIgnoreMissingTypes>true</GenFacadesIgnoreMissingTypes>
+    <IsRuntimeAssembly>true</IsRuntimeAssembly>
+    <HasMatchingContract>true</HasMatchingContract>
+    <ContractAssemblyPath>$(NetFxRefPath)$(MSBuildProjectName).dll</ContractAssemblyPath>
+    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp</DefineConstants>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/shims/manual/mscorlib.csproj b/src/shims/manual/mscorlib.csproj
index a522c16713..040aaffc68 100644
--- a/src/shims/manual/mscorlib.csproj
+++ b/src/shims/manual/mscorlib.csproj
@@ -1,24 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="dir.props" />
   <PropertyGroup>
-    <BuildConfigurations>
-      netcoreapp;
-      uap;
-    </BuildConfigurations>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-  <!-- need to by-pass the dir.props in the shims directory for this project -->
-  <Import Project="..\..\..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <AssemblyKey>ECMA</AssemblyKey>
-    <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <HasMatchingContract>true</HasMatchingContract>
-    <ContractAssemblyPath>$(NetFxRefPath)mscorlib.dll</ContractAssemblyPath>
-    <GenFacadesIgnoreMissingTypes>true</GenFacadesIgnoreMissingTypes>
-    <IsRuntimeAssembly>true</IsRuntimeAssembly>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp</DefineConstants>
     <ProjectGuid>{CEAE2042-461E-490A-974C-AD7FBD4E294E}</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />