Use CommonPath build property to include common files

Author: dsplaisted

src/System.Composition.Convention/src/System.Composition.Convention.csproj

@@ -20,22 +20,22 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\Assumes.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\Assumes.cs">
       <Link>Microsoft\Internal\Assumes.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\Assumes.InternalErrorException.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\Assumes.InternalErrorException.cs">
       <Link>Microsoft\Internal\Assumes.InternalErrorException.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\CommonStrings.Designer.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\CommonStrings.Designer.cs">
       <Link>Microsoft\Internal\CommonStrings.Designer.cs</Link>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>CommonStrings.resx</DependentUpon>
     </Compile>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\EmptyArray.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\EmptyArray.cs">
       <Link>Microsoft\Internal\EmptyArray.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\Requires.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\Requires.cs">
       <Link>Microsoft\Internal\Requires.cs</Link>
     </Compile>
     <Compile Include="Microsoft\Composition\Diagnostics\CompositionTrace.cs" />
@@ -60,7 +60,7 @@
     <Compile Include="System\Composition\ExceptionBuilder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Common\src\Microsoft\Internal\CommonStrings.resx">
+    <EmbeddedResource Include="$(CommonPath)\Microsoft\Internal\CommonStrings.resx">
       <Link>Microsoft\Internal\CommonStrings.resx</Link>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>CommonStrings.Designer.cs</LastGenOutput>

src/System.Composition.Hosting/src/System.Composition.Hosting.csproj

@@ -27,22 +27,22 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\Assumes.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\Assumes.cs">
       <Link>Microsoft\Internal\Assumes.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\Assumes.InternalErrorException.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\Assumes.InternalErrorException.cs">
       <Link>Microsoft\Internal\Assumes.InternalErrorException.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\CommonStrings.Designer.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\CommonStrings.Designer.cs">
       <Link>Microsoft\Internal\CommonStrings.Designer.cs</Link>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>CommonStrings.resx</DependentUpon>
     </Compile>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\EmptyArray.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\EmptyArray.cs">
       <Link>Microsoft\Internal\EmptyArray.cs</Link>
     </Compile>
-    <Compile Include="..\..\Common\src\Microsoft\Internal\Requires.cs">
+    <Compile Include="$(CommonPath)\Microsoft\Internal\Requires.cs">
       <Link>Microsoft\Internal\Requires.cs</Link>
     </Compile>
     <Compile Include="Microsoft\Internal\ThrowHelper.cs" />
@@ -80,7 +80,7 @@
     <Compile Include="System\Composition\Hosting\Util\SmallSparseInitonlyArray.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Common\src\Microsoft\Internal\CommonStrings.resx">
+    <EmbeddedResource Include="$(CommonPath)\Microsoft\Internal\CommonStrings.resx">
       <Link>Microsoft\Internal\CommonStrings.resx</Link>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>CommonStrings.Designer.cs</LastGenOutput>