Move more things

- Use NuGet.config to specify a specific directory for packages (for XamMac)
- Updates to MacTemplate to deal with a custom icon and Info.plist at the root
- App icons should use Eto's icon.

.gitignore

@@ -5,12 +5,11 @@
 *.suo
 bin/
 obj/
-/BuildOutput
 *.shfbproj_*
 UpgradeLog*.htm
-Source/Components
+/src/Components
 AppPackages
-packages/
 .vs/
 [Tt]humbs.db
-artifacts
+/artifacts
+

test/Directory.Build.props → Directory.Build.props

@@ -5,7 +5,7 @@
 		<XamarinMacLibPath>$(XamarinMacPath)/lib/mono</XamarinMacLibPath>
 		<!-- Prevent VS2015 from copying files from the GAC to the output folder -->
 		<DoNotCopyLocalIfInGac>true</DoNotCopyLocalIfInGac>
-		<BasePath>$(MSBuildThisFileDirectory)..\</BasePath>
+		<BasePath>$(MSBuildThisFileDirectory)</BasePath>
 		<BaseIntermediateOutputPath>$(BasePath)artifacts\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<Deterministic>False</Deterministic>

src/Directory.Build.targets → Directory.Build.targets

@@ -65,6 +65,6 @@
     </ItemGroup>
     <Message Importance="high" Text="Embedding: @(FilesToEmbed->'%(Filename)%(Extension)', ', ')" />
   </Target>
-  <Import Project="$(BasePath)build\nuspec\Eto.Platform.MacAppTemplate\Eto.Platform.Mac.Template.targets" Condition="$(UseMacTemplate) == 'True'" />
+  <Import Project="$(BasePath)build\nuspec\MacTemplate\MacTemplate.targets" Condition="$(UseMacTemplate) == 'True'" />
   <Import Condition="Exists('$(BasePath)..\Eto.Common.targets')" Project="$(BasePath)..\Eto.Common.targets" />
 </Project>

NuGet.Config

@@ -0,0 +1,9 @@
+<configuration>
+	<config>
+		<!-- 
+		Used for projects using packages.config (e.g. XamMac) 
+		Remove when XamMac is removed as everything else we're using <PackageReference>
+		-->
+		<add key="repositoryPath" value="artifacts/packages" />
+	</config>
+</configuration>

Samples/Gtk/EmbedEtoInGtk/gtk-gui/gui.stetic

@@ -5,7 +5,7 @@
   </configuration>
   <import>
     <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <widget-library name="../../../../artifacts/Debug/net45/Eto.Gtk2.dll" />
+    <widget-library name="../../../../artifacts/core/Debug/net45/Eto.Gtk2.dll" />
     <widget-library name="../bin/Debug/EmbedEtoInGtk.exe" internal="true" />
   </import>
   <widget class="Gtk.Window" id="EmbedEtoInGtk.MainWindow" design-size="423 312">

Samples/Gtk/EmbedGtkInEto/gtk-gui/gui.stetic

@@ -5,7 +5,7 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../../../artifacts/Debug/net45/Eto.Gtk2.dll" />
+    <widget-library name="../../../../artifacts/core/Debug/net45/Eto.Gtk2.dll" />
     <widget-library name="../bin/Debug/EmbedGtkInEto.exe" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="EmbedGtkInEto.MyNativeWidget" design-size="422 183">

Samples/MonoMac/EmbedEtoInMonoMac/EmbedEtoInMonoMac.csproj

@@ -64,7 +64,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="MonoMac">
-      <HintPath>..\..\..\Libraries\MonoMac\MonoMac.dll</HintPath>
+      <HintPath>..\..\..\lib\MonoMac\MonoMac.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Samples/MonoMac/EmbedMonoMacInEto/EmbedMonoMacInEto.csproj

@@ -64,7 +64,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="MonoMac">
-      <HintPath>..\..\..\Libraries\MonoMac\MonoMac.dll</HintPath>
+      <HintPath>..\..\..\lib\MonoMac\MonoMac.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Samples/Tutorials/CSharp/Tutorial1/Tutorial1 - Hello World.csproj

@@ -8,6 +8,7 @@
     <RootNamespace>Tutorial1</RootNamespace>
     <AssemblyName>Tutorial1</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <UseMacTemplate>True</UseMacTemplate>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,5 +55,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\Tutorial.targets" />
 </Project>

Samples/Tutorials/CSharp/Tutorial2/Tutorial2 - Menus and Toolbars.csproj

