Skip to content

Commit 5aaee6b

Browse files
JonarwJonarw
authored
fix #21 
1 parent 7ca675b commit 5aaee6b

14 files changed

+47
-339
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ All notable changes to this project will be documented in this file.
55
### Added
66

77
### Changed
8-
Updated SharpDX nuget packages
9-
Updated OxyPlot nuget packages from MyGet
10-
Migrated to .NET Standard library
8+
Updated SharpDX nuget packages to version 4.2.0
9+
Updated OxyPlot nuget packages from MyGet to version 2.0.0 stable
10+
Migrated OxyPlot.SharpDX to .NET Standard 1.1
11+
Update project files to VS2019 format
12+
OxyPlot.SharpDX.WPF: Dual-target .NET Framework 4.5.2 and .NET Core 3.1
13+
SimpleDemo: Target .NET Core 3.1
1114

1215
### Removed
1316

‎CONTRIBUTORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ David Wong
1818
Don Syme
1919
lsowen
2020
jeremyiverson
21+
Jonathan Arweck
2122
Just Slon <[email protected]>
2223
Oystein Bjorke <[email protected]>
2324
Thomas Ibel <[email protected]>

‎Source/Examples/SharpDX.Wpf/SimpleDemo/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎Source/Examples/SharpDX.Wpf/SimpleDemo/SimpleDemo.csproj

Lines changed: 8 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{48C8FBE0-C817-43BE-AC11-895A69100A86}</ProjectGuid>
84
<OutputType>WinExe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>SimpleDemo</RootNamespace>
11-
<AssemblyName>SimpleDemo</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15-
<WarningLevel>4</WarningLevel>
16-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
17-
<TargetFrameworkProfile />
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
6+
<UseWPF>true</UseWPF>
187
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<PlatformTarget>AnyCPU</PlatformTarget>
21-
<DebugSymbols>true</DebugSymbols>
22-
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
25-
<DefineConstants>DEBUG;TRACE</DefineConstants>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
28-
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<PlatformTarget>AnyCPU</PlatformTarget>
31-
<DebugType>pdbonly</DebugType>
32-
<Optimize>true</Optimize>
33-
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
37-
</PropertyGroup>
38-
<ItemGroup>
39-
<Reference Include="System" />
40-
<Reference Include="System.Data" />
41-
<Reference Include="System.Xml" />
42-
<Reference Include="Microsoft.CSharp" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
46-
<Reference Include="System.Net.Http" />
47-
<Reference Include="System.Xaml">
48-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
49-
</Reference>
50-
<Reference Include="WindowsBase" />
51-
<Reference Include="PresentationCore" />
52-
<Reference Include="PresentationFramework" />
53-
</ItemGroup>
54-
<ItemGroup>
55-
<ApplicationDefinition Include="App.xaml">
56-
<Generator>MSBuild:Compile</Generator>
57-
<SubType>Designer</SubType>
58-
</ApplicationDefinition>
59-
<Page Include="MainWindow.xaml">
60-
<Generator>MSBuild:Compile</Generator>
61-
<SubType>Designer</SubType>
62-
</Page>
63-
<Compile Include="App.xaml.cs">
64-
<DependentUpon>App.xaml</DependentUpon>
65-
<SubType>Code</SubType>
66-
</Compile>
67-
<Compile Include="MainViewModel.cs" />
68-
<Compile Include="MainWindow.xaml.cs">
69-
<DependentUpon>MainWindow.xaml</DependentUpon>
70-
<SubType>Code</SubType>
71-
</Compile>
72-
</ItemGroup>
73-
<ItemGroup>
74-
<Compile Include="Properties\AssemblyInfo.cs">
75-
<SubType>Code</SubType>
76-
</Compile>
77-
<Compile Include="Properties\Resources.Designer.cs">
78-
<AutoGen>True</AutoGen>
79-
<DesignTime>True</DesignTime>
80-
<DependentUpon>Resources.resx</DependentUpon>
81-
</Compile>
82-
<Compile Include="Properties\Settings.Designer.cs">
83-
<AutoGen>True</AutoGen>
84-
<DependentUpon>Settings.settings</DependentUpon>
85-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
86-
</Compile>
87-
<EmbeddedResource Include="Properties\Resources.resx">
88-
<Generator>ResXFileCodeGenerator</Generator>
89-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
90-
</EmbeddedResource>
91-
<None Include="Properties\Settings.settings">
92-
<Generator>SettingsSingleFileGenerator</Generator>
93-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
94-
</None>
95-
<AppDesigner Include="Properties\" />
96-
</ItemGroup>
97-
<ItemGroup>
98-
<None Include="App.config" />
99-
</ItemGroup>
100-
<ItemGroup>
101-
<ProjectReference Include="..\..\..\OxyPlot.SharpDX.Wpf\OxyPlot.SharpDX.Wpf.csproj">
102-
<Project>{92129d21-61e9-4952-ab75-6e5b27c8d3f7}</Project>
103-
<Name>OxyPlot.SharpDX.Wpf</Name>
104-
</ProjectReference>
105-
</ItemGroup>
8+
1069
<ItemGroup>
107-
<PackageReference Include="OxyPlot.Core">
108-
<Version>2.0.0-unstable1059</Version>
109-
</PackageReference>
110-
<PackageReference Include="SharpDX">
111-
<Version>4.2.0</Version>
112-
</PackageReference>
113-
<PackageReference Include="SharpDX.DXGI">
114-
<Version>4.2.0</Version>
115-
</PackageReference>
10+
<ProjectReference Include="..\..\..\OxyPlot.SharpDX.Wpf\OxyPlot.SharpDX.Wpf.csproj" />
11+
<ProjectReference Include="..\..\..\OxyPlot.SharpDX\OxyPlot.SharpDX.csproj" />
11612
</ItemGroup>
117-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
118-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
119-
Other similar extension points exist, see Microsoft.Common.targets.
120-
<Target Name="BeforeBuild">
121-
</Target>
122-
<Target Name="AfterBuild">
123-
</Target>
124-
-->
13+
12514
</Project>

