diff --git a/.gitignore b/.gitignore index c1746ef..70e1d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ UpgradeLog*.XML Tools/Nuget/NmeaParser/lib/ Tools/Nuget/*.nupkg src/NmeaParser.sln.ide/ +project.lock.json diff --git a/src/NmeaParser.UWP/NmeaParser.UWP.csproj b/src/NmeaParser.UWP/NmeaParser.UWP.csproj index 4e1f8ff..af58431 100644 --- a/src/NmeaParser.UWP/NmeaParser.UWP.csproj +++ b/src/NmeaParser.UWP/NmeaParser.UWP.csproj @@ -11,8 +11,8 @@ NmeaParser.UWP en-US UAP - 10.0.10069.0 - 10.0.10069.0 + 10.0.10240.0 + 10.0.10240.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -23,7 +23,7 @@ full false ..\bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP prompt 4 ..\bin\Debug\NmeaParser.UWP.xml @@ -33,11 +33,15 @@ pdbonly true ..\bin\Release\ - TRACE;NETFX_CORE;WINDOWS_UAP + TRACE;NETFX_CORE;WINDOWS_UWP prompt 4 ..\bin\Release\NmeaParser.UWP.xml + + + + GlobalSuppressions.cs @@ -46,6 +50,7 @@ BluetoothDevice.cs + @@ -57,9 +62,6 @@ True - - - CustomDictionary.xml diff --git a/src/NmeaParser.UWP/Properties/NmeaParser.rd.xml b/src/NmeaParser.UWP/Properties/NmeaParser.rd.xml new file mode 100644 index 0000000..9c46111 --- /dev/null +++ b/src/NmeaParser.UWP/Properties/NmeaParser.rd.xml @@ -0,0 +1,33 @@ + + + + + + + + + diff --git a/src/NmeaParser.UWP/project.json b/src/NmeaParser.UWP/project.json new file mode 100644 index 0000000..c594939 --- /dev/null +++ b/src/NmeaParser.UWP/project.json @@ -0,0 +1,16 @@ +{ + "dependencies": { + "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0" + }, + "frameworks": { + "uap10.0": {} + }, + "runtimes": { + "win10-arm": {}, + "win10-arm-aot": {}, + "win10-x86": {}, + "win10-x86-aot": {}, + "win10-x64": {}, + "win10-x64-aot": {} + } +} \ No newline at end of file diff --git a/src/NmeaParser.sln b/src/NmeaParser.sln index baf380f..96c9284 100644 --- a/src/NmeaParser.sln +++ b/src/NmeaParser.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22823.1 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NmeaParser.WinStore", "NmeaParser.WinStore\NmeaParser.WinStore.csproj", "{62A55887-10F5-40D2-9352-96246D1B11D3}" EndProject @@ -57,7 +57,9 @@ Global NmeaParser.Shared\NmeaParser.Shared.projitems*{62a55887-10f5-40d2-9352-96246d1b11d3}*SharedItemsImports = 4 NmeaParser.Shared\NmeaParser.Shared.projitems*{e15edbd9-0356-422b-8c29-18833787356e}*SharedItemsImports = 13 SampleApp.Store\SampleApp.Store.Shared\SampleApp.Store.Shared.projitems*{c4b3935b-7ed4-40cc-b1d2-bc2b854e319d}*SharedItemsImports = 4 + NmeaParser.Shared\NmeaParser.Shared.projitems*{0daa6e10-bc77-4b06-8356-baee9085d985}*SharedItemsImports = 4 NmeaParser.Shared\NmeaParser.Shared.projitems*{ea42a713-bc6e-4914-b54b-47c0891b7421}*SharedItemsImports = 4 + NmeaParser.Shared\NmeaParser.Shared.projitems*{507cfe3e-16c1-43ec-bc21-50f901ee223b}*SharedItemsImports = 4 SampleApp.Store\SampleApp.Store.Shared\SampleApp.Store.Shared.projitems*{95e812e6-17c2-494f-a446-fde42d75331c}*SharedItemsImports = 13 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/SampleApp.UWP/Assets/LockScreenLogo.scale-200.png b/src/SampleApp.UWP/Assets/LockScreenLogo.scale-200.png new file mode 100644 index 0000000..735f57a Binary files /dev/null and b/src/SampleApp.UWP/Assets/LockScreenLogo.scale-200.png differ diff --git a/src/SampleApp.UWP/Assets/Logo.scale-100.png b/src/SampleApp.UWP/Assets/Logo.scale-100.png deleted file mode 100644 index e26771c..0000000 Binary files a/src/SampleApp.UWP/Assets/Logo.scale-100.png and /dev/null differ diff --git a/src/SampleApp.UWP/Assets/SmallLogo.scale-100.png b/src/SampleApp.UWP/Assets/SmallLogo.scale-100.png deleted file mode 100644 index 1eb0d9d..0000000 Binary files a/src/SampleApp.UWP/Assets/SmallLogo.scale-100.png and /dev/null differ diff --git a/src/SampleApp.UWP/Assets/SplashScreen.scale-100.png b/src/SampleApp.UWP/Assets/SplashScreen.scale-100.png deleted file mode 100644 index c951e03..0000000 Binary files a/src/SampleApp.UWP/Assets/SplashScreen.scale-100.png and /dev/null differ diff --git a/src/SampleApp.UWP/Assets/SplashScreen.scale-200.png b/src/SampleApp.UWP/Assets/SplashScreen.scale-200.png new file mode 100644 index 0000000..023e7f1 Binary files /dev/null and b/src/SampleApp.UWP/Assets/SplashScreen.scale-200.png differ diff --git a/src/SampleApp.UWP/Assets/Square150x150Logo.scale-200.png b/src/SampleApp.UWP/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000..af49fec Binary files /dev/null and b/src/SampleApp.UWP/Assets/Square150x150Logo.scale-200.png differ diff --git a/src/SampleApp.UWP/Assets/Square44x44Logo.scale-200.png b/src/SampleApp.UWP/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000..ce342a2 Binary files /dev/null and b/src/SampleApp.UWP/Assets/Square44x44Logo.scale-200.png differ diff --git a/src/SampleApp.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/SampleApp.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000..f6c02ce Binary files /dev/null and b/src/SampleApp.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/src/SampleApp.UWP/Assets/StoreLogo.png b/src/SampleApp.UWP/Assets/StoreLogo.png new file mode 100644 index 0000000..7385b56 Binary files /dev/null and b/src/SampleApp.UWP/Assets/StoreLogo.png differ diff --git a/src/SampleApp.UWP/Assets/StoreLogo.scale-100.png b/src/SampleApp.UWP/Assets/StoreLogo.scale-100.png deleted file mode 100644 index dcb6727..0000000 Binary files a/src/SampleApp.UWP/Assets/StoreLogo.scale-100.png and /dev/null differ diff --git a/src/SampleApp.UWP/Assets/Wide310x150Logo.scale-200.png b/src/SampleApp.UWP/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000..288995b Binary files /dev/null and b/src/SampleApp.UWP/Assets/Wide310x150Logo.scale-200.png differ diff --git a/src/SampleApp.UWP/Assets/WideLogo.scale-100.png b/src/SampleApp.UWP/Assets/WideLogo.scale-100.png deleted file mode 100644 index 9dd94b6..0000000 Binary files a/src/SampleApp.UWP/Assets/WideLogo.scale-100.png and /dev/null differ diff --git a/src/SampleApp.UWP/SampleApp.UWP.csproj b/src/SampleApp.UWP/SampleApp.UWP.csproj index 40a01a1..2d02786 100644 --- a/src/SampleApp.UWP/SampleApp.UWP.csproj +++ b/src/SampleApp.UWP/SampleApp.UWP.csproj @@ -11,20 +11,18 @@ SampleApp.UWP en-US UAP - 10.0.10069.0 - 10.0.10069.0 + 10.0.10240.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_UAP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP ;2008 full ARM @@ -34,7 +32,7 @@ bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UAP + TRACE;NETFX_CORE;WINDOWS_UWP true ;2008 pdbonly @@ -47,7 +45,7 @@ true bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP ;2008 full x64 @@ -57,7 +55,7 @@ bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UAP + TRACE;NETFX_CORE;WINDOWS_UWP true ;2008 pdbonly @@ -70,7 +68,7 @@ true bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP ;2008 full x86 @@ -80,7 +78,7 @@ bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UAP + TRACE;NETFX_CORE;WINDOWS_UWP true ;2008 pdbonly @@ -90,6 +88,10 @@ true true + + + + App.xaml @@ -103,8 +105,6 @@ Designer - - @@ -112,11 +112,13 @@ NmeaSampleData.txt - - - - - + + + + + + + @@ -128,28 +130,6 @@ Designer - - - ..\packages\Microsoft.ApplicationInsights.0.14.3-build00177\lib\portable-win81+wpa81\Microsoft.ApplicationInsights.dll - True - - - ..\packages\Microsoft.ApplicationInsights.WindowsApps.0.14.3-build00177\lib\win81\Microsoft.ApplicationInsights.Extensibility.Windows.dll - True - - - ..\packages\Microsoft.ApplicationInsights.PersistenceChannel.0.14.3-build00177\lib\portable-win81+wpa81\Microsoft.ApplicationInsights.PersistenceChannel.dll - True - - - ..\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 - - {418353b9-6bf4-4fd2-a9b2-f8ad59f7d0fb} @@ -160,15 +140,6 @@ 14.0 - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - -