Merge Tutorials with Samples

jnkvca · Oct 17, 2014 · 16ef00a · 16ef00a
1 parent 3f50229
commit 16ef00a
Show file tree

Hide file tree

Showing 16 changed files with 288 additions and 262 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,5 @@ UpgradeLog*.htm
 Source/packages
 Source/Components
 AppPackages
-Tutorials/packages
 Resources/packages
 Samples/packages
diff --git a/Samples/Samples.sln b/Samples/Samples.sln
diff --git a/Tutorials/README.md → Samples/Tutorials/README.md b/Tutorials/README.md → Samples/Tutorials/README.md
diff --git a/Samples/Tutorials/Tutorial.targets b/Samples/Tutorials/Tutorial.targets
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">"$(MSBuildThisFileDirectory)buildapp.cmd" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
+    <PostBuildEvent Condition="'$(OS)' != 'Windows_NT'">"$(MSBuildThisFileDirectory)buildapp.sh" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/Tutorials/Tutorial1/Main.cs → Samples/Tutorials/Tutorial1/Main.cs b/Tutorials/Tutorial1/Main.cs → Samples/Tutorials/Tutorial1/Main.cs
@@ -15,7 +15,7 @@ public MyForm()
 			Title = "Hello, Eto.Forms";
 
 			// Content of the form
-			Content = new Label { Text = "Some content" };
+			Content = new Label { Text = "Some content", VerticalAlign = VerticalAlign.Middle, HorizontalAlign = HorizontalAlign.Center };
 		}
 	}
 

diff --git a/.../Tutorial1/Tutorial1 - Hello World.csproj → .../Tutorial1/Tutorial1 - Hello World.csproj b/.../Tutorial1/Tutorial1 - Hello World.csproj → .../Tutorial1/Tutorial1 - Hello World.csproj
@@ -3,12 +3,11 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7BE9E187-3FC4-49D2-A322-F4651C3AE256}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Tutorial1</RootNamespace>
     <AssemblyName>Tutorial1</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,30 +35,24 @@
   <ItemGroup>
     <Compile Include="Main.cs" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\Tutorial.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\Source\Eto.Gtk\Eto.Gtk2.csproj">
-      <Project>{1FF7BE58-A6A2-4132-8CAF-AA2EF18122A1}</Project>
-      <Name>Eto.Gtk2</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto\Eto - Pcl.csproj">
+      <Project>{35EF0A4E-2A1A-492C-8BED-106774EA09F2}</Project>
+      <Name>Eto - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto.Mac\Eto.Mac.csproj">
-      <Project>{9DD10DFF-5AB3-4E66-B798-CA17911A61E4}</Project>
-      <Name>Eto.Mac</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto.Gtk\Eto.Gtk2 - Pcl.csproj">
+      <Project>{80915A80-CA54-11E3-9C1A-0800200C9A66}</Project>
+      <Name>Eto.Gtk2 - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto.WinForms\Eto.WinForms.csproj">
-      <Project>{69D38C57-AD4B-4A16-A7B1-49BCFBE71491}</Project>
-      <Name>Eto.WinForms</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto.Mac\Eto.Mac - Pcl.csproj">
+      <Project>{3E7995E0-C9EB-11E3-9C1A-0800200C9A66}</Project>
+      <Name>Eto.Mac - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto\Eto.csproj">
-      <Project>{16289D2F-044C-49EF-83E9-9391AFF8FD2B}</Project>
-      <Name>Eto</Name>
+    <ProjectReference Include="..\..\..\Source\Eto.WinForms\Eto.WinForms - Pcl.csproj">
+      <Project>{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}</Project>
+      <Name>Eto.WinForms - Pcl</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">"$(SolutionDir)buildapp.cmd" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
-    <PostBuildEvent Condition="'$(OS)' != 'Windows_NT'">"$(SolutionDir)buildapp.sh" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/Tutorials/Tutorial2/Main.cs → Samples/Tutorials/Tutorial2/Main.cs b/Tutorials/Tutorial2/Main.cs → Samples/Tutorials/Tutorial2/Main.cs
diff --git a/...al2/Tutorial2 - Menus and Toolbars.csproj → ...al2/Tutorial2 - Menus and Toolbars.csproj b/...al2/Tutorial2 - Menus and Toolbars.csproj → ...al2/Tutorial2 - Menus and Toolbars.csproj
@@ -3,12 +3,11 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0844A0AD-778A-4DB3-8332-03AC50A17D05}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Tutorial2</RootNamespace>
     <AssemblyName>Tutorial2</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,30 +35,24 @@
   <ItemGroup>
     <Compile Include="Main.cs" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\Tutorial.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\Source\Eto.Gtk\Eto.Gtk2.csproj">
