Merge branch 'nuget-nightly'

appveyor.yml

@@ -3,6 +3,17 @@ os: Visual Studio 2015
 before_build:
 - git submodule update --init
 - nuget restore Perspex.sln
+
+
+configuration:
+  - Release
+
+after_build:
+- ps: nuget\build-appveyor.ps1
+
+artifacts:
+  - path: nuget\*.nupkg
+
 build:
   project: Perspex.sln
   verbosity: minimal

nuget/.gitignore

@@ -1,7 +1,2 @@
-- build/
-
-**/lib/**/*.dll
-**/lib/**/*.xml
-**/build/**/*.dll
-**/build/**/*.xml
+Perspex
 *.nupkg

nuget/build-appveyor.ps1

@@ -0,0 +1,7 @@
+$scriptpath = $MyInvocation.MyCommand.Path
+$dir = Split-Path $scriptpath
+Push-Location $dir
+
+sv version $env:APPVEYOR_BUILD_NUMBER
+sv version 9999.0.$version-nightly
+.\build-version.ps1 $version

nuget/build-version.ps1

@@ -0,0 +1,47 @@
+rm -Force -Recurse .\Perspex -ErrorAction SilentlyContinue
+rm -Force -Recurse *.nupkg -ErrorAction SilentlyContinue
+Copy-Item template Perspex -Recurse
+sv lib "Perspex\lib\portable-windows8+net45"
+sv build "Perspex\build\net45"
+mkdir $lib -ErrorAction SilentlyContinue
+mkdir $build -ErrorAction SilentlyContinue
+
+Copy-Item ..\src\Perspex.Animation\bin\Release\Perspex.Animation.dll $lib
+Copy-Item ..\src\Perspex.Animation\bin\Release\Perspex.Animation.xml $lib
+Copy-Item ..\src\Perspex.Application\bin\Release\Perspex.Application.dll $lib
+Copy-Item ..\src\Perspex.Application\bin\Release\Perspex.Application.xml $lib
+Copy-Item ..\src\Perspex.Base\bin\Release\Perspex.Base.dll $lib
+Copy-Item ..\src\Perspex.Base\bin\Release\Perspex.Base.xml $lib
+Copy-Item ..\src\Perspex.Controls\bin\Release\Perspex.Controls.dll $lib
+Copy-Item ..\src\Perspex.Controls\bin\Release\Perspex.Controls.xml $lib
+Copy-Item ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.dll $lib
+Copy-Item ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.xml $lib
+Copy-Item ..\src\Perspex.Input\bin\Release\Perspex.Input.dll $lib
+Copy-Item ..\src\Perspex.Input\bin\Release\Perspex.Input.xml $lib
+Copy-Item ..\src\Perspex.Interactivity\bin\Release\Perspex.Interactivity.dll $lib
+Copy-Item ..\src\Perspex.Interactivity\bin\Release\Perspex.Interactivity.xml $lib
+Copy-Item ..\src\Perspex.Layout\bin\Release\Perspex.Layout.dll $lib
+Copy-Item ..\src\Perspex.Layout\bin\Release\Perspex.Layout.xml $lib
+Copy-Item ..\src\Perspex.SceneGraph\bin\Release\Perspex.SceneGraph.dll $lib
+Copy-Item ..\src\Perspex.SceneGraph\bin\Release\Perspex.SceneGraph.xml $lib
+Copy-Item ..\src\Perspex.Styling\bin\Release\Perspex.Styling.dll $lib
+Copy-Item ..\src\Perspex.Styling\bin\Release\Perspex.Styling.xml $lib
+Copy-Item ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.dll $lib
+Copy-Item ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.xml $lib
+Copy-Item ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.dll $lib
+Copy-Item ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.xml $lib
+Copy-Item ..\src\Perspex.HtmlRenderer\bin\Release\Perspex.HtmlRenderer.dll $lib
+Copy-Item ..\src\NGenerics\bin\Release\NGenerics.dll $lib
+
+Copy-Item ..\src\Windows\Perspex.Direct2D1\bin\Release\Perspex.Direct2D1.dll $build
+Copy-Item ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.dll $build
+Copy-Item ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.Direct2D1.dll $build
+Copy-Item ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.DXGI.dll $build
+Copy-Item ..\src\Windows\Perspex.Win32\bin\Release\Perspex.Win32.dll $build
+Copy-Item ..\src\Gtk\Perspex.Gtk\bin\Release\Perspex.Gtk.dll $build
+Copy-Item ..\src\Gtk\Perspex.Cairo\bin\Release\Perspex.Cairo.dll $build
+
+(gc Perspex\Perspex.nuspec).replace('#VERSION#', $args[0]) | sc Perspex\Perspex.nuspec
+
+nuget.exe pack Perspex\Perspex.nuspec
+rm -Force -Recurse .\Perspex

