Index: Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -r60b52c243ac4e35d15cd3323a3dd7f50667934d7
--- Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj	(.../Core.Components.OxyPlot.Forms.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj	(.../Core.Components.OxyPlot.Forms.csproj)	(revision 60b52c243ac4e35d15cd3323a3dd7f50667934d7)
@@ -1,89 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{DADAA0A5-288C-49CB-9F08-337F16832C86}</ProjectGuid>
-    <RootNamespace>Core.Components.OxyPlot.Forms</RootNamespace>
-    <AssemblyName>Core.Components.OxyPlot.Forms</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="OxyPlot.WindowsForms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=245eacd6b5d2d338, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\OxyPlot.WindowsForms.1.0.0\lib\net45\OxyPlot.WindowsForms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CategoryPlotView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ChartControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Extent.cs" />
-    <Compile Include="LinearPlotView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="StackChartControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.Chart.Forms\Core.Components.Chart.Forms.csproj">
-      <Project>{2465cca1-c505-4827-9454-4fd5fd9194cd}</Project>
-      <Name>Core.Components.Chart.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.Chart\Core.Components.Chart.csproj">
-      <Project>{516EBC95-B8F2-428C-B7F6-733F01BF8FDD}</Project>
-      <Name>Core.Components.Chart</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.OxyPlot\Core.Components.OxyPlot.csproj">
-      <Project>{2344a7bd-7e25-4a1a-982e-6c674af5167a}</Project>
-      <Name>Core.Components.OxyPlot</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.Stack.Forms\Core.Components.Stack.Forms.csproj">
-      <Project>{72109E33-6518-4632-ACCF-6CBF2A312711}</Project>
-      <Name>Core.Components.Stack.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.Stack\Core.Components.Stack.csproj">
-      <Project>{6A146889-A3C4-48BF-AF53-C0B0CD355BE4}</Project>
-      <Name>Core.Components.Stack</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="OxyPlot.WindowsForms">
+      <Version>1.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Core.Components.OxyPlot.Forms.Test</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 60b52c243ac4e35d15cd3323a3dd7f50667934d7 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.OxyPlot.Forms/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 60b52c243ac4e35d15cd3323a3dd7f50667934d7 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.OxyPlot.Forms/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj
===================================================================
diff -u -r4b9bb58c473d9c3652aaa5436eabfadb195423b6 -r60b52c243ac4e35d15cd3323a3dd7f50667934d7
--- Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj	(.../Core.Components.OxyPlot.csproj)	(revision 4b9bb58c473d9c3652aaa5436eabfadb195423b6)
+++ Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj	(.../Core.Components.OxyPlot.csproj)	(revision 60b52c243ac4e35d15cd3323a3dd7f50667934d7)
@@ -1,64 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{2344A7BD-7E25-4A1A-982E-6C674AF5167A}</ProjectGuid>
-    <RootNamespace>Core.Components.OxyPlot</RootNamespace>
-    <AssemblyName>Core.Components.OxyPlot</AssemblyName>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\build\Riskeer.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(SolutionDir)\build\Source.targets" />
   <ItemGroup>
-    <Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converter\Chart\ChartAreaDataConverter.cs" />
-    <Compile Include="Converter\ChartDataHelper.cs" />
-    <Compile Include="Converter\Chart\ChartMultipleAreaDataConverter.cs" />
-    <Compile Include="Converter\Chart\ChartLineDataConverter.cs" />
-    <Compile Include="Converter\Chart\ChartMultipleLineDataConverter.cs" />
-    <Compile Include="Converter\Chart\ChartPointDataConverter.cs" />
-    <Compile Include="Converter\Stack\RowChartDataConverter.cs" />
-    <Compile Include="CustomSeries\MultipleLineSeries.cs" />
-    <Compile Include="DataSeries\Chart\ChartAreaDataSeries.cs" />
-    <Compile Include="DataSeries\Chart\ChartLineDataSeries.cs" />
-    <Compile Include="DataSeries\Chart\ChartMultipleAreaDataSeries.cs" />
-    <Compile Include="DataSeries\Chart\ChartMultipleLineDataSeries.cs" />
-    <Compile Include="DataSeries\Chart\IChartDataSeries.cs" />
-    <Compile Include="CustomSeries\MultipleAreaSeries.cs" />
-    <Compile Include="DataSeries\Stack\RowChartDataSeries.cs" />
-    <Compile Include="DataSeries\Stack\RowChartDataSeriesFactory.cs" />
-    <Compile Include="DynamicPlotController.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Converter\Chart\ChartDataConverter.cs" />
-    <Compile Include="DataSeries\Chart\ChartDataSeriesFactory.cs" />
-    <Compile Include="DataSeries\Chart\ChartPointDataSeries.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
-      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
-      <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.Chart\Core.Components.Chart.csproj">
-      <Project>{516EBC95-B8F2-428C-B7F6-733F01BF8FDD}</Project>
-      <Name>Core.Components.Chart</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Core.Components.Stack\Core.Components.Stack.csproj">
-      <Project>{6A146889-A3C4-48BF-AF53-C0B0CD355BE4}</Project>
-      <Name>Core.Components.Stack</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="OxyPlot.Core">
+      <Version>1.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Core.Components.OxyPlot.Test</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Core.Components.OxyPlot.Forms</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file
Fisheye: Tag 60b52c243ac4e35d15cd3323a3dd7f50667934d7 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.OxyPlot/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 60b52c243ac4e35d15cd3323a3dd7f50667934d7 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.OxyPlot/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?