-      <Project>{1FF7BE58-A6A2-4132-8CAF-AA2EF18122A1}</Project>
-      <Name>Eto.Gtk2</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto\Eto - Pcl.csproj">
+      <Project>{35EF0A4E-2A1A-492C-8BED-106774EA09F2}</Project>
+      <Name>Eto - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto.Mac\Eto.Mac.csproj">
-      <Project>{9DD10DFF-5AB3-4E66-B798-CA17911A61E4}</Project>
-      <Name>Eto.Mac</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto.Gtk\Eto.Gtk2 - Pcl.csproj">
+      <Project>{80915A80-CA54-11E3-9C1A-0800200C9A66}</Project>
+      <Name>Eto.Gtk2 - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto.WinForms\Eto.WinForms.csproj">
-      <Project>{69D38C57-AD4B-4A16-A7B1-49BCFBE71491}</Project>
-      <Name>Eto.WinForms</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto.Mac\Eto.Mac - Pcl.csproj">
+      <Project>{3E7995E0-C9EB-11E3-9C1A-0800200C9A66}</Project>
+      <Name>Eto.Mac - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto\Eto.csproj">
-      <Project>{16289D2F-044C-49EF-83E9-9391AFF8FD2B}</Project>
-      <Name>Eto</Name>
+    <ProjectReference Include="..\..\..\Source\Eto.WinForms\Eto.WinForms - Pcl.csproj">
+      <Project>{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}</Project>
+      <Name>Eto.WinForms - Pcl</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">"$(SolutionDir)buildapp.cmd" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
-    <PostBuildEvent Condition="'$(OS)' != 'Windows_NT'">"$(SolutionDir)buildapp.sh" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/Tutorials/Tutorial3/Main.cs → Samples/Tutorials/Tutorial3/Main.cs b/Tutorials/Tutorial3/Main.cs → Samples/Tutorials/Tutorial3/Main.cs
diff --git a/...Tutorial3/Tutorial3 - Table Layout.csproj → ...Tutorial3/Tutorial3 - Table Layout.csproj b/...Tutorial3/Tutorial3 - Table Layout.csproj → ...Tutorial3/Tutorial3 - Table Layout.csproj
@@ -3,12 +3,11 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D51732E0-1E93-11E3-8224-0800200C9A66}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Tutorial3</RootNamespace>
     <AssemblyName>Tutorial3</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,30 +35,24 @@
   <ItemGroup>
     <Compile Include="Main.cs" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\Tutorial.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\Source\Eto.Gtk\Eto.Gtk2.csproj">