nuget/build.bat

@@ -1,39 +0,0 @@
-SET lib="Perspex\lib\portable-windows8+net45"
-SET build="Perspex\build\net45"
-
-mkdir %lib%
-mkdir %build%
-
-copy ..\src\Perspex.Animation\bin\Release\Perspex.Animation.dll %lib%
-copy ..\src\Perspex.Animation\bin\Release\Perspex.Animation.xml %lib%
-copy ..\src\Perspex.Application\bin\Release\Perspex.Application.dll %lib%
-copy ..\src\Perspex.Application\bin\Release\Perspex.Application.xml %lib%
-copy ..\src\Perspex.Base\bin\Release\Perspex.Base.dll %lib%
-copy ..\src\Perspex.Base\bin\Release\Perspex.Base.xml %lib%
-copy ..\src\Perspex.Controls\bin\Release\Perspex.Controls.dll %lib%
-copy ..\src\Perspex.Controls\bin\Release\Perspex.Controls.xml %lib%
-copy ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.dll %lib%
-copy ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.xml %lib%
-copy ..\src\Perspex.Input\bin\Release\Perspex.Input.dll %lib%
-copy ..\src\Perspex.Input\bin\Release\Perspex.Input.xml %lib%
-copy ..\src\Perspex.Interactivity\bin\Release\Perspex.Interactivity.dll %lib%
-copy ..\src\Perspex.Interactivity\bin\Release\Perspex.Interactivity.xml %lib%
-copy ..\src\Perspex.Layout\bin\Release\Perspex.Layout.dll %lib%
-copy ..\src\Perspex.Layout\bin\Release\Perspex.Layout.xml %lib%
-copy ..\src\Perspex.SceneGraph\bin\Release\Perspex.SceneGraph.dll %lib%
-copy ..\src\Perspex.SceneGraph\bin\Release\Perspex.SceneGraph.xml %lib%
-copy ..\src\Perspex.Styling\bin\Release\Perspex.Styling.dll %lib%
-copy ..\src\Perspex.Styling\bin\Release\Perspex.Styling.xml %lib%
-copy ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.dll %lib%
-copy ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.xml %lib%
-copy ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.dll %lib%
-copy ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.xml %lib%
-copy ..\src\NGenerics\bin\Release\NGenerics.dll %lib%
-
-copy ..\src\Windows\Perspex.Direct2D1\bin\Release\Perspex.Direct2D1.dll %build%
-copy ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.dll %build%
-copy ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.Direct2D1.dll %build%
-copy ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.DXGI.dll %build%
-copy ..\src\Windows\Perspex.Win32\bin\Release\Perspex.Win32.dll %build%
-
-nuget.exe pack Perspex\Perspex.nuspec

nuget/build.ps1

@@ -0,0 +1 @@
+.\build-version.ps1 0.0.1-alpha

nuget/Perspex/Perspex.nuspec → nuget/template/Perspex.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Perspex</id>
-    <version>0.0.1-alpha</version>
+    <version>#VERSION#</version>
     <authors>stevenk</authors>
     <owners>stevenk</owners>
     <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>

src/Perspex.Base/Contract.cs

@@ -1,6 +1,8 @@
 // Copyright (c) The Perspex Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System.Runtime.CompilerServices;
+
 namespace Perspex
 {
     using System;
@@ -22,14 +24,13 @@ namespace Perspex
         /// The exception to throw if <paramref name="condition"/> is false.
         /// </typeparam>
         /// <param name="condition">The precondition.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void Requires<TException>(bool condition) where TException : Exception, new()
         {
-#if DEBUG
             if (!condition)
             {
                 throw new TException();
             }
-#endif
         }
     }
 }

src/Perspex.HtmlRenderer/Perspex.HtmlRenderer.csproj

@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;PCL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj

@@ -34,7 +34,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;PERSPEX_CAIRO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>