Merge branch 'release/1.3.0'

picoe · May 2, 2014 · 6820557 · 6820557
2 parents 4368977 + 50a9387
commit 6820557
Show file tree

Hide file tree

Showing 1,085 changed files with 35,408 additions and 60,101 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ bin/
 obj/
 /BuildOutput
 *.shfbproj_*
+UpgradeLog*.htm
+Source/packages
+Source/Components
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,5 @@
-AUTHOR
+AUTHORS
 Copyright © 2011-2013 Curtis Wensley. All Rights Reserved.
-
-CONTRIBUTORS
 Copyright © 2012-2013 Vivek Jhaveri. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 

diff --git a/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/versions.txt b/Libraries/Json.NET/Bin/versions.txt
diff --git a/Libraries/Json.NET/readme.txt b/Libraries/Json.NET/readme.txt
diff --git a/Libraries/WPFToolkit.Extended/WPFToolkit.Extended-License.txt b/Libraries/WPFToolkit.Extended/WPFToolkit.Extended-License.txt
diff --git a/Libraries/WPFToolkit.Extended/Xceed.Wpf.DataGrid.dll b/Libraries/WPFToolkit.Extended/Xceed.Wpf.DataGrid.dll
diff --git a/Libraries/WPFToolkit.Extended/Xceed.Wpf.Toolkit.dll b/Libraries/WPFToolkit.Extended/Xceed.Wpf.Toolkit.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/DirectX/x64/Microsoft.WindowsAPICodePack.DirectX.dll b/Libraries/WindowsApiCodePack/binaries/DirectX/x64/Microsoft.WindowsAPICodePack.DirectX.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/DirectX/x64/Microsoft.WindowsAPICodePack.DirectX.pdb b/Libraries/WindowsApiCodePack/binaries/DirectX/x64/Microsoft.WindowsAPICodePack.DirectX.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/DirectX/x86/Microsoft.WindowsAPICodePack.DirectX.dll b/Libraries/WindowsApiCodePack/binaries/DirectX/x86/Microsoft.WindowsAPICodePack.DirectX.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/DirectX/x86/Microsoft.WindowsAPICodePack.DirectX.pdb b/Libraries/WindowsApiCodePack/binaries/DirectX/x86/Microsoft.WindowsAPICodePack.DirectX.pdb
diff --git a/...s/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.dll b/...s/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.dll
diff --git a/...s/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.pdb b/...s/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Sensors.dll b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Sensors.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Sensors.pdb b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Sensors.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Shell.dll b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Shell.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Shell.pdb b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Shell.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ShellExtensions.dll b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ShellExtensions.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ShellExtensions.pdb b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ShellExtensions.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.dll b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.pdb b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.pdb
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ This framework was built so that using it in .NET is natural. For example, a sim
 
 Applications
 ------------