-      <Project>{1FF7BE58-A6A2-4132-8CAF-AA2EF18122A1}</Project>
-      <Name>Eto.Gtk2</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto\Eto - Pcl.csproj">
+      <Project>{35EF0A4E-2A1A-492C-8BED-106774EA09F2}</Project>
+      <Name>Eto - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto.Mac\Eto.Mac.csproj">
-      <Project>{9DD10DFF-5AB3-4E66-B798-CA17911A61E4}</Project>
-      <Name>Eto.Mac</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto.Gtk\Eto.Gtk2 - Pcl.csproj">
+      <Project>{80915A80-CA54-11E3-9C1A-0800200C9A66}</Project>
+      <Name>Eto.Gtk2 - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto.WinForms\Eto.WinForms.csproj">
-      <Project>{69D38C57-AD4B-4A16-A7B1-49BCFBE71491}</Project>
-      <Name>Eto.WinForms</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto.Mac\Eto.Mac - Pcl.csproj">
+      <Project>{3E7995E0-C9EB-11E3-9C1A-0800200C9A66}</Project>
+      <Name>Eto.Mac - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto\Eto.csproj">
-      <Project>{16289D2F-044C-49EF-83E9-9391AFF8FD2B}</Project>
-      <Name>Eto</Name>
+    <ProjectReference Include="..\..\..\Source\Eto.WinForms\Eto.WinForms - Pcl.csproj">
+      <Project>{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}</Project>
+      <Name>Eto.WinForms - Pcl</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">"$(SolutionDir)buildapp.cmd" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
-    <PostBuildEvent Condition="'$(OS)' != 'Windows_NT'">"$(SolutionDir)buildapp.sh" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/Tutorials/Tutorial4/Main.cs → Samples/Tutorials/Tutorial4/Main.cs b/Tutorials/Tutorial4/Main.cs → Samples/Tutorials/Tutorial4/Main.cs
diff --git a/...ials/Tutorial4/Tutorial4 - Binding.csproj → ...ials/Tutorial4/Tutorial4 - Binding.csproj b/...ials/Tutorial4/Tutorial4 - Binding.csproj → ...ials/Tutorial4/Tutorial4 - Binding.csproj
@@ -3,12 +3,11 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DDC8A290-2F20-11E4-8C21-0800200C9A66}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Tutorial4</RootNamespace>
     <AssemblyName>Tutorial4</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,30 +37,24 @@
       <SubType>Eto.Forms</SubType>
     </Compile>
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\Tutorial.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\Source\Eto.Gtk\Eto.Gtk2.csproj">
-      <Project>{1FF7BE58-A6A2-4132-8CAF-AA2EF18122A1}</Project>
-      <Name>Eto.Gtk2</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto\Eto - Pcl.csproj">
+      <Project>{35EF0A4E-2A1A-492C-8BED-106774EA09F2}</Project>
+      <Name>Eto - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto.Mac\Eto.Mac.csproj">
-      <Project>{9DD10DFF-5AB3-4E66-B798-CA17911A61E4}</Project>
-      <Name>Eto.Mac</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto.Gtk\Eto.Gtk2 - Pcl.csproj">
+      <Project>{80915A80-CA54-11E3-9C1A-0800200C9A66}</Project>
+      <Name>Eto.Gtk2 - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto.WinForms\Eto.WinForms.csproj">
-      <Project>{69D38C57-AD4B-4A16-A7B1-49BCFBE71491}</Project>
-      <Name>Eto.WinForms</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\..\Source\Eto.Mac\Eto.Mac - Pcl.csproj">
+      <Project>{3E7995E0-C9EB-11E3-9C1A-0800200C9A66}</Project>
+      <Name>Eto.Mac - Pcl</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Source\Eto\Eto.csproj">
-      <Project>{16289D2F-044C-49EF-83E9-9391AFF8FD2B}</Project>
-      <Name>Eto</Name>
+    <ProjectReference Include="..\..\..\Source\Eto.WinForms\Eto.WinForms - Pcl.csproj">
+      <Project>{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}</Project>
+      <Name>Eto.WinForms - Pcl</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">"$(SolutionDir)buildapp.cmd" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
-    <PostBuildEvent Condition="'$(OS)' != 'Windows_NT'">"$(SolutionDir)buildapp.sh" "$(TargetDir)" "$(TargetFileName)" "$(MSBuildProjectName)" "$(Configuration)"</PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/Tutorials/buildapp.cmd → Samples/Tutorials/buildapp.cmd b/Tutorials/buildapp.cmd → Samples/Tutorials/buildapp.cmd
@@ -7,7 +7,7 @@ IF %target_dir:~-1%==\ SET target_dir=%target_dir:~0,-1%
 SET assembly=%~2
 SET project_name=%~3
 
-SET eto_dir=%DIR%\..
+SET eto_dir=%DIR%\..\..
 SET eto_bin_dir=%eto_dir%\BuildOutput\Release
 
 SET input_app=%eto_dir%\Resources\MacAppTemplate.app

diff --git a/Tutorials/buildapp.sh → Samples/Tutorials/buildapp.sh b/Tutorials/buildapp.sh → Samples/Tutorials/buildapp.sh
@@ -7,7 +7,7 @@ assembly="$2"
 project_name="$3"
 configuration="$4"
 
-eto_dir="$DIR/.."
+eto_dir="$DIR/../.."
 eto_bin_dir="$eto_dir/BuildOutput/$configuration"
 
 input_app="$eto_dir/Resources/MacAppTemplate.app"
@@ -41,4 +41,4 @@ cp "$eto_bin_dir"/MonoMac.dll "$output_mono"
 sed -i -e "s/>MyApp</>$project_name</" "$output_app/Contents/Info.plist"
 sed -i -e "s/>MyApp.exe</>$assembly</" "$output_app/Contents/Info.plist"
 
-chmod +x "$output_app/Contents/MacOS/Launcher"
+chmod +x "$output_app/Contents/MacOS/Launcher.exec"
diff --git a/Tutorials/Tutorial.targets b/Tutorials/Tutorial.targets
diff --git a/Tutorials/Tutorials.sln b/Tutorials/Tutorials.sln