@@ -8,6 +8,7 @@
     <RootNamespace>Tutorial2</RootNamespace>
     <AssemblyName>Tutorial2</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <UseMacTemplate>True</UseMacTemplate>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,5 +55,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\Tutorial.targets" />
 </Project>

Samples/Tutorials/CSharp/Tutorial3/Tutorial3 - Table Layout.csproj

@@ -8,6 +8,7 @@
     <RootNamespace>Tutorial3</RootNamespace>
     <AssemblyName>Tutorial3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <UseMacTemplate>True</UseMacTemplate>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,5 +55,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\Tutorial.targets" />
 </Project>

Samples/Tutorials/CSharp/Tutorial4/Tutorial4 - Binding.csproj

@@ -8,6 +8,7 @@
     <RootNamespace>Tutorial4</RootNamespace>
     <AssemblyName>Tutorial4</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <UseMacTemplate>True</UseMacTemplate>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,5 +57,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\Tutorial.targets" />
 </Project>

Samples/Tutorials/FSharp/Tutorial1/Tutorial1 - Hello World.fsproj

@@ -13,6 +13,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <Name>Tutorial1 - Hello World</Name>
+    <UseMacTemplate>True</UseMacTemplate>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,7 +85,6 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" />
-  <Import Project="..\..\Tutorial.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Samples/Tutorials/FSharp/Tutorial2/Tutorial2 - Menus and Toolbars.fsproj

@@ -13,6 +13,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <Name>Tutorial2 - Menus and Toolbars</Name>
+    <UseMacTemplate>True</UseMacTemplate>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,7 +85,6 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" />
-  <Import Project="..\..\Tutorial.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Samples/Tutorials/FSharp/Tutorial3/Tutorial3 - Table Layout.fsproj

@@ -13,6 +13,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <Name>Tutorial2 - Menus and Toolbars</Name>
+    <UseMacTemplate>True</UseMacTemplate>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,7 +85,6 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" />
-  <Import Project="..\..\Tutorial.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Samples/Tutorials/FSharp/Tutorial4/Tutorial4 - Binding.fsproj

@@ -13,6 +13,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <Name>Tutorial2 - Menus and Toolbars</Name>
+    <UseMacTemplate>True</UseMacTemplate>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,7 +85,6 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" />
-  <Import Project="..\..\Tutorial.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

build.cmd

@@ -3,7 +3,7 @@ echo off
 WHERE msbuild
 IF %ERRORLEVEL% NEQ 0 ECHO msbuild not found.  Run in the Developer Command Prompt for VS 2017
 
-cd %~dp0\build
-msbuild -t:Package -p:BuildVersion=%1 Build.proj
+set BUILD_DIR=%~dp0\build
+msbuild -t:Package -p:BuildVersion=%1 "%BUILD_DIR%\Build.proj"
 
 pause

build.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-cd build
-xbuild /t:Package /p:BuildVersion=$1 Build.proj
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+msbuild /t:Package /p:BuildVersion=$1 $DIR/build/Build.proj

build/Build.proj

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<Configuration Condition="$(Configuration) == ''">Release</Configuration>
         <BaseDir Condition="$(BaseDir) == ''">..</BaseDir>
         <SourceDir Condition="$(SourceDir) == ''">$(BaseDir)\src</SourceDir>
         <NugetDir Condition="$(NugetDir) == ''">$(SourceDir)</NugetDir>
         <ArtifactsDir Condition="$(BuildOutoutDir) == ''">$(BaseDir)\artifacts</ArtifactsDir>
-		<ArtifactsNet45Dir Condition="$(ArtifactsNet45Dir) == ''">$(ArtifactsDir)\$(Configuration)\net45</ArtifactsNet45Dir>
-		<ArtifactsNetStandard13Dir Condition="$(ArtifactsNetStandard13Dir) == ''">$(ArtifactsDir)\$(Configuration)\netstandard1.3</ArtifactsNetStandard13Dir>
-		<ArtifactsModernDir Condition="$(ArtifactsModernDir) == ''">$(ArtifactsDir)\$(Configuration)\modern</ArtifactsModernDir>
+		<ArtifactsNet45Dir Condition="$(ArtifactsNet45Dir) == ''">$(ArtifactsDir)\core\$(Configuration)\net45</ArtifactsNet45Dir>
+		<ArtifactsNetStandard13Dir Condition="$(ArtifactsNetStandard13Dir) == ''">$(ArtifactsDir)\core\$(Configuration)\netstandard1.3</ArtifactsNetStandard13Dir>
+		<ArtifactsModernDir Condition="$(ArtifactsModernDir) == ''">$(ArtifactsDir)\core\$(Configuration)\modern</ArtifactsModernDir>
 		<PackageTargets Condition="$(PackageTargets) == ''">Build</PackageTargets>
         <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(ArtifactsDir)\nuget\$(Configuration.Trim('\\'))</PackageOutputDir>
         <Platform Condition="$(Platform) == '' and '$(OS)' == 'Unix' and !Exists('/Library/Frameworks')">Linux</Platform>
