Skip to content

Commit d8ab937

Browse files
januswjanusw
authored
Merge pull request #143 from janusw/rename_windows
Rename OxyPlot.Windows to OxyPlot.UWP
2 parents bde6b22 + 38aa436 commit d8ab937

19 files changed

+25
-25
lines changed

‎Source/Examples/Windows/SimpleDemo/MainPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:local="using:SimpleDemo"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8-
xmlns:windows="using:OxyPlot.Windows"
8+
xmlns:windows="using:OxyPlot.UWP"
99
mc:Ignorable="d">
1010

1111
<Page.DataContext>

‎Source/Examples/Windows/SimpleDemo/SimpleDemo.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@
133133
</PackageReference>
134134
</ItemGroup>
135135
<ItemGroup>
136-
<ProjectReference Include="..\..\..\OxyPlot.Windows\OxyPlot.Windows.csproj">
136+
<ProjectReference Include="..\..\..\OxyPlot.UWP\OxyPlot.UWP.csproj">
137137
<Project>{5aa87152-20d5-48f7-ad0f-6e6baa61fc25}</Project>
138-
<Name>OxyPlot.Windows</Name>
138+
<Name>OxyPlot.UWP</Name>
139139
</ProjectReference>
140140
<ProjectReference Include="..\..\..\OxyPlot\OxyPlot.csproj">
141141
<Project>{7a0b35c0-dd17-4964-8e9a-44d6cecdc692}</Project>
@@ -146,11 +146,11 @@
146146
<VisualStudioVersion>14.0</VisualStudioVersion>
147147
</PropertyGroup>
148148
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
149-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
149+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
150150
Other similar extension points exist, see Microsoft.Common.targets.
151151
<Target Name="BeforeBuild">
152152
</Target>
153153
<Target Name="AfterBuild">
154154
</Target>
155155
-->
156-
</Project>
156+
</Project>

‎Source/OxyPlot.Windows/Converters/OxyColorConverter.cs renamed to ‎Source/OxyPlot.UWP/Converters/OxyColorConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </summary>
88
// --------------------------------------------------------------------------------------------------------------------
99

