diff --git a/.gitignore b/.gitignore index 2288ef0da0..ec6f229ecd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,10 @@ obj/ /sitl /cov-int *.pyc +*.ncrunchproject +*.crunchsolution.cache +*.ncrunchsolution +/Plugins/AltitudeAngelWings/AltitudeAngelWings/Keys.config /ExtLibs/Mavlink/Mavlink.cs /ExtLibs/Mavlink/mavlink /LogAnalyzer/LogAnalyzer.zip @@ -29,3 +33,6 @@ obj/ /LogAnalyzer/LogAnalyzer64.zip /gstream /MissionPlanner.appx +/Plugins +/AltitudeAngelWings.sln +/appxkey.cer diff --git a/ExtLibs/LibVLC.NET/LibVLC.NET.csproj b/ExtLibs/LibVLC.NET/LibVLC.NET.csproj index 7fc7a95a62..afd2f7d4dd 100644 --- a/ExtLibs/LibVLC.NET/LibVLC.NET.csproj +++ b/ExtLibs/LibVLC.NET/LibVLC.NET.csproj @@ -28,12 +28,35 @@ TRACE true pdbonly - x86 + AnyCPU prompt false bin\x86\Release\LibVLC.NET.XML true + + true + bin\Debug\ + DEBUG;TRACE + bin\x86\Debug\LibVLC.NET.XML + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\Release\ + TRACE + bin\x86\Release\LibVLC.NET.XML + true + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + diff --git a/ExtLibs/px4uploader/px4uploader.csproj b/ExtLibs/px4uploader/px4uploader.csproj index 0fe56b3d6b..ef0900bce8 100644 --- a/ExtLibs/px4uploader/px4uploader.csproj +++ b/ExtLibs/px4uploader/px4uploader.csproj @@ -49,6 +49,23 @@ prompt 4 + + true + bin\Debug\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\Release\ + DEBUG;TRACE + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ..\..\packages\DotNetZip.1.9.2\lib\net20\Ionic.Zip.dll diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj index e9ece38ff2..eb94e3beaa 100644 --- a/MissionPlanner.csproj +++ b/MissionPlanner.csproj @@ -52,7 +52,7 @@ false - x86 + AnyCPU full false bin\Release\ @@ -120,6 +120,24 @@ false + + true + bin\Debug\ + TRACE;DEBUG + full + AnyCPU + default + prompt + MinimumRecommendedRules.ruleset + + + true + bin\Release\ + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ExtLibs\alglibnet2.dll diff --git a/MissionPlanner.sln b/MissionPlanner.sln index 7c85b924cc..aa7df689ff 100644 --- a/MissionPlanner.sln +++ b/MissionPlanner.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MissionPlanner", "MissionPlanner.csproj", "{A2E22272-95FE-47B6-B050-9AE7E2055BF5}" EndProject @@ -77,321 +77,129 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Debug|Any CPU.ActiveCfg = Debug|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Debug|Any CPU.Build.0 = Debug|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Debug|x86.ActiveCfg = Debug|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Debug|x86.Build.0 = Debug|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Release|Any CPU.ActiveCfg = Release|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Release|Any CPU.Build.0 = Release|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Release|Mixed Platforms.Build.0 = Release|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Release|x86.ActiveCfg = Release|x86 - {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Release|x86.Build.0 = Release|x86 + {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2E22272-95FE-47B6-B050-9AE7E2055BF5}.Release|Any CPU.Build.0 = Release|Any CPU {E64A1A41-A5B0-458E-8284-BB63705354DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E64A1A41-A5B0-458E-8284-BB63705354DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E64A1A41-A5B0-458E-8284-BB63705354DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E64A1A41-A5B0-458E-8284-BB63705354DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E64A1A41-A5B0-458E-8284-BB63705354DA}.Debug|x86.ActiveCfg = Debug|Any CPU {E64A1A41-A5B0-458E-8284-BB63705354DA}.Release|Any CPU.ActiveCfg = Release|Any CPU {E64A1A41-A5B0-458E-8284-BB63705354DA}.Release|Any CPU.Build.0 = Release|Any CPU - {E64A1A41-A5B0-458E-8284-BB63705354DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E64A1A41-A5B0-458E-8284-BB63705354DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E64A1A41-A5B0-458E-8284-BB63705354DA}.Release|x86.ActiveCfg = Release|Any CPU {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Debug|x86.ActiveCfg = Debug|Any CPU {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Release|Any CPU.ActiveCfg = Release|Any CPU {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Release|Any CPU.Build.0 = Release|Any CPU - {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {76374F95-C343-4ACC-B86F-7ECFDD668F46}.Release|x86.ActiveCfg = Release|Any CPU {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Debug|x86.ActiveCfg = Debug|Any CPU {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Release|Any CPU.ActiveCfg = Release|Any CPU {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Release|Any CPU.Build.0 = Release|Any CPU - {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A01404DF-CB52-4CCC-AD17-0F815D533D98}.Release|x86.ActiveCfg = Release|Any CPU {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Debug|x86.ActiveCfg = Debug|Any CPU {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Release|Any CPU.Build.0 = Release|Any CPU - {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6A6F4345-0A45-413E-B6D6-FD73660DAD4C}.Release|x86.ActiveCfg = Release|Any CPU {94C380C1-566A-4D86-855B-2E987851BF0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94C380C1-566A-4D86-855B-2E987851BF0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94C380C1-566A-4D86-855B-2E987851BF0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {94C380C1-566A-4D86-855B-2E987851BF0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {94C380C1-566A-4D86-855B-2E987851BF0A}.Debug|x86.ActiveCfg = Debug|Any CPU {94C380C1-566A-4D86-855B-2E987851BF0A}.Release|Any CPU.ActiveCfg = Release|Any CPU {94C380C1-566A-4D86-855B-2E987851BF0A}.Release|Any CPU.Build.0 = Release|Any CPU - {94C380C1-566A-4D86-855B-2E987851BF0A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {94C380C1-566A-4D86-855B-2E987851BF0A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {94C380C1-566A-4D86-855B-2E987851BF0A}.Release|x86.ActiveCfg = Release|Any CPU {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Debug|x86.ActiveCfg = Debug|Any CPU {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Release|Any CPU.Build.0 = Release|Any CPU - {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {28D0BEF6-D69C-43AB-A22C-724F116D50EA}.Release|x86.ActiveCfg = Release|Any CPU {A7AA6037-BF11-473E-94F9-717276FE080C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A7AA6037-BF11-473E-94F9-717276FE080C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7AA6037-BF11-473E-94F9-717276FE080C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A7AA6037-BF11-473E-94F9-717276FE080C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A7AA6037-BF11-473E-94F9-717276FE080C}.Debug|x86.ActiveCfg = Debug|Any CPU {A7AA6037-BF11-473E-94F9-717276FE080C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7AA6037-BF11-473E-94F9-717276FE080C}.Release|Any CPU.Build.0 = Release|Any CPU - {A7AA6037-BF11-473E-94F9-717276FE080C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A7AA6037-BF11-473E-94F9-717276FE080C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A7AA6037-BF11-473E-94F9-717276FE080C}.Release|x86.ActiveCfg = Release|Any CPU {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Debug|x86.ActiveCfg = Debug|Any CPU {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Release|Any CPU.ActiveCfg = Release|Any CPU {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Release|Any CPU.Build.0 = Release|Any CPU - {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}.Release|x86.ActiveCfg = Release|Any CPU {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Debug|x86.ActiveCfg = Debug|Any CPU {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Release|Any CPU.Build.0 = Release|Any CPU - {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {59129078-7B12-4198-B93E-0AA08D0BB7ED}.Release|x86.ActiveCfg = Release|Any CPU {29976BA4-A04D-4A80-A866-098C879C2FDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {29976BA4-A04D-4A80-A866-098C879C2FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29976BA4-A04D-4A80-A866-098C879C2FDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {29976BA4-A04D-4A80-A866-098C879C2FDE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {29976BA4-A04D-4A80-A866-098C879C2FDE}.Debug|x86.ActiveCfg = Debug|Any CPU {29976BA4-A04D-4A80-A866-098C879C2FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU {29976BA4-A04D-4A80-A866-098C879C2FDE}.Release|Any CPU.Build.0 = Release|Any CPU - {29976BA4-A04D-4A80-A866-098C879C2FDE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {29976BA4-A04D-4A80-A866-098C879C2FDE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {29976BA4-A04D-4A80-A866-098C879C2FDE}.Release|x86.ActiveCfg = Release|Any CPU {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Debug|x86.ActiveCfg = Debug|Any CPU {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Release|Any CPU.ActiveCfg = Release|Any CPU {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Release|Any CPU.Build.0 = Release|Any CPU - {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}.Release|x86.ActiveCfg = Release|Any CPU {2541686B-1673-43BF-AF89-3163945DB009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2541686B-1673-43BF-AF89-3163945DB009}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2541686B-1673-43BF-AF89-3163945DB009}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2541686B-1673-43BF-AF89-3163945DB009}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2541686B-1673-43BF-AF89-3163945DB009}.Debug|x86.ActiveCfg = Debug|Any CPU {2541686B-1673-43BF-AF89-3163945DB009}.Release|Any CPU.ActiveCfg = Release|Any CPU {2541686B-1673-43BF-AF89-3163945DB009}.Release|Any CPU.Build.0 = Release|Any CPU - {2541686B-1673-43BF-AF89-3163945DB009}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2541686B-1673-43BF-AF89-3163945DB009}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2541686B-1673-43BF-AF89-3163945DB009}.Release|x86.ActiveCfg = Release|Any CPU {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Debug|x86.ActiveCfg = Debug|Any CPU {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Release|Any CPU.Build.0 = Release|Any CPU - {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9CA367B8-0B98-49D1-84FB-735E612E3BA9}.Release|x86.ActiveCfg = Release|Any CPU {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Debug|x86.ActiveCfg = Debug|Any CPU {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Release|Any CPU.ActiveCfg = Release|Any CPU {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Release|Any CPU.Build.0 = Release|Any CPU - {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}.Release|x86.ActiveCfg = Release|Any CPU {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Debug|x86.ActiveCfg = Debug|Any CPU {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Release|Any CPU.ActiveCfg = Release|Any CPU {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Release|Any CPU.Build.0 = Release|Any CPU - {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}.Release|x86.ActiveCfg = Release|Any CPU {C8B88795-6D01-494D-83AD-6944BD4C5023}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C8B88795-6D01-494D-83AD-6944BD4C5023}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8B88795-6D01-494D-83AD-6944BD4C5023}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C8B88795-6D01-494D-83AD-6944BD4C5023}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C8B88795-6D01-494D-83AD-6944BD4C5023}.Debug|x86.ActiveCfg = Debug|Any CPU {C8B88795-6D01-494D-83AD-6944BD4C5023}.Release|Any CPU.ActiveCfg = Release|Any CPU {C8B88795-6D01-494D-83AD-6944BD4C5023}.Release|Any CPU.Build.0 = Release|Any CPU - {C8B88795-6D01-494D-83AD-6944BD4C5023}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C8B88795-6D01-494D-83AD-6944BD4C5023}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C8B88795-6D01-494D-83AD-6944BD4C5023}.Release|x86.ActiveCfg = Release|Any CPU {825E7A10-390C-4A2B-B3A8-491D14966912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {825E7A10-390C-4A2B-B3A8-491D14966912}.Debug|Any CPU.Build.0 = Debug|Any CPU - {825E7A10-390C-4A2B-B3A8-491D14966912}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {825E7A10-390C-4A2B-B3A8-491D14966912}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {825E7A10-390C-4A2B-B3A8-491D14966912}.Debug|x86.ActiveCfg = Debug|Any CPU {825E7A10-390C-4A2B-B3A8-491D14966912}.Release|Any CPU.ActiveCfg = Release|Any CPU {825E7A10-390C-4A2B-B3A8-491D14966912}.Release|Any CPU.Build.0 = Release|Any CPU - {825E7A10-390C-4A2B-B3A8-491D14966912}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {825E7A10-390C-4A2B-B3A8-491D14966912}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {825E7A10-390C-4A2B-B3A8-491D14966912}.Release|x86.ActiveCfg = Release|Any CPU {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Debug|x86.ActiveCfg = Debug|Any CPU {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Release|Any CPU.ActiveCfg = Release|Any CPU {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Release|Any CPU.Build.0 = Release|Any CPU - {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}.Release|x86.ActiveCfg = Release|Any CPU {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Debug|x86.ActiveCfg = Debug|Any CPU {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Release|Any CPU.ActiveCfg = Release|Any CPU {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Release|Any CPU.Build.0 = Release|Any CPU - {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}.Release|x86.ActiveCfg = Release|Any CPU {20296734-5F3C-4593-A0D5-DD20B440B13A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {20296734-5F3C-4593-A0D5-DD20B440B13A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20296734-5F3C-4593-A0D5-DD20B440B13A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {20296734-5F3C-4593-A0D5-DD20B440B13A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {20296734-5F3C-4593-A0D5-DD20B440B13A}.Debug|x86.ActiveCfg = Debug|Any CPU {20296734-5F3C-4593-A0D5-DD20B440B13A}.Release|Any CPU.ActiveCfg = Release|Any CPU {20296734-5F3C-4593-A0D5-DD20B440B13A}.Release|Any CPU.Build.0 = Release|Any CPU - {20296734-5F3C-4593-A0D5-DD20B440B13A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {20296734-5F3C-4593-A0D5-DD20B440B13A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {20296734-5F3C-4593-A0D5-DD20B440B13A}.Release|x86.ActiveCfg = Release|Any CPU - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Debug|Any CPU.ActiveCfg = Debug|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Debug|Any CPU.Build.0 = Debug|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Debug|x86.ActiveCfg = Debug|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Debug|x86.Build.0 = Debug|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Release|Any CPU.ActiveCfg = Release|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Release|Any CPU.Build.0 = Release|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Release|Mixed Platforms.Build.0 = Release|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Release|x86.ActiveCfg = Release|x86 - {664FC484-2A94-4B0D-808F-A71F88E06B11}.Release|x86.Build.0 = Release|x86 + {664FC484-2A94-4B0D-808F-A71F88E06B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {664FC484-2A94-4B0D-808F-A71F88E06B11}.Debug|Any CPU.Build.0 = Debug|Any CPU + {664FC484-2A94-4B0D-808F-A71F88E06B11}.Release|Any CPU.ActiveCfg = Release|Any CPU + {664FC484-2A94-4B0D-808F-A71F88E06B11}.Release|Any CPU.Build.0 = Release|Any CPU {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Debug|x86.ActiveCfg = Debug|Any CPU {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Release|Any CPU.ActiveCfg = Release|Any CPU {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Release|Any CPU.Build.0 = Release|Any CPU - {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Release|x86.ActiveCfg = Release|Any CPU {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Debug|x86.ActiveCfg = Debug|Any CPU {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Release|Any CPU.ActiveCfg = Release|Any CPU {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Release|Any CPU.Build.0 = Release|Any CPU - {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Release|x86.ActiveCfg = Release|Any CPU {ABA78B2E-77C3-4377-8568-9542AC227971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ABA78B2E-77C3-4377-8568-9542AC227971}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABA78B2E-77C3-4377-8568-9542AC227971}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {ABA78B2E-77C3-4377-8568-9542AC227971}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {ABA78B2E-77C3-4377-8568-9542AC227971}.Debug|x86.ActiveCfg = Debug|Any CPU {ABA78B2E-77C3-4377-8568-9542AC227971}.Release|Any CPU.ActiveCfg = Release|Any CPU {ABA78B2E-77C3-4377-8568-9542AC227971}.Release|Any CPU.Build.0 = Release|Any CPU - {ABA78B2E-77C3-4377-8568-9542AC227971}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {ABA78B2E-77C3-4377-8568-9542AC227971}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {ABA78B2E-77C3-4377-8568-9542AC227971}.Release|x86.ActiveCfg = Release|Any CPU {B5211B56-CA30-4B2A-843B-832849F18CEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5211B56-CA30-4B2A-843B-832849F18CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5211B56-CA30-4B2A-843B-832849F18CEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B5211B56-CA30-4B2A-843B-832849F18CEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B5211B56-CA30-4B2A-843B-832849F18CEA}.Debug|x86.ActiveCfg = Debug|Any CPU {B5211B56-CA30-4B2A-843B-832849F18CEA}.Release|Any CPU.ActiveCfg = Release|Any CPU {B5211B56-CA30-4B2A-843B-832849F18CEA}.Release|Any CPU.Build.0 = Release|Any CPU - {B5211B56-CA30-4B2A-843B-832849F18CEA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B5211B56-CA30-4B2A-843B-832849F18CEA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B5211B56-CA30-4B2A-843B-832849F18CEA}.Release|x86.ActiveCfg = Release|Any CPU - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Debug|Any CPU.ActiveCfg = Debug|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Debug|x86.ActiveCfg = Debug|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Debug|x86.Build.0 = Debug|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Release|Any CPU.ActiveCfg = Release|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Release|Mixed Platforms.Build.0 = Release|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Release|x86.ActiveCfg = Release|x86 - {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Release|x86.Build.0 = Release|x86 + {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB06DFF7-4F41-4B9D-A3C3-3B6D2B8702B6}.Release|Any CPU.Build.0 = Release|Any CPU {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Debug|x86.ActiveCfg = Debug|Any CPU {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Release|Any CPU.ActiveCfg = Release|Any CPU {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Release|Any CPU.Build.0 = Release|Any CPU - {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B8943726-04B0-4477-BFDA-E156A0CD98A4}.Release|x86.ActiveCfg = Release|Any CPU {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Debug|x86.ActiveCfg = Debug|Any CPU - {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Debug|x86.Build.0 = Debug|Any CPU {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Release|Any CPU.ActiveCfg = Release|Any CPU {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Release|Any CPU.Build.0 = Release|Any CPU - {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Release|x86.ActiveCfg = Release|Any CPU - {CCE510F7-1DA6-40F2-8921-B86ED41BB85E}.Release|x86.Build.0 = Release|Any CPU {65473257-E70F-410B-9269-D0C0F771EA87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65473257-E70F-410B-9269-D0C0F771EA87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65473257-E70F-410B-9269-D0C0F771EA87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {65473257-E70F-410B-9269-D0C0F771EA87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {65473257-E70F-410B-9269-D0C0F771EA87}.Debug|x86.ActiveCfg = Debug|Any CPU - {65473257-E70F-410B-9269-D0C0F771EA87}.Debug|x86.Build.0 = Debug|Any CPU {65473257-E70F-410B-9269-D0C0F771EA87}.Release|Any CPU.ActiveCfg = Release|Any CPU {65473257-E70F-410B-9269-D0C0F771EA87}.Release|Any CPU.Build.0 = Release|Any CPU - {65473257-E70F-410B-9269-D0C0F771EA87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {65473257-E70F-410B-9269-D0C0F771EA87}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {65473257-E70F-410B-9269-D0C0F771EA87}.Release|x86.ActiveCfg = Release|Any CPU - {65473257-E70F-410B-9269-D0C0F771EA87}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appxmanifest.xml b/appxmanifest.xml index a2c999ba8e..764609292b 100644 --- a/appxmanifest.xml +++ b/appxmanifest.xml @@ -1,6 +1,8 @@ - + Mission Planner Michael Oborne @@ -14,8 +16,8 @@ - - + diff --git a/build.bat b/build.bat index f11d3fd589..df881c6046 100644 --- a/build.bat +++ b/build.bat @@ -1,11 +1,13 @@ - - -"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" MissionPlanner.sln /m /p:Configuration=Release /p:Mavlink10=true - -del bin\release\MissionPlannerBeta.zip - -"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\makeappx" pack /d bin\Release /p MissionPlanner.appx - -"C:\Program Files (x86)\Windows Kits\8.1\bin\x86\signtool" sign /a /v /fd SHA256 /t http://timestamp.verisign.com/scripts/timestamp.dll /n "Michael Oborne" MissionPlanner.appx - + + +rem "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" MissionPlanner.sln /m /p:Configuration=Release /p:TargetFrameworkVersion=v4.6 + +"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" MissionPlanner.sln /m /p:Configuration=Release + +del bin\release\MissionPlannerBeta.zip + +"C:\Program Files (x86)\Windows Kits\10\bin\x86\makeappx" pack /d bin\Release /p MissionPlanner.appx + +"C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool" sign /a /v /fd SHA256 /t http://timestamp.verisign.com/scripts/timestamp.dll /n "3B1842DF-8664-4A02-B840-61F61DA8A94E" MissionPlanner.appx + pause \ No newline at end of file