@@ -20,8 +20,8 @@
 		<mdtool Condition="$(mdtool) == '' and $(Platform) == 'Linux'">"mdtool"</mdtool>
 		<mdtool Condition="$(mdtool) == '' and $(Platform) == 'Mac'">"/Applications/Xamarin Studio.app/Contents/MacOS/mdtool"</mdtool>
 		<mdtool Condition="$(mdtool) == '' and $(Platform) == 'Windows'">"c:\Program Files (x86)\Xamarin Studio\bin\mdtool.exe"</mdtool>
-		<IncludeXamMac Condition="$(IncludeXamMac) == '' and (Exists('/Library/Frameworks/Xamarin.Mac.framework') or Exists('$(ArtifactsNet45Dir)/XamMac.dll'))">true</IncludeXamMac>
-		<IncludeXamiOS Condition="$(IncludeXamiOS) == '' and $(Platform) == 'Mac' and Exists('/Library/Frameworks/Xamarin.iOS.framework')">true</IncludeXamiOS>
+		<XamarinMacPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current</XamarinMacPath>
+		<ReferencePath Condition="$(ReferencePath) == '' and Exists('$(XamarinMacPath)')">$(XamarinMacPath)\lib\mono</ReferencePath>
 		<UtilitiesBasePath>$(ArtifactsDir)\obj</UtilitiesBasePath>
 	</PropertyGroup>
 	<Import Project="Utilities.targets" Condition="$(UtilitiesImported) == ''" />
@@ -116,7 +116,8 @@
 	</Target>
 
 	<Target Name="Build" DependsOnTargets="UpdateVersion">
-    	<MSBuild Projects="$(SourceDir)\Eto.sln" Targets="$(PackageTargets)" Properties="Configuration=$(Configuration);Platform=$(Platform)"/>
+    	<Exec Command="nuget restore $(SourceDir)\Eto.sln" /> <!-- msbuild restore target doesn't use package.config (needed only for XamMac currently) -->
+    	<MSBuild Projects="$(SourceDir)\Eto.sln" Targets="$(PackageTargets)" Properties="Configuration=$(Configuration);Platform=$(Platform);ReferencePath=$(ReferencePath)"/>
 	</Target>
 
 

build/nuspec/Eto.Platform.Mac.nuspec

@@ -32,9 +32,10 @@ You do not need to use any of the classes of this assembly (unless customizing t
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="Libraries/MonoMac/MonoMac.dll" target="lib\net45" />
-		<file src="Libraries/MonoMac/MonoMac-License.txt" target="MonoMac-License.txt" />
+		<file src="lib/MonoMac/MonoMac.dll" target="lib\net45" />
+		<file src="lib/MonoMac/MonoMac-License.txt" target="MonoMac-License.txt" />
 		<file src="artifacts/$configuration$/net45/Eto.Mac.dll" target="lib\net45" />
 		<file src="artifacts/$configuration$/net45/LICENSE.txt" target="LICENSE.txt" />
+		<file src="build/MacTemplate/*.*" target="build\" />
 	</files>
 </package>

build/nuspec/Eto.Platform.Mac64.nuspec

@@ -34,9 +34,10 @@ You do not need to use any of the classes of this assembly (unless customizing t
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="Libraries/MonoMac64/MonoMac.dll" target="lib\net45" />
-		<file src="Libraries/MonoMac64/MonoMac-License.txt" target="MonoMac-License.txt" />
+		<file src="lib/MonoMac64/MonoMac.dll" target="lib\net45" />
+		<file src="lib/MonoMac64/MonoMac-License.txt" target="MonoMac-License.txt" />
 		<file src="artifacts/$configuration$/net45/Eto.Mac64.dll" target="lib\net45" />
 		<file src="artifacts/$configuration$/net45/LICENSE.txt" target="LICENSE.txt" />
+		<file src="build/MacTemplate/*.*" target="build\" />
 	</files>
 </package>