Skip to content

Commit 7ca675b

Browse files
objorkeobjorke
authored
Merge pull request #20 from twsI/fix1224
Updated package.config to PackageReference
2 parents 540196a + f38c43f commit 7ca675b

14 files changed

+112
-100
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ 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
811

912
### Removed
1013

‎CONTRIBUTORS

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This is the official list of people who have contributed
2+
# to the OxyPlot repository.
3+
# The AUTHORS file lists the copyright holders; this file
4+
# lists people.
5+
6+
# People submitting code should be listed in this file (by email address).
7+
8+
# Names should be added to this file like so:
9+
# Name <email address>
10+
11+
# Please keep the list sorted.
12+
13+
Benoît Blanchon
14+
Brannon King
15+
bszypelow
16+
Dan Aizenstros
17+
David Wong
18+
Don Syme
19+
lsowen
20+
jeremyiverson
21+
Just Slon <[email protected]>
22+
Oystein Bjorke <[email protected]>
23+
Thomas Ibel <[email protected]>
24+
twsl <[email protected]>
25+
Soarc <[email protected]>

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,6 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
40-
<HintPath>..\..\..\packages\OxyPlot.Core.2.0.0-unstable1035\lib\net45\OxyPlot.dll</HintPath>
41-
</Reference>
42-
<Reference Include="SharpDX, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
43-
<HintPath>..\..\..\packages\SharpDX.3.0.2\lib\net45\SharpDX.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
46-
<Reference Include="SharpDX.DXGI, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
47-
<HintPath>..\..\..\packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll</HintPath>
48-
<Private>True</Private>
49-
</Reference>
5039
<Reference Include="System" />
5140
<Reference Include="System.Data" />
5241
<Reference Include="System.Xml" />
@@ -99,7 +88,6 @@
9988
<Generator>ResXFileCodeGenerator</Generator>
10089
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
10190
</EmbeddedResource>
102-
<None Include="packages.config" />
10391
<None Include="Properties\Settings.settings">
10492
<Generator>SettingsSingleFileGenerator</Generator>
10593
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -115,6 +103,17 @@
115103
<Name>OxyPlot.SharpDX.Wpf</Name>
116104
</ProjectReference>
117105
</ItemGroup>
106+
<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>
116+
</ItemGroup>
118117
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119118
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120119
Other similar extension points exist, see Microsoft.Common.targets.

‎Source/Examples/SharpDX.Wpf/SimpleDemo/packages.config

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

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

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,35 +41,8 @@
4141
<AssemblyOriginatorKeyFile>OxyPlot.SharpDX.Wpf.snk</AssemblyOriginatorKeyFile>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
45-
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable1035\lib\net45\OxyPlot.dll</HintPath>
46-
</Reference>
4744
<Reference Include="PresentationCore" />
4845
<Reference Include="PresentationFramework" />
49-
<Reference Include="SharpDX, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
50-
<HintPath>..\packages\SharpDX.3.0.2\lib\net45\SharpDX.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
53-
<Reference Include="SharpDX.Direct2D1, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
54-
<HintPath>..\packages\SharpDX.Direct2D1.3.0.2\lib\net45\SharpDX.Direct2D1.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="SharpDX.Direct3D11, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
58-
<HintPath>..\packages\SharpDX.Direct3D11.3.0.2\lib\net45\SharpDX.Direct3D11.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="SharpDX.Direct3D9, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
62-
<HintPath>..\packages\SharpDX.Direct3D9.3.0.2\lib\net45\SharpDX.Direct3D9.dll</HintPath>
63-
<Private>True</Private>
64-
</Reference>
65-
<Reference Include="SharpDX.DXGI, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
66-
<HintPath>..\packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll</HintPath>
67-
<Private>True</Private>
68-
</Reference>
69-
<Reference Include="SharpDX.Mathematics, Version=3.0.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
70-
<HintPath>..\packages\SharpDX.Mathematics.3.0.2\lib\net45\SharpDX.Mathematics.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
7346
<Reference Include="System" />
7447
<Reference Include="System.Core" />
7548
<Reference Include="System.Xaml" />
@@ -95,9 +68,6 @@
9568
</ItemGroup>
9669
<ItemGroup>
9770
<None Include="OxyPlot.SharpDX.Wpf.snk" />
98-
<Resource Include="packages.config">
99-
<SubType>Designer</SubType>
100-
</Resource>
10171
</ItemGroup>
10272
<ItemGroup>
10373
<EmbeddedResource Include="Resources\designmode.png" />
@@ -108,7 +78,35 @@
10878
<SubType>Designer</SubType>
10979
</Page>
11080
</ItemGroup>
111-
<Import Project="..\OxyPlot.SharpDX\OxyPlot.SharpDX.projitems" Label="Shared" />
81+
<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>
103+
</ItemGroup>
104+
<ItemGroup>
105+
<ProjectReference Include="..\OxyPlot.SharpDX\OxyPlot.SharpDX.csproj">
106+
<Project>{5d8ec148-9b3d-4a3d-a0b9-a2e9812e647d}</Project>
107+
<Name>OxyPlot.SharpDX</Name>
108+
</ProjectReference>
109+
</ItemGroup>
112110
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
113111
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
114112
Other similar extension points exist, see Microsoft.Common.targets.