-* [Manager](https://www.manager.io) - Accounting Software
+* [Manager](http://www.manager.io) - Accounting Software
 * [PabloDraw](http://picoe.ca/products/pablodraw/alpha) - Character based drawing application
 * [JabbR.Desktop](https://github.com/JabbR/JabbR.Desktop) - JabbR client
 * [Notedown](https://github.com/modmonkeys/Notedown) - Note taking application
@@ -61,12 +61,12 @@ Namespaces
 Currently supported targets
 ---------------------------
 
-* OS X: MonoMac and Xamarin.Mac
-* Linux: GTK# 2 and 3
-* Windows: Windows Forms and WPF
+* iOS using Xamarin.iOS
+* OS X: MonoMac or Xamarin.Mac
+* Linux: GTK# 2 or 3
+* Windows: Windows Forms (using GDI or Direct2D) or WPF
 
 Under development
 -----------------
 
-* iOS using Xamarin.iOS
-* Android using Xamarin.Android
+* Android using Xamarin.Android
diff --git a/Resources/Eto.Platform.Mac.Template.nuspec b/Resources/Eto.Platform.Mac.Template.nuspec
diff --git a/Resources/Publish.targets b/Resources/Publish.targets
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<Configuration Condition="$(Configuration) == ''">Release</Configuration>
+        <BaseDir Condition="$(BaseDir) == ''">..\Source</BaseDir>
+		<SourceDir Condition="$(SourceDir) == ''">..\BuildOutput\$(Configuration)</SourceDir>
+		<SourcePclDir Condition="$(SourcePclDir) == ''">..\BuildOutput\Pcl\$(Configuration)</SourcePclDir>
+		<TargetDir Condition="$(TargetDir) == ''">..\BuildOutput\Nuget\$(Configuration)</TargetDir>
+		<PackageTargets Condition="$(PackageTargets) == ''">Clean;Build</PackageTargets>
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+	</PropertyGroup>
+	<Import Project="$(BaseDir)\.nuget\NuGet.targets" Condition="Exists('$(BaseDir)\.nuget\NuGet.targets')" />
+	<Target Name="PrepareMac">
+		<PropertyGroup>
+			<mdtool Condition="$(mdtool) == ''">"/Applications/Xamarin Studio.app/Contents/MacOS/mdtool"</mdtool>
+		</PropertyGroup>
+    	<Exec Command="$(mdtool) build -t:Clean -p:Eto.Platform.XamMac -c:'Mac $(Configuration)' $(BaseDir)\Eto.sln" />
+    	<Exec Command="$(mdtool) build -t:Clean -p:Eto -c:'Mac $(Configuration)' $(BaseDir)\Eto.sln" />
+    	<Exec Command="$(mdtool) build -p:Eto.Platform.XamMac -c:'Mac $(Configuration)' $(BaseDir)\Eto.sln" />
+	</Target>
+    <Target Name="Package">
+
+    	<MSBuild Projects="$(BaseDir)\Eto.sln" Targets="$(PackageTargets)" Properties="Configuration=Windows $(Configuration);Platform=Any CPU" />
+
+		<GetAssemblyInformationVersion AssemblyFileName="$(SourceDir)\Eto.dll">
+			<Output TaskParameter="AssemblyInformationalVersion" PropertyName="AssemblyVersion" />
+		</GetAssemblyInformationVersion>
+
+		<!-- Nuget has problems with files that have no extension -->		
+		<Copy SourceFiles="$(SourceDir)\LICENSE" DestinationFiles="$(SourceDir)\LICENSE.txt" />
+
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.nuspec;NuspecInfoAssembly=$(SourceDir)\Eto.dll;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Platform.Gtk.nuspec;NuspecInfoAssembly=$(SourceDir)\Eto.Platform.Gtk.dll;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Platform.Gtk3.nuspec;NuspecInfoAssembly=$(SourceDir)\Eto.Platform.Gtk3.dll;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Platform.Mac.nuspec;NuspecInfoAssembly=$(SourceDir)\Eto.Platform.Mac.dll;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Platform.Windows.nuspec;NuspecInfoAssembly=$(SourceDir)\Eto.Platform.Windows.dll;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Platform.Wpf.nuspec;NuspecInfoAssembly=$(SourceDir)\Eto.Platform.Wpf.dll;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Platform.XamMac.nuspec;NuspecInfoAssembly=$(SourceDir)\Eto.Platform.XamMac.dll;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Json.nuspec;NuspecInfoAssembly=$(SourceDir)\Eto.Json.dll;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Platform.Mac.Template.nuspec;NugetBuildOptions=-Version $(AssemblyVersion);TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="BuildPackage" Properties="ProjectPath=nuspec\Eto.Forms.Sample\Eto.Forms.Sample.nuspec;NugetBuildOptions=-Version $(AssemblyVersion);TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    </Target>
+    <Target Name="Publish">
+		<GetAssemblyInformationVersion AssemblyFileName="$(SourceDir)\Eto.dll">
+			<Output TaskParameter="AssemblyInformationalVersion" PropertyName="AssemblyVersion" />
+		</GetAssemblyInformationVersion>
+
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Forms.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.Gtk.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.Gtk3.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.Mac.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.Windows.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.Wpf.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.XamMac.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<!--<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Json.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>-->
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.Mac.Template.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Forms.Sample.$(AssemblyVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    </Target>
+</Project>