diff --git a/GtkTest/GtkTest.csproj b/GtkTest/GtkTest.csproj index 97af345b..153a1f3f 100644 --- a/GtkTest/GtkTest.csproj +++ b/GtkTest/GtkTest.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {0AF50CE4-E455-4A9D-92AD-711CBD068A55} Exe diff --git a/MacTest/MacTest.csproj b/MacTest/MacTest.csproj index fc543644..a3f46b89 100644 --- a/MacTest/MacTest.csproj +++ b/MacTest/MacTest.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {2B7FF081-FE53-42F7-9D5D-D4B38E548F94} {948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/MixedGtkMacTest/MixedGtkMacTest.csproj b/MixedGtkMacTest/MixedGtkMacTest.csproj index be0919c9..5a8cde4d 100644 --- a/MixedGtkMacTest/MixedGtkMacTest.csproj +++ b/MixedGtkMacTest/MixedGtkMacTest.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {14CF6E75-0D08-4BBD-B0F5-742196E5656D} Exe diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj index 6a4bcc57..a64c2d70 100644 --- a/Samples/Samples.csproj +++ b/Samples/Samples.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {88C04B85-B69B-47B4-AB9F-64F6DD4E0897} Library diff --git a/Testing/GtkTestRunner.csproj b/Testing/GtkTestRunner.csproj index 9d701d5d..cb746a90 100644 --- a/Testing/GtkTestRunner.csproj +++ b/Testing/GtkTestRunner.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {BC764278-4141-483C-8643-2EA8C40373B2} Exe @@ -43,22 +43,14 @@ libs\nunit-console-runner.dll - - False - - - False - - - False - + + + libs\nunit.util.dll - - False - + diff --git a/Testing/MacTestRunner.csproj b/Testing/MacTestRunner.csproj index 82354841..59db51fc 100644 --- a/Testing/MacTestRunner.csproj +++ b/Testing/MacTestRunner.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {0017C823-67F6-4DFA-8C2C-E23CD1E33D8F} {948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/Testing/WpfTestRunner.csproj b/Testing/WpfTestRunner.csproj index f23d0f1b..dee13a2f 100644 --- a/Testing/WpfTestRunner.csproj +++ b/Testing/WpfTestRunner.csproj @@ -32,10 +32,6 @@ prompt 4 - - - - libs\nunit-console-runner.dll diff --git a/Xwt.Gtk.Mac/MacPlatformBackend.cs b/Xwt.Gtk.Mac/MacPlatformBackend.cs new file mode 100644 index 00000000..2b013c3b --- /dev/null +++ b/Xwt.Gtk.Mac/MacPlatformBackend.cs @@ -0,0 +1,38 @@ +// +// GtkMacEngine.cs +// +// Author: +// Lluis Sanchez Gual +// +// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using Xwt.GtkBackend; + +namespace Xwt.Gtk.Mac +{ + public class MacPlatformBackend: GtkPlatformBackend + { + public override void Initialize () + { + } + } +} + diff --git a/Xwt.Gtk.Mac/Properties/AssemblyInfo.cs b/Xwt.Gtk.Mac/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..c6ede56e --- /dev/null +++ b/Xwt.Gtk.Mac/Properties/AssemblyInfo.cs @@ -0,0 +1,47 @@ +// +// AssemblyInfo.cs +// +// Author: +// Lluis Sanchez Gual +// +// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System.Reflection; +using System.Runtime.CompilerServices; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. +[assembly: AssemblyTitle ("Xwt.GtkMac")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("Xamarin")] +[assembly: AssemblyProduct ("")] +[assembly: AssemblyCopyright ("Xamarin, Inc (http://www.xamarin.com)")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. +[assembly: AssemblyVersion ("1.0.*")] +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + diff --git a/Xwt.Gtk.Mac/Xwt.Gtk.Mac.csproj b/Xwt.Gtk.Mac/Xwt.Gtk.Mac.csproj index aae472a6..a4ff10f4 100644 --- a/Xwt.Gtk.Mac/Xwt.Gtk.Mac.csproj +++ b/Xwt.Gtk.Mac/Xwt.Gtk.Mac.csproj @@ -3,13 +3,14 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 - {FB234220-D409-43D9-8926-E2D629A19285} - {948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {E95833C9-90AA-4366-9262-0A1BED148249} Library Xwt.Gtk.Mac Xwt.Gtk.Mac + true + ..\xwt.snk true @@ -20,67 +21,33 @@ prompt 4 false - false - false - false - false - none + full true bin\Release prompt 4 false - false - false - false - false - - False - - - False - - - False - - - False - - - False - - - + + + + - - - - - - - - - - - - - {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} - Xwt - {C3887A93-B2BD-4097-8E2F-3A063EFF32FD} Xwt.Gtk + False - - {B7C1673E-5124-4BE5-8D21-EC8B12F85B6B} - Xwt.Mac + + {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} + Xwt + False - + \ No newline at end of file diff --git a/Xwt.Gtk.Windows/Properties/AssemblyInfo.cs b/Xwt.Gtk.Windows/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..a17877ae --- /dev/null +++ b/Xwt.Gtk.Windows/Properties/AssemblyInfo.cs @@ -0,0 +1,47 @@ +// +// AssemblyInfo.cs +// +// Author: +// Lluis Sanchez Gual +// +// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System.Reflection; +using System.Runtime.CompilerServices; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. +[assembly: AssemblyTitle ("Xwt.GtkWin32")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("Xamarin")] +[assembly: AssemblyProduct ("")] +[assembly: AssemblyCopyright ("Xamarin, Inc (http://www.xamarin.com)")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. +[assembly: AssemblyVersion ("1.0.*")] +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + diff --git a/Xwt.Gtk.Windows/WindowsPlatformBackend.cs b/Xwt.Gtk.Windows/WindowsPlatformBackend.cs new file mode 100644 index 00000000..8880252c --- /dev/null +++ b/Xwt.Gtk.Windows/WindowsPlatformBackend.cs @@ -0,0 +1,35 @@ +// +// GtkWin32Engine.cs +// +// Author: +// Lluis Sanchez Gual +// +// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using Xwt.GtkBackend; + +namespace Xwt.Gtk.Windows +{ + public class WindowsPlatformBackend: GtkPlatformBackend + { + } +} + diff --git a/Xwt.Gtk.Windows/Xwt.Gtk.Windows.csproj b/Xwt.Gtk.Windows/Xwt.Gtk.Windows.csproj new file mode 100644 index 00000000..aa4c1456 --- /dev/null +++ b/Xwt.Gtk.Windows/Xwt.Gtk.Windows.csproj @@ -0,0 +1,53 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9} + Library + Xwt.Gtk.Windows + Xwt.GtkWin32 + true + ..\xwt.snk + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + false + + + full + true + bin\Release + prompt + 4 + false + + + + + + + + + + + + {C3887A93-B2BD-4097-8E2F-3A063EFF32FD} + Xwt.Gtk + False + + + {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} + Xwt + False + + + \ No newline at end of file diff --git a/Xwt.Gtk/AssemblyInfo.cs b/Xwt.Gtk/AssemblyInfo.cs index 6a5f632f..e4b21c0f 100755 --- a/Xwt.Gtk/AssemblyInfo.cs +++ b/Xwt.Gtk/AssemblyInfo.cs @@ -25,3 +25,7 @@ using System.Runtime.CompilerServices; //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] +[assembly:InternalsVisibleTo("Xwt.Gtk.Mac, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")] +[assembly:InternalsVisibleTo("Xwt.Gtk.Windows, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")] + + diff --git a/Xwt.Gtk/Xwt.Gtk.csproj b/Xwt.Gtk/Xwt.Gtk.csproj index 50ac8955..19ae25f4 100644 --- a/Xwt.Gtk/Xwt.Gtk.csproj +++ b/Xwt.Gtk/Xwt.Gtk.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.21022 + 8.0.30703 2.0 {C3887A93-B2BD-4097-8E2F-3A063EFF32FD} Library @@ -128,6 +128,7 @@ + diff --git a/Xwt.Gtk/Xwt.GtkBackend/GtkEngine.cs b/Xwt.Gtk/Xwt.GtkBackend/GtkEngine.cs index bad937bf..e94bc934 100755 --- a/Xwt.Gtk/Xwt.GtkBackend/GtkEngine.cs +++ b/Xwt.Gtk/Xwt.GtkBackend/GtkEngine.cs @@ -29,11 +29,15 @@ using System; using Xwt.Backends; using Xwt.CairoBackend; using Gdk; +using System.Reflection; +using System.IO; namespace Xwt.GtkBackend { public class GtkEngine: ToolkitEngineBackend { + GtkPlatformBackend platformBackend; + public override void InitializeApplication () { Gtk.Application.Init (); @@ -103,6 +107,34 @@ namespace Xwt.GtkBackend RegisterBackend (); RegisterBackend (); RegisterBackend (); + + string typeName = null; + string asmName = null; + if (Platform.IsMac) { + typeName = "Xwt.Gtk.Mac.MacPlatformBackend"; + asmName = "Xwt.Gtk.Mac"; + } + + if (typeName != null) { + var loc = Path.GetDirectoryName (GetType ().Assembly.Location); + loc = Path.Combine (loc, asmName + ".dll"); + + Assembly asm = null; + try { + if (File.Exists (loc)) { + asm = Assembly.LoadFrom (loc); + } else { + asm = Assembly.Load (asmName); + } + } catch { + // Not found + } + + Type platformType = asm != null ? asm.GetType (typeName) : null; + + if (platformType != null) + platformBackend = (GtkPlatformBackend) Activator.CreateInstance (platformType); + } } public override void Dispose () diff --git a/Xwt.Gtk/Xwt.GtkBackend/GtkPlatformBackend.cs b/Xwt.Gtk/Xwt.GtkBackend/GtkPlatformBackend.cs new file mode 100644 index 00000000..ed076bae --- /dev/null +++ b/Xwt.Gtk/Xwt.GtkBackend/GtkPlatformBackend.cs @@ -0,0 +1,37 @@ +// +// GtkPlatformBackend.cs +// +// Author: +// Lluis Sanchez Gual +// +// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; + +namespace Xwt.GtkBackend +{ + public class GtkPlatformBackend + { + public virtual void Initialize () + { + } + } +} + diff --git a/Xwt.Mac/Xwt.Mac.csproj b/Xwt.Mac/Xwt.Mac.csproj index 9fa8bb70..9921e770 100644 --- a/Xwt.Mac/Xwt.Mac.csproj +++ b/Xwt.Mac/Xwt.Mac.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {B7C1673E-5124-4BE5-8D21-EC8B12F85B6B} Library diff --git a/Xwt.WPF/Xwt.WPF.csproj b/Xwt.WPF/Xwt.WPF.csproj index 7fb94d7c..e4add5d0 100644 --- a/Xwt.WPF/Xwt.WPF.csproj +++ b/Xwt.WPF/Xwt.WPF.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 10.0.0 + 8.0.30703 2.0 {C93D746E-1586-4D4F-B411-BF5A966E6A08} Library diff --git a/Xwt.sln b/Xwt.sln index 9633fe15..f0517b6e 100644 --- a/Xwt.sln +++ b/Xwt.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt", "Xwt\Xwt.csproj", "{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}" @@ -29,6 +29,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfTest", "WpfTest\WpfTest. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MixedGtkMacTest", "MixedGtkMacTest\MixedGtkMacTest.csproj", "{14CF6E75-0D08-4BBD-B0F5-742196E5656D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Mac", "Xwt.Gtk.Mac\Xwt.Gtk.Mac.csproj", "{E95833C9-90AA-4366-9262-0A1BED148249}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xwt.Gtk.Windows", "Xwt.Gtk.Windows\Xwt.Gtk.Windows.csproj", "{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution AppStore|Any CPU = AppStore|Any CPU @@ -150,6 +154,39 @@ Global {14CF6E75-0D08-4BBD-B0F5-742196E5656D}.Win-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {14CF6E75-0D08-4BBD-B0F5-742196E5656D}.Win-Debug|Mixed Platforms.Build.0 = Debug|Any CPU {14CF6E75-0D08-4BBD-B0F5-742196E5656D}.Win-Debug|x86.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.AppStore|x86.ActiveCfg = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.AppStore|x86.Build.0 = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|x86.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Debug|x86.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Linux-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Linux-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Linux-Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Linux-Debug|x86.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Linux-Debug|x86.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Mac-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Mac-Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Mac-Debug|x86.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Mac-Debug|x86.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|Any CPU.Build.0 = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|x86.ActiveCfg = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Release|x86.Build.0 = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Win-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Win-Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Win-Debug|x86.ActiveCfg = Debug|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.Win-Debug|x86.Build.0 = Debug|Any CPU {2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU {2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.AppStore|Any CPU.Build.0 = Debug|Any CPU {2B7FF081-FE53-42F7-9D5D-D4B38E548F94}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -404,6 +441,39 @@ Global {E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Win-Debug|Mixed Platforms.Build.0 = Debug|x86 {E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Win-Debug|x86.ActiveCfg = Debug|x86 {E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Win-Debug|x86.Build.0 = Debug|x86 + {E95833C9-90AA-4366-9262-0A1BED148249}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.AppStore|x86.ActiveCfg = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.AppStore|x86.Build.0 = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Debug|x86.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Debug|x86.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Linux-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Linux-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Linux-Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Linux-Debug|x86.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Linux-Debug|x86.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Mac-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Mac-Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Mac-Debug|x86.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Mac-Debug|x86.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Release|Any CPU.Build.0 = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Release|x86.ActiveCfg = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Release|x86.Build.0 = Release|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Win-Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Win-Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Win-Debug|x86.ActiveCfg = Debug|Any CPU + {E95833C9-90AA-4366-9262-0A1BED148249}.Win-Debug|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {BC764278-4141-483C-8643-2EA8C40373B2} = {164E1FED-7688-4AE9-B19B-012F8784F9DD} diff --git a/Xwt/Xwt.csproj b/Xwt/Xwt.csproj index 6b6a242e..dec2ef36 100644 --- a/Xwt/Xwt.csproj +++ b/Xwt/Xwt.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.21022 + 8.0.30703 2.0 {92494904-35FA-4DC9-BDE9-3A3E87AC49D3} Library