Rebase with dotnet master

dotnet · Jan 31, 2018 · b652cd3 · b652cd3
1 parent 2728bb9
commit b652cd3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.../src/System/Numerics/Vector.netcoreapp.cs → ...eLib/System/Numerics/Vector.netcoreapp.cs b/.../src/System/Numerics/Vector.netcoreapp.cs → ...eLib/System/Numerics/Vector.netcoreapp.cs
diff --git a/.../src/System/Numerics/Vector.netcoreapp.tt → ...eLib/System/Numerics/Vector.netcoreapp.tt b/.../src/System/Numerics/Vector.netcoreapp.tt → ...eLib/System/Numerics/Vector.netcoreapp.tt
diff --git a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -52,10 +52,11 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
-    <Compile Include="System\Numerics\Vector.netcoreapp.cs">
+    <Compile Include="$(CommonPath)\CoreLib\System\Numerics\Vector.netcoreapp.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Vector.netcoreapp.tt</DependentUpon>
+	  <Link>System\Numerics\Vector.netcoreapp.cs</Link>
     </Compile>
   </ItemGroup>
   <!-- Carry a copy of MathF where not available -->
@@ -107,9 +108,10 @@
     <Reference Include="System.Runtime.Extensions" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
-    <Content Include="System\Numerics\Vector.netcoreapp.tt">
+    <Content Include="$(CommonPath)\CoreLib\System\Numerics\Vector.netcoreapp.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Vector.netcoreapp.cs</LastGenOutput>
+	  <Link>System\Numerics\Vector.netcoreapp.tt</Link>
     </Content>
   </ItemGroup>
   <ItemGroup>