From 254da8a14c28c825a0962a7928cb3c0ced1c6bc7 Mon Sep 17 00:00:00 2001 From: mort5161 Date: Fri, 25 Jul 2014 10:41:25 -0700 Subject: [PATCH] Used shared project + rename namespace --- src/NmeaParser.Tests/NmeaMessages.cs | 6 ++--- src/NmeaParser.Tests/NmeaParser.Tests.csproj | 2 +- src/NmeaParser.Tests/Package.appxmanifest | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- src/NmeaParser.sln | 11 ++++++-- .../{ => NmeaParser.Shared/Nmea}/Device.cs | 2 +- .../{ => NmeaParser.Shared}/Nmea/Gps/GPGGA.cs | 2 +- .../{ => NmeaParser.Shared}/Nmea/Gps/GPRMC.cs | 2 +- .../Nmea/Gps/Garmin/PGRME.cs | 0 .../Nmea/LaserRangeMessage.cs | 2 +- .../Nmea/LaserTech/LaserRange/PLTIT.cs | 2 +- .../Nmea}/NmeaDevice.cs | 4 +-- .../Nmea/NmeaMessage.cs | 2 +- .../Nmea/Trimble/LaserRange/PTNLA.cs | 2 +- .../Nmea/Trimble/LaserRange/PTNLB.cs | 2 +- .../Nmea/UnknownMessage.cs | 2 +- .../NmeaParser.Shared.projitems | 27 +++++++++++++++++++ .../NmeaParser.Shared.shproj | 12 +++++++++ src/NmeaParser/NmeaParser.WinPhone.csproj | 20 +++----------- src/NmeaParser/NmeaParser.WinStore.csproj | 17 +++--------- src/NmeaParser/Properties/AssemblyInfo.cs | 4 +-- 21 files changed, 76 insertions(+), 53 deletions(-) rename src/NmeaParser/{ => NmeaParser.Shared/Nmea}/Device.cs (99%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/Gps/GPGGA.cs (98%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/Gps/GPRMC.cs (98%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/Gps/Garmin/PGRME.cs (100%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/LaserRangeMessage.cs (98%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/LaserTech/LaserRange/PLTIT.cs (85%) rename src/NmeaParser/{ => NmeaParser.Shared/Nmea}/NmeaDevice.cs (94%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/NmeaMessage.cs (98%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/Trimble/LaserRange/PTNLA.cs (86%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/Trimble/LaserRange/PTNLB.cs (95%) rename src/NmeaParser/{ => NmeaParser.Shared}/Nmea/UnknownMessage.cs (92%) create mode 100644 src/NmeaParser/NmeaParser.Shared/NmeaParser.Shared.projitems create mode 100644 src/NmeaParser/NmeaParser.Shared/NmeaParser.Shared.shproj diff --git a/src/NmeaParser.Tests/NmeaMessages.cs b/src/NmeaParser.Tests/NmeaMessages.cs index 6204bcc..8e17c73 100644 --- a/src/NmeaParser.Tests/NmeaMessages.cs +++ b/src/NmeaParser.Tests/NmeaMessages.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; -using BTDevices.Nmea; -using BTDevices.Nmea.Gps; +using NmeaParser.Nmea; +using NmeaParser.Nmea.Gps; -namespace BTDevices.Tests +namespace NmeaParser.Tests { [TestClass] public class NmeaMessages diff --git a/src/NmeaParser.Tests/NmeaParser.Tests.csproj b/src/NmeaParser.Tests/NmeaParser.Tests.csproj index 935fe7c..fc1c114 100644 --- a/src/NmeaParser.Tests/NmeaParser.Tests.csproj +++ b/src/NmeaParser.Tests/NmeaParser.Tests.csproj @@ -136,7 +136,7 @@ - + {62a55887-10f5-40d2-9352-96246d1b11d3} BTDevices.WinStore diff --git a/src/NmeaParser.Tests/Package.appxmanifest b/src/NmeaParser.Tests/Package.appxmanifest index ba88fb9..88dddbc 100644 --- a/src/NmeaParser.Tests/Package.appxmanifest +++ b/src/NmeaParser.Tests/Package.appxmanifest @@ -6,10 +6,10 @@ Version="1.0.0.0" /> - BTDevices.Tests + NmeaParser.Tests mort5161 Images\UnitTestStoreLogo.png - BTDevices.Tests + NmeaParser.Tests diff --git a/src/NmeaParser.Tests/Properties/AssemblyInfo.cs b/src/NmeaParser.Tests/Properties/AssemblyInfo.cs index 0255b2a..193a210 100644 --- a/src/NmeaParser.Tests/Properties/AssemblyInfo.cs +++ b/src/NmeaParser.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ 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("BTDevices.Tests")] +[assembly: AssemblyTitle("NmeaParser.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BTDevices.Tests")] +[assembly: AssemblyProduct("NmeaParser.Tests")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NmeaParser.sln b/src/NmeaParser.sln index b18592c..9420b98 100644 --- a/src/NmeaParser.sln +++ b/src/NmeaParser.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinPhone", "WinPhone", "{26A0F6A9-4B11-46F4-BB01-50D37D1C3CB4}" EndProject @@ -13,7 +13,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.Tests", "NmeaPar EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.WinPhone", "NmeaParser\NmeaParser.WinPhone.csproj", "{EA42A713-BC6E-4914-B54B-47C0891B7421}" EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NmeaParser.Shared", "NmeaParser\NmeaParser.Shared\NmeaParser.Shared.shproj", "{E15EDBD9-0356-422B-8C29-18833787356E}" +EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + NmeaParser\NmeaParser.Shared\NmeaParser.Shared.projitems*{62a55887-10f5-40d2-9352-96246d1b11d3}*SharedItemsImports = 4 + NmeaParser\NmeaParser.Shared\NmeaParser.Shared.projitems*{e15edbd9-0356-422b-8c29-18833787356e}*SharedItemsImports = 13 + NmeaParser\NmeaParser.Shared\NmeaParser.Shared.projitems*{ea42a713-bc6e-4914-b54b-47c0891b7421}*SharedItemsImports = 4 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -84,8 +91,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {EA42A713-BC6E-4914-B54B-47C0891B7421} = {26A0F6A9-4B11-46F4-BB01-50D37D1C3CB4} {62A55887-10F5-40D2-9352-96246D1B11D3} = {07131E3E-1C4E-41CB-BD14-7950AA858A23} {5B5BAF9D-3FB9-47F9-AE07-B8CC43EC887C} = {07131E3E-1C4E-41CB-BD14-7950AA858A23} + {EA42A713-BC6E-4914-B54B-47C0891B7421} = {26A0F6A9-4B11-46F4-BB01-50D37D1C3CB4} EndGlobalSection EndGlobal diff --git a/src/NmeaParser/Device.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/Device.cs similarity index 99% rename from src/NmeaParser/Device.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/Device.cs index ba5bf10..350f3a6 100644 --- a/src/NmeaParser/Device.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/Device.cs @@ -15,7 +15,7 @@ using Windows.Foundation; using BTDevice = Windows.Networking.Proximity.PeerInformation; #endif -namespace BTDevices +namespace NmeaParser { public abstract class Device : IDisposable { diff --git a/src/NmeaParser/Nmea/Gps/GPGGA.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/Gps/GPGGA.cs similarity index 98% rename from src/NmeaParser/Nmea/Gps/GPGGA.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/Gps/GPGGA.cs index 2530e70..7e5eac4 100644 --- a/src/NmeaParser/Nmea/Gps/GPGGA.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/Gps/GPGGA.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BTDevices.Nmea.Gps +namespace NmeaParser.Nmea.Gps { /// /// Recommended Minimum diff --git a/src/NmeaParser/Nmea/Gps/GPRMC.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/Gps/GPRMC.cs similarity index 98% rename from src/NmeaParser/Nmea/Gps/GPRMC.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/Gps/GPRMC.cs index 1353947..1a567a8 100644 --- a/src/NmeaParser/Nmea/Gps/GPRMC.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/Gps/GPRMC.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BTDevices.Nmea.Gps +namespace NmeaParser.Nmea.Gps { /// /// Recommended Minimum diff --git a/src/NmeaParser/Nmea/Gps/Garmin/PGRME.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs similarity index 100% rename from src/NmeaParser/Nmea/Gps/Garmin/PGRME.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/Gps/Garmin/PGRME.cs diff --git a/src/NmeaParser/Nmea/LaserRangeMessage.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/LaserRangeMessage.cs similarity index 98% rename from src/NmeaParser/Nmea/LaserRangeMessage.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/LaserRangeMessage.cs index 9102b21..39766fd 100644 --- a/src/NmeaParser/Nmea/LaserRangeMessage.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/LaserRangeMessage.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BTDevices.Nmea +namespace NmeaParser.Nmea { /// /// Laser Range Measurement diff --git a/src/NmeaParser/Nmea/LaserTech/LaserRange/PLTIT.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs similarity index 85% rename from src/NmeaParser/Nmea/LaserTech/LaserRange/PLTIT.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs index 9e8a3f2..8b4f362 100644 --- a/src/NmeaParser/Nmea/LaserTech/LaserRange/PLTIT.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/LaserTech/LaserRange/PLTIT.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BTDevices.Nmea.LaserTech.LaserRange +namespace NmeaParser.Nmea.LaserTech.LaserRange { /// /// Laser Range diff --git a/src/NmeaParser/NmeaDevice.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/NmeaDevice.cs similarity index 94% rename from src/NmeaParser/NmeaDevice.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/NmeaDevice.cs index a0b8057..848c011 100644 --- a/src/NmeaParser/NmeaDevice.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/NmeaDevice.cs @@ -11,7 +11,7 @@ using BTDevice = Windows.Networking.Proximity.PeerInformation; #endif using Windows.Foundation; -namespace BTDevices +namespace NmeaParser { public class NmeaDevice : Device { @@ -37,7 +37,7 @@ namespace BTDevices { try { - var msg = BTDevices.Nmea.NmeaMessage.Parse(p); + var msg = NmeaParser.Nmea.NmeaMessage.Parse(p); if (msg != null) OnMessageReceived(msg); } diff --git a/src/NmeaParser/Nmea/NmeaMessage.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/NmeaMessage.cs similarity index 98% rename from src/NmeaParser/Nmea/NmeaMessage.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/NmeaMessage.cs index 69bfab7..1027ef1 100644 --- a/src/NmeaParser/Nmea/NmeaMessage.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/NmeaMessage.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace BTDevices.Nmea +namespace NmeaParser.Nmea { public class NmeaMessageType : Attribute { public string Type { get; set; } } diff --git a/src/NmeaParser/Nmea/Trimble/LaserRange/PTNLA.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs similarity index 86% rename from src/NmeaParser/Nmea/Trimble/LaserRange/PTNLA.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs index ce2f80e..ece44b1 100644 --- a/src/NmeaParser/Nmea/Trimble/LaserRange/PTNLA.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLA.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BTDevices.Nmea.Trimble.LaserRange +namespace NmeaParser.Nmea.Trimble.LaserRange { /// /// Burden finder diff --git a/src/NmeaParser/Nmea/Trimble/LaserRange/PTNLB.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs similarity index 95% rename from src/NmeaParser/Nmea/Trimble/LaserRange/PTNLB.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs index 31635c7..e4c34af 100644 --- a/src/NmeaParser/Nmea/Trimble/LaserRange/PTNLB.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/Trimble/LaserRange/PTNLB.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BTDevices.Nmea.Trimble.LaserRange +namespace NmeaParser.Nmea.Trimble.LaserRange { /// /// Tree Measurement diff --git a/src/NmeaParser/Nmea/UnknownMessage.cs b/src/NmeaParser/NmeaParser.Shared/Nmea/UnknownMessage.cs similarity index 92% rename from src/NmeaParser/Nmea/UnknownMessage.cs rename to src/NmeaParser/NmeaParser.Shared/Nmea/UnknownMessage.cs index cd4ada5..ce68ddb 100644 --- a/src/NmeaParser/Nmea/UnknownMessage.cs +++ b/src/NmeaParser/NmeaParser.Shared/Nmea/UnknownMessage.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BTDevices.Nmea +namespace NmeaParser.Nmea { public class UnknownMessage : NmeaMessage { diff --git a/src/NmeaParser/NmeaParser.Shared/NmeaParser.Shared.projitems b/src/NmeaParser/NmeaParser.Shared/NmeaParser.Shared.projitems new file mode 100644 index 0000000..be8ea6a --- /dev/null +++ b/src/NmeaParser/NmeaParser.Shared/NmeaParser.Shared.projitems @@ -0,0 +1,27 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + e15edbd9-0356-422b-8c29-18833787356e + + + NmeaParser.Shared + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NmeaParser/NmeaParser.Shared/NmeaParser.Shared.shproj b/src/NmeaParser/NmeaParser.Shared/NmeaParser.Shared.shproj new file mode 100644 index 0000000..14730cb --- /dev/null +++ b/src/NmeaParser/NmeaParser.Shared/NmeaParser.Shared.shproj @@ -0,0 +1,12 @@ + + + + e15edbd9-0356-422b-8c29-18833787356e + + + + + + + + diff --git a/src/NmeaParser/NmeaParser.WinPhone.csproj b/src/NmeaParser/NmeaParser.WinPhone.csproj index 17d69c9..42599ed 100644 --- a/src/NmeaParser/NmeaParser.WinPhone.csproj +++ b/src/NmeaParser/NmeaParser.WinPhone.csproj @@ -9,8 +9,8 @@ {C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties - BTDevices - BTDevices.WinPhone + NmeaParser + NmeaParser.WinPhone WindowsPhone v8.0 $(TargetFrameworkVersion) @@ -41,22 +41,10 @@ 4 - - - - - - - - - - - - - - + + diff --git a/src/NmeaParser/NmeaParser.WinStore.csproj b/src/NmeaParser/NmeaParser.WinStore.csproj index d7e93e0..f4c22e2 100644 --- a/src/NmeaParser/NmeaParser.WinStore.csproj +++ b/src/NmeaParser/NmeaParser.WinStore.csproj @@ -9,8 +9,8 @@ {62A55887-10F5-40D2-9352-96246D1B11D3} Library Properties - BTDevices - BTDevices.WinStore + NmeaParser + NmeaParser.WinStore en-US 8.1 12 @@ -36,25 +36,14 @@ - - - - - - - - - - - - 12.0 +