From 36f7a1f38138f66db4f4b155bdae6ed8f81603ac Mon Sep 17 00:00:00 2001 From: ycastonguay Date: Wed, 11 Sep 2013 01:48:34 -0400 Subject: [PATCH] WindowsStore: MPfm.Library now builds correctly. However, the WinRT implementation of DatabaseFacade is not completed yet. Related to issue #423. --- MPfm/MPfm.Core/MPfm.Core.WindowsStore.csproj | 6 +- MPfm/MPfm.Library/Database/DatabaseFacade.cs | 19 +- .../Database/WinRTSQLiteGateway.cs | 682 +++++++++--------- .../MPfm.Library.WindowsStore.csproj | 10 +- MPfm/MPfm.Library/packages.config | 2 +- .../MPfm.Player.WindowsStore.csproj | 6 +- .../MPfm.Sound/MPfm.Sound.WindowsStore.csproj | 6 +- .../MPfm.WindowsStore.csproj | 13 +- MPfm/MPfm_WindowsStore.sln | 22 +- 9 files changed, 395 insertions(+), 371 deletions(-) diff --git a/MPfm/MPfm.Core/MPfm.Core.WindowsStore.csproj b/MPfm/MPfm.Core/MPfm.Core.WindowsStore.csproj index d4072a17..589c3f20 100644 --- a/MPfm/MPfm.Core/MPfm.Core.WindowsStore.csproj +++ b/MPfm/MPfm.Core/MPfm.Core.WindowsStore.csproj @@ -35,7 +35,7 @@ true bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full ARM @@ -57,7 +57,7 @@ true bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x64 @@ -79,7 +79,7 @@ true bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x86 diff --git a/MPfm/MPfm.Library/Database/DatabaseFacade.cs b/MPfm/MPfm.Library/Database/DatabaseFacade.cs index b5cbe197..cabe46c7 100644 --- a/MPfm/MPfm.Library/Database/DatabaseFacade.cs +++ b/MPfm/MPfm.Library/Database/DatabaseFacade.cs @@ -902,8 +902,14 @@ public int GetAudioFilePlayCountFromHistory(Guid audioFileId) string query = "SELECT COUNT(*) FROM History WHERE AudioFileId = '" + audioFileId.ToString() + "'"; object value = _gateway.ExecuteScalar(query); - // Check value for null - if (value == DBNull.Value) + bool isNull = false; + #if WINDOWSSTORE + isNull = value == null; + #else + isNull = value == DBNull.Value; + #endif + + if (isNull) { // No play count return 0; @@ -940,8 +946,13 @@ public int GetAudioFilePlayCountFromHistory(Guid audioFileId) string query = "SELECT TOP 1 FROM History WHERE AudioFileId = '" + audioFileId.ToString() + "' ORDER BY EventDateTime"; object value = _gateway.ExecuteScalar(query); - // Check value for null - if (value == DBNull.Value) + bool isNull = false; +#if WINDOWSSTORE + isNull = value == null; +#else + isNull = value == DBNull.Value; +#endif + if (isNull) { // No last played value return null; diff --git a/MPfm/MPfm.Library/Database/WinRTSQLiteGateway.cs b/MPfm/MPfm.Library/Database/WinRTSQLiteGateway.cs index 7227470c..5eb1e6e7 100644 --- a/MPfm/MPfm.Library/Database/WinRTSQLiteGateway.cs +++ b/MPfm/MPfm.Library/Database/WinRTSQLiteGateway.cs @@ -154,7 +154,7 @@ public int Execute(string sql) { // Create and open connection connection = GenerateConnection(); - int rows = connection.Execute(sql, new object[]); + int rows = connection.Execute(sql, new object[0]); return rows; } catch @@ -180,7 +180,7 @@ public object ExecuteScalar(string sql) try { connection = GenerateConnection(); - object obj = connection.ExecuteScalar(sql, new object[]); + object obj = connection.ExecuteScalar(sql, new object[0]); return obj; } catch @@ -216,24 +216,24 @@ public IEnumerable SelectList(string sql) try { - connection = GenerateConnection(); + //connection = GenerateConnection(); //connection.Get() //connection.CreateCommand() - connection.Open(); - - // Create command - command = factory.CreateCommand(); - command.CommandText = sql; - command.Connection = connection; - - // Create and execute reader - reader = command.ExecuteReader(); - while (reader.Read()) - { - // Add key/value to dictionary - object field = reader.GetValue(0); - list.Add(field); - } + //connection.Open(); + + //// Create command + //command = factory.CreateCommand(); + //command.CommandText = sql; + //command.Connection = connection; + + //// Create and execute reader + //reader = command.ExecuteReader(); + //while (reader.Read()) + //{ + // // Add key/value to dictionary + // object field = reader.GetValue(0); + // list.Add(field); + //} return list; } @@ -243,22 +243,22 @@ public IEnumerable SelectList(string sql) } finally { - // Clean up reader and _connection - if (reader != null) - { - reader.Close(); - reader.Dispose(); - } + //// Clean up reader and _connection + //if (reader != null) + //{ + // reader.Close(); + // reader.Dispose(); + //} - // Dispose command - command.Dispose(); - - // Close and clean up _connection - if (connection.State == ConnectionState.Open) - { - connection.Close(); - connection.Dispose(); - } + //// Dispose command + //command.Dispose(); + + //// Close and clean up _connection + //if (connection.State == ConnectionState.Open) + //{ + // connection.Close(); + // connection.Dispose(); + //} } } @@ -270,56 +270,58 @@ public IEnumerable SelectList(string sql) public List> SelectTuple(string sql) { SQLiteConnection connection = null; - DbDataReader reader = null; // No reader for WInRT... argh! + //DbDataReader reader = null; // No reader for WInRT... argh! SQLiteCommand command = null; List> listTuple = new List>(); - try - { - // Create and open _connection - connection = GenerateConnection(); - connection.Open(); - - // Create command - command = factory.CreateCommand(); - command.CommandText = sql; - command.Connection = connection; + return listTuple; - // Create and execute reader - reader = command.ExecuteReader(); - while (reader.Read()) - { - // Add key/value to dictionary - object field1 = reader.GetValue(0); - object field2 = reader.GetValue(1); - listTuple.Add(new Tuple(field1, field2)); - } - - return listTuple; - } - catch - { - throw; - } - finally - { - // Clean up reader and _connection - if (reader != null) - { - reader.Close(); - reader.Dispose(); - } - - // Dispose command - command.Dispose(); - - // Close and clean up _connection - if (connection.State == ConnectionState.Open) - { - connection.Close(); - connection.Dispose(); - } - } + //try + //{ + // // Create and open _connection + // connection = GenerateConnection(); + // connection.Open(); + + // // Create command + // command = factory.CreateCommand(); + // command.CommandText = sql; + // command.Connection = connection; + + // // Create and execute reader + // reader = command.ExecuteReader(); + // while (reader.Read()) + // { + // // Add key/value to dictionary + // object field1 = reader.GetValue(0); + // object field2 = reader.GetValue(1); + // listTuple.Add(new Tuple(field1, field2)); + // } + + // return listTuple; + //} + //catch + //{ + // throw; + //} + //finally + //{ + // // Clean up reader and _connection + // if (reader != null) + // { + // reader.Close(); + // reader.Dispose(); + // } + + // // Dispose command + // command.Dispose(); + + // // Close and clean up _connection + // if (connection.State == ConnectionState.Open) + // { + // connection.Close(); + // connection.Dispose(); + // } + //} } /// @@ -349,106 +351,108 @@ public T SelectOne(string sql) where T : new() public List Select(string sql) where T : new() { SQLiteConnection connection = null; - DbDataReader reader = null; + //DbDataReader reader = null; SQLiteCommand command = null; List list = new List(); Dictionary dictMap = GetMap(); - try - { - // Create and open _connection - connection = GenerateConnection(); - connection.Open(); - - // Create command - command = factory.CreateCommand(); - command.CommandText = sql; - command.Connection = connection; - - // Create and execute reader - reader = command.ExecuteReader(); - while (reader.Read()) - { - // Create object and fill data - T data = new T(); - - // Cycle through columns - for (int a = 0; a < reader.FieldCount; a++) - { - // Get column info - string fieldName = reader.GetName(a); - Type fieldType = reader.GetFieldType(a); - object fieldValue = reader.GetValue(a); - - // Check for map - string propertyName = fieldName; - if(dictMap.ContainsKey(fieldName)) - { - propertyName = dictMap[fieldName]; - } - - // Get property info and fill column if valid - PropertyInfo info = typeof(T).GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty); - if (info != null) - { - // Set value to null - if (fieldValue is System.DBNull) - fieldValue = null; - - // Check if the type is an enum - if (info.PropertyType.IsEnum) - { - fieldValue = Enum.Parse(info.PropertyType, fieldValue.ToString()); - } - else if (info.PropertyType.FullName.ToUpper() == "SYSTEM.GUID") - { - // Guid aren't supported in SQLite, so they are stored as strings. - fieldValue = new Guid(fieldValue.ToString()); - } - else if (info.PropertyType.FullName != fieldType.FullName) - { - // Call a convert method in the Convert static class, if available - MethodInfo castMethod = typeof(Convert).GetMethod("To" + info.PropertyType.Name, new Type[] { fieldType }); - if (castMethod != null) - { - fieldValue = castMethod.Invoke(null, new object[] { fieldValue }); - } - } - - // Set property value - info.SetValue(data, fieldValue, null); - } - } - - // Add item to list - list.Add(data); - } - - return list; - } - //catch + return list; + + //try + //{ + // // Create and open _connection + // connection = GenerateConnection(); + // connection.Open(); + + // // Create command + // command = factory.CreateCommand(); + // command.CommandText = sql; + // command.Connection = connection; + + // // Create and execute reader + // reader = command.ExecuteReader(); + // while (reader.Read()) + // { + // // Create object and fill data + // T data = new T(); + + // // Cycle through columns + // for (int a = 0; a < reader.FieldCount; a++) + // { + // // Get column info + // string fieldName = reader.GetName(a); + // Type fieldType = reader.GetFieldType(a); + // object fieldValue = reader.GetValue(a); + + // // Check for map + // string propertyName = fieldName; + // if(dictMap.ContainsKey(fieldName)) + // { + // propertyName = dictMap[fieldName]; + // } + + // // Get property info and fill column if valid + // PropertyInfo info = typeof(T).GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty); + // if (info != null) + // { + // // Set value to null + // if (fieldValue is System.DBNull) + // fieldValue = null; + + // // Check if the type is an enum + // if (info.PropertyType.IsEnum) + // { + // fieldValue = Enum.Parse(info.PropertyType, fieldValue.ToString()); + // } + // else if (info.PropertyType.FullName.ToUpper() == "SYSTEM.GUID") + // { + // // Guid aren't supported in SQLite, so they are stored as strings. + // fieldValue = new Guid(fieldValue.ToString()); + // } + // else if (info.PropertyType.FullName != fieldType.FullName) + // { + // // Call a convert method in the Convert static class, if available + // MethodInfo castMethod = typeof(Convert).GetMethod("To" + info.PropertyType.Name, new Type[] { fieldType }); + // if (castMethod != null) + // { + // fieldValue = castMethod.Invoke(null, new object[] { fieldValue }); + // } + // } + + // // Set property value + // info.SetValue(data, fieldValue, null); + // } + // } + + // // Add item to list + // list.Add(data); + // } + + // return list; + //} + ////catch + ////{ + //// throw; + ////} + //finally //{ - // throw; + // // Clean up reader and _connection + // if (reader != null) + // { + // reader.Close(); + // reader.Dispose(); + // } + + // // Dispose command + // command.Dispose(); + + // // Close and clean up _connection + // if (connection.State == ConnectionState.Open) + // { + // connection.Close(); + // connection.Dispose(); + // } //} - finally - { - // Clean up reader and _connection - if (reader != null) - { - reader.Close(); - reader.Dispose(); - } - - // Dispose command - command.Dispose(); - - // Close and clean up _connection - if (connection.State == ConnectionState.Open) - { - connection.Close(); - connection.Dispose(); - } - } } /// @@ -482,89 +486,91 @@ public int Update(T obj, string tableName, Dictionary where) Dictionary dictMap = GetMap(); StringBuilder sql = new StringBuilder(); - try - { - // Generate query - sql.AppendLine("UPDATE [" + tableName + "] SET "); + return 0; - // Scan through properties - PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); - bool addedOneItem = false; - for (int a = 0; a < propertyInfos.Length; a++) - { - PropertyInfo propertyInfo = propertyInfos[a]; - if (propertyInfo.GetSetMethod() != null) - { - string fieldName = propertyInfo.Name; - if (dictMap.ContainsValue(propertyInfo.Name)) - fieldName = dictMap.FindKeyByValue(propertyInfo.Name); - - // Add comma if an item was added previously - if(!addedOneItem) - addedOneItem = true; - else - sql.Append(", "); - - // Add database field name - sql.Append("[" + fieldName + "]="); - object value = propertyInfo.GetValue(obj, null); - sql.Append(FormatSQLValue(value)); - sql.Append("\n"); - } - } - - // Generate where clause - sql.AppendLine(" WHERE "); - addedOneItem = false; - for(int a = 0; a < where.Count; a++) - { - // Add comma if an item was added previously - if(!addedOneItem) - addedOneItem = true; - else - sql.Append(", "); - - KeyValuePair keyValue = where.ElementAt(a); - sql.AppendLine("[" + keyValue.Key + "]="); - sql.Append(FormatSQLValue(keyValue.Value)); - - // Add an AND keyword if this isn't the last item - if (a < where.Count - 1) - { - sql.Append(" AND "); - } - sql.Append("\n"); - } - - // Create and open _connection - connection = GenerateConnection(); - connection.Open(); - - // Create command - command = factory.CreateCommand(); - command.CommandText = sql.ToString(); - command.Connection = connection; - - // Execute command - int count = command.ExecuteNonQuery(); - return count; - } - catch - { - throw; - } - finally - { - // Dispose command - command.Dispose(); - - // Close and clean up _connection - if (connection.State == ConnectionState.Open) - { - connection.Close(); - connection.Dispose(); - } - } + //try + //{ + // // Generate query + // sql.AppendLine("UPDATE [" + tableName + "] SET "); + + // // Scan through properties + // PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); + // bool addedOneItem = false; + // for (int a = 0; a < propertyInfos.Length; a++) + // { + // PropertyInfo propertyInfo = propertyInfos[a]; + // if (propertyInfo.GetSetMethod() != null) + // { + // string fieldName = propertyInfo.Name; + // if (dictMap.ContainsValue(propertyInfo.Name)) + // fieldName = dictMap.FindKeyByValue(propertyInfo.Name); + + // // Add comma if an item was added previously + // if(!addedOneItem) + // addedOneItem = true; + // else + // sql.Append(", "); + + // // Add database field name + // sql.Append("[" + fieldName + "]="); + // object value = propertyInfo.GetValue(obj, null); + // sql.Append(FormatSQLValue(value)); + // sql.Append("\n"); + // } + // } + + // // Generate where clause + // sql.AppendLine(" WHERE "); + // addedOneItem = false; + // for(int a = 0; a < where.Count; a++) + // { + // // Add comma if an item was added previously + // if(!addedOneItem) + // addedOneItem = true; + // else + // sql.Append(", "); + + // KeyValuePair keyValue = where.ElementAt(a); + // sql.AppendLine("[" + keyValue.Key + "]="); + // sql.Append(FormatSQLValue(keyValue.Value)); + + // // Add an AND keyword if this isn't the last item + // if (a < where.Count - 1) + // { + // sql.Append(" AND "); + // } + // sql.Append("\n"); + // } + + // // Create and open _connection + // connection = GenerateConnection(); + // connection.Open(); + + // // Create command + // command = factory.CreateCommand(); + // command.CommandText = sql.ToString(); + // command.Connection = connection; + + // // Execute command + // int count = command.ExecuteNonQuery(); + // return count; + //} + //catch + //{ + // throw; + //} + //finally + //{ + // // Dispose command + // command.Dispose(); + + // // Close and clean up _connection + // if (connection.State == ConnectionState.Open) + // { + // connection.Close(); + // connection.Dispose(); + // } + //} } /// @@ -581,89 +587,91 @@ public int Insert(T obj, string tableName) Dictionary dictMap = GetMap(); StringBuilder sql = new StringBuilder(); - try - { - // Generate query - sql.AppendLine("INSERT INTO [" + tableName + "] ("); + return 0; - // Scan through properties to set column names - PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); - bool addedOneItem = false; - for (int a = 0; a < propertyInfos.Length; a++) - { - PropertyInfo propertyInfo = propertyInfos[a]; - if (propertyInfo.GetSetMethod() != null) - { - string fieldName = propertyInfo.Name; - if (dictMap.ContainsValue(propertyInfo.Name)) - fieldName = dictMap.FindKeyByValue(propertyInfo.Name); - - // Add comma if an item was added previously - if(!addedOneItem) - addedOneItem = true; - else - sql.Append(", "); - - sql.Append("[" + fieldName + "]"); - sql.Append("\n"); - } - } - sql.AppendLine(") VALUES ("); - - // Scan through properties and set values - addedOneItem = false; - for (int a = 0; a < propertyInfos.Length; a++) - { - PropertyInfo propertyInfo = propertyInfos[a]; - if (propertyInfo.GetSetMethod() != null) - { - string fieldName = propertyInfo.Name; - if (dictMap.ContainsValue(propertyInfo.Name)) - fieldName = dictMap.FindKeyByValue(propertyInfo.Name); - - // Add comma if an item was added previously - if(!addedOneItem) - addedOneItem = true; - else - sql.Append(", "); - - // Get value and determine how to add field value - object value = propertyInfo.GetValue(obj, null); - sql.Append(FormatSQLValue(value)); - sql.Append("\n"); - } - } - sql.AppendLine(") "); - - // Create and open _connection - connection = GenerateConnection(); - connection.Open(); - - // Create command - command = factory.CreateCommand(); - command.CommandText = sql.ToString(); - command.Connection = connection; - - // Execute command - int count = command.ExecuteNonQuery(); - return count; - } - catch - { - throw; - } - finally - { - // Dispose command - command.Dispose(); - - // Close and clean up _connection - if (connection.State == ConnectionState.Open) - { - connection.Close(); - connection.Dispose(); - } - } + //try + //{ + // // Generate query + // sql.AppendLine("INSERT INTO [" + tableName + "] ("); + + // // Scan through properties to set column names + // PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); + // bool addedOneItem = false; + // for (int a = 0; a < propertyInfos.Length; a++) + // { + // PropertyInfo propertyInfo = propertyInfos[a]; + // if (propertyInfo.GetSetMethod() != null) + // { + // string fieldName = propertyInfo.Name; + // if (dictMap.ContainsValue(propertyInfo.Name)) + // fieldName = dictMap.FindKeyByValue(propertyInfo.Name); + + // // Add comma if an item was added previously + // if(!addedOneItem) + // addedOneItem = true; + // else + // sql.Append(", "); + + // sql.Append("[" + fieldName + "]"); + // sql.Append("\n"); + // } + // } + // sql.AppendLine(") VALUES ("); + + // // Scan through properties and set values + // addedOneItem = false; + // for (int a = 0; a < propertyInfos.Length; a++) + // { + // PropertyInfo propertyInfo = propertyInfos[a]; + // if (propertyInfo.GetSetMethod() != null) + // { + // string fieldName = propertyInfo.Name; + // if (dictMap.ContainsValue(propertyInfo.Name)) + // fieldName = dictMap.FindKeyByValue(propertyInfo.Name); + + // // Add comma if an item was added previously + // if(!addedOneItem) + // addedOneItem = true; + // else + // sql.Append(", "); + + // // Get value and determine how to add field value + // object value = propertyInfo.GetValue(obj, null); + // sql.Append(FormatSQLValue(value)); + // sql.Append("\n"); + // } + // } + // sql.AppendLine(") "); + + // // Create and open _connection + // connection = GenerateConnection(); + // connection.Open(); + + // // Create command + // command = factory.CreateCommand(); + // command.CommandText = sql.ToString(); + // command.Connection = connection; + + // // Execute command + // int count = command.ExecuteNonQuery(); + // return count; + //} + //catch + //{ + // throw; + //} + //finally + //{ + // // Dispose command + // command.Dispose(); + + // // Close and clean up _connection + // if (connection.State == ConnectionState.Open) + // { + // connection.Close(); + // connection.Dispose(); + // } + //} } /// diff --git a/MPfm/MPfm.Library/MPfm.Library.WindowsStore.csproj b/MPfm/MPfm.Library/MPfm.Library.WindowsStore.csproj index feb817ec..55ec0bcb 100644 --- a/MPfm/MPfm.Library/MPfm.Library.WindowsStore.csproj +++ b/MPfm/MPfm.Library/MPfm.Library.WindowsStore.csproj @@ -35,7 +35,7 @@ true bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full ARM @@ -79,7 +79,7 @@ true bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x86 @@ -186,9 +186,6 @@ ..\MPfm.Core\Lib\PCL\TinyIoC.dll - - - Microsoft Visual C++ Runtime Package @@ -197,6 +194,9 @@ SQLite for Windows Runtime + + + 11.0 diff --git a/MPfm/MPfm.Library/packages.config b/MPfm/MPfm.Library/packages.config index 13db0a00..594a1329 100644 --- a/MPfm/MPfm.Library/packages.config +++ b/MPfm/MPfm.Library/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/MPfm/MPfm.Player/MPfm.Player.WindowsStore.csproj b/MPfm/MPfm.Player/MPfm.Player.WindowsStore.csproj index 256a2006..354a25f4 100644 --- a/MPfm/MPfm.Player/MPfm.Player.WindowsStore.csproj +++ b/MPfm/MPfm.Player/MPfm.Player.WindowsStore.csproj @@ -35,7 +35,7 @@ true bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full ARM @@ -57,7 +57,7 @@ true bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x64 @@ -79,7 +79,7 @@ true bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x86 diff --git a/MPfm/MPfm.Sound/MPfm.Sound.WindowsStore.csproj b/MPfm/MPfm.Sound/MPfm.Sound.WindowsStore.csproj index e7fe7288..e53c2cab 100644 --- a/MPfm/MPfm.Sound/MPfm.Sound.WindowsStore.csproj +++ b/MPfm/MPfm.Sound/MPfm.Sound.WindowsStore.csproj @@ -35,7 +35,7 @@ true bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full ARM @@ -57,7 +57,7 @@ true bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x64 @@ -79,7 +79,7 @@ true bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x86 diff --git a/MPfm/MPfm.WindowsStore/MPfm.WindowsStore.csproj b/MPfm/MPfm.WindowsStore/MPfm.WindowsStore.csproj index d2b1b0a6..21e5d673 100644 --- a/MPfm/MPfm.WindowsStore/MPfm.WindowsStore.csproj +++ b/MPfm/MPfm.WindowsStore/MPfm.WindowsStore.csproj @@ -20,7 +20,7 @@ full false bin\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE prompt 4 @@ -36,7 +36,7 @@ true bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full ARM @@ -58,7 +58,7 @@ true bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x64 @@ -80,7 +80,7 @@ true bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE + TRACE;DEBUG;NETFX_CORE;WINDOWSSTORE ;2008 full x86 @@ -171,6 +171,11 @@ Designer + + + ..\MPfm.Core\Lib\PCL\TinyIoC.dll + + 11.0 diff --git a/MPfm/MPfm_WindowsStore.sln b/MPfm/MPfm_WindowsStore.sln index f4e58f56..66fda26f 100644 --- a/MPfm/MPfm_WindowsStore.sln +++ b/MPfm/MPfm_WindowsStore.sln @@ -63,9 +63,9 @@ Global {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug_MacOSX|x86.ActiveCfg = Debug|x86 {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug_MacOSX|x86.Build.0 = Debug|x86 {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug_MacOSX|x86.Deploy.0 = Debug|x86 - {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|Any CPU.ActiveCfg = Debug|x86 + {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|Any CPU.Build.0 = Debug|x86 + {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|Any CPU.Deploy.0 = Debug|x86 {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|ARM.ActiveCfg = Debug|ARM {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|ARM.Build.0 = Debug|ARM {B7E431B3-1AEF-4023-B8B5-36BE68D713E9}.Debug|ARM.Deploy.0 = Debug|ARM @@ -127,8 +127,8 @@ Global {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug_MacOSX|x64.Build.0 = Debug|x64 {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug_MacOSX|x86.ActiveCfg = Debug|x86 {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug_MacOSX|x86.Build.0 = Debug|x86 - {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug|Any CPU.ActiveCfg = Debug|x86 + {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug|Any CPU.Build.0 = Debug|x86 {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug|ARM.ActiveCfg = Debug|ARM {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug|ARM.Build.0 = Debug|ARM {E97BAD77-806E-402B-A3FC-283C31FDB37D}.Debug|x64.ActiveCfg = Debug|x64 @@ -175,8 +175,8 @@ Global {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug_MacOSX|x64.Build.0 = Debug|x64 {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug_MacOSX|x86.ActiveCfg = Debug|x86 {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug_MacOSX|x86.Build.0 = Debug|x86 - {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug|Any CPU.ActiveCfg = Debug|x86 + {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug|Any CPU.Build.0 = Debug|x86 {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug|ARM.ActiveCfg = Debug|ARM {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug|ARM.Build.0 = Debug|ARM {A0D06CD4-F009-4068-A79C-377A7D2E014C}.Debug|x64.ActiveCfg = Debug|x64 @@ -223,8 +223,8 @@ Global {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug_MacOSX|x64.Build.0 = Debug|x64 {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug_MacOSX|x86.ActiveCfg = Debug|x86 {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug_MacOSX|x86.Build.0 = Debug|x86 - {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug|Any CPU.ActiveCfg = Debug|x86 + {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug|Any CPU.Build.0 = Debug|x86 {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug|ARM.ActiveCfg = Debug|ARM {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug|ARM.Build.0 = Debug|ARM {B096C459-3E2D-4932-A961-DE692F6B6C1C}.Debug|x64.ActiveCfg = Debug|x64 @@ -271,8 +271,8 @@ Global {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug_MacOSX|x64.Build.0 = Debug|x64 {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug_MacOSX|x86.ActiveCfg = Debug|x86 {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug_MacOSX|x86.Build.0 = Debug|x86 - {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug|Any CPU.ActiveCfg = Debug|x64 - {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug|Any CPU.Build.0 = Debug|x64 + {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug|Any CPU.ActiveCfg = Debug|x86 + {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug|Any CPU.Build.0 = Debug|x86 {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug|ARM.ActiveCfg = Debug|ARM {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug|ARM.Build.0 = Debug|ARM {394F4601-AF24-43A1-BCD3-0784645DAB17}.Debug|x64.ActiveCfg = Debug|x64