Skip to content

Commit

Permalink
Merge branch 'release/2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cwensley
cwensley committed Nov 14, 2014
2 parents 6820557 + f9a88e2 commit dca7d80
Show file tree
Hide file tree
Showing 2,195 changed files with 150,035 additions and 85,785 deletions.
9 changes: 7 additions & 2 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
/Resources/MacAppTemplate.app/Contents/MacOS/* eol=lf
*.sh eol=lf

* text=auto
*.sh eol=lf
*.sln eol=crlf
*.cmd eol=crlf
*.csproj text
*.xaml text
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ obj/
UpgradeLog*.htm
Source/packages
Source/Components
AppPackages
Resources/packages
Samples/packages
Source/Addins/Eto.Addin.XamarinStudio/packages
125 changes: 62 additions & 63 deletions Help/Help.shfbproj
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<!-- The configuration and platform will be used to determine which
assemblies to include from solution and project documentation
sources -->
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{130627a0-3530-4939-8d7a-c447563618d1}</ProjectGuid>
<SHFBSchemaVersion>1.9.3.0</SHFBSchemaVersion>
sources -->
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{130627a0-3530-4939-8d7a-c447563618d1}</ProjectGuid>
<SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
<RootNamespace>Documentation</RootNamespace>
<Name>Documentation</Name>
<!-- SHFB properties -->
<OutputPath>..\BuildOutput\Help\html-shfb\</OutputPath>
<HtmlHelpName>EtoForms</HtmlHelpName>
<Language>en-US</Language>
<HelpFileFormat>Website</HelpFileFormat>
<DocumentationSources>
<DocumentationSource sourceFile="..\BuildOutput\Debug\Eto.dll" xmlns="" />
<DocumentationSource sourceFile="..\BuildOutput\Debug\Eto.xml" xmlns="" />
</DocumentationSources>
<HelpTitle>Eto.Forms documentation</HelpTitle>
<PresentationStyle>vs2010</PresentationStyle>
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, SealedProtected</VisibleItems>
<ProjectSummary>Eto.Forms Cross Platform UI Framework</ProjectSummary>
<NamespaceSummaries>
<NamespaceSummaryItem name="Eto" isDocumented="True" xmlns="">Eto</NamespaceSummaryItem>
<NamespaceSummaryItem name="Eto.Forms" isDocumented="True" xmlns="">Eto.Forms User Interface</NamespaceSummaryItem>
<NamespaceSummaryItem name="Eto.IO" isDocumented="True" xmlns="">Eto.IO Input/Output abstractions</NamespaceSummaryItem>
<NamespaceSummaryItem name="Eto.Misc" isDocumented="True" xmlns="">Misc</NamespaceSummaryItem>
</NamespaceSummaries>
</PropertyGroup>
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
<RootNamespace>Documentation</RootNamespace>
<Name>Documentation</Name>
<!-- SHFB properties -->
<OutputPath>..\BuildOutput\Help\html-shfb\</OutputPath>
<HtmlHelpName>EtoForms</HtmlHelpName>
<Language>en-US</Language>
<HelpFileFormat>Website</HelpFileFormat>
<DocumentationSources>
<DocumentationSource sourceFile="..\BuildOutput\Release\Eto.dll" />
<DocumentationSource sourceFile="..\BuildOutput\Release\Eto.xml" /></DocumentationSources>
<HelpTitle>Eto.Forms documentation</HelpTitle>
<PresentationStyle>vs2010</PresentationStyle>
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, SealedProtected</VisibleItems>
<ProjectSummary>Eto.Forms Cross Platform UI Framework</ProjectSummary>
<NamespaceSummaries>
<NamespaceSummaryItem name="Eto" isDocumented="True" xmlns="">Eto</NamespaceSummaryItem>
<NamespaceSummaryItem name="Eto.Forms" isDocumented="True" xmlns="">Eto.Forms User Interface</NamespaceSummaryItem>
<NamespaceSummaryItem name="Eto.IO" isDocumented="True" xmlns="">Eto.IO Input/Output abstractions</NamespaceSummaryItem>
<NamespaceSummaryItem name="Eto.Misc" isDocumented="True" xmlns="">Misc</NamespaceSummaryItem>
</NamespaceSummaries>
</PropertyGroup>
<!-- There are no properties for these groups. AnyCPU needs to appear in
order for Visual Studio to perform the build. The others are optional
common platform types that may appear. -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
</PropertyGroup>
<ItemGroup>
<Reference Include="Eto">
<HintPath>BuildOutput\Debug\Eto.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<SiteMap Include="Site Map.sitemap" />
</ItemGroup>
<ItemGroup>
<Content Include="Top.html" />
</ItemGroup>
<!-- Import the SHFB build targets -->
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
common platform types that may appear. -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
</PropertyGroup>
<ItemGroup>
<Reference Include="Eto">
<HintPath>BuildOutput\Debug\Eto.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<SiteMap Include="Site Map.sitemap" />
</ItemGroup>
<ItemGroup>
<Content Include="Top.html" />
</ItemGroup>
<!-- Import the SHFB build targets -->
<Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
</Project>
6 changes: 3 additions & 3 deletions Help/Site Map.sitemap
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0">
<siteMapNode title="Eto.Forms" url="Top.html" isDefault="true" isSelected="true" splitToc="true" />
<?xml version="1.0" encoding="utf-8"?>
<siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0">
<siteMapNode title="Eto.Forms" url="Top.html" isDefault="true" isSelected="true" splitToc="true" />
</siteMap>
22 changes: 11 additions & 11 deletions Help/Top.html
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Eto.Forms Documentation</title>
</head>

<body>

</body>

</html>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Eto.Forms Documentation</title>
</head>

<body>

</body>

</html>
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AUTHORS
Copyright © 2011-2013 Curtis Wensley. All Rights Reserved.
Copyright © 2011-2014 Curtis Wensley. All Rights Reserved.
Copyright © 2012-2013 Vivek Jhaveri. All Rights Reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted
Expand Down
Binary file modified Libraries/GtkSharp3/atk-sharp.dll
100755 → 100644
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Libraries/GtkSharp3/atk-sharp.dll.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<configuration>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
<dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so.0"/>
<dllmap dll="atksharpglue-3" target="/usr/lib/cli/atk-sharp-3.0/libatksharpglue-3.so"/>
</configuration>
Binary file modified Libraries/GtkSharp3/cairo-sharp.dll
100755 → 100644
View file
Binary file not shown.
Binary file modified Libraries/GtkSharp3/gdk-sharp.dll
100755 → 100644
View file
Binary file not shown.
Binary file modified Libraries/GtkSharp3/gio-sharp.dll
100755 → 100644
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Libraries/GtkSharp3/gio-sharp.dll.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
<dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0.so.0"/>
<dllmap dll="giosharpglue-3" target="/usr/lib/cli/gio-sharp-3.0/libgiosharpglue-3.so"/>
</configuration>
Binary file modified Libraries/GtkSharp3/glib-sharp.dll
100755 → 100644
View file
Binary file not shown.
Binary file removed Libraries/GtkSharp3/gtk-dotnet.dll
View file
Binary file not shown.
3 changes: 0 additions & 3 deletions Libraries/GtkSharp3/gtk-dotnet.dll.config
View file

This file was deleted.

Binary file removed Libraries/GtkSharp3/gtk-dotnet.dll.mdb
View file
Binary file not shown.
Binary file modified Libraries/GtkSharp3/gtk-sharp.dll
100755 → 100644
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Libraries/GtkSharp3/gtk-sharp.dll.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
<dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so.0"/>
<dllmap dll="libgtk-win32-3.0-0.dll" target="libgtk-3.so.0"/>
<dllmap dll="gtksharpglue-3" target="/usr/lib/cli/gtk-sharp-3.0/libgtksharpglue-3.so"/>
</configuration>
Binary file added Libraries/GtkSharp3/libatksharpglue-3.so
View file
Binary file not shown.
Binary file added Libraries/GtkSharp3/libgiosharpglue-3.so
View file
Binary file not shown.
Binary file added Libraries/GtkSharp3/libgtksharpglue-3.so
View file
Binary file not shown.
Binary file added Libraries/GtkSharp3/libpangosharpglue-3.so
View file
Binary file not shown.
Binary file modified Libraries/GtkSharp3/pango-sharp.dll
100755 → 100644
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Libraries/GtkSharp3/pango-sharp.dll.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
<dllmap dll="libpango-1.0-0.dll" target="libpango-1.0.so.0"/>
<dllmap dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0.so.0"/>
<dllmap dll="pangosharpglue-3" target="/usr/lib/cli/pango-sharp-3.0/libpangosharpglue-3.so"/>
</configuration>
Loading

0 comments on commit dca7d80

Please sign in to comment.