10-
namespace OxyPlot.Windows
10+
namespace OxyPlot.UWP
1111
{
1212
using System;
1313

‎Source/OxyPlot.Windows/Converters/ThicknessConverter.cs renamed to ‎Source/OxyPlot.UWP/Converters/ThicknessConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </summary>
88
// --------------------------------------------------------------------------------------------------------------------
99

10-
namespace OxyPlot.Windows
10+
namespace OxyPlot.UWP
1111
{
1212
using System;
1313

‎Source/OxyPlot.Windows/OxyPlot.Windows.csproj renamed to ‎Source/OxyPlot.UWP/OxyPlot.UWP.csproj

File renamed without changes.

‎Source/OxyPlot.Windows/OxyPlot.Windows.snk renamed to ‎Source/OxyPlot.UWP/OxyPlot.Windows.snk

File renamed without changes.

‎Source/OxyPlot.Windows/PlotView.cs renamed to ‎Source/OxyPlot.UWP/PlotView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </summary>
88
// --------------------------------------------------------------------------------------------------------------------
99

10-
namespace OxyPlot.Windows
10+
namespace OxyPlot.UWP
1111
{
1212
using System;
1313
using System.Collections.ObjectModel;

‎Source/OxyPlot.Windows/Properties/AssemblyInfo.cs renamed to ‎Source/OxyPlot.UWP/Properties/AssemblyInfo.cs

File renamed without changes.

‎Source/OxyPlot.Windows/Properties/OxyPlot.Windows.rd.xml renamed to ‎Source/OxyPlot.UWP/Properties/OxyPlot.Windows.rd.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
https://go.microsoft.com/fwlink/?LinkID=391919
2626
-->
2727
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
28-
<Library Name="OxyPlot.Windows">
28+
<Library Name="OxyPlot.UWP">
2929

3030
<!-- add directives for your library here -->
3131

‎Source/OxyPlot.Windows/RenderContext.cs renamed to ‎Source/OxyPlot.UWP/RenderContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </summary>
88
// --------------------------------------------------------------------------------------------------------------------
99

10-
namespace OxyPlot.Windows
10+
namespace OxyPlot.UWP
1111
{
1212
using System;
1313
using System.Collections.Generic;

‎Source/OxyPlot.Windows/Themes/Generic.xaml renamed to ‎Source/OxyPlot.UWP/Themes/Generic.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:local="using:OxyPlot.Windows">
4+
xmlns:local="using:OxyPlot.UWP">
55

66
<local:ThicknessConverter x:Key="ThicknessConverter" />
77

‎Source/OxyPlot.Windows/Tracker/TrackerControl.cs renamed to ‎Source/OxyPlot.UWP/Tracker/TrackerControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </summary>
88
// --------------------------------------------------------------------------------------------------------------------
99

10-
namespace OxyPlot.Windows
10+
namespace OxyPlot.UWP
1111
{
1212
using System;
1313

‎Source/OxyPlot.Windows/Tracker/TrackerDefinition.cs renamed to ‎Source/OxyPlot.UWP/Tracker/TrackerDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </summary>
88
// --------------------------------------------------------------------------------------------------------------------
99

10-
namespace OxyPlot.Windows
10+
namespace OxyPlot.UWP
1111
{
1212
using global::Windows.UI.Xaml;
1313
using global::Windows.UI.Xaml.Controls;

‎Source/OxyPlot.Windows/Utilities/ConverterExtensions.cs renamed to ‎Source/OxyPlot.UWP/Utilities/ConverterExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </summary>
88
// --------------------------------------------------------------------------------------------------------------------
99

10-
namespace OxyPlot.Windows
10+
namespace OxyPlot.UWP
1111
{
1212
using System;
1313

‎Source/OxyPlot.Windows/Utilities/MouseButtonHelper.cs renamed to ‎Source/OxyPlot.UWP/Utilities/MouseButtonHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </summary>
88
// --------------------------------------------------------------------------------------------------------------------
99

10-
namespace OxyPlot.Windows
10+
namespace OxyPlot.UWP
1111
{
1212
using System;
1313

‎Source/OxyPlot.Xamarin.Forms.Platform.UWP/OxyPlot.Xamarin.Forms.Platform.UWP.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
<EmbeddedResource Include="Properties\OxyPlot.Xamarin.Forms.Platform.UWP.rd.xml" />
110110
</ItemGroup>
111111
<ItemGroup>
112-
<ProjectReference Include="..\OxyPlot.Windows\OxyPlot.Windows.csproj">
113-
<Project>{1147c415-0d76-4002-ba70-e572208cf0e7}</Project>
114-
<Name>OxyPlot.Windows</Name>
112+
<ProjectReference Include="..\OxyPlot.UWP\OxyPlot.UWP.csproj">
113+
<Project>{E5A01125-17B6-4568-A065-65D56AC68D8F}</Project>
114+
<Name>OxyPlot.UWP</Name>
115115
</ProjectReference>
116116
<ProjectReference Include="..\OxyPlot.Xamarin.Forms\OxyPlot.Xamarin.Forms.csproj">
117117
<Project>{b63c5f8c-61c8-4e69-93d6-f49f816d3746}</Project>

‎Source/OxyPlot.Xamarin.Forms.Platform.UWP/PlotViewRenderer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace OxyPlot.Xamarin.Forms.Platform.UWP
1111
{
1212
using System.ComponentModel;
1313

14-
using OxyPlot.Windows;
14+
using OxyPlot.UWP;
1515

1616
/// <summary>
1717
/// Provides a custom <see cref="OxyPlot.Xamarin.Forms.PlotView" /> renderer for UWP projects with xamarin forms.

‎Source/OxyPlot.Xamarin.Forms.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<file src="OxyPlot.Xamarin.Forms.Platform.MacOS\bin\Release\OxyPlot.Xamarin.Forms.Platform.Mac.???" target="lib/Xamarin.Mac20" />
5858
<file src="OxyPlot.Xamarin.Forms.Platform.MacOS\bin\Release\OxyPlot.Xamarin.Forms.???" target="lib/Xamarin.Mac20" />
5959

60-
<file src="OxyPlot.Windows\bin\Release\uap10.0\OxyPlot.Windows.???" target="lib/uap10.0" />
60+
<file src="OxyPlot.UWP\bin\Release\uap10.0\OxyPlot.UWP.???" target="lib/uap10.0" />
6161
<file src="OxyPlot.Xamarin.Forms.Platform.UWP\bin\x64\Release\OxyPlot.Xamarin.Forms.Platform.UWP.???" target="lib/uap10.0" />
6262
<file src="OxyPlot.Xamarin.Forms.Platform.UWP\bin\x64\Release\OxyPlot.Xamarin.Forms.???" target="lib/uap10.0" />
6363

‎Source/OxyPlot.Xamarin.Forms.sln

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.Xamarin.Mac", "OxyP
4646
EndProject
4747
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDemo.MacOS", "Examples\Xamarin.Forms\SimpleDemo\SimpleDemo.MacOS\SimpleDemo.MacOS.csproj", "{45F9FFD0-0424-4DD2-9991-DABFF0FF8ED9}"
4848
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.Windows", "OxyPlot.Windows\OxyPlot.Windows.csproj", "{E5A01125-17B6-4568-A065-65D56AC68D8F}"
49+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OxyPlot.UWP", "OxyPlot.UWP\OxyPlot.UWP.csproj", "{E5A01125-17B6-4568-A065-65D56AC68D8F}"
5050
EndProject
5151
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExampleBrowser", "ExampleBrowser", "{982659B2-5D53-4E71-8FAA-FE1A6F104AE5}"
5252
EndProject
@@ -162,6 +162,7 @@ Global
162162
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Debug|Any CPU.Build.0 = Debug|Any CPU
163163
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Debug|ARM.ActiveCfg = Debug|Any CPU
164164
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
165+
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Debug|iPhone.Build.0 = Debug|Any CPU
165166
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
166167
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
167168
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
@@ -171,13 +172,12 @@ Global
171172
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|Any CPU.Build.0 = Release|Any CPU
172173
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|ARM.ActiveCfg = Release|Any CPU
173174
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|iPhone.ActiveCfg = Release|Any CPU
175+
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|iPhone.Build.0 = Release|Any CPU
174176
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
175177
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
176178
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
177179
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|x64.ActiveCfg = Release|Any CPU
178180
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|x86.ActiveCfg = Release|Any CPU
179-
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Debug|iPhone.Build.0 = Debug|Any CPU
180-
{64F4DC0C-2BFE-4C22-B9D1-B04566C2314C}.Release|iPhone.Build.0 = Release|Any CPU
181181
{60D23CA9-4AF6-4179-A3F5-6AEBC907337E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
182182
{60D23CA9-4AF6-4179-A3F5-6AEBC907337E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
183183
{60D23CA9-4AF6-4179-A3F5-6AEBC907337E}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
@@ -298,6 +298,7 @@ Global
298298
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
299299
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Debug|ARM.ActiveCfg = Debug|Any CPU
300300
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
301+
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Debug|iPhone.Build.0 = Debug|Any CPU
301302
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
302303
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
303304
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
@@ -307,13 +308,12 @@ Global
307308
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|Any CPU.Build.0 = Release|Any CPU
308309
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|ARM.ActiveCfg = Release|Any CPU
309310
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|iPhone.ActiveCfg = Release|Any CPU
311+
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|iPhone.Build.0 = Release|Any CPU
310312
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
311313
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
312314
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
313315
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|x64.ActiveCfg = Release|Any CPU
314316
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|x86.ActiveCfg = Release|Any CPU
315-
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Debug|iPhone.Build.0 = Debug|Any CPU
316-
{191ABC81-B335-44D7-BE0D-3C5E9196FA8B}.Release|iPhone.Build.0 = Release|Any CPU
317317
{5A89745A-2AD2-4ABF-8851-535B2024A8FA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
318318
{5A89745A-2AD2-4ABF-8851-535B2024A8FA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
319319
{5A89745A-2AD2-4ABF-8851-535B2024A8FA}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU

0 commit comments

Comments
 (0)