diff --git a/Cocktail.Compat/Cocktail.Compat.SL.csproj b/Cocktail.Compat.SL/Cocktail.Compat.SL.csproj similarity index 86% rename from Cocktail.Compat/Cocktail.Compat.SL.csproj rename to Cocktail.Compat.SL/Cocktail.Compat.SL.csproj index 772cc64c..c76180a6 100644 --- a/Cocktail.Compat/Cocktail.Compat.SL.csproj +++ b/Cocktail.Compat.SL/Cocktail.Compat.SL.csproj @@ -19,8 +19,8 @@ true ..\ true - Bin.SL - obj.SL\$(Configuration) + Bin + obj\$(Configuration) $(BaseOutputPath)\$(Configuration) $(BaseOutputPath)\$(Configuration)\Cocktail.Compat.SL.xml @@ -100,35 +100,40 @@ - - - - - - - + + + + + + + OperationResult.cs - - - + + + Properties\AssemblyInfo.cs + + + StringResources.Designer.cs StringResources.resx - + - + + StringResources.resx + + + + {65fce695-2e91-4245-86d6-3fb3486aefad} Cocktail.SL - - - diff --git a/Cocktail.Compat.SL/Cocktail.snk b/Cocktail.Compat.SL/Cocktail.snk new file mode 100644 index 00000000..7e27675f Binary files /dev/null and b/Cocktail.Compat.SL/Cocktail.snk differ diff --git a/Cocktail.Compat.SL/packages.config b/Cocktail.Compat.SL/packages.config new file mode 100644 index 00000000..24b5cdce --- /dev/null +++ b/Cocktail.Compat.SL/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Cocktail.Compat/packages.config b/Cocktail.Compat/packages.config index 24b5cdce..d65cdc6f 100644 --- a/Cocktail.Compat/packages.config +++ b/Cocktail.Compat/packages.config @@ -3,5 +3,4 @@ - \ No newline at end of file diff --git a/Cocktail/Cocktail.SL.csproj b/Cocktail.SL/Cocktail.SL.csproj similarity index 64% rename from Cocktail/Cocktail.SL.csproj rename to Cocktail.SL/Cocktail.SL.csproj index 0e6f564e..11d6bce4 100644 --- a/Cocktail/Cocktail.SL.csproj +++ b/Cocktail.SL/Cocktail.SL.csproj @@ -17,8 +17,8 @@ false true true - Bin.SL - obj.SL\$(Configuration) + Bin + obj\$(Configuration) $(BaseOutputPath)\$(Configuration) $(BaseOutputPath)\$(Configuration)\Cocktail.SL.xml True @@ -118,133 +118,132 @@ - - - - - + + + + + Composition.cs - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + HarnessViewModel.cs - - - + + + ICompositionProvider.cs - - - - - - - - - - - - - + + + + + + + + + + + + + MefCompositionProvider.Desktop.cs - + MefCompositionProvider.Desktop.cs - - + + MessageBoxView.xaml - - - - - - - - - - + + + + + + + + + + Navigator.cs - - - - - - - - - - - + + + + + + + + Properties\AssemblyInfo.cs + + + + + + StringResources.Designer.cs + StringResources.resx + + + + + + + + + + + DialogHostView.xaml - + HarnessView.xaml - - True - True - StringResources.resx - - - - - - - - - - - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - - - ResXFileCodeGenerator - StringResources.Designer.cs - Designer - - + + + StringResources.resx + + diff --git a/Cocktail.SL/Cocktail.snk b/Cocktail.SL/Cocktail.snk new file mode 100644 index 00000000..7e27675f Binary files /dev/null and b/Cocktail.SL/Cocktail.snk differ diff --git a/Cocktail/Silverlight/DialogHostView.xaml b/Cocktail.SL/DialogHostView.xaml similarity index 100% rename from Cocktail/Silverlight/DialogHostView.xaml rename to Cocktail.SL/DialogHostView.xaml diff --git a/Cocktail/Silverlight/DialogHostView.xaml.cs b/Cocktail.SL/DialogHostView.xaml.cs similarity index 100% rename from Cocktail/Silverlight/DialogHostView.xaml.cs rename to Cocktail.SL/DialogHostView.xaml.cs diff --git a/Cocktail/Silverlight/HarnessView.xaml b/Cocktail.SL/HarnessView.xaml similarity index 100% rename from Cocktail/Silverlight/HarnessView.xaml rename to Cocktail.SL/HarnessView.xaml diff --git a/Cocktail/Silverlight/HarnessView.xaml.cs b/Cocktail.SL/HarnessView.xaml.cs similarity index 100% rename from Cocktail/Silverlight/HarnessView.xaml.cs rename to Cocktail.SL/HarnessView.xaml.cs diff --git a/Cocktail.SL/packages.config b/Cocktail.SL/packages.config new file mode 100644 index 00000000..2233aefd --- /dev/null +++ b/Cocktail.SL/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Cocktail.Utils/Cocktail.Utils.SL.csproj b/Cocktail.Utils.SL/Cocktail.Utils.SL.csproj similarity index 93% rename from Cocktail.Utils/Cocktail.Utils.SL.csproj rename to Cocktail.Utils.SL/Cocktail.Utils.SL.csproj index 55da03d8..fc287467 100644 --- a/Cocktail.Utils/Cocktail.Utils.SL.csproj +++ b/Cocktail.Utils.SL/Cocktail.Utils.SL.csproj @@ -19,8 +19,8 @@ true true 4.0.20901.0 - Bin.SL - obj.SL\$(Configuration) + Bin + obj\$(Configuration) $(BaseOutputPath)\$(Configuration) $(BaseOutputPath)\$(Configuration)\Cocktail.Utils.SL.xml True @@ -72,9 +72,11 @@ - - - + + + Properties\AssemblyInfo.cs + + diff --git a/Cocktail.Utils.SL/Cocktail.snk b/Cocktail.Utils.SL/Cocktail.snk new file mode 100644 index 00000000..7e27675f Binary files /dev/null and b/Cocktail.Utils.SL/Cocktail.snk differ diff --git a/Cocktail.Utils/Cocktail.Utils.WinRT.csproj b/Cocktail.Utils.WinRT/Cocktail.Utils.WinRT.csproj similarity index 93% rename from Cocktail.Utils/Cocktail.Utils.WinRT.csproj rename to Cocktail.Utils.WinRT/Cocktail.Utils.WinRT.csproj index d3df2d20..536bcf0a 100644 --- a/Cocktail.Utils/Cocktail.Utils.WinRT.csproj +++ b/Cocktail.Utils.WinRT/Cocktail.Utils.WinRT.csproj @@ -14,8 +14,8 @@ en-US 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Bin.WinRT - obj.WinRT\$(Platform)\$(Configuration) + Bin + obj\$(Platform)\$(Configuration) $(BaseOutputPath)\$(Platform)\$(Configuration) $(BaseOutputPath)\$(Platform)\$(Configuration)\Cocktail.Utils.WinRT.xml True @@ -99,9 +99,11 @@ - - - + + + Properties\AssemblyInfo.cs + + 11.0 diff --git a/Cocktail/Cocktail.WinRT.csproj b/Cocktail.WinRT/Cocktail.WinRT.csproj similarity index 73% rename from Cocktail/Cocktail.WinRT.csproj rename to Cocktail.WinRT/Cocktail.WinRT.csproj index 9515ae1c..91ca4f61 100644 --- a/Cocktail/Cocktail.WinRT.csproj +++ b/Cocktail.WinRT/Cocktail.WinRT.csproj @@ -14,8 +14,8 @@ en-US 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Bin.WinRT - obj.WinRT\$(Platform)\$(Configuration) + Bin + obj\$(Platform)\$(Configuration) $(BaseOutputPath)\$(Platform)\$(Configuration) $(BaseOutputPath)\$(Platform)\$(Configuration)\Cocktail.WinRT.xml True @@ -98,70 +98,73 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MefCompositionProvider.WinRT.cs - - - + + + Navigator.cs - - - - - - - + + + + + + + Properties\AssemblyInfo.cs + + Code - - + + + StringResources.WinRT.Designer.cs True True StringResources.resx - - - - - + + + + + @@ -214,9 +217,9 @@ - + ResXFileCodeGenerator - StringResources1.Designer.cs + StringResources.WinRT.Designer.cs diff --git a/Cocktail.WinRT/Cocktail.snk b/Cocktail.WinRT/Cocktail.snk new file mode 100644 index 00000000..7e27675f Binary files /dev/null and b/Cocktail.WinRT/Cocktail.snk differ diff --git a/Cocktail.WinRT/packages.config b/Cocktail.WinRT/packages.config new file mode 100644 index 00000000..7ccd9005 --- /dev/null +++ b/Cocktail.WinRT/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Cocktail.sln b/Cocktail.sln index 88ad4124..8faf161f 100644 --- a/Cocktail.sln +++ b/Cocktail.sln @@ -18,10 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Model", "Test Projects EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Tests", "Test Projects\Cocktail.Tests\Cocktail.Tests.csproj", "{7E2FF932-5278-4092-8CAA-1EE7EC22A405}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.SL", "Cocktail\Cocktail.SL.csproj", "{65FCE695-2E91-4245-86D6-3FB3486AEFAD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Utils.SL", "Cocktail.Utils\Cocktail.Utils.SL.csproj", "{39915105-64A5-493F-B91B-838D5CEEE9F2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{73AB0673-460E-4133-923C-5FBB3D7C4009}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config @@ -29,16 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{73AB06 .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.WinRT", "Cocktail\Cocktail.WinRT.csproj", "{4B283109-31D0-4C29-9420-6FCDF703513E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Tests.WinRT", "Test Projects\Cocktail.Tests\Cocktail.Tests.WinRT.csproj", "{7FC50DD1-60C1-43FC-BACC-FA79B296341C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Model.WinRT", "Test Projects\Test.Model\Test.Model.WinRT.csproj", "{D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Web", "Test Projects\Test.Web\Test.Web.csproj", "{DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Utils.WinRT", "Cocktail.Utils\Cocktail.Utils.WinRT.csproj", "{7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{04CA7342-D7C5-4602-BA76-7F887461F214}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET", ".NET", "{1EE1F402-9F5F-4FD1-9F0E-9A24C0C8AFC7}" @@ -49,7 +37,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinRT", "WinRT", "{31A296A1 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Compat", "Cocktail.Compat\Cocktail.Compat.csproj", "{26C283E8-B53E-4562-BA1B-23D67745B74B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Compat.SL", "Cocktail.Compat\Cocktail.Compat.SL.csproj", "{6B4D8E6D-DC0B-47FF-953D-F378450C9856}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.SL", "Cocktail.SL\Cocktail.SL.csproj", "{65FCE695-2E91-4245-86D6-3FB3486AEFAD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.WinRT", "Cocktail.WinRT\Cocktail.WinRT.csproj", "{4B283109-31D0-4C29-9420-6FCDF703513E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Compat.SL", "Cocktail.Compat.SL\Cocktail.Compat.SL.csproj", "{6B4D8E6D-DC0B-47FF-953D-F378450C9856}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Utils.SL", "Cocktail.Utils.SL\Cocktail.Utils.SL.csproj", "{39915105-64A5-493F-B91B-838D5CEEE9F2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Utils.WinRT", "Cocktail.Utils.WinRT\Cocktail.Utils.WinRT.csproj", "{7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Model.WinRT", "Test Projects\Test.Model.WinRT\Test.Model.WinRT.csproj", "{D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocktail.Tests.WinRT", "Test Projects\Cocktail.Tests.WinRT\Cocktail.Tests.WinRT.csproj", "{7FC50DD1-60C1-43FC-BACC-FA79B296341C}" EndProject Global GlobalSection(TestCaseManagementSettings) = postSolution @@ -124,6 +124,34 @@ Global {7E2FF932-5278-4092-8CAA-1EE7EC22A405}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7E2FF932-5278-4092-8CAA-1EE7EC22A405}.Release|x64.ActiveCfg = Release|Any CPU {7E2FF932-5278-4092-8CAA-1EE7EC22A405}.Release|x86.ActiveCfg = Release|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|ARM.ActiveCfg = Debug|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|x64.ActiveCfg = Debug|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|x86.ActiveCfg = Debug|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|Any CPU.Build.0 = Release|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|ARM.ActiveCfg = Release|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|x64.ActiveCfg = Release|Any CPU + {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|x86.ActiveCfg = Release|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|x64.ActiveCfg = Debug|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|x86.ActiveCfg = Debug|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|Any CPU.Build.0 = Release|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|ARM.ActiveCfg = Release|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|x64.ActiveCfg = Release|Any CPU + {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|x86.ActiveCfg = Release|Any CPU {65FCE695-2E91-4245-86D6-3FB3486AEFAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65FCE695-2E91-4245-86D6-3FB3486AEFAD}.Debug|Any CPU.Build.0 = Debug|Any CPU {65FCE695-2E91-4245-86D6-3FB3486AEFAD}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -138,20 +166,6 @@ Global {65FCE695-2E91-4245-86D6-3FB3486AEFAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU {65FCE695-2E91-4245-86D6-3FB3486AEFAD}.Release|x64.ActiveCfg = Release|Any CPU {65FCE695-2E91-4245-86D6-3FB3486AEFAD}.Release|x86.ActiveCfg = Release|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|x64.ActiveCfg = Debug|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|x86.ActiveCfg = Debug|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|Any CPU.Build.0 = Release|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|ARM.ActiveCfg = Release|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|x64.ActiveCfg = Release|Any CPU - {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|x86.ActiveCfg = Release|Any CPU {4B283109-31D0-4C29-9420-6FCDF703513E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B283109-31D0-4C29-9420-6FCDF703513E}.Debug|Any CPU.Build.0 = Debug|Any CPU {4B283109-31D0-4C29-9420-6FCDF703513E}.Debug|ARM.ActiveCfg = Debug|ARM @@ -172,6 +186,74 @@ Global {4B283109-31D0-4C29-9420-6FCDF703513E}.Release|x64.Build.0 = Release|x64 {4B283109-31D0-4C29-9420-6FCDF703513E}.Release|x86.ActiveCfg = Release|x86 {4B283109-31D0-4C29-9420-6FCDF703513E}.Release|x86.Build.0 = Release|x86 + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|ARM.ActiveCfg = Debug|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|x64.ActiveCfg = Debug|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|x86.ActiveCfg = Debug|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|Any CPU.Build.0 = Release|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|ARM.ActiveCfg = Release|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|x64.ActiveCfg = Release|Any CPU + {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|x86.ActiveCfg = Release|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|ARM.ActiveCfg = Debug|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|x64.ActiveCfg = Debug|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Debug|x86.ActiveCfg = Debug|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|Any CPU.Build.0 = Release|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|ARM.ActiveCfg = Release|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|x64.ActiveCfg = Release|Any CPU + {39915105-64A5-493F-B91B-838D5CEEE9F2}.Release|x86.ActiveCfg = Release|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|ARM.ActiveCfg = Debug|ARM + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|ARM.Build.0 = Debug|ARM + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|x64.ActiveCfg = Debug|x64 + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|x64.Build.0 = Debug|x64 + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|x86.ActiveCfg = Debug|x86 + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|x86.Build.0 = Debug|x86 + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|Any CPU.Build.0 = Release|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|ARM.ActiveCfg = Release|ARM + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|ARM.Build.0 = Release|ARM + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|x64.ActiveCfg = Release|x64 + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|x64.Build.0 = Release|x64 + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|x86.ActiveCfg = Release|x86 + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|x86.Build.0 = Release|x86 + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|ARM.ActiveCfg = Debug|ARM + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|ARM.Build.0 = Debug|ARM + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|x64.ActiveCfg = Debug|x64 + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|x64.Build.0 = Debug|x64 + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|x86.ActiveCfg = Debug|x86 + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|x86.Build.0 = Debug|x86 + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|Any CPU.Build.0 = Release|Any CPU + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|ARM.ActiveCfg = Release|ARM + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|ARM.Build.0 = Release|ARM + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|x64.ActiveCfg = Release|x64 + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|x64.Build.0 = Release|x64 + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|x86.ActiveCfg = Release|x86 + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|x86.Build.0 = Release|x86 {7FC50DD1-60C1-43FC-BACC-FA79B296341C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7FC50DD1-60C1-43FC-BACC-FA79B296341C}.Debug|Any CPU.Build.0 = Debug|Any CPU {7FC50DD1-60C1-43FC-BACC-FA79B296341C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -202,88 +284,6 @@ Global {7FC50DD1-60C1-43FC-BACC-FA79B296341C}.Release|x86.ActiveCfg = Release|x86 {7FC50DD1-60C1-43FC-BACC-FA79B296341C}.Release|x86.Build.0 = Release|x86 {7FC50DD1-60C1-43FC-BACC-FA79B296341C}.Release|x86.Deploy.0 = Release|x86 - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|ARM.ActiveCfg = Debug|ARM - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|ARM.Build.0 = Debug|ARM - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|x64.ActiveCfg = Debug|x64 - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|x64.Build.0 = Debug|x64 - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|x86.ActiveCfg = Debug|x86 - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Debug|x86.Build.0 = Debug|x86 - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|Any CPU.Build.0 = Release|Any CPU - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|ARM.ActiveCfg = Release|ARM - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|ARM.Build.0 = Release|ARM - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|x64.ActiveCfg = Release|x64 - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|x64.Build.0 = Release|x64 - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|x86.ActiveCfg = Release|x86 - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400}.Release|x86.Build.0 = Release|x86 - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|ARM.ActiveCfg = Debug|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|x64.ActiveCfg = Debug|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Debug|x86.ActiveCfg = Debug|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|Any CPU.Build.0 = Release|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|ARM.ActiveCfg = Release|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|x64.ActiveCfg = Release|Any CPU - {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3}.Release|x86.ActiveCfg = Release|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|ARM.ActiveCfg = Debug|ARM - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|ARM.Build.0 = Debug|ARM - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|x64.ActiveCfg = Debug|x64 - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|x64.Build.0 = Debug|x64 - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|x86.ActiveCfg = Debug|x86 - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Debug|x86.Build.0 = Debug|x86 - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|Any CPU.Build.0 = Release|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|ARM.ActiveCfg = Release|ARM - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|ARM.Build.0 = Release|ARM - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|x64.ActiveCfg = Release|x64 - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|x64.Build.0 = Release|x64 - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|x86.ActiveCfg = Release|x86 - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7}.Release|x86.Build.0 = Release|x86 - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|x64.ActiveCfg = Debug|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Debug|x86.ActiveCfg = Debug|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|Any CPU.Build.0 = Release|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|ARM.ActiveCfg = Release|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|x64.ActiveCfg = Release|Any CPU - {26C283E8-B53E-4562-BA1B-23D67745B74B}.Release|x86.ActiveCfg = Release|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|x64.ActiveCfg = Debug|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Debug|x86.ActiveCfg = Debug|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|Any CPU.Build.0 = Release|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|ARM.ActiveCfg = Release|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|x64.ActiveCfg = Release|Any CPU - {6B4D8E6D-DC0B-47FF-953D-F378450C9856}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -292,19 +292,19 @@ Global {8C488C7E-C1A3-4FD6-96FF-D2517804A514} = {5FCDCDCA-09B7-4787-BF81-137E7A188B1D} {12BEA1AF-5380-4024-BEDD-C914B0C15178} = {5FCDCDCA-09B7-4787-BF81-137E7A188B1D} {7E2FF932-5278-4092-8CAA-1EE7EC22A405} = {5FCDCDCA-09B7-4787-BF81-137E7A188B1D} - {7FC50DD1-60C1-43FC-BACC-FA79B296341C} = {5FCDCDCA-09B7-4787-BF81-137E7A188B1D} - {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400} = {5FCDCDCA-09B7-4787-BF81-137E7A188B1D} {DA8ACA0B-83EB-4F38-9FA4-8A969E815FE3} = {5FCDCDCA-09B7-4787-BF81-137E7A188B1D} + {D71FE28F-1D7E-4E6B-AE41-D0C7BC809400} = {5FCDCDCA-09B7-4787-BF81-137E7A188B1D} + {7FC50DD1-60C1-43FC-BACC-FA79B296341C} = {5FCDCDCA-09B7-4787-BF81-137E7A188B1D} {1EE1F402-9F5F-4FD1-9F0E-9A24C0C8AFC7} = {04CA7342-D7C5-4602-BA76-7F887461F214} {513938FE-0520-4D93-8A1F-1014EF1DE9FA} = {04CA7342-D7C5-4602-BA76-7F887461F214} {31A296A1-FB74-4449-9BAA-3E0C73787677} = {04CA7342-D7C5-4602-BA76-7F887461F214} {261E777A-1FE0-455E-87FD-DDB95B2757AA} = {1EE1F402-9F5F-4FD1-9F0E-9A24C0C8AFC7} {10F63FBB-FB0D-4B76-9E3F-5979D19CB01F} = {1EE1F402-9F5F-4FD1-9F0E-9A24C0C8AFC7} {26C283E8-B53E-4562-BA1B-23D67745B74B} = {1EE1F402-9F5F-4FD1-9F0E-9A24C0C8AFC7} - {39915105-64A5-493F-B91B-838D5CEEE9F2} = {513938FE-0520-4D93-8A1F-1014EF1DE9FA} {65FCE695-2E91-4245-86D6-3FB3486AEFAD} = {513938FE-0520-4D93-8A1F-1014EF1DE9FA} {6B4D8E6D-DC0B-47FF-953D-F378450C9856} = {513938FE-0520-4D93-8A1F-1014EF1DE9FA} - {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7} = {31A296A1-FB74-4449-9BAA-3E0C73787677} + {39915105-64A5-493F-B91B-838D5CEEE9F2} = {513938FE-0520-4D93-8A1F-1014EF1DE9FA} {4B283109-31D0-4C29-9420-6FCDF703513E} = {31A296A1-FB74-4449-9BAA-3E0C73787677} + {7CA86F0A-AB76-4FE8-8E56-AD8ABC56E8B7} = {31A296A1-FB74-4449-9BAA-3E0C73787677} EndGlobalSection EndGlobal diff --git a/Cocktail/Cocktail.csproj b/Cocktail/Cocktail.csproj index 8cfc63c2..04ed0f86 100644 --- a/Cocktail/Cocktail.csproj +++ b/Cocktail/Cocktail.csproj @@ -182,14 +182,6 @@ - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - MSBuild:Compile Designer diff --git a/Cocktail/Common/StandardStyles.xaml b/Cocktail/Common/StandardStyles.xaml deleted file mode 100644 index 698b2fe0..00000000 --- a/Cocktail/Common/StandardStyles.xaml +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Cocktail/Desktop/DialogHostView.xaml b/Cocktail/DialogHostView.xaml similarity index 100% rename from Cocktail/Desktop/DialogHostView.xaml rename to Cocktail/DialogHostView.xaml diff --git a/Cocktail/Desktop/HarnessView.xaml b/Cocktail/HarnessView.xaml similarity index 100% rename from Cocktail/Desktop/HarnessView.xaml rename to Cocktail/HarnessView.xaml diff --git a/Cocktail/StringResources.Designer.cs b/Cocktail/StringResources.Designer.cs index a707ffab..0768eaca 100644 --- a/Cocktail/StringResources.Designer.cs +++ b/Cocktail/StringResources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.18033 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/Cocktail/StringResources1.Designer.cs b/Cocktail/StringResources.WinRT.Designer.cs similarity index 99% rename from Cocktail/StringResources1.Designer.cs rename to Cocktail/StringResources.WinRT.Designer.cs index 59dadfcf..ae488995 100644 --- a/Cocktail/StringResources1.Designer.cs +++ b/Cocktail/StringResources.WinRT.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.18033 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/Cocktail/packages.config b/Cocktail/packages.config index 81870e71..9b2a94f5 100644 --- a/Cocktail/packages.config +++ b/Cocktail/packages.config @@ -1,9 +1,5 @@  - - - - \ No newline at end of file diff --git a/NuGet/IdeaBlade.Cocktail.Compat.nuspec b/NuGet/IdeaBlade.Cocktail.Compat.nuspec index b27eeadd..8df517b7 100644 --- a/NuGet/IdeaBlade.Cocktail.Compat.nuspec +++ b/NuGet/IdeaBlade.Cocktail.Compat.nuspec @@ -25,8 +25,10 @@ Line of business applications need to query and save database data, model the da - + + + \ No newline at end of file diff --git a/NuGet/IdeaBlade.Cocktail.Utils.nuspec b/NuGet/IdeaBlade.Cocktail.Utils.nuspec index 4dce2e04..77bb4307 100644 --- a/NuGet/IdeaBlade.Cocktail.Utils.nuspec +++ b/NuGet/IdeaBlade.Cocktail.Utils.nuspec @@ -21,9 +21,11 @@ Line of business applications need to query and save database data, model the da - - - + + + + + \ No newline at end of file diff --git a/NuGet/IdeaBlade.Cocktail.nuspec b/NuGet/IdeaBlade.Cocktail.nuspec index 375e8004..9b1be35a 100644 --- a/NuGet/IdeaBlade.Cocktail.nuspec +++ b/NuGet/IdeaBlade.Cocktail.nuspec @@ -33,10 +33,14 @@ Line of business applications need to query and save database data, model the da - - - + + + + + + + \ No newline at end of file diff --git a/Test Projects/Cocktail.Tests/Cocktail.Tests.WinRT.csproj b/Test Projects/Cocktail.Tests.WinRT/Cocktail.Tests.WinRT.csproj similarity index 77% rename from Test Projects/Cocktail.Tests/Cocktail.Tests.WinRT.csproj rename to Test Projects/Cocktail.Tests.WinRT/Cocktail.Tests.WinRT.csproj index 52bf5d51..d2358dcd 100644 --- a/Test Projects/Cocktail.Tests/Cocktail.Tests.WinRT.csproj +++ b/Test Projects/Cocktail.Tests.WinRT/Cocktail.Tests.WinRT.csproj @@ -14,8 +14,8 @@ en-US 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Bin.WinRT - obj.WinRT\$(Configuration) + Bin + obj\$(Configuration) $(BaseOutputPath)\$(Platform)\$(Configuration) Cocktail.Tests.WinRT_TemporaryKey.pfx ..\..\ @@ -110,35 +110,65 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + Helpers\CocktailTestBase.WinRT.cs + + + Helpers\CompositionContextResolver.cs + + + Helpers\ConnectionOptionsResolver.cs + + + Helpers\CustomerListViewModel.cs + + + Helpers\CustomerRepository.cs + + + Helpers\EntityManagerProviderFactory.cs + + + Helpers\GenericExport.cs + + + Helpers\ICustomerRepository.cs + + + Helpers\NonSharedObject.cs + + + Helpers\SampleDataProvider.cs + + + Helpers\SharedObject.cs + + + Helpers\SyncInterceptor.cs + + + Helpers\TestEntityManagerDelegate.cs + + + Helpers\TestEventHandler.cs + + + Helpers\ViewModelLocator.cs + + + + + Properties\AssemblyInfo.cs + + Designer - - @@ -204,15 +234,16 @@ - + {4b283109-31d0-4c29-9420-6fcdf703513e} Cocktail.WinRT - + {d71fe28f-1d7e-4e6b-ae41-d0c7bc809400} Test.Model.WinRT + 11.0 @@ -220,7 +251,8 @@ false - Cocktail.snk + + diff --git a/Test Projects/Cocktail.Tests/Cocktail.Tests.WinRT_TemporaryKey.pfx b/Test Projects/Cocktail.Tests.WinRT/Cocktail.Tests.WinRT_TemporaryKey.pfx similarity index 100% rename from Test Projects/Cocktail.Tests/Cocktail.Tests.WinRT_TemporaryKey.pfx rename to Test Projects/Cocktail.Tests.WinRT/Cocktail.Tests.WinRT_TemporaryKey.pfx diff --git a/Test Projects/Cocktail.Tests/Images/UnitTestLogo.png b/Test Projects/Cocktail.Tests.WinRT/Images/UnitTestLogo.png similarity index 100% rename from Test Projects/Cocktail.Tests/Images/UnitTestLogo.png rename to Test Projects/Cocktail.Tests.WinRT/Images/UnitTestLogo.png diff --git a/Test Projects/Cocktail.Tests/Images/UnitTestSmallLogo.png b/Test Projects/Cocktail.Tests.WinRT/Images/UnitTestSmallLogo.png similarity index 100% rename from Test Projects/Cocktail.Tests/Images/UnitTestSmallLogo.png rename to Test Projects/Cocktail.Tests.WinRT/Images/UnitTestSmallLogo.png diff --git a/Test Projects/Cocktail.Tests/Images/UnitTestSplashScreen.png b/Test Projects/Cocktail.Tests.WinRT/Images/UnitTestSplashScreen.png similarity index 100% rename from Test Projects/Cocktail.Tests/Images/UnitTestSplashScreen.png rename to Test Projects/Cocktail.Tests.WinRT/Images/UnitTestSplashScreen.png diff --git a/Test Projects/Cocktail.Tests/Images/UnitTestStoreLogo.png b/Test Projects/Cocktail.Tests.WinRT/Images/UnitTestStoreLogo.png similarity index 100% rename from Test Projects/Cocktail.Tests/Images/UnitTestStoreLogo.png rename to Test Projects/Cocktail.Tests.WinRT/Images/UnitTestStoreLogo.png diff --git a/Test Projects/Cocktail.Tests/Package.appxmanifest b/Test Projects/Cocktail.Tests.WinRT/Package.appxmanifest similarity index 100% rename from Test Projects/Cocktail.Tests/Package.appxmanifest rename to Test Projects/Cocktail.Tests.WinRT/Package.appxmanifest diff --git a/Test Projects/Cocktail.Tests.WinRT/packages.config b/Test Projects/Cocktail.Tests.WinRT/packages.config new file mode 100644 index 00000000..1cdf2080 --- /dev/null +++ b/Test Projects/Cocktail.Tests.WinRT/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Test Projects/Cocktail.Tests/Cocktail.Tests.SL.csproj b/Test Projects/Cocktail.Tests/Cocktail.Tests.SL.csproj deleted file mode 100644 index 290b8111..00000000 --- a/Test Projects/Cocktail.Tests/Cocktail.Tests.SL.csproj +++ /dev/null @@ -1,185 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {0D74727E-5C3A-4F77-B769-FD3E976B01F4} - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - Cocktail.Tests - Cocktail.Tests.SL - Silverlight - v5.0 - $(TargetFrameworkVersion) - true - - true - true - Cocktail.Tests.SL.xap - Properties\AppManifest.xml - Cocktail.Tests.App - TestPage.html - true - true - false - Properties\OutOfBrowserSettings.xml - false - true - - Bin.SL5 - obj.SL5\$(Configuration) - $(BaseOutputPath)\$(Configuration) - True - - ..\..\ - true - - - - - - v3.5 - - - true - full - false - DEBUG;TRACE;SILVERLIGHT - true - true - prompt - 4 - - - pdbonly - true - TRACE;SILVERLIGHT - true - true - prompt - 4 - - - true - - - Cocktail.snk - - - - ..\..\packages\Caliburn.Micro.1.3.1\lib\sl5\Caliburn.Micro.dll - - - False - ..\..\..\..\..\..\DevForce 2012\Silverlight Assemblies\IdeaBlade.Core.SL.dll - - - False - ..\..\..\..\..\..\DevForce 2012\Silverlight Assemblies\IdeaBlade.EntityModel.SL.dll - - - False - ..\..\..\..\..\..\DevForce 2012\Silverlight Assemblies\IdeaBlade.Linq.SL.dll - - - False - ..\..\..\..\..\..\DevForce 2012\Silverlight Assemblies\IdeaBlade.Validation.SL.dll - - - ..\..\packages\Microsoft.CompilerServices.AsyncTargetingPack.1.0.0\lib\sl50\Microsoft.CompilerServices.AsyncTargetingPack.Silverlight5.dll - - - $(MSBuildExtensionsPath)\..\Microsoft SDKs\Silverlight\v5.0\Toolkit\dec11\Testing\Microsoft.Silverlight.Testing.dll - - - $(MSBuildExtensionsPath)\..\Microsoft SDKs\Silverlight\v5.0\Toolkit\dec11\Testing\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - False - - - - - - - - - - - - - App.xaml - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - Designer - MSBuild:Compile - - - - - - - - - - - {65FCE695-2E91-4245-86D6-3FB3486AEFAD} - Cocktail.SL5 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Test Projects/Cocktail.Tests/packages.config b/Test Projects/Cocktail.Tests/packages.config index 1cdf2080..df124120 100644 --- a/Test Projects/Cocktail.Tests/packages.config +++ b/Test Projects/Cocktail.Tests/packages.config @@ -1,9 +1,6 @@  - - - \ No newline at end of file diff --git a/Test Projects/Test.Model/Test.Model.WinRT.csproj b/Test Projects/Test.Model.WinRT/Test.Model.WinRT.csproj similarity index 94% rename from Test Projects/Test.Model/Test.Model.WinRT.csproj rename to Test Projects/Test.Model.WinRT/Test.Model.WinRT.csproj index b2150610..8c93f8de 100644 --- a/Test Projects/Test.Model/Test.Model.WinRT.csproj +++ b/Test Projects/Test.Model.WinRT/Test.Model.WinRT.csproj @@ -14,8 +14,8 @@ en-US 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Bin.WinRT - obj.WinRT\$(Configuration) + Bin + obj\$(Configuration) $(BaseOutputPath)\$(Platform)\$(Configuration) ..\..\ true @@ -96,10 +96,12 @@ true - - - - + + + + + Properties\AssemblyInfo.cs + diff --git a/Test Projects/Test.Model.WinRT/packages.config b/Test Projects/Test.Model.WinRT/packages.config new file mode 100644 index 00000000..b873d2d9 --- /dev/null +++ b/Test Projects/Test.Model.WinRT/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Test Projects/Test.Model/Test.Model.SL.csproj b/Test Projects/Test.Model/Test.Model.SL.csproj deleted file mode 100644 index 31d85627..00000000 --- a/Test Projects/Test.Model/Test.Model.SL.csproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {B920BE08-ECDB-42CE-AD08-4D2B6426A2FE} - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - Test.Model - Test.Model.SL - Silverlight - v5.0 - $(TargetFrameworkVersion) - false - true - true - - Bin.SL5 - $(BaseOutputPath)\$(Configuration) - ..\..\ - true - - - - v3.5 - - - true - full - false - DEBUG;TRACE;SILVERLIGHT - true - true - prompt - 4 - - - pdbonly - true - TRACE;SILVERLIGHT - true - true - prompt - 4 - - - true - - - Cocktail.snk - - - - False - ..\..\..\..\..\..\DevForce 2012\Silverlight Assemblies\IdeaBlade.Core.SL.dll - - - False - ..\..\..\..\..\..\DevForce 2012\Silverlight Assemblies\IdeaBlade.EntityModel.SL.dll - - - False - ..\..\..\..\..\..\DevForce 2012\Silverlight Assemblies\IdeaBlade.Validation.SL.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Test Projects/Test.Model/packages.config b/Test Projects/Test.Model/packages.config index b873d2d9..9607cfd7 100644 --- a/Test Projects/Test.Model/packages.config +++ b/Test Projects/Test.Model/packages.config @@ -2,5 +2,4 @@ - \ No newline at end of file