diff --git a/.gitignore b/.gitignore index 70e1d0a..54780d3 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ Tools/Nuget/NmeaParser/lib/ Tools/Nuget/*.nupkg src/NmeaParser.sln.ide/ project.lock.json +src/.vs/ diff --git a/Tools/Nuget/NmeaParser/NmeaParser.nuspec b/Tools/Nuget/NmeaParser/NmeaParser.nuspec deleted file mode 100644 index f47955b..0000000 --- a/Tools/Nuget/NmeaParser/NmeaParser.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - 2.0.0-beta1 - Morten Nielsen - Morten Nielsen - http://opensource.org/licenses/ms-pl.html - https://github.com/dotMorten/NmeaParser - SharpGIS.NmeaParser - NmeaParser - false - An NMEA stream parser for serial port, bluetooth and file-based nmea simulation. - en-US - nmea winrt wpf win8 win8.1 wp8.1 uwp xamarin gps serialport bluetooth - - - - diff --git a/Tools/Nuget/NuGet.exe b/Tools/Nuget/NuGet.exe deleted file mode 100644 index 9f8781d..0000000 Binary files a/Tools/Nuget/NuGet.exe and /dev/null differ diff --git a/Tools/Nuget/buildNuget.cmd b/Tools/Nuget/buildNuget.cmd deleted file mode 100644 index e6b4222..0000000 --- a/Tools/Nuget/buildNuget.cmd +++ /dev/null @@ -1,33 +0,0 @@ -@echo off - -@echo ******************************************* -@echo * COPYING BINARIES FOR NUGET * -@echo ******************************************* -REM msbuild ..\..\src\NmeaParser.sln /t:Rebuild /p:Configuration=Release -msbuild ..\..\src\NmeaParser.WinDesktop\NmeaParser.WinDesktop.csproj /t:Rebuild /p:Configuration=Release -msbuild ..\..\src\NmeaParser.WinStore\NmeaParser.WinStore.csproj /t:Rebuild /p:Configuration=Release -msbuild ..\..\src\NmeaParser.WinPhone\NmeaParser.WinPhone.csproj /t:Rebuild /p:Configuration=Release -msbuild ..\..\src\NmeaParser.UWP\NmeaParser.UWP.csproj /t:Rebuild /p:Configuration=Release -msbuild ..\..\src\NmeaParser.Android\NmeaParser.Android.csproj /t:Rebuild /p:Configuration=Release -msbuild ..\..\src\NmeaParser.iOS\NmeaParser.iOS.csproj /t:Rebuild /p:Configuration=Release -msbuild ..\..\src\NmeaParser.NetStandard\NmeaParser.NetStandard.csproj /t:Rebuild /p:Configuration=Release -xcopy ..\..\src\bin\Release\NmeaParser.WinStore.dll .\NmeaParser\lib\netcore45\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.WinStore.xml .\NmeaParser\lib\netcore45\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.WinPhone.dll .\NmeaParser\lib\wpa\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.WinPhone.xml .\NmeaParser\lib\wpa\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.WinDesktop.dll .\NmeaParser\lib\net40-client\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.WinDesktop.xml .\NmeaParser\lib\net40-client\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.UWP.dll .\NmeaParser\lib\uap10.0\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.UWP.xml .\NmeaParser\lib\uap10.0\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.Android.dll .\NmeaParser\lib\MonoAndroid10\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.Android.xml .\NmeaParser\lib\MonoAndroid10\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.iOS.dll .\NmeaParser\lib\Xamarin.iOS10\ /Y -xcopy ..\..\src\bin\Release\NmeaParser.iOS.xml .\NmeaParser\lib\Xamarin.iOS10\ /Y -xcopy ..\..\src\bin\Release\netstandard1.4\NmeaParser.NetStandard.dll .\NmeaParser\lib\netstandard1.4\ /Y -xcopy ..\..\src\bin\Release\netstandard1.4\NmeaParser.NetStandard.xml .\NmeaParser\lib\netstandard1.4\ /Y - - -@echo ******************************************* -@echo * BUILDING NUGET PAKCAGE * -@echo ******************************************* -nuget pack NmeaParser\NmeaParser.nuspec -o .\ diff --git a/src/NmeaParser.Android/NmeaParser.Android.csproj b/src/NmeaParser.Android/NmeaParser.Android.csproj deleted file mode 100644 index 777515f..0000000 --- a/src/NmeaParser.Android/NmeaParser.Android.csproj +++ /dev/null @@ -1,69 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {0DAA6E10-BC77-4B06-8356-BAEE9085D985} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - NmeaParser.Android - NmeaParser.Android - 512 - Resources\Resource.Designer.cs - Off - True - True - v6.0 - - - true - full - false - ..\Bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\Bin\Debug\NmeaParser.Android.xml - - - pdbonly - true - ..\Bin\Release\ - TRACE - prompt - 4 - ..\bin\Release\NmeaParser.Android.xml - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NmeaParser.Android/Resources/AboutResources.txt b/src/NmeaParser.Android/Resources/AboutResources.txt deleted file mode 100644 index 194ae28..0000000 --- a/src/NmeaParser.Android/Resources/AboutResources.txt +++ /dev/null @@ -1,50 +0,0 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.xml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable-hdpi/ - icon.png - - drawable-ldpi/ - icon.png - - drawable-mdpi/ - icon.png - - layout/ - main.xml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called -"Resource" that contains the tokens for each one of the resources included. For example, -for the above Resources layout, this is what the Resource class would expose: - -public class Resource { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main -to reference the layout/main.xml file, or Resource.strings.first_string to reference the first -string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/src/NmeaParser.Android/Resources/Resource.Designer.cs b/src/NmeaParser.Android/Resources/Resource.Designer.cs deleted file mode 100644 index b7cd7eb..0000000 --- a/src/NmeaParser.Android/Resources/Resource.Designer.cs +++ /dev/null @@ -1,60 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("NmeaParser.Android.Resource", IsApplication=false)] - -namespace NmeaParser.Android -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f020001 - public static int ApplicationName = 2130837505; - - // aapt resource value: 0x7f020000 - public static int Hello = 2130837504; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/src/NmeaParser.Android/Resources/Values/Strings.xml b/src/NmeaParser.Android/Resources/Values/Strings.xml deleted file mode 100644 index 8fd1763..0000000 --- a/src/NmeaParser.Android/Resources/Values/Strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - Hello World, Click Me! - $projectname$ - diff --git a/src/NmeaParser.NetStandard/NmeaParser.NetStandard.csproj b/src/NmeaParser.NetStandard/NmeaParser.NetStandard.csproj deleted file mode 100644 index 1e27d54..0000000 --- a/src/NmeaParser.NetStandard/NmeaParser.NetStandard.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - netstandard1.4 - NmeaParser - NmeaParser.NetStandard - False - - NmeaParser - Morten Nielsen - Copyright © Morten Nielsen 2015-2017 - https://github.com/dotMorten/NmeaParser - https://github.com/dotMorten/NmeaParser - https://github.com/dotMorten/NmeaParser/blob/master/LICENCE.TXT - - - - ..\Bin\Debug\netstandard1.4\NmeaParser.NetStandard.xml - ..\Bin\Debug\ - - - - ..\Bin\Release\ - ..\Bin\Release\netstandard1.4\NmeaParser.NetStandard.xml - - - - - \ No newline at end of file diff --git a/src/NmeaParser.Shared/NmeaFileDevice.cs b/src/NmeaParser.Shared/NmeaFileDevice.cs deleted file mode 100644 index 12ab88a..0000000 --- a/src/NmeaParser.Shared/NmeaFileDevice.cs +++ /dev/null @@ -1,90 +0,0 @@ -// -// Copyright (c) 2014 Morten Nielsen -// -// Licensed under the Microsoft Public License (Ms-PL) (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://opensource.org/licenses/Ms-PL.html -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NmeaParser -{ - /// - /// A file-based NMEA device reading from a NMEA log file. - /// - public class NmeaFileDevice : BufferedStreamDevice - { -#if NETFX_CORE - Windows.Storage.IStorageFile m_filename; -#else - string m_filename; -#endif - - /// - /// Initializes a new instance of the class. - /// - /// -#if NETFX_CORE - public NmeaFileDevice(Windows.Storage.IStorageFile fileName) : this(fileName, 1000) -#else - public NmeaFileDevice(string fileName) : this(fileName, 1000) -#endif - { - m_filename = fileName; - } - /// - /// Initializes a new instance of the class. - /// - /// - /// The time to wait between each group of lines being read in milliseconds -#if NETFX_CORE - public NmeaFileDevice(Windows.Storage.IStorageFile fileName, int readSpeed) - : base(readSpeed) -#else - public NmeaFileDevice(string fileName, int readSpeed) : base(readSpeed) -#endif - { - m_filename = fileName; - } - -#if !NETFX_CORE - /// - /// Gets the name of the nmea file this device is using. - /// - public string FileName - { - get { return m_filename; } - } -#endif - - /// - /// Gets the stream to perform buffer reads on. - /// - /// -#if !NETFX_CORE - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")] -#endif - protected override Task GetStreamAsync() - { -#if NETFX_CORE - return m_filename.OpenStreamForReadAsync(); -#else - return Task.FromResult(System.IO.File.OpenRead(m_filename)); -#endif - } - } -} diff --git a/src/NmeaParser.Shared/NmeaParser.Shared.projitems b/src/NmeaParser.Shared/NmeaParser.Shared.projitems deleted file mode 100644 index 745fabb..0000000 --- a/src/NmeaParser.Shared/NmeaParser.Shared.projitems +++ /dev/null @@ -1,38 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - e15edbd9-0356-422b-8c29-18833787356e - - - NmeaParser - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NmeaParser.Shared/Properties/AssemblyInfo.cs b/src/NmeaParser.Shared/Properties/AssemblyInfo.cs deleted file mode 100644 index 59546f2..0000000 --- a/src/NmeaParser.Shared/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("NmeaParser")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Morten Nielsen")] -[assembly: AssemblyProduct("NmeaParser")] -[assembly: AssemblyCopyright("Copyright © Morten Nielsen 2015-2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.0.0")] -[assembly: AssemblyFileVersion("1.6.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/src/NmeaParser.Shared/TypedEventHandler.cs b/src/NmeaParser.Shared/TypedEventHandler.cs deleted file mode 100644 index ab435d5..0000000 --- a/src/NmeaParser.Shared/TypedEventHandler.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -// Copyright (c) 2014 Morten Nielsen -// -// Licensed under the Microsoft Public License (Ms-PL) (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://opensource.org/licenses/Ms-PL.html -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#if !NETFX_CORE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Windows.Foundation -{ - /// - /// Represents a method that handles general events. - /// - /// The object type. - /// The type of event data generated by the event. - public delegate void TypedEventHandler(TSender sender, TResult args); -} -#endif \ No newline at end of file diff --git a/src/NmeaParser.Tests/Images/UnitTestLogo.scale-100.png b/src/NmeaParser.Tests/Images/UnitTestLogo.scale-100.png deleted file mode 100644 index ebd735a..0000000 Binary files a/src/NmeaParser.Tests/Images/UnitTestLogo.scale-100.png and /dev/null differ diff --git a/src/NmeaParser.Tests/Images/UnitTestSmallLogo.scale-100.png b/src/NmeaParser.Tests/Images/UnitTestSmallLogo.scale-100.png deleted file mode 100644 index 92dd105..0000000 Binary files a/src/NmeaParser.Tests/Images/UnitTestSmallLogo.scale-100.png and /dev/null differ diff --git a/src/NmeaParser.Tests/Images/UnitTestSplashScreen.scale-100.png b/src/NmeaParser.Tests/Images/UnitTestSplashScreen.scale-100.png deleted file mode 100644 index 193187f..0000000 Binary files a/src/NmeaParser.Tests/Images/UnitTestSplashScreen.scale-100.png and /dev/null differ diff --git a/src/NmeaParser.Tests/Images/UnitTestStoreLogo.scale-100.png b/src/NmeaParser.Tests/Images/UnitTestStoreLogo.scale-100.png deleted file mode 100644 index 3765186..0000000 Binary files a/src/NmeaParser.Tests/Images/UnitTestStoreLogo.scale-100.png and /dev/null differ diff --git a/src/NmeaParser.Tests/NmeaParser.Tests.csproj b/src/NmeaParser.Tests/NmeaParser.Tests.csproj deleted file mode 100644 index 6265791..0000000 --- a/src/NmeaParser.Tests/NmeaParser.Tests.csproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C} - Library - Properties - NmeaParser.Tests - NmeaParser.Tests - en-US - 8.1 - 12 - 512 - {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - NmeaParser.Tests_TemporaryKey.pfx - Never - - - true - full - false - bin\Debug\ - DEBUG;TRACE;NETFX_CORE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;NETFX_CORE - prompt - 4 - - - True - true - - - - - - - - - - - - - - - Designer - - - - - - NmeaSampleData.txt - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - {62a55887-10f5-40d2-9352-96246d1b11d3} - NmeaParser.WinStore - - - - 12.0 - - - - \ No newline at end of file diff --git a/src/NmeaParser.Tests/NmeaParser.Tests_TemporaryKey.pfx b/src/NmeaParser.Tests/NmeaParser.Tests_TemporaryKey.pfx deleted file mode 100644 index 527192e..0000000 Binary files a/src/NmeaParser.Tests/NmeaParser.Tests_TemporaryKey.pfx and /dev/null differ diff --git a/src/NmeaParser.Tests/Package.appxmanifest b/src/NmeaParser.Tests/Package.appxmanifest deleted file mode 100644 index 88dddbc..0000000 --- a/src/NmeaParser.Tests/Package.appxmanifest +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - NmeaParser.Tests - mort5161 - Images\UnitTestStoreLogo.png - NmeaParser.Tests - - - - 6.3.0 - 6.3.0 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/NmeaParser.Tests/Properties/AssemblyInfo.cs b/src/NmeaParser.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 193a210..0000000 --- a/src/NmeaParser.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("NmeaParser.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NmeaParser.Tests")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/NmeaParser.UWP/NmeaParser.UWP.csproj b/src/NmeaParser.UWP/NmeaParser.UWP.csproj deleted file mode 100644 index a474622..0000000 --- a/src/NmeaParser.UWP/NmeaParser.UWP.csproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - - Debug - AnyCPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB} - Library - Properties - NmeaParser - NmeaParser.UWP - en-US - UAP - 10.0.14393.0 - 10.0.10240.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - AnyCPU - true - full - false - ..\bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - prompt - 4 - ..\bin\Debug\NmeaParser.UWP.xml - - - AnyCPU - pdbonly - true - ..\bin\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - prompt - 4 - ..\bin\Release\NmeaParser.UWP.xml - - - - - - - - GlobalSuppressions.cs - - - BluetoothDevice.cs - - - - - - - ..\packages\System.Numerics.Vectors.4.0.0\lib\win8\System.Numerics.Vectors.dll - True - - - ..\packages\System.Numerics.Vectors.4.0.0\lib\win8\System.Numerics.Vectors.WindowsRuntime.dll - True - - - - - CustomDictionary.xml - - - - - - - 14.0 - - - - - \ No newline at end of file diff --git a/src/NmeaParser.UWP/packages.config b/src/NmeaParser.UWP/packages.config deleted file mode 100644 index f1b625f..0000000 --- a/src/NmeaParser.UWP/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/NmeaParser.WinDesktop/NmeaParser.WinDesktop.csproj b/src/NmeaParser.WinDesktop/NmeaParser.WinDesktop.csproj deleted file mode 100644 index 7951761..0000000 --- a/src/NmeaParser.WinDesktop/NmeaParser.WinDesktop.csproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - - Debug - AnyCPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554} - Library - Properties - NmeaParser - NmeaParser.WinDesktop - v4.5.2 - 512 - - - - true - full - false - ..\Bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\Bin\Debug\NmeaParser.WinDesktop.xml - true - AllRules.ruleset - - - pdbonly - true - ..\Bin\Release\ - TRACE - prompt - 4 - ..\Bin\Release\NmeaParser.WinDesktop.xml - true - - - - - - - - - GlobalSuppressions.cs - - - - - - - CustomDictionary.xml - - - - - - \ No newline at end of file diff --git a/src/NmeaParser.WinDesktop/Properties/AssemblyInfo.Desktop.cs b/src/NmeaParser.WinDesktop/Properties/AssemblyInfo.Desktop.cs deleted file mode 100644 index cf139bf..0000000 --- a/src/NmeaParser.WinDesktop/Properties/AssemblyInfo.Desktop.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c96fd2bc-67e6-45fd-a57e-1bb8088bdc43")] diff --git a/src/NmeaParser.WinPhone/NmeaParser.WinPhone.csproj b/src/NmeaParser.WinPhone/NmeaParser.WinPhone.csproj deleted file mode 100644 index 654a234..0000000 --- a/src/NmeaParser.WinPhone/NmeaParser.WinPhone.csproj +++ /dev/null @@ -1,74 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {EA42A713-BC6E-4914-B54B-47C0891B7421} - Library - Properties - NmeaParser - NmeaParser.WinPhone - en-US - 8.1 - 12 - 512 - {76F1466A-8B6D-4E39-A767-685A06062A39};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - true - full - false - ..\bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP - prompt - 4 - ..\bin\Debug\NmeaParser.WinPhone.xml - true - AllRules.ruleset - - - pdbonly - true - ..\bin\Release\ - TRACE;NETFX_CORE;WINDOWS_PHONE_APP - prompt - 4 - ..\bin\Release\NmeaParser.WinPhone.xml - true - - - - - - - - GlobalSuppressions.cs - - - BluetoothDevice.cs - - - - - CustomDictionary.xml - - - - - 12.0 - - - WindowsPhoneApp - - - - \ No newline at end of file diff --git a/src/NmeaParser.WinStore/NmeaParser.WinStore.csproj b/src/NmeaParser.WinStore/NmeaParser.WinStore.csproj deleted file mode 100644 index db82e0f..0000000 --- a/src/NmeaParser.WinStore/NmeaParser.WinStore.csproj +++ /dev/null @@ -1,70 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {62A55887-10F5-40D2-9352-96246D1B11D3} - Library - Properties - NmeaParser - NmeaParser.WinStore - en-US - 8.1 - 12 - 512 - {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - true - full - false - ..\bin\Debug\ - DEBUG;TRACE;NETFX_CORE - prompt - 4 - ..\bin\Debug\NmeaParser.WinStore.xml - AllRules.ruleset - true - - - pdbonly - true - ..\bin\Release\ - TRACE;NETFX_CORE - prompt - 4 - ..\bin\Release\NmeaParser.WinStore.xml - true - - - - - - - - GlobalSuppressions.cs - - - - - - CustomDictionary.xml - Designer - - - - 12.0 - - - - - \ No newline at end of file diff --git a/src/NmeaParser.iOS/NmeaParser.iOS.csproj b/src/NmeaParser.iOS/NmeaParser.iOS.csproj deleted file mode 100644 index 5f80def..0000000 --- a/src/NmeaParser.iOS/NmeaParser.iOS.csproj +++ /dev/null @@ -1,49 +0,0 @@ - - - - Debug - iPhoneSimulator - 8.0.30703 - 2.0 - {507CFE3E-16C1-43EC-BC21-50F901EE223B} - {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - NmeaParser.iOS - Resources - NmeaParser.iOS - - - true - full - false - ..\Bin\Debug\ - DEBUG - prompt - 4 - false - true - iPhone Developer - ..\Bin\Debug\NmeaParser.iOS.xml - - - none - true - ..\Bin\Release\ - prompt - 4 - false - iPhone Developer - ..\Bin\Release\NmeaParser.iOS.xml - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NmeaParser.sln b/src/NmeaParser.sln index 238a46a..ba46e63 100644 --- a/src/NmeaParser.sln +++ b/src/NmeaParser.sln @@ -1,18 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2003 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.WinStore", "NmeaParser.WinStore\NmeaParser.WinStore.csproj", "{62A55887-10F5-40D2-9352-96246D1B11D3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.Tests", "NmeaParser.Tests\NmeaParser.Tests.csproj", "{5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.WinPhone", "NmeaParser.WinPhone\NmeaParser.WinPhone.csproj", "{EA42A713-BC6E-4914-B54B-47C0891B7421}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NmeaParser.Shared", "NmeaParser.Shared\NmeaParser.Shared.shproj", "{E15EDBD9-0356-422B-8C29-18833787356E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.WinDesktop", "NmeaParser.WinDesktop\NmeaParser.WinDesktop.csproj", "{DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NmeaParser", "NmeaParser", "{1701F3BA-A09C-4706-A612-24FD9340FC18}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CF767486-305D-40EE-8845-58EF76C16D85}" @@ -39,28 +29,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution GlobalSuppressions.cs = GlobalSuppressions.cs EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.Android", "NmeaParser.Android\NmeaParser.Android.csproj", "{0DAA6E10-BC77-4B06-8356-BAEE9085D985}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.iOS", "NmeaParser.iOS\NmeaParser.iOS.csproj", "{507CFE3E-16C1-43EC-BC21-50F901EE223B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.UWP", "NmeaParser.UWP\NmeaParser.UWP.csproj", "{418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UWP", "UWP", "{01FEC943-B537-4BCF-945A-6C914B06E448}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp.UWP", "SampleApp.UWP\SampleApp.UWP.csproj", "{7B252F1E-2E9D-4362-9C14-3376AAB8B5A0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NmeaParser", "NmeaParser\NmeaParser.csproj", "{1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.Tests.UWP", "UnitTests\NmeaParser.Tests.UWP\NmeaParser.Tests.UWP.csproj", "{92CAD93B-6C3B-45A0-A723-BE046DE50FEC}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NmeaParser.Tests", "UnitTests\NmeaParser.Tests\NmeaParser.Tests.shproj", "{979AE182-EB59-4181-9D45-3FD6E4817F11}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - NmeaParser.Shared\NmeaParser.Shared.projitems*{0daa6e10-bc77-4b06-8356-baee9085d985}*SharedItemsImports = 4 - NmeaParser.Shared\NmeaParser.Shared.projitems*{418353b9-6bf4-4fd2-a9b2-f8ad59f7d0fb}*SharedItemsImports = 4 - NmeaParser.Shared\NmeaParser.Shared.projitems*{507cfe3e-16c1-43ec-bc21-50f901ee223b}*SharedItemsImports = 4 - NmeaParser.Shared\NmeaParser.Shared.projitems*{62a55887-10f5-40d2-9352-96246d1b11d3}*SharedItemsImports = 4 + UnitTests\NmeaParser.Tests\NmeaParser.Tests.projitems*{92cad93b-6c3b-45a0-a723-be046de50fec}*SharedItemsImports = 4 SampleApp.Store\SampleApp.Store.Shared\SampleApp.Store.Shared.projitems*{95e812e6-17c2-494f-a446-fde42d75331c}*SharedItemsImports = 13 + UnitTests\NmeaParser.Tests\NmeaParser.Tests.projitems*{979ae182-eb59-4181-9d45-3fd6e4817f11}*SharedItemsImports = 13 SampleApp.Store\SampleApp.Store.Shared\SampleApp.Store.Shared.projitems*{9ee3ea1d-f28c-4cf2-b540-db0415050d5f}*SharedItemsImports = 4 SampleApp.Store\SampleApp.Store.Shared\SampleApp.Store.Shared.projitems*{c4b3935b-7ed4-40cc-b1d2-bc2b854e319d}*SharedItemsImports = 4 - NmeaParser.Shared\NmeaParser.Shared.projitems*{df711ab9-f14e-4f1f-b8f2-b6ddc4691554}*SharedItemsImports = 4 - NmeaParser.Shared\NmeaParser.Shared.projitems*{e15edbd9-0356-422b-8c29-18833787356e}*SharedItemsImports = 13 - NmeaParser.Shared\NmeaParser.Shared.projitems*{ea42a713-bc6e-4914-b54b-47c0891b7421}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,78 +58,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {62A55887-10F5-40D2-9352-96246D1B11D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Debug|ARM.ActiveCfg = Debug|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Debug|ARM.Build.0 = Debug|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Debug|x64.ActiveCfg = Debug|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Debug|x64.Build.0 = Debug|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Debug|x86.ActiveCfg = Debug|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Debug|x86.Build.0 = Debug|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Release|Any CPU.Build.0 = Release|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Release|ARM.ActiveCfg = Release|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Release|ARM.Build.0 = Release|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Release|x64.ActiveCfg = Release|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Release|x64.Build.0 = Release|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Release|x86.ActiveCfg = Release|Any CPU - {62A55887-10F5-40D2-9352-96246D1B11D3}.Release|x86.Build.0 = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|ARM.Build.0 = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|ARM.Deploy.0 = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|x64.ActiveCfg = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|x64.Build.0 = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|x64.Deploy.0 = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|x86.ActiveCfg = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|x86.Build.0 = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Debug|x86.Deploy.0 = Debug|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|Any CPU.Build.0 = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|Any CPU.Deploy.0 = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|ARM.ActiveCfg = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|ARM.Build.0 = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|ARM.Deploy.0 = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|x64.ActiveCfg = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|x64.Build.0 = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|x64.Deploy.0 = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|x86.ActiveCfg = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|x86.Build.0 = Release|Any CPU - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C}.Release|x86.Deploy.0 = Release|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Debug|ARM.Build.0 = Debug|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Debug|x64.ActiveCfg = Debug|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Debug|x64.Build.0 = Debug|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Debug|x86.ActiveCfg = Debug|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Debug|x86.Build.0 = Debug|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Release|Any CPU.Build.0 = Release|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Release|ARM.ActiveCfg = Release|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Release|ARM.Build.0 = Release|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Release|x64.ActiveCfg = Release|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Release|x64.Build.0 = Release|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Release|x86.ActiveCfg = Release|Any CPU - {EA42A713-BC6E-4914-B54B-47C0891B7421}.Release|x86.Build.0 = Release|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Debug|ARM.ActiveCfg = Debug|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Debug|ARM.Build.0 = Debug|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Debug|x64.ActiveCfg = Debug|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Debug|x64.Build.0 = Debug|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Debug|x86.ActiveCfg = Debug|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Debug|x86.Build.0 = Debug|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Release|Any CPU.Build.0 = Release|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Release|ARM.ActiveCfg = Release|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Release|ARM.Build.0 = Release|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Release|x64.ActiveCfg = Release|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Release|x64.Build.0 = Release|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Release|x86.ActiveCfg = Release|Any CPU - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554}.Release|x86.Build.0 = Release|Any CPU {5DB6C7C7-A19C-4BE3-AFE6-26E3061DA01F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5DB6C7C7-A19C-4BE3-AFE6-26E3061DA01F}.Debug|Any CPU.Build.0 = Debug|Any CPU {5DB6C7C7-A19C-4BE3-AFE6-26E3061DA01F}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -209,54 +122,6 @@ Global {9EE3EA1D-F28C-4CF2-B540-DB0415050D5F}.Release|x86.ActiveCfg = Release|Any CPU {9EE3EA1D-F28C-4CF2-B540-DB0415050D5F}.Release|x86.Build.0 = Release|Any CPU {9EE3EA1D-F28C-4CF2-B540-DB0415050D5F}.Release|x86.Deploy.0 = Release|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Debug|ARM.Build.0 = Debug|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Debug|x64.ActiveCfg = Debug|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Debug|x64.Build.0 = Debug|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Debug|x86.ActiveCfg = Debug|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Debug|x86.Build.0 = Debug|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Release|Any CPU.Build.0 = Release|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Release|ARM.ActiveCfg = Release|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Release|ARM.Build.0 = Release|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Release|x64.ActiveCfg = Release|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Release|x64.Build.0 = Release|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Release|x86.ActiveCfg = Release|Any CPU - {0DAA6E10-BC77-4B06-8356-BAEE9085D985}.Release|x86.Build.0 = Release|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Debug|ARM.Build.0 = Debug|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Debug|x64.ActiveCfg = Debug|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Debug|x64.Build.0 = Debug|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Debug|x86.ActiveCfg = Debug|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Debug|x86.Build.0 = Debug|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Release|Any CPU.Build.0 = Release|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Release|ARM.ActiveCfg = Release|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Release|ARM.Build.0 = Release|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Release|x64.ActiveCfg = Release|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Release|x64.Build.0 = Release|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Release|x86.ActiveCfg = Release|Any CPU - {507CFE3E-16C1-43EC-BC21-50F901EE223B}.Release|x86.Build.0 = Release|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Debug|ARM.ActiveCfg = Debug|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Debug|ARM.Build.0 = Debug|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Debug|x64.ActiveCfg = Debug|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Debug|x64.Build.0 = Debug|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Debug|x86.ActiveCfg = Debug|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Debug|x86.Build.0 = Debug|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Release|Any CPU.Build.0 = Release|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Release|ARM.ActiveCfg = Release|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Release|ARM.Build.0 = Release|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Release|x64.ActiveCfg = Release|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Release|x64.Build.0 = Release|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Release|x86.ActiveCfg = Release|Any CPU - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB}.Release|x86.Build.0 = Release|Any CPU {7B252F1E-2E9D-4362-9C14-3376AAB8B5A0}.Debug|Any CPU.ActiveCfg = Debug|x86 {7B252F1E-2E9D-4362-9C14-3376AAB8B5A0}.Debug|Any CPU.Build.0 = Debug|x86 {7B252F1E-2E9D-4362-9C14-3376AAB8B5A0}.Debug|Any CPU.Deploy.0 = Debug|x86 @@ -281,16 +146,49 @@ Global {7B252F1E-2E9D-4362-9C14-3376AAB8B5A0}.Release|x86.ActiveCfg = Release|x86 {7B252F1E-2E9D-4362-9C14-3376AAB8B5A0}.Release|x86.Build.0 = Release|x86 {7B252F1E-2E9D-4362-9C14-3376AAB8B5A0}.Release|x86.Deploy.0 = Release|x86 + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Debug|ARM.Build.0 = Debug|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Debug|x64.ActiveCfg = Debug|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Debug|x64.Build.0 = Debug|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Debug|x86.ActiveCfg = Debug|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Debug|x86.Build.0 = Debug|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Release|Any CPU.Build.0 = Release|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Release|ARM.ActiveCfg = Release|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Release|ARM.Build.0 = Release|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Release|x64.ActiveCfg = Release|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Release|x64.Build.0 = Release|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Release|x86.ActiveCfg = Release|Any CPU + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C}.Release|x86.Build.0 = Release|Any CPU + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|Any CPU.ActiveCfg = Debug|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|Any CPU.Build.0 = Debug|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|Any CPU.Deploy.0 = Debug|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|ARM.ActiveCfg = Debug|ARM + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|ARM.Build.0 = Debug|ARM + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|ARM.Deploy.0 = Debug|ARM + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|x64.ActiveCfg = Debug|x64 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|x64.Build.0 = Debug|x64 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|x64.Deploy.0 = Debug|x64 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|x86.ActiveCfg = Debug|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|x86.Build.0 = Debug|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Debug|x86.Deploy.0 = Debug|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|Any CPU.ActiveCfg = Release|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|ARM.ActiveCfg = Release|ARM + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|ARM.Build.0 = Release|ARM + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|ARM.Deploy.0 = Release|ARM + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|x64.ActiveCfg = Release|x64 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|x64.Build.0 = Release|x64 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|x64.Deploy.0 = Release|x64 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|x86.ActiveCfg = Release|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|x86.Build.0 = Release|x86 + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {62A55887-10F5-40D2-9352-96246D1B11D3} = {1701F3BA-A09C-4706-A612-24FD9340FC18} - {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C} = {28B8E327-C504-4E08-B2CE-09D1CBB8B904} - {EA42A713-BC6E-4914-B54B-47C0891B7421} = {1701F3BA-A09C-4706-A612-24FD9340FC18} - {E15EDBD9-0356-422B-8C29-18833787356E} = {1701F3BA-A09C-4706-A612-24FD9340FC18} - {DF711AB9-F14E-4F1F-B8F2-B6DDC4691554} = {1701F3BA-A09C-4706-A612-24FD9340FC18} {5DB6C7C7-A19C-4BE3-AFE6-26E3061DA01F} = {7ABA337E-6748-484E-A0F4-E1715E1C95F1} {71F04187-BE90-47DE-A7BD-4D6CED50D446} = {A4B9D59A-C8C6-4199-A7F3-F3AF0C748281} {95E812E6-17C2-494F-A446-FDE42D75331C} = {71F04187-BE90-47DE-A7BD-4D6CED50D446} @@ -298,10 +196,13 @@ Global {9EE3EA1D-F28C-4CF2-B540-DB0415050D5F} = {71F04187-BE90-47DE-A7BD-4D6CED50D446} {7ABA337E-6748-484E-A0F4-E1715E1C95F1} = {A4B9D59A-C8C6-4199-A7F3-F3AF0C748281} {28B8E327-C504-4E08-B2CE-09D1CBB8B904} = {CF767486-305D-40EE-8845-58EF76C16D85} - {0DAA6E10-BC77-4B06-8356-BAEE9085D985} = {1701F3BA-A09C-4706-A612-24FD9340FC18} - {507CFE3E-16C1-43EC-BC21-50F901EE223B} = {1701F3BA-A09C-4706-A612-24FD9340FC18} - {418353B9-6BF4-4FD2-A9B2-F8AD59F7D0FB} = {1701F3BA-A09C-4706-A612-24FD9340FC18} {01FEC943-B537-4BCF-945A-6C914B06E448} = {A4B9D59A-C8C6-4199-A7F3-F3AF0C748281} {7B252F1E-2E9D-4362-9C14-3376AAB8B5A0} = {01FEC943-B537-4BCF-945A-6C914B06E448} + {1ADC3666-1DDB-48C4-9811-1E58B6D09A7C} = {1701F3BA-A09C-4706-A612-24FD9340FC18} + {92CAD93B-6C3B-45A0-A723-BE046DE50FEC} = {28B8E327-C504-4E08-B2CE-09D1CBB8B904} + {979AE182-EB59-4181-9D45-3FD6E4817F11} = {28B8E327-C504-4E08-B2CE-09D1CBB8B904} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {03788B53-C0BF-485B-AA19-A9EAB0E9AF7B} EndGlobalSection EndGlobal diff --git a/src/NmeaParser.WinStore/BluetoothDevice.cs b/src/NmeaParser/BluetoothDevice.WinStore.cs similarity index 56% rename from src/NmeaParser.WinStore/BluetoothDevice.cs rename to src/NmeaParser/BluetoothDevice.WinStore.cs index d343bfb..efb359c 100644 --- a/src/NmeaParser.WinStore/BluetoothDevice.cs +++ b/src/NmeaParser/BluetoothDevice.WinStore.cs @@ -1,4 +1,4 @@ -// +// // Copyright (c) 2014 Morten Nielsen // // Licensed under the Microsoft Public License (Ms-PL) (the "License"); @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - +#if NETFX_CORE using System; using System.Collections.Generic; using System.Linq; @@ -21,13 +21,11 @@ using System.Text; using System.IO; using System.Threading.Tasks; using Windows.Networking.Sockets; -#if NETFX_CORE -using BTDevice = Windows.Devices.Bluetooth.Rfcomm.RfcommDeviceService; using Windows.Devices.Bluetooth.Rfcomm; using System.Runtime.InteropServices.WindowsRuntime; using Windows.Foundation; -#else -using BTDevice = Windows.Networking.Proximity.PeerInformation; +#if WINDOWS_UWP +using Windows.Networking.Proximity; #endif namespace NmeaParser @@ -37,32 +35,50 @@ namespace NmeaParser /// public class BluetoothDevice : NmeaDevice { - private BTDevice m_device; - private StreamSocket m_socket; + private Windows.Devices.Bluetooth.Rfcomm.RfcommDeviceService m_deviceService; +#if WINDOWS_UWP + private Windows.Networking.Proximity.PeerInformation m_devicePeer; +#endif + private StreamSocket m_socket; /// /// Initializes a new instance of the class. /// - /// The device. - public BluetoothDevice(BTDevice device) + /// The RF Comm Device service. + public BluetoothDevice(Windows.Devices.Bluetooth.Rfcomm.RfcommDeviceService service) { - m_device = device; + m_deviceService = service; } - /// - /// Creates the stream the NmeaDevice is working on top off. - /// - /// - protected override async Task OpenStreamAsync() +#if WINDOWS_UWP + + /// + /// Initializes a new instance of the class. + /// + /// The peer information device. + public BluetoothDevice(Windows.Networking.Proximity.PeerInformation peer) + { + m_devicePeer = peer; + } +#endif + + /// + /// Creates the stream the NmeaDevice is working on top off. + /// + /// + protected override async Task OpenStreamAsync() { var socket = new Windows.Networking.Sockets.StreamSocket(); - await socket.ConnectAsync( -#if NETFX_CORE - m_device.ConnectionHostName, - m_device.ConnectionServiceName); -#else - m_device.HostName, "1"); +#if WINDOWS_UWP + if (m_devicePeer != null) + { + await socket.ConnectAsync(m_devicePeer.HostName, "1"); + } + else #endif + { + await socket.ConnectAsync(m_deviceService.ConnectionHostName, m_deviceService.ConnectionServiceName); + } m_socket = socket; return socket.InputStream.AsStreamForRead(); } @@ -83,3 +99,4 @@ namespace NmeaParser } } } +#endif \ No newline at end of file diff --git a/src/NmeaParser.Shared/BufferedStreamDevice.cs b/src/NmeaParser/BufferedStreamDevice.cs similarity index 100% rename from src/NmeaParser.Shared/BufferedStreamDevice.cs rename to src/NmeaParser/BufferedStreamDevice.cs diff --git a/src/NmeaParser.Shared/IMultiPartMessage.cs b/src/NmeaParser/IMultiPartMessage.cs similarity index 100% rename from src/NmeaParser.Shared/IMultiPartMessage.cs rename to src/NmeaParser/IMultiPartMessage.cs diff --git a/src/NmeaParser.Shared/Nmea/Gnss/Gngst.cs b/src/NmeaParser/Nmea/Gnss/Gngst.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gnss/Gngst.cs rename to src/NmeaParser/Nmea/Gnss/Gngst.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPBOD.cs b/src/NmeaParser/Nmea/Gps/GPBOD.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPBOD.cs rename to src/NmeaParser/Nmea/Gps/GPBOD.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPGGA.cs b/src/NmeaParser/Nmea/Gps/GPGGA.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPGGA.cs rename to src/NmeaParser/Nmea/Gps/GPGGA.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPGLL.cs b/src/NmeaParser/Nmea/Gps/GPGLL.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPGLL.cs rename to src/NmeaParser/Nmea/Gps/GPGLL.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPGSA.cs b/src/NmeaParser/Nmea/Gps/GPGSA.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPGSA.cs rename to src/NmeaParser/Nmea/Gps/GPGSA.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPGST.cs b/src/NmeaParser/Nmea/Gps/GPGST.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPGST.cs rename to src/NmeaParser/Nmea/Gps/GPGST.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPGSV.cs b/src/NmeaParser/Nmea/Gps/GPGSV.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPGSV.cs rename to src/NmeaParser/Nmea/Gps/GPGSV.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPRMB.cs b/src/NmeaParser/Nmea/Gps/GPRMB.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPRMB.cs rename to src/NmeaParser/Nmea/Gps/GPRMB.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPRMC.cs b/src/NmeaParser/Nmea/Gps/GPRMC.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPRMC.cs rename to src/NmeaParser/Nmea/Gps/GPRMC.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPRTE.cs b/src/NmeaParser/Nmea/Gps/GPRTE.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/GPRTE.cs rename to src/NmeaParser/Nmea/Gps/GPRTE.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs b/src/NmeaParser/Nmea/Gps/Garmin/PGRME.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs rename to src/NmeaParser/Nmea/Gps/Garmin/PGRME.cs diff --git a/src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRMZ.cs b/src/NmeaParser/Nmea/Gps/Garmin/PGRMZ.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/Gps/Garmin/PGRMZ.cs rename to src/NmeaParser/Nmea/Gps/Garmin/PGRMZ.cs diff --git a/src/NmeaParser.Shared/Nmea/LaserRange/LaserRangeMessage.cs b/src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/LaserRange/LaserRangeMessage.cs rename to src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs diff --git a/src/NmeaParser.Shared/Nmea/LaserRange/LaserTech/PLTIT.cs b/src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/LaserRange/LaserTech/PLTIT.cs rename to src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs diff --git a/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLA.cs b/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLA.cs rename to src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs diff --git a/src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLB.cs b/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/LaserRange/Trimble/PTNLB.cs rename to src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs diff --git a/src/NmeaParser.Shared/Nmea/NmeaMessage.cs b/src/NmeaParser/Nmea/NmeaMessage.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/NmeaMessage.cs rename to src/NmeaParser/Nmea/NmeaMessage.cs diff --git a/src/NmeaParser.Shared/Nmea/UnknownMessage.cs b/src/NmeaParser/Nmea/UnknownMessage.cs similarity index 100% rename from src/NmeaParser.Shared/Nmea/UnknownMessage.cs rename to src/NmeaParser/Nmea/UnknownMessage.cs diff --git a/src/NmeaParser.Shared/NmeaDevice.cs b/src/NmeaParser/NmeaDevice.cs similarity index 98% rename from src/NmeaParser.Shared/NmeaDevice.cs rename to src/NmeaParser/NmeaDevice.cs index 2725d5e..5f7c60a 100644 --- a/src/NmeaParser.Shared/NmeaDevice.cs +++ b/src/NmeaParser/NmeaDevice.cs @@ -20,7 +20,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.IO; -using Windows.Foundation; namespace NmeaParser { @@ -32,8 +31,8 @@ namespace NmeaParser private object m_lockObject = new object(); private string m_message = ""; private Stream m_stream; - System.Threading.CancellationTokenSource m_cts; - TaskCompletionSource closeTask; + private System.Threading.CancellationTokenSource m_cts; + private TaskCompletionSource closeTask; /// /// Initializes a new instance of the class. diff --git a/src/NmeaParser/NmeaFileDevice.cs b/src/NmeaParser/NmeaFileDevice.cs new file mode 100644 index 0000000..b7734f7 --- /dev/null +++ b/src/NmeaParser/NmeaFileDevice.cs @@ -0,0 +1,111 @@ +// +// Copyright (c) 2014 Morten Nielsen +// +// Licensed under the Microsoft Public License (Ms-PL) (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://opensource.org/licenses/Ms-PL.html +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NmeaParser +{ + /// + /// A file-based NMEA device reading from a NMEA log file. + /// + public class NmeaFileDevice : BufferedStreamDevice + { +#if NETFX_CORE + private Windows.Storage.IStorageFile m_storageFile; +#endif + private string m_filename; + + + /// + /// Initializes a new instance of the class. + /// + /// + public NmeaFileDevice(string fileName) : this(fileName, 1000) + { + } + +#if NETFX_CORE + /// + /// Initializes a new instance of the class. + /// + /// + public NmeaFileDevice(Windows.Storage.IStorageFile fileName) : this(fileName, 1000) + { + } +#endif + /// + /// Initializes a new instance of the class. + /// + /// + /// The time to wait between each group of lines being read in milliseconds + public NmeaFileDevice(string fileName, int readSpeed) : base(readSpeed) + { + m_filename = fileName; + } + +#if NETFX_CORE + /// + /// Initializes a new instance of the class. + /// + /// + /// The time to wait between each group of lines being read in milliseconds + public NmeaFileDevice(Windows.Storage.IStorageFile fileName, int readSpeed) + : base(readSpeed) + { + m_storageFile = fileName; + } +#endif + + /// + /// Gets the name of the nmea file this device is using. + /// + public string FileName + { + get + { +#if NETFX_CORE + if (m_storageFile != null) + return m_storageFile.Path; +#endif + return m_filename; + } + } + + /// + /// Gets the stream to perform buffer reads on. + /// + /// + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")] + protected override Task GetStreamAsync() + { + +#if NETFX_CORE + if (m_storageFile != null) + return m_storageFile.OpenStreamForReadAsync(); +#endif +#if WINDOWS_STORE + return Windows.Storage.StorageFile.GetFileFromPathAsync(m_filename).AsTask().ContinueWith(f => { return f.Result.OpenStreamForReadAsync(); }).ContinueWith(t => { return t.Result.Result; }); +#else + return Task.FromResult(System.IO.File.OpenRead(m_filename)); +#endif + } + } +} diff --git a/src/NmeaParser/NmeaParser.csproj b/src/NmeaParser/NmeaParser.csproj new file mode 100644 index 0000000..473060b --- /dev/null +++ b/src/NmeaParser/NmeaParser.csproj @@ -0,0 +1,68 @@ + + + + netstandard1.4;net451;monoandroid50;xamarinios10;uap10.0;win81 + true + true + Debug;Release + AnyCPU + Morten Nielsen + Morten Nielsen + An NMEA stream parser for serial port, bluetooth and file-based nmea simulation. + nmea winrt wpf win8 win8.1 wp8.1 uwp xamarin gps serialport bluetooth + SharpGIS.NmeaParser + 1.7.0 + http://opensource.org/licenses/ms-pl.html + https://github.com/dotMorten/NmeaParser + https://github.com/dotMorten/NmeaParser + en-US + Copyright © Morten Nielsen 2015-2017 + $(MSBuildThisFileDirectory)..\Bin\$(Configuration) + $(OutDir) + + + + $(DefineConstants);NETSTANDARD + NMEA Parser - .NET Standard 1.4 + + + + $(DefineConstants);NETFX + NMEA Parser - .NET Framework 4.5.1 + + + + $(DefineConstants);XAMARIN + NMEA Parser - Android + + + + $(DefineConstants);XAMARIN + NMEA Parser - iOS + + + + UAP + 10.0.14393.0 + 10.0.14393.0 + NMEA Parser - UWP + + + + 8.1 + $(DefineConstants);WINDOWS_STORE + NMEA Parser - WinStore + + + + + + + + + + + + + + diff --git a/src/NmeaParser.UWP/Properties/NmeaParser.rd.xml b/src/NmeaParser/Properties/NmeaParser.rd.xml similarity index 100% rename from src/NmeaParser.UWP/Properties/NmeaParser.rd.xml rename to src/NmeaParser/Properties/NmeaParser.rd.xml diff --git a/src/NmeaParser.WinDesktop/SerialPortDevice.cs b/src/NmeaParser/SerialPortDevice.Desktop.cs similarity index 99% rename from src/NmeaParser.WinDesktop/SerialPortDevice.cs rename to src/NmeaParser/SerialPortDevice.Desktop.cs index 2425eef..ed080d1 100644 --- a/src/NmeaParser.WinDesktop/SerialPortDevice.cs +++ b/src/NmeaParser/SerialPortDevice.Desktop.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - +#if NETFX using System; using System.Collections.Generic; using System.Linq; @@ -87,3 +87,4 @@ namespace NmeaParser } } } +#endif \ No newline at end of file diff --git a/src/NmeaParser.UWP/SerialPortDevice.cs b/src/NmeaParser/SerialPortDevice.UWP.cs similarity index 99% rename from src/NmeaParser.UWP/SerialPortDevice.cs rename to src/NmeaParser/SerialPortDevice.UWP.cs index bee20d5..656d9d5 100644 --- a/src/NmeaParser.UWP/SerialPortDevice.cs +++ b/src/NmeaParser/SerialPortDevice.UWP.cs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // - +#if WINDOWS_UWP using System; using System.Collections.Generic; using System.Linq; @@ -86,3 +86,4 @@ namespace NmeaParser } } } +#endif \ No newline at end of file diff --git a/src/NmeaParser.Shared/StreamDevice.cs b/src/NmeaParser/StreamDevice.cs similarity index 100% rename from src/NmeaParser.Shared/StreamDevice.cs rename to src/NmeaParser/StreamDevice.cs diff --git a/src/SampleApp.Store/SampleApp.Store.Windows/SampleApp.Store.Windows.csproj b/src/SampleApp.Store/SampleApp.Store.Windows/SampleApp.Store.Windows.csproj index f12360f..347fcc4 100644 --- a/src/SampleApp.Store/SampleApp.Store.Windows/SampleApp.Store.Windows.csproj +++ b/src/SampleApp.Store/SampleApp.Store.Windows/SampleApp.Store.Windows.csproj @@ -38,9 +38,9 @@ - - {62a55887-10f5-40d2-9352-96246d1b11d3} - NmeaParser.WinStore + + {1adc3666-1ddb-48c4-9811-1e58b6d09a7c} + NmeaParser diff --git a/src/SampleApp.Store/SampleApp.Store.WindowsPhone/SampleApp.Store.WindowsPhone.csproj b/src/SampleApp.Store/SampleApp.Store.WindowsPhone/SampleApp.Store.WindowsPhone.csproj index a6c024e..148048e 100644 --- a/src/SampleApp.Store/SampleApp.Store.WindowsPhone/SampleApp.Store.WindowsPhone.csproj +++ b/src/SampleApp.Store/SampleApp.Store.WindowsPhone/SampleApp.Store.WindowsPhone.csproj @@ -37,9 +37,9 @@ - - {ea42a713-bc6e-4914-b54b-47c0891b7421} - NmeaParser.WinPhone + + {1adc3666-1ddb-48c4-9811-1e58b6d09a7c} + NmeaParser diff --git a/src/SampleApp.UWP/App.xaml.cs b/src/SampleApp.UWP/App.xaml.cs index f9752aa..c2b06fc 100644 --- a/src/SampleApp.UWP/App.xaml.cs +++ b/src/SampleApp.UWP/App.xaml.cs @@ -24,19 +24,12 @@ namespace SampleApp.UWP /// sealed partial class App : Application { - /// - /// Allows tracking page views, exceptions and other telemetry through the Microsoft Application Insights service. - /// - public static Microsoft.ApplicationInsights.TelemetryClient TelemetryClient; - /// /// Initializes the singleton application object. This is the first line of authored code /// executed, and as such is the logical equivalent of main() or WinMain(). /// public App() { - TelemetryClient = new Microsoft.ApplicationInsights.TelemetryClient(); - this.InitializeComponent(); this.Suspending += OnSuspending; } diff --git a/src/SampleApp.UWP/SampleApp.UWP.csproj b/src/SampleApp.UWP/SampleApp.UWP.csproj index 98893f6..9e8db69 100644 --- a/src/SampleApp.UWP/SampleApp.UWP.csproj +++ b/src/SampleApp.UWP/SampleApp.UWP.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.14393.0 - 10.0.10240.0 + 10.0.14393.0 14 true 512 @@ -131,9 +131,9 @@ - - {418353b9-6bf4-4fd2-a9b2-f8ad59f7d0fb} - NmeaParser.UWP + + {1adc3666-1ddb-48c4-9811-1e58b6d09a7c} + NmeaParser diff --git a/src/SampleApp.UWP/SampleApp.UWP.csproj.bak b/src/SampleApp.UWP/SampleApp.UWP.csproj.bak new file mode 100644 index 0000000..be757d3 --- /dev/null +++ b/src/SampleApp.UWP/SampleApp.UWP.csproj.bak @@ -0,0 +1,150 @@ + + + + + Debug + x86 + {7B252F1E-2E9D-4362-9C14-3376AAB8B5A0} + AppContainerExe + Properties + SampleApp.UWP + SampleApp.UWP + en-US + UAP + 10.0.14393.0 + 10.0.10240.0 + 14 + true + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + SampleApp.UWP_TemporaryKey.pfx + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + true + + + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + true + + + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + true + true + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + + + + + + App.xaml + + + MainPage.xaml + + + + + + Designer + + + + + + NmeaSampleData.txt + + + + + + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + {1adc3666-1ddb-48c4-9811-1e58b6d09a7c} + NmeaParser + + + + 14.0 + + + + \ No newline at end of file diff --git a/src/SampleApp.UWP/project.json b/src/SampleApp.UWP/project.json index e3b2dba..92d1456 100644 --- a/src/SampleApp.UWP/project.json +++ b/src/SampleApp.UWP/project.json @@ -1,9 +1,6 @@ { "dependencies": { - "Microsoft.ApplicationInsights": "1.0.0", - "Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0", - "Microsoft.ApplicationInsights.WindowsApps": "1.0.0", - "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0" + "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0" }, "frameworks": { "uap10.0": {} diff --git a/src/SampleApp.WinDesktop/App.config b/src/SampleApp.WinDesktop/App.config index 8e15646..d0feca6 100644 --- a/src/SampleApp.WinDesktop/App.config +++ b/src/SampleApp.WinDesktop/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/src/SampleApp.WinDesktop/Properties/Resources.Designer.cs b/src/SampleApp.WinDesktop/Properties/Resources.Designer.cs index b8355be..a3ac465 100644 --- a/src/SampleApp.WinDesktop/Properties/Resources.Designer.cs +++ b/src/SampleApp.WinDesktop/Properties/Resources.Designer.cs @@ -1,71 +1,63 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace SampleApp.WinDesktop.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SampleApp.WinDesktop.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } +namespace SampleApp.WinDesktop.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SampleApp.WinDesktop.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } } diff --git a/src/SampleApp.WinDesktop/Properties/Settings.Designer.cs b/src/SampleApp.WinDesktop/Properties/Settings.Designer.cs index 9a973f9..82e7a7e 100644 --- a/src/SampleApp.WinDesktop/Properties/Settings.Designer.cs +++ b/src/SampleApp.WinDesktop/Properties/Settings.Designer.cs @@ -1,30 +1,26 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace SampleApp.WinDesktop.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } +namespace SampleApp.WinDesktop.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } } diff --git a/src/SampleApp.WinDesktop/SampleApp.WinDesktop.csproj b/src/SampleApp.WinDesktop/SampleApp.WinDesktop.csproj index 6198350..f221bfc 100644 --- a/src/SampleApp.WinDesktop/SampleApp.WinDesktop.csproj +++ b/src/SampleApp.WinDesktop/SampleApp.WinDesktop.csproj @@ -9,10 +9,11 @@ Properties SampleApp.WinDesktop SampleApp.WinDesktop - v4.5 + v4.5.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + AnyCPU @@ -157,18 +158,18 @@ - - - {df711ab9-f14e-4f1f-b8f2-b6ddc4691554} - NmeaParser.WinDesktop - - NmeaSampleData.txt PreserveNewest + + + {1adc3666-1ddb-48c4-9811-1e58b6d09a7c} + NmeaParser + + + + + + + + + + + UnitTestApp.xaml + + + + + MSBuild:Compile + Designer + + + + + Designer + + + + + + NmeaSampleData.txt + + + + + + + + + + + + + {1adc3666-1ddb-48c4-9811-1e58b6d09a7c} + NmeaParser + + + + + 14.0 + + + + \ No newline at end of file diff --git a/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP.nuget.props b/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP.nuget.props new file mode 100644 index 0000000..6810bf6 --- /dev/null +++ b/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP.nuget.props @@ -0,0 +1,22 @@ + + + + True + NuGet + C:\GitHub\dotMorten\NmeaParser\src\UnitTests\NmeaParser.Tests.UWP\project.lock.json + $(UserProfile)\.nuget\packages\ + C:\Users\mort5161\.nuget\packages\;C:\Program Files (x86)\Microsoft SDKs\NuGetPackagesFallback\ + ProjectJson + 4.5.0 + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + + \ No newline at end of file diff --git a/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP.nuget.targets b/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP.nuget.targets new file mode 100644 index 0000000..80e3be1 --- /dev/null +++ b/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP.nuget.targets @@ -0,0 +1,13 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + + \ No newline at end of file diff --git a/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP_TemporaryKey.pfx b/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP_TemporaryKey.pfx new file mode 100644 index 0000000..5b9aea3 Binary files /dev/null and b/src/UnitTests/NmeaParser.Tests.UWP/NmeaParser.Tests.UWP_TemporaryKey.pfx differ diff --git a/src/UnitTests/NmeaParser.Tests.UWP/Package.appxmanifest b/src/UnitTests/NmeaParser.Tests.UWP/Package.appxmanifest new file mode 100644 index 0000000..43f77f7 --- /dev/null +++ b/src/UnitTests/NmeaParser.Tests.UWP/Package.appxmanifest @@ -0,0 +1,45 @@ + + + + + + + + + NmeaParser.Tests.UWP + mort5161 + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/UnitTests/NmeaParser.Tests.UWP/Properties/AssemblyInfo.cs b/src/UnitTests/NmeaParser.Tests.UWP/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..9b5b175 --- /dev/null +++ b/src/UnitTests/NmeaParser.Tests.UWP/Properties/AssemblyInfo.cs @@ -0,0 +1,18 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("NmeaParser.Tests.UWP")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("NmeaParser.Tests.UWP")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyMetadata("TargetPlatform","UAP")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: ComVisible(false)] \ No newline at end of file diff --git a/src/UnitTests/NmeaParser.Tests.UWP/Properties/UnitTestApp.rd.xml b/src/UnitTests/NmeaParser.Tests.UWP/Properties/UnitTestApp.rd.xml new file mode 100644 index 0000000..efee59d --- /dev/null +++ b/src/UnitTests/NmeaParser.Tests.UWP/Properties/UnitTestApp.rd.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/UnitTests/NmeaParser.Tests.UWP/UnitTestApp.xaml b/src/UnitTests/NmeaParser.Tests.UWP/UnitTestApp.xaml new file mode 100644 index 0000000..a86b75a --- /dev/null +++ b/src/UnitTests/NmeaParser.Tests.UWP/UnitTestApp.xaml @@ -0,0 +1,8 @@ + + + diff --git a/src/UnitTests/NmeaParser.Tests.UWP/UnitTestApp.xaml.cs b/src/UnitTests/NmeaParser.Tests.UWP/UnitTestApp.xaml.cs new file mode 100644 index 0000000..bbcb58c --- /dev/null +++ b/src/UnitTests/NmeaParser.Tests.UWP/UnitTestApp.xaml.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace NmeaParser.Tests.UWP +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + sealed partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + this.Suspending += OnSuspending; + } + + /// + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used such as when the application is launched to open a specific file. + /// + /// Details about the launch request and process. + protected override void OnLaunched(LaunchActivatedEventArgs e) + { + +#if DEBUG + if (System.Diagnostics.Debugger.IsAttached) + { + this.DebugSettings.EnableFrameRateCounter = true; + } +#endif + + Frame rootFrame = Window.Current.Content as Frame; + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == null) + { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame(); + + rootFrame.NavigationFailed += OnNavigationFailed; + + if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) + { + //TODO: Load state from previously suspended application + } + + // Place the frame in the current Window + Window.Current.Content = rootFrame; + } + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); + + // Ensure the current window is active + Window.Current.Activate(); + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments); + } + + /// + /// Invoked when Navigation to a certain page fails + /// + /// The Frame which failed navigation + /// Details about the navigation failure + void OnNavigationFailed(object sender, NavigationFailedEventArgs e) + { + throw new Exception("Failed to load Page " + e.SourcePageType.FullName); + } + + /// + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// + /// The source of the suspend request. + /// Details about the suspend request. + private void OnSuspending(object sender, SuspendingEventArgs e) + { + var deferral = e.SuspendingOperation.GetDeferral(); + //TODO: Save application state and stop any background activity + deferral.Complete(); + } + } +} diff --git a/src/NmeaParser.UWP/project.json b/src/UnitTests/NmeaParser.Tests.UWP/project.json similarity index 57% rename from src/NmeaParser.UWP/project.json rename to src/UnitTests/NmeaParser.Tests.UWP/project.json index c594939..fb45499 100644 --- a/src/NmeaParser.UWP/project.json +++ b/src/UnitTests/NmeaParser.Tests.UWP/project.json @@ -1,9 +1,11 @@ { "dependencies": { - "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0" + "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.4", + "MSTest.TestAdapter": "1.2.0", + "MSTest.TestFramework": "1.2.0" }, "frameworks": { - "uap10.0": {} + "uap10.0.10586": {} }, "runtimes": { "win10-arm": {}, diff --git a/src/NmeaParser.Tests/BufferedStringDevice.cs b/src/UnitTests/NmeaParser.Tests/BufferedStringDevice.cs similarity index 100% rename from src/NmeaParser.Tests/BufferedStringDevice.cs rename to src/UnitTests/NmeaParser.Tests/BufferedStringDevice.cs diff --git a/src/NmeaParser.Tests/DeviceTests.cs b/src/UnitTests/NmeaParser.Tests/DeviceTests.cs similarity index 97% rename from src/NmeaParser.Tests/DeviceTests.cs rename to src/UnitTests/NmeaParser.Tests/DeviceTests.cs index bfd953d..b9fa0b0 100644 --- a/src/NmeaParser.Tests/DeviceTests.cs +++ b/src/UnitTests/NmeaParser.Tests/DeviceTests.cs @@ -1,4 +1,4 @@ -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/NmeaParser.Tests/NmeaMessages.cs b/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs similarity index 98% rename from src/NmeaParser.Tests/NmeaMessages.cs rename to src/UnitTests/NmeaParser.Tests/NmeaMessages.cs index 19a188e..624f449 100644 --- a/src/NmeaParser.Tests/NmeaMessages.cs +++ b/src/UnitTests/NmeaParser.Tests/NmeaMessages.cs @@ -18,12 +18,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using NmeaParser.Nmea; using NmeaParser.Nmea.Gps; using System.Threading.Tasks; using System.IO; using NmeaParser.Nmea.Gnss; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace NmeaParser.Tests { @@ -110,7 +110,7 @@ namespace NmeaParser.Tests var msg = NmeaMessage.Parse(input); Assert.IsInstanceOfType(msg, typeof(Gpgga)); Gpgga gga = (Gpgga)msg; - Assert.AreEqual(new TimeSpan(23, 52, 36), gga.TimeSinceLastDgpsUpdate); + Assert.AreEqual(new TimeSpan(23, 52, 36), gga.FixTime); Assert.AreEqual(39.432465, gga.Latitude); Assert.AreEqual(-119.7653516666666667, gga.Longitude, 0.0000000001); Assert.AreEqual(NmeaParser.Nmea.Gps.Gpgga.FixQuality.GpsFix, gga.Quality); @@ -121,7 +121,8 @@ namespace NmeaParser.Tests Assert.AreEqual(-22.1, gga.HeightOfGeoid); Assert.AreEqual("M", gga.HeightOfGeoidUnits); Assert.AreEqual(-1, gga.DgpsStationId); - } + Assert.AreEqual(TimeSpan.MaxValue, gga.TimeSinceLastDgpsUpdate); + } [TestMethod] public void TestPtlna() diff --git a/src/UnitTests/NmeaParser.Tests/NmeaParser.Tests.projitems b/src/UnitTests/NmeaParser.Tests/NmeaParser.Tests.projitems new file mode 100644 index 0000000..ddafed4 --- /dev/null +++ b/src/UnitTests/NmeaParser.Tests/NmeaParser.Tests.projitems @@ -0,0 +1,16 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 979ae182-eb59-4181-9d45-3fd6e4817f11 + + + NmeaParser.Tests + + + + + + + \ No newline at end of file diff --git a/src/NmeaParser.Shared/NmeaParser.Shared.shproj b/src/UnitTests/NmeaParser.Tests/NmeaParser.Tests.shproj similarity index 72% rename from src/NmeaParser.Shared/NmeaParser.Shared.shproj rename to src/UnitTests/NmeaParser.Tests/NmeaParser.Tests.shproj index 14730cb..be64146 100644 --- a/src/NmeaParser.Shared/NmeaParser.Shared.shproj +++ b/src/UnitTests/NmeaParser.Tests/NmeaParser.Tests.shproj @@ -1,12 +1,13 @@ - + - e15edbd9-0356-422b-8c29-18833787356e + 979ae182-eb59-4181-9d45-3fd6e4817f11 + 14.0 - +