‎Source/OxyPlot.SharpDX.Wpf/packages.config

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

‎Source/OxyPlot.SharpDX.sln

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat
1818
EndProject
1919
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.SharpDX.Wpf", "OxyPlot.SharpDX.Wpf\OxyPlot.SharpDX.Wpf.csproj", "{92129D21-61E9-4952-AB75-6E5B27C8D3F7}"
2020
EndProject
21-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "OxyPlot.SharpDX", "OxyPlot.SharpDX\OxyPlot.SharpDX.shproj", "{455376C6-4146-497C-BF77-61CBB67F5DF9}"
22-
EndProject
2321
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDemo", "Examples\SharpDX.Wpf\SimpleDemo\SimpleDemo.csproj", "{48C8FBE0-C817-43BE-AC11-895A69100A86}"
2422
EndProject
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.SharpDX", "OxyPlot.SharpDX\OxyPlot.SharpDX.csproj", "{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}"
24+
EndProject
2525
Global
26-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
27-
OxyPlot.SharpDX\OxyPlot.SharpDX.projitems*{455376c6-4146-497c-bf77-61cbb67f5df9}*SharedItemsImports = 13
28-
OxyPlot.SharpDX\OxyPlot.SharpDX.projitems*{92129d21-61e9-4952-ab75-6e5b27c8d3f7}*SharedItemsImports = 4
29-
EndGlobalSection
3026
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3127
Debug|Any CPU = Debug|Any CPU
3228
Debug|ARM = Debug|ARM
@@ -70,6 +66,22 @@ Global
7066
{48C8FBE0-C817-43BE-AC11-895A69100A86}.Release|x64.Build.0 = Release|Any CPU
7167
{48C8FBE0-C817-43BE-AC11-895A69100A86}.Release|x86.ActiveCfg = Release|Any CPU
7268
{48C8FBE0-C817-43BE-AC11-895A69100A86}.Release|x86.Build.0 = Release|Any CPU
69+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Debug|Any CPU.Build.0 = Debug|Any CPU
71+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Debug|ARM.ActiveCfg = Debug|Any CPU
72+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Debug|ARM.Build.0 = Debug|Any CPU
73+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Debug|x64.ActiveCfg = Debug|Any CPU
74+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Debug|x64.Build.0 = Debug|Any CPU
75+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Debug|x86.ActiveCfg = Debug|Any CPU
76+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Debug|x86.Build.0 = Debug|Any CPU
77+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Release|Any CPU.ActiveCfg = Release|Any CPU
78+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Release|Any CPU.Build.0 = Release|Any CPU
79+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Release|ARM.ActiveCfg = Release|Any CPU
80+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Release|ARM.Build.0 = Release|Any CPU
81+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Release|x64.ActiveCfg = Release|Any CPU
82+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Release|x64.Build.0 = Release|Any CPU
83+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Release|x86.ActiveCfg = Release|Any CPU
84+
{5D8EC148-9B3D-4A3D-A0B9-A2E9812E647D}.Release|x86.Build.0 = Release|Any CPU
7385
EndGlobalSection
7486
GlobalSection(SolutionProperties) = preSolution
7587
HideSolutionNode = FALSE

‎Source/OxyPlot.SharpDX/CacherRenderContext.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace OxyPlot.SharpDX
1717
using global::SharpDX.Direct2D1;
1818
using global::SharpDX.DirectWrite;
1919
using global::SharpDX.WIC;
20+
using OxyPlot;
2021
using Bitmap = global::SharpDX.Direct2D1.Bitmap;
2122
using BitmapInterpolationMode = global::SharpDX.Direct2D1.BitmapInterpolationMode;
2223
using D2DFactory = global::SharpDX.Direct2D1.Factory;

‎Source/OxyPlot.SharpDX/InternalsVisibleTo.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using System.Runtime.CompilerServices;
2+
3+
[assembly: InternalsVisibleTo("OxyPlot.SharpDX.Wpf, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d310c7f79b3af0d4d7864284761f045fab5974338ce014632a65717a19088e28fe60566f63eebd6c4ecad49e69a3f04079c57572678566347b1f13e0c8ea264be911c310aa1ecccd395f0b8444d29fd389f6f5238bd37a4ddcb0bb0f7fd2571c30a58538614cb7dc258eefc85704e506ad0fe182d76706c047c624945254f0bf")]

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard1.2</TargetFramework>
5+
<SignAssembly>true</SignAssembly>
6+
<AssemblyOriginatorKeyFile>OxyPlot.SharpDX.snk</AssemblyOriginatorKeyFile>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="OxyPlot.Core" Version="2.0.0-unstable1059" />
11+
<PackageReference Include="SharpDX" Version="4.2.0" />
12+
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" />
13+
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
14+
</ItemGroup>
15+
16+
</Project>

‎Source/OxyPlot.SharpDX/OxyPlot.SharpDX.projitems

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

‎Source/OxyPlot.SharpDX/OxyPlot.SharpDX.shproj

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

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

596 Bytes
Binary file not shown.

‎nuget.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="OxyPlot MyGet" value="https://www.myget.org/F/oxyplot/api/v3/index.json" />
5+
</packageSources>
6+
</configuration>

0 commit comments

Comments
 (0)