From d98f6c34216e420270546572f53c62288161ad37 Mon Sep 17 00:00:00 2001 From: Antonius Riha Date: Mon, 8 Jun 2015 22:33:18 +0200 Subject: [PATCH 01/10] csproj ToolsVersion to 4.0 --- atk/atk.csproj | 2 +- audit/audit.csproj | 2 +- cairo/cairo.csproj | 2 +- gdk/gdk.csproj | 2 +- generator/generator.csproj | 2 +- gio/gio.csproj | 2 +- glib/glib.csproj | 2 +- gtk-sharp.sln | 512 ++++++++++++++++++------------------- gtk/gtk.csproj | 2 +- pango/pango.csproj | 2 +- sample/sample.csproj | 2 +- 11 files changed, 266 insertions(+), 266 deletions(-) diff --git a/atk/atk.csproj b/atk/atk.csproj index bf262bbe4..f769119f0 100644 --- a/atk/atk.csproj +++ b/atk/atk.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/audit/audit.csproj b/audit/audit.csproj index 5eecec0d7..64980a516 100644 --- a/audit/audit.csproj +++ b/audit/audit.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/cairo/cairo.csproj b/cairo/cairo.csproj index a09505773..632d1dbdf 100644 --- a/cairo/cairo.csproj +++ b/cairo/cairo.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/gdk/gdk.csproj b/gdk/gdk.csproj index 96e7fd688..2c16a1234 100644 --- a/gdk/gdk.csproj +++ b/gdk/gdk.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/generator/generator.csproj b/generator/generator.csproj index fbab856bb..df6e0f6bc 100644 --- a/generator/generator.csproj +++ b/generator/generator.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/gio/gio.csproj b/gio/gio.csproj index 7495e21c6..3a93a421e 100644 --- a/gio/gio.csproj +++ b/gio/gio.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/glib/glib.csproj b/glib/glib.csproj index 762ceb644..b80beb776 100644 --- a/glib/glib.csproj +++ b/glib/glib.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/gtk-sharp.sln b/gtk-sharp.sln index ef9c2ffbf..bd332c55e 100644 --- a/gtk-sharp.sln +++ b/gtk-sharp.sln @@ -1,256 +1,256 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample", "sample\sample.csproj", "{48234565-8E78-462E-ADEC-9AAA81B641B2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator\generator.csproj", "{80E73555-2284-40DC-9068-9A40B7359B0C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtk-sharp", "gtk-sharp", "{E0AD538D-9979-479B-8CBA-ED9143536CE0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "glib", "glib\glib.csproj", "{3BF1D531-8840-4F15-8066-A9788D8C398B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "atk", "atk\atk.csproj", "{42FE871A-D8CF-4B29-9AFF-B02454E6C976}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cairo", "cairo\cairo.csproj", "{364577DB-9728-4951-AC2C-EDF7A6FCC09D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdk", "gdk\gdk.csproj", "{58346CC6-DE93-45B4-8093-3508BD5DAA12}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gio", "gio\gio.csproj", "{1C3BB17B-336D-432A-8952-4E979BC90867}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gtk", "gtk\gtk.csproj", "{94045F11-4266-40B4-910F-298985AF69D5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pango", "pango\pango.csproj", "{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "audit", "audit\audit.csproj", "{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.ActiveCfg = Debug|x86 - {1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.Build.0 = Debug|x86 - {1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.ActiveCfg = Release|x86 - {1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.Build.0 = Release|x86 - {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.ActiveCfg = Debug|x86 - {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.Build.0 = Debug|x86 - {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.ActiveCfg = Release|x86 - {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.Build.0 = Release|x86 - {3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.ActiveCfg = Debug|x86 - {3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.Build.0 = Debug|x86 - {3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.ActiveCfg = Release|x86 - {3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.Build.0 = Release|x86 - {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.ActiveCfg = Debug|x86 - {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.Build.0 = Debug|x86 - {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.ActiveCfg = Release|x86 - {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.Build.0 = Release|x86 - {48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.ActiveCfg = Debug|x86 - {48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.Build.0 = Debug|x86 - {48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.ActiveCfg = Release|x86 - {48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.Build.0 = Release|x86 - {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.ActiveCfg = Debug|x86 - {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.Build.0 = Debug|x86 - {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.ActiveCfg = Release|x86 - {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.Build.0 = Release|x86 - {80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.ActiveCfg = Debug|x86 - {80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.Build.0 = Debug|x86 - {80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.ActiveCfg = Release|x86 - {80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.Build.0 = Release|x86 - {94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.ActiveCfg = Debug|x86 - {94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.Build.0 = Debug|x86 - {94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.ActiveCfg = Release|x86 - {94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.Build.0 = Release|x86 - {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.ActiveCfg = Debug|x86 - {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.Build.0 = Debug|x86 - {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.ActiveCfg = Release|x86 - {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.Build.0 = Release|x86 - {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.ActiveCfg = Debug|x86 - {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.Build.0 = Debug|x86 - {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.ActiveCfg = Release|x86 - {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {3BF1D531-8840-4F15-8066-A9788D8C398B} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} - {42FE871A-D8CF-4B29-9AFF-B02454E6C976} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} - {364577DB-9728-4951-AC2C-EDF7A6FCC09D} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} - {58346CC6-DE93-45B4-8093-3508BD5DAA12} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} - {1C3BB17B-336D-432A-8952-4E979BC90867} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} - {94045F11-4266-40B4-910F-298985AF69D5} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} - {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = sample\sample.csproj - Policies = $0 - $0.TextStylePolicy = $1 - $1.inheritsSet = null - $1.scope = text/x-csharp - $0.CSharpFormattingPolicy = $2 - $2.inheritsSet = Mono - $2.inheritsScope = text/x-csharp - $2.scope = text/x-csharp - $0.TextStylePolicy = $3 - $3.FileWidth = 120 - $3.TabsToSpaces = False - $3.inheritsSet = VisualStudio - $3.inheritsScope = text/plain - $3.scope = text/plain - $0.DotNetNamingPolicy = $4 - $4.DirectoryNamespaceAssociation = None - $4.ResourceNamePolicy = FileFormatDefault - $0.StandardHeader = $5 - $5.Text = - $5.IncludeInNewFiles = True - $0.NameConventionPolicy = $6 - $6.Rules = $7 - $7.NamingRule = $8 - $8.Name = Namespaces - $8.AffectedEntity = Namespace - $8.VisibilityMask = VisibilityMask - $8.NamingStyle = PascalCase - $8.IncludeInstanceMembers = True - $8.IncludeStaticEntities = True - $7.NamingRule = $9 - $9.Name = Types - $9.AffectedEntity = Class, Struct, Enum, Delegate - $9.VisibilityMask = VisibilityMask - $9.NamingStyle = PascalCase - $9.IncludeInstanceMembers = True - $9.IncludeStaticEntities = True - $7.NamingRule = $10 - $10.Name = Interfaces - $10.RequiredPrefixes = $11 - $11.String = I - $10.AffectedEntity = Interface - $10.VisibilityMask = VisibilityMask - $10.NamingStyle = PascalCase - $10.IncludeInstanceMembers = True - $10.IncludeStaticEntities = True - $7.NamingRule = $12 - $12.Name = Attributes - $12.RequiredSuffixes = $13 - $13.String = Attribute - $12.AffectedEntity = CustomAttributes - $12.VisibilityMask = VisibilityMask - $12.NamingStyle = PascalCase - $12.IncludeInstanceMembers = True - $12.IncludeStaticEntities = True - $7.NamingRule = $14 - $14.Name = Event Arguments - $14.RequiredSuffixes = $15 - $15.String = EventArgs - $14.AffectedEntity = CustomEventArgs - $14.VisibilityMask = VisibilityMask - $14.NamingStyle = PascalCase - $14.IncludeInstanceMembers = True - $14.IncludeStaticEntities = True - $7.NamingRule = $16 - $16.Name = Exceptions - $16.RequiredSuffixes = $17 - $17.String = Exception - $16.AffectedEntity = CustomExceptions - $16.VisibilityMask = VisibilityMask - $16.NamingStyle = PascalCase - $16.IncludeInstanceMembers = True - $16.IncludeStaticEntities = True - $7.NamingRule = $18 - $18.Name = Methods - $18.AffectedEntity = Methods - $18.VisibilityMask = VisibilityMask - $18.NamingStyle = PascalCase - $18.IncludeInstanceMembers = True - $18.IncludeStaticEntities = True - $7.NamingRule = $19 - $19.Name = Static Readonly Fields - $19.AffectedEntity = ReadonlyField - $19.VisibilityMask = Internal, Protected, Public - $19.NamingStyle = PascalCase - $19.IncludeInstanceMembers = False - $19.IncludeStaticEntities = True - $7.NamingRule = $20 - $20.Name = Fields (Non Private) - $20.AffectedEntity = Field - $20.VisibilityMask = Internal, Protected, Public - $20.NamingStyle = PascalCase - $20.IncludeInstanceMembers = True - $20.IncludeStaticEntities = True - $7.NamingRule = $21 - $21.Name = ReadOnly Fields (Non Private) - $21.AffectedEntity = ReadonlyField - $21.VisibilityMask = Internal, Protected, Public - $21.NamingStyle = PascalCase - $21.IncludeInstanceMembers = True - $21.IncludeStaticEntities = False - $7.NamingRule = $22 - $22.Name = Fields (Private) - $22.AllowedPrefixes = $23 - $23.String = _ - $23.String = m_ - $22.AffectedEntity = Field, ReadonlyField - $22.VisibilityMask = Private - $22.NamingStyle = CamelCase - $22.IncludeInstanceMembers = True - $22.IncludeStaticEntities = False - $7.NamingRule = $24 - $24.Name = Static Fields (Private) - $24.AffectedEntity = Field - $24.VisibilityMask = Private - $24.NamingStyle = CamelCase - $24.IncludeInstanceMembers = False - $24.IncludeStaticEntities = True - $7.NamingRule = $25 - $25.Name = ReadOnly Fields (Private) - $25.AllowedPrefixes = $26 - $26.String = _ - $26.String = m_ - $25.AffectedEntity = ReadonlyField - $25.VisibilityMask = Private - $25.NamingStyle = CamelCase - $25.IncludeInstanceMembers = True - $25.IncludeStaticEntities = False - $7.NamingRule = $27 - $27.Name = Constant Fields - $27.AffectedEntity = ConstantField - $27.VisibilityMask = VisibilityMask - $27.NamingStyle = PascalCase - $27.IncludeInstanceMembers = True - $27.IncludeStaticEntities = True - $7.NamingRule = $28 - $28.Name = Properties - $28.AffectedEntity = Property - $28.VisibilityMask = VisibilityMask - $28.NamingStyle = PascalCase - $28.IncludeInstanceMembers = True - $28.IncludeStaticEntities = True - $7.NamingRule = $29 - $29.Name = Events - $29.AffectedEntity = Event - $29.VisibilityMask = VisibilityMask - $29.NamingStyle = PascalCase - $29.IncludeInstanceMembers = True - $29.IncludeStaticEntities = True - $7.NamingRule = $30 - $30.Name = Enum Members - $30.AffectedEntity = EnumMember - $30.VisibilityMask = VisibilityMask - $30.NamingStyle = PascalCase - $30.IncludeInstanceMembers = True - $30.IncludeStaticEntities = True - $7.NamingRule = $31 - $31.Name = Parameters - $31.AffectedEntity = Parameter - $31.VisibilityMask = VisibilityMask - $31.NamingStyle = CamelCase - $31.IncludeInstanceMembers = True - $31.IncludeStaticEntities = True - $7.NamingRule = $32 - $32.Name = Type Parameters - $32.RequiredPrefixes = $33 - $33.String = T - $32.AffectedEntity = TypeParameter - $32.VisibilityMask = VisibilityMask - $32.NamingStyle = PascalCase - $32.IncludeInstanceMembers = True - $32.IncludeStaticEntities = True - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample", "sample\sample.csproj", "{48234565-8E78-462E-ADEC-9AAA81B641B2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator\generator.csproj", "{80E73555-2284-40DC-9068-9A40B7359B0C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtk-sharp", "gtk-sharp", "{E0AD538D-9979-479B-8CBA-ED9143536CE0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "glib", "glib\glib.csproj", "{3BF1D531-8840-4F15-8066-A9788D8C398B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "atk", "atk\atk.csproj", "{42FE871A-D8CF-4B29-9AFF-B02454E6C976}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cairo", "cairo\cairo.csproj", "{364577DB-9728-4951-AC2C-EDF7A6FCC09D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdk", "gdk\gdk.csproj", "{58346CC6-DE93-45B4-8093-3508BD5DAA12}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gio", "gio\gio.csproj", "{1C3BB17B-336D-432A-8952-4E979BC90867}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gtk", "gtk\gtk.csproj", "{94045F11-4266-40B4-910F-298985AF69D5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pango", "pango\pango.csproj", "{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "audit", "audit\audit.csproj", "{D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.ActiveCfg = Debug|x86 + {1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.Build.0 = Debug|x86 + {1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.ActiveCfg = Release|x86 + {1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.Build.0 = Release|x86 + {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.ActiveCfg = Debug|x86 + {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.Build.0 = Debug|x86 + {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.ActiveCfg = Release|x86 + {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.Build.0 = Release|x86 + {3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.ActiveCfg = Debug|x86 + {3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.Build.0 = Debug|x86 + {3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.ActiveCfg = Release|x86 + {3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.Build.0 = Release|x86 + {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.ActiveCfg = Debug|x86 + {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.Build.0 = Debug|x86 + {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.ActiveCfg = Release|x86 + {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.Build.0 = Release|x86 + {48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.ActiveCfg = Debug|x86 + {48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.Build.0 = Debug|x86 + {48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.ActiveCfg = Release|x86 + {48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.Build.0 = Release|x86 + {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.ActiveCfg = Debug|x86 + {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.Build.0 = Debug|x86 + {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.ActiveCfg = Release|x86 + {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.Build.0 = Release|x86 + {80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.ActiveCfg = Debug|x86 + {80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.Build.0 = Debug|x86 + {80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.ActiveCfg = Release|x86 + {80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.Build.0 = Release|x86 + {94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.ActiveCfg = Debug|x86 + {94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.Build.0 = Debug|x86 + {94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.ActiveCfg = Release|x86 + {94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.Build.0 = Release|x86 + {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.ActiveCfg = Debug|x86 + {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.Build.0 = Debug|x86 + {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.ActiveCfg = Release|x86 + {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.Build.0 = Release|x86 + {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.ActiveCfg = Debug|x86 + {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.Build.0 = Debug|x86 + {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.ActiveCfg = Release|x86 + {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {3BF1D531-8840-4F15-8066-A9788D8C398B} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} + {42FE871A-D8CF-4B29-9AFF-B02454E6C976} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} + {364577DB-9728-4951-AC2C-EDF7A6FCC09D} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} + {58346CC6-DE93-45B4-8093-3508BD5DAA12} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} + {1C3BB17B-336D-432A-8952-4E979BC90867} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} + {94045F11-4266-40B4-910F-298985AF69D5} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} + {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = sample\sample.csproj + Policies = $0 + $0.TextStylePolicy = $1 + $1.inheritsSet = null + $1.scope = text/x-csharp + $0.CSharpFormattingPolicy = $2 + $2.inheritsSet = Mono + $2.inheritsScope = text/x-csharp + $2.scope = text/x-csharp + $0.TextStylePolicy = $3 + $3.FileWidth = 120 + $3.TabsToSpaces = False + $3.inheritsSet = VisualStudio + $3.inheritsScope = text/plain + $3.scope = text/plain + $0.DotNetNamingPolicy = $4 + $4.DirectoryNamespaceAssociation = None + $4.ResourceNamePolicy = FileFormatDefault + $0.StandardHeader = $5 + $5.Text = + $5.IncludeInNewFiles = True + $0.NameConventionPolicy = $6 + $6.Rules = $7 + $7.NamingRule = $8 + $8.Name = Namespaces + $8.AffectedEntity = Namespace + $8.VisibilityMask = VisibilityMask + $8.NamingStyle = PascalCase + $8.IncludeInstanceMembers = True + $8.IncludeStaticEntities = True + $7.NamingRule = $9 + $9.Name = Types + $9.AffectedEntity = Class, Struct, Enum, Delegate + $9.VisibilityMask = VisibilityMask + $9.NamingStyle = PascalCase + $9.IncludeInstanceMembers = True + $9.IncludeStaticEntities = True + $7.NamingRule = $10 + $10.Name = Interfaces + $10.RequiredPrefixes = $11 + $11.String = I + $10.AffectedEntity = Interface + $10.VisibilityMask = VisibilityMask + $10.NamingStyle = PascalCase + $10.IncludeInstanceMembers = True + $10.IncludeStaticEntities = True + $7.NamingRule = $12 + $12.Name = Attributes + $12.RequiredSuffixes = $13 + $13.String = Attribute + $12.AffectedEntity = CustomAttributes + $12.VisibilityMask = VisibilityMask + $12.NamingStyle = PascalCase + $12.IncludeInstanceMembers = True + $12.IncludeStaticEntities = True + $7.NamingRule = $14 + $14.Name = Event Arguments + $14.RequiredSuffixes = $15 + $15.String = EventArgs + $14.AffectedEntity = CustomEventArgs + $14.VisibilityMask = VisibilityMask + $14.NamingStyle = PascalCase + $14.IncludeInstanceMembers = True + $14.IncludeStaticEntities = True + $7.NamingRule = $16 + $16.Name = Exceptions + $16.RequiredSuffixes = $17 + $17.String = Exception + $16.AffectedEntity = CustomExceptions + $16.VisibilityMask = VisibilityMask + $16.NamingStyle = PascalCase + $16.IncludeInstanceMembers = True + $16.IncludeStaticEntities = True + $7.NamingRule = $18 + $18.Name = Methods + $18.AffectedEntity = Methods + $18.VisibilityMask = VisibilityMask + $18.NamingStyle = PascalCase + $18.IncludeInstanceMembers = True + $18.IncludeStaticEntities = True + $7.NamingRule = $19 + $19.Name = Static Readonly Fields + $19.AffectedEntity = ReadonlyField + $19.VisibilityMask = Internal, Protected, Public + $19.NamingStyle = PascalCase + $19.IncludeInstanceMembers = False + $19.IncludeStaticEntities = True + $7.NamingRule = $20 + $20.Name = Fields (Non Private) + $20.AffectedEntity = Field + $20.VisibilityMask = Internal, Protected, Public + $20.NamingStyle = PascalCase + $20.IncludeInstanceMembers = True + $20.IncludeStaticEntities = True + $7.NamingRule = $21 + $21.Name = ReadOnly Fields (Non Private) + $21.AffectedEntity = ReadonlyField + $21.VisibilityMask = Internal, Protected, Public + $21.NamingStyle = PascalCase + $21.IncludeInstanceMembers = True + $21.IncludeStaticEntities = False + $7.NamingRule = $22 + $22.Name = Fields (Private) + $22.AllowedPrefixes = $23 + $23.String = _ + $23.String = m_ + $22.AffectedEntity = Field, ReadonlyField + $22.VisibilityMask = Private + $22.NamingStyle = CamelCase + $22.IncludeInstanceMembers = True + $22.IncludeStaticEntities = False + $7.NamingRule = $24 + $24.Name = Static Fields (Private) + $24.AffectedEntity = Field + $24.VisibilityMask = Private + $24.NamingStyle = CamelCase + $24.IncludeInstanceMembers = False + $24.IncludeStaticEntities = True + $7.NamingRule = $25 + $25.Name = ReadOnly Fields (Private) + $25.AllowedPrefixes = $26 + $26.String = _ + $26.String = m_ + $25.AffectedEntity = ReadonlyField + $25.VisibilityMask = Private + $25.NamingStyle = CamelCase + $25.IncludeInstanceMembers = True + $25.IncludeStaticEntities = False + $7.NamingRule = $27 + $27.Name = Constant Fields + $27.AffectedEntity = ConstantField + $27.VisibilityMask = VisibilityMask + $27.NamingStyle = PascalCase + $27.IncludeInstanceMembers = True + $27.IncludeStaticEntities = True + $7.NamingRule = $28 + $28.Name = Properties + $28.AffectedEntity = Property + $28.VisibilityMask = VisibilityMask + $28.NamingStyle = PascalCase + $28.IncludeInstanceMembers = True + $28.IncludeStaticEntities = True + $7.NamingRule = $29 + $29.Name = Events + $29.AffectedEntity = Event + $29.VisibilityMask = VisibilityMask + $29.NamingStyle = PascalCase + $29.IncludeInstanceMembers = True + $29.IncludeStaticEntities = True + $7.NamingRule = $30 + $30.Name = Enum Members + $30.AffectedEntity = EnumMember + $30.VisibilityMask = VisibilityMask + $30.NamingStyle = PascalCase + $30.IncludeInstanceMembers = True + $30.IncludeStaticEntities = True + $7.NamingRule = $31 + $31.Name = Parameters + $31.AffectedEntity = Parameter + $31.VisibilityMask = VisibilityMask + $31.NamingStyle = CamelCase + $31.IncludeInstanceMembers = True + $31.IncludeStaticEntities = True + $7.NamingRule = $32 + $32.Name = Type Parameters + $32.RequiredPrefixes = $33 + $33.String = T + $32.AffectedEntity = TypeParameter + $32.VisibilityMask = VisibilityMask + $32.NamingStyle = PascalCase + $32.IncludeInstanceMembers = True + $32.IncludeStaticEntities = True + EndGlobalSection +EndGlobal diff --git a/gtk/gtk.csproj b/gtk/gtk.csproj index 11bbc08eb..2dfa09d66 100644 --- a/gtk/gtk.csproj +++ b/gtk/gtk.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/pango/pango.csproj b/pango/pango.csproj index 2e6e52d31..23a03068f 100644 --- a/pango/pango.csproj +++ b/pango/pango.csproj @@ -1,5 +1,5 @@ - + Debug x86 diff --git a/sample/sample.csproj b/sample/sample.csproj index a2c17919f..383309cd1 100644 --- a/sample/sample.csproj +++ b/sample/sample.csproj @@ -1,5 +1,5 @@ - + Debug x86 From 16310b15a0f0e4cd78bab0b30f7786dda7ff18e1 Mon Sep 17 00:00:00 2001 From: Harol Alfonso Reina Herrera Date: Thu, 29 Oct 2015 09:24:44 -0500 Subject: [PATCH 02/10] Update csproj TargetFrameworkVersion --- atk/atk.csproj | 3 ++- audit/audit.csproj | 3 ++- cairo/cairo.csproj | 3 ++- gdk/gdk.csproj | 3 ++- generator/generator.csproj | 3 ++- gio/gio.csproj | 3 ++- glib/glib.csproj | 3 ++- gtk/gtk.csproj | 3 ++- pango/pango.csproj | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/atk/atk.csproj b/atk/atk.csproj index f769119f0..27b2979f4 100644 --- a/atk/atk.csproj +++ b/atk/atk.csproj @@ -9,7 +9,8 @@ Library atk atk-sharp - v3.5 + v4.0 + true diff --git a/audit/audit.csproj b/audit/audit.csproj index 64980a516..19f2cedfe 100644 --- a/audit/audit.csproj +++ b/audit/audit.csproj @@ -9,7 +9,8 @@ Exe audit audit - v3.5 + v4.0 + true diff --git a/cairo/cairo.csproj b/cairo/cairo.csproj index 632d1dbdf..3b4d65db8 100644 --- a/cairo/cairo.csproj +++ b/cairo/cairo.csproj @@ -9,7 +9,8 @@ Library cairo cairo-sharp - v3.5 + v4.0 + true diff --git a/gdk/gdk.csproj b/gdk/gdk.csproj index 2c16a1234..5d9306b8f 100644 --- a/gdk/gdk.csproj +++ b/gdk/gdk.csproj @@ -9,7 +9,8 @@ Library gdk gdk-sharp - v3.5 + v4.0 + true diff --git a/generator/generator.csproj b/generator/generator.csproj index df6e0f6bc..b4673e6bc 100644 --- a/generator/generator.csproj +++ b/generator/generator.csproj @@ -9,7 +9,8 @@ Exe generator gapi_codegen - v3.5 + v4.0 + true diff --git a/gio/gio.csproj b/gio/gio.csproj index 3a93a421e..71e01d2c0 100644 --- a/gio/gio.csproj +++ b/gio/gio.csproj @@ -9,7 +9,8 @@ Library gio gio-sharp - v3.5 + v4.0 + true diff --git a/glib/glib.csproj b/glib/glib.csproj index b80beb776..55eccbd27 100644 --- a/glib/glib.csproj +++ b/glib/glib.csproj @@ -9,7 +9,8 @@ Library glib glib-sharp - v3.5 + v4.0 + true diff --git a/gtk/gtk.csproj b/gtk/gtk.csproj index 2dfa09d66..ef90088fd 100644 --- a/gtk/gtk.csproj +++ b/gtk/gtk.csproj @@ -9,7 +9,8 @@ Library gtk gtk-sharp - v3.5 + v4.0 + true diff --git a/pango/pango.csproj b/pango/pango.csproj index 23a03068f..f60d9ae9a 100644 --- a/pango/pango.csproj +++ b/pango/pango.csproj @@ -9,7 +9,8 @@ Library pango pango-sharp - v3.5 + v4.0 + true From 751a5ceed5b8fe8d0c4defe22cb6969b0379ac5d Mon Sep 17 00:00:00 2001 From: Harol Alfonso Reina Herrera Date: Thu, 29 Oct 2015 10:10:23 -0500 Subject: [PATCH 03/10] Update References file's in csproj --- atk/atk.csproj | 21 ++- gdk/gdk.csproj | 40 +++-- gio/gio.csproj | 207 +++++++++++++----------- glib/glib.csproj | 4 + gtk/gtk.csproj | 364 ++++++++++++++++++++++++++++++++----------- pango/pango.csproj | 42 +++-- sample/sample.csproj | 28 ++-- 7 files changed, 481 insertions(+), 225 deletions(-) diff --git a/atk/atk.csproj b/atk/atk.csproj index 27b2979f4..824da7ce4 100644 --- a/atk/atk.csproj +++ b/atk/atk.csproj @@ -128,6 +128,21 @@ + + + + + + + + + + + + + + Properties\AssemblyInfo.cs + @@ -135,12 +150,10 @@ glib - - - + PreserveNewest - \ No newline at end of file + diff --git a/gdk/gdk.csproj b/gdk/gdk.csproj index 5d9306b8f..a35afdffc 100644 --- a/gdk/gdk.csproj +++ b/gdk/gdk.csproj @@ -76,6 +76,8 @@ + + @@ -83,6 +85,7 @@ + @@ -112,18 +115,25 @@ - + + - + + + + + + + @@ -132,25 +142,24 @@ + + - - + - - @@ -184,9 +193,9 @@ + - @@ -207,23 +216,26 @@ + + + - - - + + Properties\AssemblyInfo.cs + @@ -243,14 +255,10 @@ pango - - - - - + PreserveNewest - \ No newline at end of file + diff --git a/gio/gio.csproj b/gio/gio.csproj index 71e01d2c0..6bc47ffcb 100644 --- a/gio/gio.csproj +++ b/gio/gio.csproj @@ -46,102 +46,95 @@ + + - + - - - - - - - - + - + - - - - - - - - - + - - - - - - + + - + - - + + + + - + + + + + + + + + + + - - - - - - + + + + @@ -155,11 +148,15 @@ + + - + + + @@ -172,38 +169,28 @@ + - + + - - + + - - - - - - - - - - - - - - + + @@ -215,14 +202,16 @@ - - + + + + + - @@ -231,24 +220,18 @@ - - - - - - + + - - @@ -256,12 +239,33 @@ + + + + + + + + + + + - - + + + + + + + + + + + + @@ -274,26 +278,42 @@ + - + + + + - - + + + + - + + + + + + + + + + + @@ -305,56 +325,68 @@ - + + + - - - + + + + + + + + + + - + - - + + + + + + + + - - - @@ -363,14 +395,14 @@ - - + - - + + Properties\AssemblyInfo.cs + @@ -381,13 +413,10 @@ - - - - + PreserveNewest - \ No newline at end of file + diff --git a/glib/glib.csproj b/glib/glib.csproj index 55eccbd27..24bf5bbda 100644 --- a/glib/glib.csproj +++ b/glib/glib.csproj @@ -103,6 +103,10 @@ + + + Properties\AssemblyInfo.cs + diff --git a/gtk/gtk.csproj b/gtk/gtk.csproj index ef90088fd..97b284691 100644 --- a/gtk/gtk.csproj +++ b/gtk/gtk.csproj @@ -148,7 +148,6 @@ - @@ -158,24 +157,29 @@ + + + + + + + - - + - - + @@ -183,23 +187,30 @@ + + - - - + + + + + + + + @@ -211,13 +222,14 @@ - + + @@ -244,10 +256,12 @@ - + + + @@ -261,17 +275,28 @@ + + + + + + + + + + + + - @@ -279,11 +304,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -292,11 +366,12 @@ - + + @@ -309,6 +384,8 @@ + + @@ -322,15 +399,19 @@ + + + - + + @@ -342,6 +423,9 @@ + + + @@ -362,19 +446,39 @@ - + + + + + - + + + + + + + + - + + + + + + + + + + @@ -388,10 +492,12 @@ + + @@ -409,15 +515,25 @@ + + + + + + + + + + - + @@ -426,6 +542,7 @@ + @@ -441,24 +558,51 @@ - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -473,55 +617,51 @@ - - - - - - - + + - + + - - - - - - - - - - - + + + + + + + + + + - - + + + @@ -532,19 +672,29 @@ + + + + + + + + + + @@ -557,11 +707,11 @@ - + @@ -570,10 +720,14 @@ + + + + @@ -587,16 +741,24 @@ + + + + + + + + @@ -607,7 +769,9 @@ + + @@ -615,9 +779,6 @@ - - - @@ -633,14 +794,18 @@ + + + + - + @@ -671,20 +836,19 @@ + - - - + @@ -693,6 +857,10 @@ + + + + @@ -700,21 +868,26 @@ + + - - - - + + + + + + + @@ -725,68 +898,72 @@ - - - - + - + - - - - - + + + + + + + - + + + + + - - + + + + - - + @@ -796,6 +973,7 @@ + @@ -811,10 +989,11 @@ - + + @@ -836,27 +1015,24 @@ + + - - - - + + - - - - + @@ -866,8 +1042,14 @@ + + + + + + @@ -912,31 +1094,40 @@ - - + - - - + + + + + + + + + + + + Properties\AssemblyInfo.cs + @@ -967,10 +1158,7 @@ pango - - - - + PreserveNewest diff --git a/pango/pango.csproj b/pango/pango.csproj index f60d9ae9a..61f9856ce 100644 --- a/pango/pango.csproj +++ b/pango/pango.csproj @@ -90,7 +90,6 @@ - @@ -103,6 +102,17 @@ + + + + + + + + + + + @@ -112,6 +122,12 @@ + + + + + + @@ -122,12 +138,6 @@ - - - - - - @@ -138,8 +148,8 @@ - + @@ -149,14 +159,14 @@ + - - + @@ -165,8 +175,8 @@ - + @@ -189,6 +199,9 @@ + + Properties\AssemblyInfo.cs + @@ -200,13 +213,10 @@ cairo - - - - + PreserveNewest - \ No newline at end of file + diff --git a/sample/sample.csproj b/sample/sample.csproj index 383309cd1..a6c91b410 100644 --- a/sample/sample.csproj +++ b/sample/sample.csproj @@ -9,7 +9,8 @@ Exe sample sample - v3.5 + v4.0 + true @@ -50,7 +51,6 @@ - @@ -83,15 +83,6 @@ - - - - - - - - - @@ -108,11 +99,20 @@ - + + + + + + + + + + @@ -123,6 +123,7 @@ + @@ -154,4 +155,7 @@ gtk + + + \ No newline at end of file From c7dfa5decce6f29d42fe39dc1bcd6636b8ef06b0 Mon Sep 17 00:00:00 2001 From: Harol Alfonso Reina Herrera Date: Thu, 29 Oct 2015 11:19:50 -0500 Subject: [PATCH 04/10] Update Solution to Visual Studio 2013 --- gtk-sharp.sln | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/gtk-sharp.sln b/gtk-sharp.sln index bd332c55e..300887f44 100644 --- a/gtk-sharp.sln +++ b/gtk-sharp.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sample", "sample\sample.csproj", "{48234565-8E78-462E-ADEC-9AAA81B641B2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "generator\generator.csproj", "{80E73555-2284-40DC-9068-9A40B7359B0C}" @@ -29,14 +31,14 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.ActiveCfg = Debug|x86 - {1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.Build.0 = Debug|x86 - {1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.ActiveCfg = Release|x86 - {1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.Build.0 = Release|x86 - {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.ActiveCfg = Debug|x86 - {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.Build.0 = Debug|x86 - {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.ActiveCfg = Release|x86 - {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.Build.0 = Release|x86 + {48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.ActiveCfg = Debug|x86 + {48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.Build.0 = Debug|x86 + {48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.ActiveCfg = Release|x86 + {48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.Build.0 = Release|x86 + {80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.ActiveCfg = Debug|x86 + {80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.Build.0 = Debug|x86 + {80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.ActiveCfg = Release|x86 + {80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.Build.0 = Release|x86 {3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.ActiveCfg = Debug|x86 {3BF1D531-8840-4F15-8066-A9788D8C398B}.Debug|x86.Build.0 = Debug|x86 {3BF1D531-8840-4F15-8066-A9788D8C398B}.Release|x86.ActiveCfg = Release|x86 @@ -45,30 +47,33 @@ Global {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Debug|x86.Build.0 = Debug|x86 {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.ActiveCfg = Release|x86 {42FE871A-D8CF-4B29-9AFF-B02454E6C976}.Release|x86.Build.0 = Release|x86 - {48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.ActiveCfg = Debug|x86 - {48234565-8E78-462E-ADEC-9AAA81B641B2}.Debug|x86.Build.0 = Debug|x86 - {48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.ActiveCfg = Release|x86 - {48234565-8E78-462E-ADEC-9AAA81B641B2}.Release|x86.Build.0 = Release|x86 + {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.ActiveCfg = Debug|x86 + {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Debug|x86.Build.0 = Debug|x86 + {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.ActiveCfg = Release|x86 + {364577DB-9728-4951-AC2C-EDF7A6FCC09D}.Release|x86.Build.0 = Release|x86 {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.ActiveCfg = Debug|x86 {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Debug|x86.Build.0 = Debug|x86 {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.ActiveCfg = Release|x86 {58346CC6-DE93-45B4-8093-3508BD5DAA12}.Release|x86.Build.0 = Release|x86 - {80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.ActiveCfg = Debug|x86 - {80E73555-2284-40DC-9068-9A40B7359B0C}.Debug|x86.Build.0 = Debug|x86 - {80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.ActiveCfg = Release|x86 - {80E73555-2284-40DC-9068-9A40B7359B0C}.Release|x86.Build.0 = Release|x86 + {1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.ActiveCfg = Debug|x86 + {1C3BB17B-336D-432A-8952-4E979BC90867}.Debug|x86.Build.0 = Debug|x86 + {1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.ActiveCfg = Release|x86 + {1C3BB17B-336D-432A-8952-4E979BC90867}.Release|x86.Build.0 = Release|x86 {94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.ActiveCfg = Debug|x86 {94045F11-4266-40B4-910F-298985AF69D5}.Debug|x86.Build.0 = Debug|x86 {94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.ActiveCfg = Release|x86 {94045F11-4266-40B4-910F-298985AF69D5}.Release|x86.Build.0 = Release|x86 - {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.ActiveCfg = Debug|x86 - {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.Build.0 = Debug|x86 - {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.ActiveCfg = Release|x86 - {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.Build.0 = Release|x86 {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.ActiveCfg = Debug|x86 {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Debug|x86.Build.0 = Debug|x86 {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.ActiveCfg = Release|x86 {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}.Release|x86.Build.0 = Release|x86 + {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.ActiveCfg = Debug|x86 + {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Debug|x86.Build.0 = Debug|x86 + {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.ActiveCfg = Release|x86 + {D8A1AAF8-EA10-4D1D-8A8A-D38C56C0A753}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {3BF1D531-8840-4F15-8066-A9788D8C398B} = {E0AD538D-9979-479B-8CBA-ED9143536CE0} From 018b6242360b3f9d8da31363109f19e36bef4990 Mon Sep 17 00:00:00 2001 From: Harol Alfonso Reina Herrera Date: Thu, 29 Oct 2015 11:25:24 -0500 Subject: [PATCH 05/10] Create gtkdotnet Project in Solution --- gtkdotnet/gtkdotnet.csproj | 71 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 gtkdotnet/gtkdotnet.csproj diff --git a/gtkdotnet/gtkdotnet.csproj b/gtkdotnet/gtkdotnet.csproj new file mode 100644 index 000000000..eccbd2196 --- /dev/null +++ b/gtkdotnet/gtkdotnet.csproj @@ -0,0 +1,71 @@ + + + + Debug + x86 + {CF2BE08F-9354-4CB6-8D49-05DFE1BBCF1F} + Library + Gtk.DotNet + gtk-dotnet + v4.0 + + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + false + true + + + full + true + bin\Release + prompt + 4 + false + true + + + + + + + + + + Properties\AssemblyInfo.cs + + + + + + {3BF1D531-8840-4F15-8066-A9788D8C398B} + glib + + + {1C3BB17B-336D-432A-8952-4E979BC90867} + gio + + + {364577DB-9728-4951-AC2C-EDF7A6FCC09D} + cairo + + + {FF422D8C-562F-4EA6-8590-9D1A5CD40AD4} + pango + + + {58346CC6-DE93-45B4-8093-3508BD5DAA12} + gdk + + + {94045F11-4266-40B4-910F-298985AF69D5} + gtk + + + From b20872aa41c99c33d89a12fffc36949379b20dc9 Mon Sep 17 00:00:00 2001 From: Harol Alfonso Reina Herrera Date: Thu, 29 Oct 2015 11:43:03 -0500 Subject: [PATCH 06/10] Revert: Seperate pkgconfig version from package version --- configure.ac | 3 --- gdk/gdk-sharp-3.0.pc.in | 2 +- gio/gio-sharp-3.0.pc.in | 2 +- glib/glib-sharp-3.0.pc.in | 2 +- gtk/gtk-sharp-3.0.pc.in | 2 +- gtkdotnet/gtk-dotnet-3.0.pc.in | 2 +- parser/gapi-3.0.pc.in | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 6bec9227d..c89c76b44 100644 --- a/configure.ac +++ b/configure.ac @@ -14,9 +14,6 @@ AC_SUBST(CAIRO_API_VERSION) POLICY_VERSIONS="" AC_SUBST(POLICY_VERSIONS) -PKG_VERSION=3.12.0 -AC_SUBST(PKG_VERSION) - PACKAGE_VERSION=gtk-sharp-3.0 AC_SUBST(PACKAGE_VERSION) diff --git a/gdk/gdk-sharp-3.0.pc.in b/gdk/gdk-sharp-3.0.pc.in index fbba15f36..b93391215 100644 --- a/gdk/gdk-sharp-3.0.pc.in +++ b/gdk/gdk-sharp-3.0.pc.in @@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0 Name: Gdk# Description: Gdk# - GDK .NET Binding -Version: @PKG_VERSION@ +Version: @VERSION@ Cflags: -I:${gapidir}/gdk-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gdk-sharp.dll Requires: glib-sharp-3.0 diff --git a/gio/gio-sharp-3.0.pc.in b/gio/gio-sharp-3.0.pc.in index fd39c6796..efb3810e3 100644 --- a/gio/gio-sharp-3.0.pc.in +++ b/gio/gio-sharp-3.0.pc.in @@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0 Name: GIO# Description: GIO# - GIO .NET Binding -Version: @PKG_VERSION@ +Version: @VERSION@ Cflags: -I:${gapidir}/gio-api.xml Libs: -r:${assemblies_dir}/gio-sharp.dll Requires: glib-sharp-3.0 diff --git a/glib/glib-sharp-3.0.pc.in b/glib/glib-sharp-3.0.pc.in index 429f32ca2..fcf0fb72c 100644 --- a/glib/glib-sharp-3.0.pc.in +++ b/glib/glib-sharp-3.0.pc.in @@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0 Name: GLib# Description: GLib# - .NET Binding for the glib library. -Version: @PKG_VERSION@ +Version: @VERSION@ Cflags: -I:${gapidir}/glib-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glib-sharp.dll diff --git a/gtk/gtk-sharp-3.0.pc.in b/gtk/gtk-sharp-3.0.pc.in index c7097d0a6..a5ed3ca2c 100644 --- a/gtk/gtk-sharp-3.0.pc.in +++ b/gtk/gtk-sharp-3.0.pc.in @@ -6,7 +6,7 @@ gapidir=${prefix}/share/gapi-3.0 Name: Gtk# Description: Gtk# - GNOME .NET Binding -Version: @PKG_VERSION@ +Version: @VERSION@ Cflags: -I:${gapidir}/cairo-api.xml -I:${gapidir}/pango-api.xml -I:${gapidir}/atk-api.xml -I:${gapidir}/gtk-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/cairo-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/pango-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/atk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-sharp.dll Requires: glib-sharp-3.0 gio-sharp-3.0 gdk-sharp-3.0 diff --git a/gtkdotnet/gtk-dotnet-3.0.pc.in b/gtkdotnet/gtk-dotnet-3.0.pc.in index 8bf1741e7..e8afe6830 100644 --- a/gtkdotnet/gtk-dotnet-3.0.pc.in +++ b/gtkdotnet/gtk-dotnet-3.0.pc.in @@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib Name: Gtk.DotNet Description: .NET Extensions for Gtk -Version: @PKG_VERSION@ +Version: @VERSION@ Requires:gtk-sharp-3.0 Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-dotnet.dll diff --git a/parser/gapi-3.0.pc.in b/parser/gapi-3.0.pc.in index fdf2d6a11..665d02608 100644 --- a/parser/gapi-3.0.pc.in +++ b/parser/gapi-3.0.pc.in @@ -3,4 +3,4 @@ prefix=${pcfiledir}/../.. Name: GAPI Description: GObject .NET API Wrapping Tool -Version: @PKG_VERSION@ +Version: @VERSION@ From 5a7a0f7a3c242931192b9c4ed29309d66bea57a6 Mon Sep 17 00:00:00 2001 From: Martin Kupec Date: Tue, 1 Sep 2015 17:54:14 +0200 Subject: [PATCH 07/10] Fix properties setting when constructing GLib.Objects This is a proper fix of old FIXME. It defers setting of managed properties during GLib.Object construction until we have paired Managed and Unmanaged objects. --- glib/Object.cs | 57 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/glib/Object.cs b/glib/Object.cs index df0ce8fbf..50a2ce6ea 100644 --- a/glib/Object.cs +++ b/glib/Object.cs @@ -36,6 +36,7 @@ namespace GLib { bool disposed = false; static uint idx = 1; static Dictionary Objects = new Dictionary(); + static Dictionary> PropertiesToSet = new Dictionary>(); ~Object () { @@ -89,7 +90,9 @@ namespace GLib { ToggleRef toggle_ref; lock (Objects) { - toggle_ref = (ToggleRef) Objects[o]; + if (!Objects.TryGetValue (o, out toggle_ref)) { + return null; + } } if (toggle_ref != null) { @@ -406,7 +409,9 @@ namespace GLib { GType gtype = new GLib.GType (gtypeval); GObjectClass threshold_class = (GObjectClass) Marshal.PtrToStructure (gtype.GetThresholdType ().GetClassPtr (), typeof (GObjectClass)); IntPtr raw = threshold_class.constructor_cb (gtypeval, n_construct_properties, construct_properties); - bool construct_needed = true; + Dictionary deferred; + + GLib.Object obj = null; for (int i = 0; i < n_construct_properties; i++) { IntPtr p = new IntPtr (construct_properties.ToInt64 () + i * 2 * IntPtr.Size); @@ -417,16 +422,21 @@ namespace GLib { Value val = (Value) Marshal.PtrToStructure (Marshal.ReadIntPtr (p, IntPtr.Size), typeof (Value)); if ((IntPtr) val.Val != IntPtr.Zero) { GCHandle gch = (GCHandle) (IntPtr) val.Val; - Object o = (GLib.Object) gch.Target; - o.Raw = raw; - construct_needed = false; + obj = (GLib.Object) gch.Target; + obj.Raw = raw; break; } } - if (construct_needed) - GetObject (raw, false); + if (obj == null) + obj = GetObject (raw, false); + if(PropertiesToSet.TryGetValue(raw, out deferred)) { + foreach(var item in deferred) { + SetDeferredProperty(obj, item.Value, item.Key); + } + PropertiesToSet.Remove(raw); + } return raw; } @@ -511,17 +521,30 @@ namespace GLib { static void SetPropertyCallback(IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) { - // FIXME: Here is a big quick hack to avoid race condition when trying to set up adjustment with contructor - // Because Raw is set too late - if (param_spec != IntPtr.Zero) { - ParamSpec foo = new ParamSpec(param_spec); - if (foo.Name == "gtk-sharp-managed-instance") { - GCHandle gch = (GCHandle) (IntPtr) value.Val; - Object o = (GLib.Object) gch.Target; - o.Raw = handle; - } + // There are multiple issues in this place. + // We cannot construct an object here as it can be in construction + // from ConstructorCallback thus managed object already created. + // + // We cannot use the "gtk-sharp-managed-instance" property as when + // constructed by Gtk.Builder it is set to null. + // + // We defer setting the properties to later time when + // we have unmanaged and managed objects paired. + GLib.Object obj = TryGetObject(handle); + if(obj != null) { + SetDeferredProperty(obj, value, param_spec); + return; } - GLib.Object obj = GLib.Object.GetObject (handle, false); + Dictionary deferred; + if(!PropertiesToSet.TryGetValue(handle, out deferred)) { + deferred = new Dictionary(); + PropertiesToSet.Add(handle, deferred); + } + deferred[param_spec] = value; + } + + static void SetDeferredProperty(GLib.Object obj, GLib.Value value, IntPtr param_spec) + { var type = (Type)obj.LookupGType (); Dictionary props; From a76f60df81531552e0ad6abf270da202b3dd62b5 Mon Sep 17 00:00:00 2001 From: Martin Kupec Date: Tue, 1 Sep 2015 23:55:41 +0200 Subject: [PATCH 08/10] Add possibility to pick glib type name for custom classes This patch adds TypeName attribute which can be used on custom class derived from GLib.Object in order to set GLib type name of the class. --- glib/GType.cs | 21 +++++++++++++++++--- glib/Makefile.am | 1 + glib/Object.cs | 2 +- glib/TypeNameAttribute.cs | 41 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 glib/TypeNameAttribute.cs diff --git a/glib/GType.cs b/glib/GType.cs index 7f63e2bae..32e5eb878 100644 --- a/glib/GType.cs +++ b/glib/GType.cs @@ -95,19 +95,32 @@ namespace GLib { public static readonly GType Variant = new GType ((IntPtr) TypeFundamentals.TypeVariant); + static HashSet managedTypes = new HashSet (); static IDictionary types = new Dictionary (); static IDictionary gtypes = new Dictionary (); public static void Register (GType native_type, System.Type type) + { + Register (native_type, type, false); + } + + public static void Register (GType native_type, System.Type type, bool managed) { lock (types) { if (native_type != GType.Pointer && native_type != GType.Boxed && native_type != ManagedValue.GType) types[native_type.Val] = type; if (type != null) gtypes[type] = native_type; + if (managed) + managedTypes.Add(native_type); } } + public static bool IsManaged (GType gtype) + { + return managedTypes.Contains(gtype); + } + static GType () { g_type_init (); @@ -318,7 +331,7 @@ namespace GLib { public GType GetThresholdType () { GType curr_type = this; - while (curr_type.ToString ().StartsWith ("__gtksharp_")) + while (IsManaged (curr_type)) curr_type = curr_type.GetBaseType (); return curr_type; } @@ -364,7 +377,9 @@ namespace GLib { internal static GType RegisterGObjectType (Object.ClassInitializer gobject_class_initializer) { GType parent_gtype = LookupGObjectType (gobject_class_initializer.Type.BaseType); - string name = BuildEscapedName (gobject_class_initializer.Type); + + TypeNameAttribute nattr = (TypeNameAttribute)Attribute.GetCustomAttribute (gobject_class_initializer.Type, typeof (TypeNameAttribute), false); + string name = nattr != null ? nattr.Name : BuildEscapedName (gobject_class_initializer.Type); IntPtr native_name = GLib.Marshaller.StringToPtrGStrdup (name); GTypeQuery query; @@ -376,7 +391,7 @@ namespace GLib { GType gtype = new GType (g_type_register_static (parent_gtype.Val, native_name, ref info, 0)); GLib.Marshaller.Free (native_name); - Register (gtype, gobject_class_initializer.Type); + Register (gtype, gobject_class_initializer.Type, true); return gtype; } diff --git a/glib/Makefile.am b/glib/Makefile.am index 4502f44b5..eb840d20c 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -90,6 +90,7 @@ sources = \ ToggleRef.cs \ TypeFundamentals.cs \ TypeInitializerAttribute.cs \ + TypeNameAttribute.cs \ ValueArray.cs \ Value.cs \ Variant.cs \ diff --git a/glib/Object.cs b/glib/Object.cs index 50a2ce6ea..3f444eeab 100644 --- a/glib/Object.cs +++ b/glib/Object.cs @@ -619,7 +619,7 @@ namespace GLib { protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals) { GType gtype = LookupGType (); - bool is_managed_subclass = gtype.ToString ().StartsWith ("__gtksharp"); + bool is_managed_subclass = GType.IsManaged (gtype); GParameter[] parms = new GParameter [is_managed_subclass ? names.Length + 1 : names.Length]; for (int i = 0; i < names.Length; i++) { parms [i].name = GLib.Marshaller.StringToPtrGStrdup (names [i]); diff --git a/glib/TypeNameAttribute.cs b/glib/TypeNameAttribute.cs new file mode 100644 index 000000000..edadff098 --- /dev/null +++ b/glib/TypeNameAttribute.cs @@ -0,0 +1,41 @@ +// TypeNameAttribute.cs +// +// Copyright (c) 2015 Martin Kupec +// Copyright (c) 2015 Ales Kurecka +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + +namespace GLib { + + using System; + + [AttributeUsage (AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public sealed class TypeNameAttribute : Attribute { + private readonly string name; + + public TypeNameAttribute (string name) + { + this.name = name; + } + + public string Name + { + get { + return name; + } + } + } +} From c2fd7af4b4d90e030435d6684232ecc5bf688feb Mon Sep 17 00:00:00 2001 From: Harol Alfonso Reina Date: Thu, 29 Oct 2015 12:28:34 -0500 Subject: [PATCH 09/10] Changed type of property BackgroundGdk in gtk-api.raw --- gtk/gtk-api.raw | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw index f4da044a0..2615dfb55 100644 --- a/gtk/gtk-api.raw +++ b/gtk/gtk-api.raw @@ -22995,11 +22995,11 @@ - + - + @@ -23028,7 +23028,7 @@ - + From c099ec1facfd09c75eb07fb4657c83adbd6679dd Mon Sep 17 00:00:00 2001 From: Harol Alfonso Reina Date: Thu, 29 Oct 2015 12:31:21 -0500 Subject: [PATCH 10/10] build: Post-release version bump to 3.14.0, Update API_VERSION, Update PACKAGE_VERSION --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c89c76b44..f41421b6f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(gtk-sharp, 2.99.4) +AC_INIT(gtk-sharp, 3.14.0) AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 tar-ustar foreign]) AC_CANONICAL_HOST @@ -7,14 +7,14 @@ AC_CONFIG_HEADERS(config.h) AM_MAINTAINER_MODE AC_CONFIG_MACRO_DIR([m4]) -API_VERSION=3.0.0.0 +API_VERSION=3.14.0.0 AC_SUBST(API_VERSION) CAIRO_API_VERSION=1.12.0.0 AC_SUBST(CAIRO_API_VERSION) POLICY_VERSIONS="" AC_SUBST(POLICY_VERSIONS) -PACKAGE_VERSION=gtk-sharp-3.0 +PACKAGE_VERSION=gtk-sharp-3.14 AC_SUBST(PACKAGE_VERSION) WIN64DEFINES=