‎Source/OxyPlot.SharpDX.Wpf/OxyPlot.SharpDX.Wpf.csproj

Lines changed: 23 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,31 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{92129D21-61E9-4952-AB75-6E5B27C8D3F7}</ProjectGuid>
84
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>OxyPlot.SharpDX.Wpf</RootNamespace>
11-
<AssemblyName>OxyPlot.SharpDX.Wpf</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
5+
<TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
6+
<UseWPF>true</UseWPF>
7+
<Product>OxyPlot.SharpDX.Wpf</Product>
8+
<Description>OxyPlot controls for WPF with SharpDX based renderer</Description>
9+
<ApplicationIcon />
10+
<StartupObject />
11+
<Version>2.0.0</Version>
12+
<Authors>Oystein Bjorke</Authors>
13+
<Company>OxyPlot</Company>
14+
<PackageProjectUrl>https://oxyplot.github.io/</PackageProjectUrl>
15+
<RepositoryUrl>https://github.com/oxyplot/oxyplot-sharpdx</RepositoryUrl>
16+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1517
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<PlatformTarget>AnyCPU</PlatformTarget>
25-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
<DocumentationFile>bin\Release\OxyPlot.SharpDX.Wpf.XML</DocumentationFile>
35-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
36-
</PropertyGroup>
37-
<PropertyGroup>
38-
<SignAssembly>true</SignAssembly>
39-
</PropertyGroup>
40-
<PropertyGroup>
41-
<AssemblyOriginatorKeyFile>OxyPlot.SharpDX.Wpf.snk</AssemblyOriginatorKeyFile>
42-
</PropertyGroup>
43-
<ItemGroup>
44-
<Reference Include="PresentationCore" />
45-
<Reference Include="PresentationFramework" />
46-
<Reference Include="System" />
47-
<Reference Include="System.Core" />
48-
<Reference Include="System.Xaml" />
49-
<Reference Include="System.Xml.Linq" />
50-
<Reference Include="Microsoft.CSharp" />
51-
<Reference Include="System.Xml" />
52-
<Reference Include="WindowsBase" />
53-
</ItemGroup>
54-
<ItemGroup>
55-
<Compile Include="Converters\OxyColorConverter.cs" />
56-
<Compile Include="Converters\ThicknessConverter.cs" />
57-
<Compile Include="D3D11Image.cs" />
58-
<Compile Include="PlotImage.cs" />
59-
<Compile Include="PlotView.cs" />
60-
<Compile Include="..\AssemblyInfo.cs">
61-
<Link>Properties\AssemblyInfo.cs</Link>
62-
</Compile>
63-
<Compile Include="Properties\AssemblyDescription.cs" />
64-
<Compile Include="Tracker\TrackerControl.cs" />
65-
<Compile Include="Tracker\TrackerDefinition.cs" />
66-
<Compile Include="Utilities\ConverterExtensions.cs" />
67-
<Compile Include="Utilities\Keyboard.cs" />
68-
</ItemGroup>
69-
<ItemGroup>
70-
<None Include="OxyPlot.SharpDX.Wpf.snk" />
71-
</ItemGroup>
72-
<ItemGroup>
73-
<EmbeddedResource Include="Resources\designmode.png" />
74-
</ItemGroup>
75-
<ItemGroup>
76-
<Page Include="Themes\Generic.xaml">
77-
<Generator>MSBuild:Compile</Generator>
78-
<SubType>Designer</SubType>
79-
</Page>
80-
</ItemGroup>
18+
8119
<ItemGroup>
82-
<PackageReference Include="OxyPlot.Core">
83-
<Version>2.0.0-unstable1059</Version>
84-
</PackageReference>
85-
<PackageReference Include="SharpDX">
86-
<Version>4.2.0</Version>
87-
</PackageReference>
88-
<PackageReference Include="SharpDX.Direct2D1">
89-
<Version>4.2.0</Version>
90-
</PackageReference>
91-
<PackageReference Include="SharpDX.Direct3D11">
92-
<Version>4.2.0</Version>
93-
</PackageReference>
94-
<PackageReference Include="SharpDX.Direct3D9">
95-
<Version>4.2.0</Version>
96-
</PackageReference>
97-
<PackageReference Include="SharpDX.DXGI">
98-
<Version>4.2.0</Version>
99-
</PackageReference>
100-
<PackageReference Include="SharpDX.Mathematics">
101-
<Version>4.2.0</Version>
102-
</PackageReference>
20+
<PackageReference Include="OxyPlot.Core" Version="2.0.0" />
21+
<PackageReference Include="SharpDX" Version="4.2.0" />
22+
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
23+
<PackageReference Include="SharpDX.Direct3D9" Version="4.2.0" />
24+
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
10325
</ItemGroup>
26+
10427
<ItemGroup>
105-
<ProjectReference Include="..\OxyPlot.SharpDX\OxyPlot.SharpDX.csproj">
106-
<Project>{5d8ec148-9b3d-4a3d-a0b9-a2e9812e647d}</Project>
107-
<Name>OxyPlot.SharpDX</Name>
108-
</ProjectReference>
28+
<ProjectReference Include="..\OxyPlot.SharpDX\OxyPlot.SharpDX.csproj" />
10929
</ItemGroup>
110-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
111-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
112-
Other similar extension points exist, see Microsoft.Common.targets.
113-
<Target Name="BeforeBuild">
114-
</Target>
115-
<Target Name="AfterBuild">
116-
</Target>
117-
-->
30+
11831
</Project>

‎Source/OxyPlot.SharpDX.Wpf/OxyPlot.SharpDX.Wpf.csproj.DotSettings

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Source/OxyPlot.SharpDX.Wpf/OxyPlot.SharpDX.Wpf.nuspec

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎Source/OxyPlot.SharpDX.Wpf/OxyPlot.SharpDX.Wpf.snk

-596 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)