diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj index 95bdbee80..a0e05998e 100644 --- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj +++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj @@ -104,6 +104,77 @@ false 4 + + true + bin\Debug64\ + DEBUG;SQLITE_DEBUG TRUE WIN32 _MSC_VER NO_TCL SQLITE_ASCII SQLITE_DISABLE_LFS SQLITE_HAS_CODEC SQLITE_MEM_POOL SQLITE_MUTEX_W32 SQLITE_THREADSAFE SQLITE_OMIT_AUTHORIZATION SQLITE_OMIT_DEPRECATED SQLITE_OMIT_GET_TABLE SQLITE_OMIT_INCRBLOB SQLITE_OMIT_LOOKASIDE SQLITE_OMIT_SHARED_CACHE SQLITE_OMIT_UTF16 SQLITE_OMIT_WAL SQLITE_OS_WIN SQLITE_SYSTEM_MALLOC VDBE_PROFILE_OFF + full + x86 + prompt + AllRules.ruleset + false + false + false + + + true + bin\x86\Debug64\ + DEBUG;SQLITE_DEBUG TRUE WIN32 _MSC_VER NO_TCL SQLITE_ASCII SQLITE_DISABLE_LFS SQLITE_HAS_CODEC SQLITE_MEM_POOL SQLITE_MUTEX_W32 SQLITE_THREADSAFE SQLITE_OMIT_AUTHORIZATION SQLITE_OMIT_DEPRECATED SQLITE_OMIT_GET_TABLE SQLITE_OMIT_INCRBLOB SQLITE_OMIT_LOOKASIDE SQLITE_OMIT_SHARED_CACHE SQLITE_OMIT_UTF16 SQLITE_OMIT_WAL SQLITE_OS_WIN SQLITE_SYSTEM_MALLOC VDBE_PROFILE_OFF + full + x86 + prompt + AllRules.ruleset + false + false + false + + + true + bin\x64\Debug\ + DEBUG;SQLITE_DEBUG TRUE WIN32 _MSC_VER NO_TCL SQLITE_ASCII SQLITE_DISABLE_LFS SQLITE_HAS_CODEC SQLITE_MEM_POOL SQLITE_MUTEX_W32 SQLITE_THREADSAFE SQLITE_OMIT_AUTHORIZATION SQLITE_OMIT_DEPRECATED SQLITE_OMIT_GET_TABLE SQLITE_OMIT_INCRBLOB SQLITE_OMIT_LOOKASIDE SQLITE_OMIT_SHARED_CACHE SQLITE_OMIT_UTF16 SQLITE_OMIT_WAL SQLITE_OS_WIN SQLITE_SYSTEM_MALLOC VDBE_PROFILE_OFF + full + x64 + prompt + AllRules.ruleset + false + false + + + bin\x64\Release\ + TRUE WIN32 _MSC_VER NDEBUG NO_TCL SQLITE_ASCII SQLITE_DISABLE_LFS SQLITE_ENABLE_OVERSIZE_CELL_CHECK SQLITE_MUTEX_OMIT SQLITE_OMIT_AUTHORIZATION SQLITE_OMIT_DEPRECATED SQLITE_OMIT_GET_TABLE SQLITE_OMIT_INCRBLOB SQLITE_OMIT_LOOKASIDE SQLITE_OMIT_SHARED_CACHE SQLITE_OMIT_UTF16 SQLITE_OMIT_WAL SQLITE_OS_WIN SQLITE_SYSTEM_MALLOC VDBE_PROFILE_OFF + true + x64 + prompt + AllRules.ruleset + false + false + + + bin\x64\Release64\ + TRUE WIN32 _MSC_VER NDEBUG NO_TCL SQLITE_ASCII SQLITE_DISABLE_LFS SQLITE_ENABLE_OVERSIZE_CELL_CHECK SQLITE_MUTEX_OMIT SQLITE_OMIT_AUTHORIZATION SQLITE_OMIT_DEPRECATED SQLITE_OMIT_GET_TABLE SQLITE_OMIT_INCRBLOB SQLITE_OMIT_LOOKASIDE SQLITE_OMIT_SHARED_CACHE SQLITE_OMIT_UTF16 SQLITE_OMIT_WAL SQLITE_OS_WIN SQLITE_SYSTEM_MALLOC VDBE_PROFILE_OFF + true + x64 + bin\Release\Community.CsharpSqlite.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + AllRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + true + bin\x64\Debug64\ + DEBUG;SQLITE_DEBUG TRUE WIN32 _MSC_VER NO_TCL SQLITE_ASCII SQLITE_DISABLE_LFS SQLITE_HAS_CODEC SQLITE_MEM_POOL SQLITE_MUTEX_W32 SQLITE_THREADSAFE SQLITE_OMIT_AUTHORIZATION SQLITE_OMIT_DEPRECATED SQLITE_OMIT_GET_TABLE SQLITE_OMIT_INCRBLOB SQLITE_OMIT_LOOKASIDE SQLITE_OMIT_SHARED_CACHE SQLITE_OMIT_UTF16 SQLITE_OMIT_WAL SQLITE_OS_WIN SQLITE_SYSTEM_MALLOC VDBE_PROFILE_OFF + full + x64 + prompt + AllRules.ruleset + false + false + diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj index 0a784fc4b..b20a2a243 100644 --- a/Launcher/Launcher.csproj +++ b/Launcher/Launcher.csproj @@ -56,6 +56,68 @@ false false + + true + bin\Debug64\ + DEBUG;TRACE + true + full + x86 + prompt + false + false + false + + + true + bin\x64\Debug\ + DEBUG;TRACE + true + full + x64 + prompt + false + false + + + bin\x64\Release\ + TRACE + true + true + pdbonly + x64 + prompt + false + false + + + bin\x64\Release64\ + TRACE + true + true + pdbonly + x64 + bin\Release\Launcher.exe.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + true + bin\x64\Debug64\ + DEBUG;TRACE + true + full + x64 + prompt + false + false + diff --git a/Localizations/Localizations.csproj b/Localizations/Localizations.csproj deleted file mode 100644 index 1067df7ee..000000000 --- a/Localizations/Localizations.csproj +++ /dev/null @@ -1,91 +0,0 @@ - - - - Release - AnyCPU - 8.0.50727 - 2.0 - {CA96058C-1A37-465D-A357-D6D695B13D25} - Library - Properties - MatterHackers.Localizations - MatterHackers.Localizations - False - False - False - Auto - 4194304 - AnyCPU - 4096 - false - - - 2.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - True - full - False - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - x86 - - - none - True - bin\Release\ - TRACE - prompt - 4 - True - x86 - - - bin\Release64\ - TRACE - true - true - 4096 - x64 - bin\Release\MatterHackers.Localizations.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - - - - - - - - - - - {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} - Agg - - - \ No newline at end of file diff --git a/Localizations/TranslationMap.cs b/Localizations/TranslationMap.cs deleted file mode 100644 index 759604ede..000000000 --- a/Localizations/TranslationMap.cs +++ /dev/null @@ -1,187 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Globalization; -using System.Threading; -using System.IO; - -using MatterHackers.Agg; - -namespace MatterHackers.Localizations -{ - public class TranslationMap - { - const string engishTag = "English:"; - const string translatedTag = "Translated:"; - - Dictionary translationDictionary = new Dictionary(); - Dictionary masterDictionary = new Dictionary(); - - string pathToTranslationFile; - string pathToMasterFile; - - string twoLetterIsoLanguageName; - public string TwoLetterIsoLanguageName - { - get { return twoLetterIsoLanguageName; } - } - - public TranslationMap(string pathToTranslationsFolder, string twoLetterIsoLanguageName = "") - { - if (twoLetterIsoLanguageName == "") - { - twoLetterIsoLanguageName = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName; - } - - LoadTranslation(pathToTranslationsFolder, twoLetterIsoLanguageName); - } - - void ReadIntoDictonary(Dictionary dictionary, string pathAndFilename) - { - string[] lines = File.ReadAllLines(pathAndFilename); - bool lookingForEnglish = true; - string englishString = ""; - for (int i = 0; i < lines.Length; i++) - { - string line = lines[i].Trim(); - if (line.Length == 0) - { - // we are happy to skip blank lines - continue; - } - - if (lookingForEnglish) - { - if (line.Length < engishTag.Length || !line.StartsWith(engishTag)) - { - throw new Exception("Found unknown string at line {0}. Looking for {1}.".FormatWith(i, engishTag)); - } - else - { - englishString = lines[i].Substring(engishTag.Length); - lookingForEnglish = false; - } - } - else - { - if (line.Length < translatedTag.Length || !line.StartsWith(translatedTag)) - { - throw new Exception("Found unknown string at line {0}. Looking for {1}.".FormatWith(i, translatedTag)); - } - else - { - string translatedString = lines[i].Substring(translatedTag.Length); - // store the string - dictionary.Add(DecodeWhileReading(englishString), DecodeWhileReading(translatedString)); - // go back to looking for english - lookingForEnglish = true; - } - } - } - } - - public void LoadTranslation(string pathToTranslationsFolder, string twoLetterIsoLanguageName) - { - this.twoLetterIsoLanguageName = twoLetterIsoLanguageName.ToLower(); - - this.pathToMasterFile = Path.Combine(pathToTranslationsFolder, "Master.txt"); - ReadIntoDictonary(masterDictionary, pathToMasterFile); - - this.pathToTranslationFile = Path.Combine(pathToTranslationsFolder, TwoLetterIsoLanguageName, "Translation.txt"); - if (File.Exists(pathToTranslationFile)) - { - ReadIntoDictonary(translationDictionary, pathToTranslationFile); - } - - foreach (KeyValuePair keyValue in translationDictionary) - { - if (!masterDictionary.ContainsKey(keyValue.Key)) - { - AddNewString(masterDictionary, pathToMasterFile, keyValue.Key); - } - } - - if (TwoLetterIsoLanguageName != "en") - { - foreach (KeyValuePair keyValue in masterDictionary) - { - if (!translationDictionary.ContainsKey(keyValue.Key)) - { - AddNewString(translationDictionary, pathToTranslationFile, keyValue.Key); - } - } - } - } - - string EncodeForSaving(string stringToEncode) - { - // replace the cariage returns with '\n's - return stringToEncode.Replace("\n", "\\n"); - } - - string DecodeWhileReading(string stringToDecode) - { - return stringToDecode.Replace("\\n", "\n"); - } - - void AddNewString(Dictionary dictionary, string pathAndFilename, string englishString) - { - // We only ship release and this could cause a write to the ProgramFiles directory which is not allowed. - // So we only write translation text while in debug (another solution in the future could be implemented). LBB -#if DEBUG - // TODO: make sure we don't throw an assertion when running from the ProgramFiles directory. - // Don't do saving when we are. - if (!dictionary.ContainsKey(englishString)) - { - dictionary.Add(englishString, englishString); - - using (TimedLock.Lock(this, "TranslationMap")) - { - string pathName = Path.GetDirectoryName(pathAndFilename); - if (!Directory.Exists(pathName)) - { - Directory.CreateDirectory(pathName); - } - if (!File.Exists(pathAndFilename)) - { - using (StreamWriter masterFileStream = File.CreateText(pathAndFilename)) - { - } - } - - using (StreamWriter masterFileStream = File.AppendText(pathAndFilename)) - { - - masterFileStream.WriteLine("{0}{1}".FormatWith(engishTag, EncodeForSaving(englishString))); - masterFileStream.WriteLine("{0}{1}".FormatWith(translatedTag, EncodeForSaving(englishString))); - masterFileStream.WriteLine(""); - } - } - } -#endif - } - - public string Translate(string englishString) - { - string tranlatedString; - if (!translationDictionary.TryGetValue(englishString, out tranlatedString)) - { - if (TwoLetterIsoLanguageName != "en") - { - AddNewString(translationDictionary, pathToTranslationFile, englishString); - } - AddNewString(masterDictionary, pathToMasterFile, englishString); - return englishString; - } - - return tranlatedString; - } - - public static void AssertDebugNotDefined() - { -#if DEBUG - throw new Exception("DEBUG is defined and should not be!"); -#endif - } - } -} diff --git a/MatterControl.csproj b/MatterControl.csproj index f741608dc..32958dac1 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -394,7 +394,7 @@ {670BDDFF-927B-425D-9DD1-22ACB14356EB} PlatformWin32 - + {CA96058C-1A37-465D-A357-D6D695B13D25} Localizations diff --git a/MatterControl.sln b/MatterControl.sln index 05e44e99b..4d4853d34 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -64,7 +64,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InfInstaller", "PrinterDriv EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeshViewer", "..\agg-sharp\examples\MeshViewer\MeshViewer.csproj", "{A737BC76-165B-46C6-82B7-8871C7C92942}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Localizations", "Localizations\Localizations.csproj", "{CA96058C-1A37-465D-A357-D6D695B13D25}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Localizations", "..\agg-sharp\Localizations\Localizations.csproj", "{CA96058C-1A37-465D-A357-D6D695B13D25}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessing", "..\agg-sharp\ImageProcessing\ImageProcessing.csproj", "{036BCCBA-52D8-457C-84AE-8821F209FE4A}" EndProject @@ -105,6 +105,9 @@ Global Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Debug64|Any CPU = Debug64|Any CPU + Debug64|x64 = Debug64|x64 + Debug64|x86 = Debug64|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 @@ -117,6 +120,10 @@ Global {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|Any CPU.Build.0 = Debug|Any CPU {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|x64.ActiveCfg = Debug|Any CPU {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug|x86.ActiveCfg = Debug|Any CPU + {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug64|Any CPU.Build.0 = Debug64|x64 + {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {0B8D6F56-BD7F-4426-B858-D9292B084656}.Debug64|x86.ActiveCfg = Debug64|Any CPU {0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|Any CPU.Build.0 = Release|Any CPU {0B8D6F56-BD7F-4426-B858-D9292B084656}.Release|x64.ActiveCfg = Release|Any CPU @@ -130,6 +137,10 @@ Global {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|x64.ActiveCfg = Debug|Any CPU {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug|x86.ActiveCfg = Debug|Any CPU + {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|Any CPU.Build.0 = Debug64|x64 + {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Debug64|x86.ActiveCfg = Debug64|Any CPU {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Release|Any CPU.ActiveCfg = Release|Any CPU {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Release|Any CPU.Build.0 = Release|Any CPU {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}.Release|x64.ActiveCfg = Release|Any CPU @@ -143,6 +154,10 @@ Global {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug|x64.ActiveCfg = Debug|Any CPU {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug|x86.ActiveCfg = Debug|Any CPU + {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|Any CPU.Build.0 = Debug64|x64 + {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Debug64|x86.ActiveCfg = Debug64|Any CPU {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Release|Any CPU.ActiveCfg = Release|Any CPU {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Release|Any CPU.Build.0 = Release|Any CPU {670BDDFF-927B-425D-9DD1-22ACB14356EB}.Release|x64.ActiveCfg = Release|Any CPU @@ -156,6 +171,11 @@ Global {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug|x64.ActiveCfg = Debug|Any CPU {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug|x86.ActiveCfg = Debug|Any CPU + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|Any CPU.Build.0 = Debug64|x64 + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|x64.ActiveCfg = Debug64|x64 + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|x64.Build.0 = Debug64|x64 + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Debug64|x86.ActiveCfg = Debug64|x64 {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Release|Any CPU.Build.0 = Release|Any CPU {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}.Release|x64.ActiveCfg = Release|Any CPU @@ -169,6 +189,10 @@ Global {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug|Any CPU.Build.0 = Debug|Any CPU {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug|x64.ActiveCfg = Debug|Any CPU {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug|x86.ActiveCfg = Debug|Any CPU + {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|Any CPU.Build.0 = Debug64|x64 + {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Debug64|x86.ActiveCfg = Debug64|Any CPU {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Release|Any CPU.ActiveCfg = Release|Any CPU {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Release|Any CPU.Build.0 = Release|Any CPU {545B6912-77FF-4B34-BA76-6C3D6A32BE6A}.Release|x64.ActiveCfg = Release|Any CPU @@ -182,6 +206,11 @@ Global {74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|Any CPU.Build.0 = Debug|Any CPU {74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|x64.ActiveCfg = Debug|Any CPU {74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|x86.ActiveCfg = Debug|Any CPU + {74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|Any CPU.Build.0 = Debug64|x64 + {74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|x64.ActiveCfg = Debug64|x64 + {74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|x64.Build.0 = Debug64|x64 + {74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|x86.ActiveCfg = Debug64|x64 {74F6BB6C-9D02-4512-A59A-21940E35C532}.Release|Any CPU.ActiveCfg = Release|Any CPU {74F6BB6C-9D02-4512-A59A-21940E35C532}.Release|Any CPU.Build.0 = Release|Any CPU {74F6BB6C-9D02-4512-A59A-21940E35C532}.Release|x64.ActiveCfg = Release|Any CPU @@ -195,6 +224,11 @@ Global {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|Any CPU.Build.0 = Debug|Any CPU {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|x64.ActiveCfg = Debug|Any CPU {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|x86.ActiveCfg = Debug|Any CPU + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|Any CPU.Build.0 = Debug64|x64 + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|x64.ActiveCfg = Debug64|x64 + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|x64.Build.0 = Debug64|x64 + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|x86.ActiveCfg = Debug64|x64 {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Release|Any CPU.ActiveCfg = Release|Any CPU {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Release|Any CPU.Build.0 = Release|Any CPU {7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Release|x64.ActiveCfg = Release|Any CPU @@ -208,6 +242,10 @@ Global {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug|x64.ActiveCfg = Debug|Any CPU {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug|x86.ActiveCfg = Debug|Any CPU + {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|Any CPU.Build.0 = Debug64|x64 + {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Debug64|x86.ActiveCfg = Debug64|Any CPU {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Release|Any CPU.ActiveCfg = Release|Any CPU {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Release|Any CPU.Build.0 = Release|Any CPU {86F6AAF2-9B50-40B8-A427-1897D76471C5}.Release|x64.ActiveCfg = Release|Any CPU @@ -222,6 +260,11 @@ Global {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug|x64.ActiveCfg = Debug|x64 {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug|x64.Build.0 = Debug|x64 {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug|x86.ActiveCfg = Debug|Any CPU + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|Any CPU.Build.0 = Debug64|x64 + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x64.ActiveCfg = Debug64|x64 + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x64.Build.0 = Debug64|x64 + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Debug64|x86.ActiveCfg = Debug64|x64 {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Any CPU.ActiveCfg = Release|Any CPU {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|Any CPU.Build.0 = Release|Any CPU {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}.Release|x64.ActiveCfg = Release|x64 @@ -235,6 +278,10 @@ Global {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|x64.ActiveCfg = Debug|Any CPU {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug|x86.ActiveCfg = Debug|Any CPU + {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|Any CPU.Build.0 = Debug64|x64 + {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Debug64|x86.ActiveCfg = Debug64|Any CPU {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|Any CPU.Build.0 = Release|Any CPU {C958F745-156E-4BDC-A24A-3721C7BE7B8A}.Release|x64.ActiveCfg = Release|Any CPU @@ -249,6 +296,12 @@ Global {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|x64.ActiveCfg = Debug|x86 {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|x86.ActiveCfg = Debug|x86 {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|x86.Build.0 = Debug|x86 + {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug64|Any CPU.Build.0 = Debug64|x64 + {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug64|x64.ActiveCfg = Debug64|x64 + {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug64|x64.Build.0 = Debug64|x64 + {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug64|x86.ActiveCfg = Debug64|x86 + {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug64|x86.Build.0 = Debug64|x86 {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Release|Any CPU.ActiveCfg = Release|Any CPU {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Release|Any CPU.Build.0 = Release|Any CPU {F1653F20-D47D-4F29-8C55-3C835542AF5F}.Release|x64.ActiveCfg = Release|x86 @@ -264,6 +317,10 @@ Global {1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug|Any CPU.Build.0 = Debug|Any CPU {1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug|x64.ActiveCfg = Debug|Any CPU {1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug|x86.ActiveCfg = Debug|Any CPU + {1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|Any CPU.Build.0 = Debug64|x64 + {1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {1E01ABE0-B494-4FE4-B0D6-540133286887}.Debug64|x86.ActiveCfg = Debug64|Any CPU {1E01ABE0-B494-4FE4-B0D6-540133286887}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E01ABE0-B494-4FE4-B0D6-540133286887}.Release|Any CPU.Build.0 = Release|Any CPU {1E01ABE0-B494-4FE4-B0D6-540133286887}.Release|x64.ActiveCfg = Release|Any CPU @@ -277,6 +334,11 @@ Global {F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|x64.ActiveCfg = Debug|Any CPU {F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|x86.ActiveCfg = Debug|Any CPU + {F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|Any CPU.Build.0 = Debug64|x64 + {F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|x64.ActiveCfg = Debug64|x64 + {F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|x64.Build.0 = Debug64|x64 + {F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|x86.ActiveCfg = Debug64|x64 {F67AE800-B0C7-42A8-836F-597B4E74591C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F67AE800-B0C7-42A8-836F-597B4E74591C}.Release|Any CPU.Build.0 = Release|Any CPU {F67AE800-B0C7-42A8-836F-597B4E74591C}.Release|x64.ActiveCfg = Release|Any CPU @@ -290,6 +352,10 @@ Global {D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug|x64.ActiveCfg = Debug|Any CPU {D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug|x86.ActiveCfg = Debug|Any CPU + {D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|Any CPU.Build.0 = Debug64|x64 + {D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {D3ABF72C-64C2-4E51-A119-E077210FA990}.Debug64|x86.ActiveCfg = Debug64|Any CPU {D3ABF72C-64C2-4E51-A119-E077210FA990}.Release|Any CPU.ActiveCfg = Release|Any CPU {D3ABF72C-64C2-4E51-A119-E077210FA990}.Release|Any CPU.Build.0 = Release|Any CPU {D3ABF72C-64C2-4E51-A119-E077210FA990}.Release|x64.ActiveCfg = Release|Any CPU @@ -303,6 +369,11 @@ Global {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug|x64.ActiveCfg = Debug|Any CPU {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug|x86.ActiveCfg = Debug|Any CPU + {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug64|Any CPU.Build.0 = Debug64|x64 + {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug64|x64.ActiveCfg = Debug64|x64 + {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug64|x64.Build.0 = Debug64|x64 + {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug64|x86.ActiveCfg = Debug64|x64 {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Release|Any CPU.ActiveCfg = Release|Any CPU {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Release|Any CPU.Build.0 = Release|Any CPU {990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Release|x64.ActiveCfg = Release|Any CPU @@ -316,6 +387,10 @@ Global {A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|Any CPU.Build.0 = Debug|Any CPU {A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|x64.ActiveCfg = Debug|Any CPU {A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|x86.ActiveCfg = Debug|Any CPU + {A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|Any CPU.Build.0 = Debug64|x64 + {A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|x86.ActiveCfg = Debug64|Any CPU {A737BC76-165B-46C6-82B7-8871C7C92942}.Release|Any CPU.ActiveCfg = Release|Any CPU {A737BC76-165B-46C6-82B7-8871C7C92942}.Release|Any CPU.Build.0 = Release|Any CPU {A737BC76-165B-46C6-82B7-8871C7C92942}.Release|x64.ActiveCfg = Release|Any CPU @@ -328,6 +403,11 @@ Global {CA96058C-1A37-465D-A357-D6D695B13D25}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA96058C-1A37-465D-A357-D6D695B13D25}.Debug|x64.ActiveCfg = Debug|Any CPU {CA96058C-1A37-465D-A357-D6D695B13D25}.Debug|x86.ActiveCfg = Debug|Any CPU + {CA96058C-1A37-465D-A357-D6D695B13D25}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {CA96058C-1A37-465D-A357-D6D695B13D25}.Debug64|Any CPU.Build.0 = Debug64|x64 + {CA96058C-1A37-465D-A357-D6D695B13D25}.Debug64|x64.ActiveCfg = Debug64|x64 + {CA96058C-1A37-465D-A357-D6D695B13D25}.Debug64|x64.Build.0 = Debug64|x64 + {CA96058C-1A37-465D-A357-D6D695B13D25}.Debug64|x86.ActiveCfg = Debug64|x64 {CA96058C-1A37-465D-A357-D6D695B13D25}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA96058C-1A37-465D-A357-D6D695B13D25}.Release|Any CPU.Build.0 = Release|Any CPU {CA96058C-1A37-465D-A357-D6D695B13D25}.Release|x64.ActiveCfg = Release|Any CPU @@ -341,6 +421,11 @@ Global {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|x64.ActiveCfg = Debug|Any CPU {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|x86.ActiveCfg = Debug|Any CPU + {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|Any CPU.Build.0 = Debug64|x64 + {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|x64.ActiveCfg = Debug64|x64 + {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|x64.Build.0 = Debug64|x64 + {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|x86.ActiveCfg = Debug64|x64 {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Release|Any CPU.Build.0 = Release|Any CPU {036BCCBA-52D8-457C-84AE-8821F209FE4A}.Release|x64.ActiveCfg = Release|Any CPU @@ -354,6 +439,11 @@ Global {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x64.ActiveCfg = Debug|Any CPU {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x86.ActiveCfg = Debug|Any CPU + {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|Any CPU.Build.0 = Debug64|x64 + {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|x64.ActiveCfg = Debug64|x64 + {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|x64.Build.0 = Debug64|x64 + {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|x86.ActiveCfg = Debug64|x64 {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Any CPU.ActiveCfg = Release|Any CPU {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|Any CPU.Build.0 = Release|Any CPU {9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Release|x64.ActiveCfg = Release|Any CPU @@ -367,6 +457,11 @@ Global {DF6845CD-64C6-4263-8357-DA8066855739}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF6845CD-64C6-4263-8357-DA8066855739}.Debug|x64.ActiveCfg = Debug|Any CPU {DF6845CD-64C6-4263-8357-DA8066855739}.Debug|x86.ActiveCfg = Debug|Any CPU + {DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|Any CPU.Build.0 = Debug64|x64 + {DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|x64.ActiveCfg = Debug64|x64 + {DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|x64.Build.0 = Debug64|x64 + {DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|x86.ActiveCfg = Debug64|x64 {DF6845CD-64C6-4263-8357-DA8066855739}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF6845CD-64C6-4263-8357-DA8066855739}.Release|Any CPU.Build.0 = Release|Any CPU {DF6845CD-64C6-4263-8357-DA8066855739}.Release|x64.ActiveCfg = Release|Any CPU @@ -380,6 +475,10 @@ Global {291CD87C-2C58-4369-9D85-238C7EB31542}.Debug|Any CPU.Build.0 = Debug|Any CPU {291CD87C-2C58-4369-9D85-238C7EB31542}.Debug|x64.ActiveCfg = Debug|Any CPU {291CD87C-2C58-4369-9D85-238C7EB31542}.Debug|x86.ActiveCfg = Debug|Any CPU + {291CD87C-2C58-4369-9D85-238C7EB31542}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {291CD87C-2C58-4369-9D85-238C7EB31542}.Debug64|Any CPU.Build.0 = Debug64|x64 + {291CD87C-2C58-4369-9D85-238C7EB31542}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {291CD87C-2C58-4369-9D85-238C7EB31542}.Debug64|x86.ActiveCfg = Debug64|Any CPU {291CD87C-2C58-4369-9D85-238C7EB31542}.Release|Any CPU.ActiveCfg = Release|Any CPU {291CD87C-2C58-4369-9D85-238C7EB31542}.Release|Any CPU.Build.0 = Release|Any CPU {291CD87C-2C58-4369-9D85-238C7EB31542}.Release|x64.ActiveCfg = Release|Any CPU @@ -393,6 +492,10 @@ Global {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Debug|x64.ActiveCfg = Debug|Any CPU {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Debug|x86.ActiveCfg = Debug|Any CPU + {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Debug64|Any CPU.Build.0 = Debug64|x64 + {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Debug64|x86.ActiveCfg = Debug64|Any CPU {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Release|Any CPU.ActiveCfg = Release|Any CPU {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Release|Any CPU.Build.0 = Release|Any CPU {865172A0-A1A9-49C2-9386-F2FDB4E141B7}.Release|x64.ActiveCfg = Release|Any CPU @@ -405,6 +508,11 @@ Global {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug|x64.ActiveCfg = Debug|Any CPU {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug|x86.ActiveCfg = Debug|Any CPU + {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|Any CPU.Build.0 = Debug64|x64 + {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|x64.ActiveCfg = Debug64|x64 + {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|x64.Build.0 = Debug64|x64 + {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Debug64|x86.ActiveCfg = Debug64|x64 {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Release|Any CPU.Build.0 = Release|Any CPU {A526DC5D-65F3-461B-805F-D3AC9665F5C9}.Release|x64.ActiveCfg = Release|Any CPU @@ -418,6 +526,10 @@ Global {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug|x64.ActiveCfg = Debug|Any CPU {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug|x86.ActiveCfg = Debug|Any CPU + {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug64|Any CPU.Build.0 = Debug64|x64 + {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {F49EC1DD-D645-4709-8667-B57318AF67B0}.Debug64|x86.ActiveCfg = Debug64|Any CPU {F49EC1DD-D645-4709-8667-B57318AF67B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {F49EC1DD-D645-4709-8667-B57318AF67B0}.Release|Any CPU.Build.0 = Release|Any CPU {F49EC1DD-D645-4709-8667-B57318AF67B0}.Release|x64.ActiveCfg = Release|Any CPU @@ -431,6 +543,10 @@ Global {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|Any CPU.Build.0 = Debug|Any CPU {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|x64.ActiveCfg = Debug|Any CPU {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|x86.ActiveCfg = Debug|Any CPU + {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug64|Any CPU.Build.0 = Debug64|x64 + {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug64|x86.ActiveCfg = Debug64|Any CPU {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Release|Any CPU.ActiveCfg = Release|Any CPU {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Release|Any CPU.Build.0 = Release|Any CPU {C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Release|x64.ActiveCfg = Release|Any CPU @@ -443,6 +559,11 @@ Global {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|x64.ActiveCfg = Debug|Any CPU {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|x86.ActiveCfg = Debug|Any CPU + {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug64|Any CPU.Build.0 = Debug64|x64 + {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug64|x64.ActiveCfg = Debug64|x64 + {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug64|x64.Build.0 = Debug64|x64 + {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug64|x86.ActiveCfg = Debug64|x64 {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Release|Any CPU.ActiveCfg = Release|Any CPU {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Release|Any CPU.Build.0 = Release|Any CPU {3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Release|x64.ActiveCfg = Release|Any CPU @@ -456,6 +577,10 @@ Global {239CC6B1-537C-4998-9AA9-3372A3464498}.Debug|Any CPU.Build.0 = Debug|Any CPU {239CC6B1-537C-4998-9AA9-3372A3464498}.Debug|x64.ActiveCfg = Debug|Any CPU {239CC6B1-537C-4998-9AA9-3372A3464498}.Debug|x86.ActiveCfg = Debug|Any CPU + {239CC6B1-537C-4998-9AA9-3372A3464498}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {239CC6B1-537C-4998-9AA9-3372A3464498}.Debug64|Any CPU.Build.0 = Debug64|x64 + {239CC6B1-537C-4998-9AA9-3372A3464498}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {239CC6B1-537C-4998-9AA9-3372A3464498}.Debug64|x86.ActiveCfg = Debug64|Any CPU {239CC6B1-537C-4998-9AA9-3372A3464498}.Release|Any CPU.ActiveCfg = Release|Any CPU {239CC6B1-537C-4998-9AA9-3372A3464498}.Release|Any CPU.Build.0 = Release|Any CPU {239CC6B1-537C-4998-9AA9-3372A3464498}.Release|x64.ActiveCfg = Release|Any CPU @@ -468,6 +593,10 @@ Global {BEC6FD13-C765-4B90-836B-53823AC12E20}.Debug|Any CPU.Build.0 = Debug|Any CPU {BEC6FD13-C765-4B90-836B-53823AC12E20}.Debug|x64.ActiveCfg = Debug|Any CPU {BEC6FD13-C765-4B90-836B-53823AC12E20}.Debug|x86.ActiveCfg = Debug|Any CPU + {BEC6FD13-C765-4B90-836B-53823AC12E20}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {BEC6FD13-C765-4B90-836B-53823AC12E20}.Debug64|Any CPU.Build.0 = Debug64|x64 + {BEC6FD13-C765-4B90-836B-53823AC12E20}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {BEC6FD13-C765-4B90-836B-53823AC12E20}.Debug64|x86.ActiveCfg = Debug64|Any CPU {BEC6FD13-C765-4B90-836B-53823AC12E20}.Release|Any CPU.ActiveCfg = Release|Any CPU {BEC6FD13-C765-4B90-836B-53823AC12E20}.Release|Any CPU.Build.0 = Release|Any CPU {BEC6FD13-C765-4B90-836B-53823AC12E20}.Release|x64.ActiveCfg = Release|Any CPU @@ -480,6 +609,11 @@ Global {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Debug|x64.ActiveCfg = Debug|Any CPU {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Debug|x86.ActiveCfg = Debug|Any CPU + {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Debug64|Any CPU.Build.0 = Debug64|x64 + {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Debug64|x64.ActiveCfg = Debug64|x64 + {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Debug64|x64.Build.0 = Debug64|x64 + {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Debug64|x86.ActiveCfg = Debug64|x64 {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Release|Any CPU.Build.0 = Release|Any CPU {A3680C51-A549-4D1F-AEA5-3931EA755E9A}.Release|x64.ActiveCfg = Release|Any CPU @@ -492,6 +626,10 @@ Global {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug|Any CPU.Build.0 = Debug|Any CPU {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug|x64.ActiveCfg = Debug|Any CPU {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug|x86.ActiveCfg = Debug|Any CPU + {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug64|Any CPU.Build.0 = Debug64|x64 + {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug64|x86.ActiveCfg = Debug64|Any CPU {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Release|Any CPU.ActiveCfg = Release|Any CPU {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Release|Any CPU.Build.0 = Release|Any CPU {DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Release|x64.ActiveCfg = Release|Any CPU @@ -504,6 +642,10 @@ Global {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug|x64.ActiveCfg = Debug|Any CPU {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug|x86.ActiveCfg = Debug|Any CPU + {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|Any CPU.Build.0 = Debug64|x64 + {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|x64.ActiveCfg = Debug64|Any CPU + {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Debug64|x86.ActiveCfg = Debug64|Any CPU {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Release|Any CPU.Build.0 = Release|Any CPU {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB}.Release|x64.ActiveCfg = Release|Any CPU @@ -516,6 +658,11 @@ Global {6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug|Any CPU.Build.0 = Debug|Any CPU {6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug|x64.ActiveCfg = Debug|Any CPU {6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug|x86.ActiveCfg = Debug|Any CPU + {6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug64|Any CPU.ActiveCfg = Debug64|x64 + {6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug64|Any CPU.Build.0 = Debug64|x64 + {6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug64|x64.ActiveCfg = Debug64|x64 + {6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug64|x64.Build.0 = Debug64|x64 + {6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug64|x86.ActiveCfg = Debug64|x64 {6782BF37-8139-4DC6-885E-98D22D1FB258}.Release|Any CPU.ActiveCfg = Release|Any CPU {6782BF37-8139-4DC6-885E-98D22D1FB258}.Release|Any CPU.Build.0 = Release|Any CPU {6782BF37-8139-4DC6-885E-98D22D1FB258}.Release|x64.ActiveCfg = Release|Any CPU @@ -529,6 +676,24 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {670BDDFF-927B-425D-9DD1-22ACB14356EB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {545B6912-77FF-4B34-BA76-6C3D6A32BE6A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {74F6BB6C-9D02-4512-A59A-21940E35C532} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {86F6AAF2-9B50-40B8-A427-1897D76471C5} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {C958F745-156E-4BDC-A24A-3721C7BE7B8A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {1E01ABE0-B494-4FE4-B0D6-540133286887} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {F67AE800-B0C7-42A8-836F-597B4E74591C} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {D3ABF72C-64C2-4E51-A119-E077210FA990} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {A737BC76-165B-46C6-82B7-8871C7C92942} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {036BCCBA-52D8-457C-84AE-8821F209FE4A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {DF6845CD-64C6-4263-8357-DA8066855739} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {A526DC5D-65F3-461B-805F-D3AC9665F5C9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} + {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} {291CD87C-2C58-4369-9D85-238C7EB31542} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84} {F49EC1DD-D645-4709-8667-B57318AF67B0} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84} {239CC6B1-537C-4998-9AA9-3372A3464498} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84} @@ -536,24 +701,6 @@ Global {A3680C51-A549-4D1F-AEA5-3931EA755E9A} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84} {DA4A9C04-C54A-4571-B6B0-957C7E6E868B} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84} {6782BF37-8139-4DC6-885E-98D22D1FB258} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84} - {657DBC6D-C3EA-4398-A3FA-DDB73C14F71B} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {7E61A5BD-E78F-4B80-88C9-3821B4FA062E} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {F67AE800-B0C7-42A8-836F-597B4E74591C} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {74F6BB6C-9D02-4512-A59A-21940E35C532} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {036BCCBA-52D8-457C-84AE-8821F209FE4A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {DF6845CD-64C6-4263-8357-DA8066855739} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {A737BC76-165B-46C6-82B7-8871C7C92942} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {C958F745-156E-4BDC-A24A-3721C7BE7B8A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {3E4AABA8-D85F-4922-88C6-5C1B2D2308FB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {670BDDFF-927B-425D-9DD1-22ACB14356EB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {86F6AAF2-9B50-40B8-A427-1897D76471C5} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {1E01ABE0-B494-4FE4-B0D6-540133286887} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {545B6912-77FF-4B34-BA76-6C3D6A32BE6A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {D3ABF72C-64C2-4E51-A119-E077210FA990} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} - {A526DC5D-65F3-461B-805F-D3AC9665F5C9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = MatterControl.csproj diff --git a/PluginSystem/MatterControlPluginSystem.csproj b/PluginSystem/MatterControlPluginSystem.csproj index f3804a3ff..e29abdef0 100644 --- a/PluginSystem/MatterControlPluginSystem.csproj +++ b/PluginSystem/MatterControlPluginSystem.csproj @@ -55,6 +55,67 @@ false false + + true + bin\Debug64\ + DEBUG;TRACE + true + full + x86 + prompt + false + false + + + true + bin\x64\Debug\ + DEBUG;TRACE + true + full + x64 + prompt + false + false + + + bin\x64\Release\ + TRACE + true + true + pdbonly + x64 + prompt + false + false + + + bin\x64\Release64\ + TRACE + true + true + pdbonly + x64 + bin\Release\MatterHackers.MatterControl.Pulgins.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + + + true + bin\x64\Debug64\ + DEBUG;TRACE + true + full + x64 + prompt + false + false + false + diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index 81746be8c..bc66dfdca 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -55,6 +55,66 @@ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules false + + true + bin\Debug64\ + DEBUG;TRACE + true + full + x86 + prompt + false + false + + + true + bin\x64\Debug\ + DEBUG;TRACE + true + full + x64 + prompt + false + false + + + bin\x64\Release\ + TRACE + true + true + pdbonly + x64 + prompt + false + false + + + bin\x64\Release64\ + TRACE + true + true + pdbonly + x64 + bin\Release\InfInstaller.exe.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + + + true + bin\x64\Debug64\ + DEBUG;TRACE + true + full + x64 + prompt + false + false + diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index a88e1b661..8dd5654ce 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2603,3 +2603,36 @@ Translated:Warning - Moving Too Low English:Oops! Could not find this file: Translated:Oops! Could not find this file: +English:The number of extruders this machine has. +Translated:The number of extruders this machine has. + +English:All extrusions are multiplied by this value. Increasing it above 1 (1.1 is a good max value) will increase the amount of filament being extruded; decreasing it (.9 is a good minimum value) will decrease the amount being extruded. +Translated:All extrusions are multiplied by this value. Increasing it above 1 (1.1 is a good max value) will increase the amount of filament being extruded; decreasing it (.9 is a good minimum value) will decrease the amount being extruded. + +English:This is the minimum speed that the printer will reduce to to make the layer take long enough to satisfy the minimum layer time. +Translated:This is the minimum speed that the printer will reduce to to make the layer take long enough to satisfy the minimum layer time. + +English:Minimum Print Speed +Translated:Minimum Print Speed + +English:Skirt and Raft +Translated:Skirt and Raft + +English:Length on Move +Translated:Length on Move + +English:Length on Tool Change +Translated:Length on Tool Change + +English:Minimum Extrusion\nRequiring Retraction +Translated:Minimum Extrusion\nRequiring Retraction + +English:Minimum Fan Speed +Translated:Minimum Fan Speed + +English:Extruder Count +Translated:Extruder Count + +English:Hardware +Translated:Hardware +