Move cake script one up

.gitignore

@@ -262,4 +262,4 @@ src/MahApps.Metro/Styles/Themes/*.xaml
 !src/MahApps.Metro/Styles/Themes/Theme.Template.exe
 
 # cake
-src/tools/
+tools/

XamlStyler/format_all_xaml.cmd

@@ -0,0 +1 @@
+xstyler.exe -r -d ..\src\ -c .\Options\MahApps.Metro.XAMLStyler.json

appveyor.yml

@@ -17,16 +17,13 @@
     do_not_increment_build_number: false
 
   build_script:
-    - ps: cd src
-    - ps: .\build.ps1 -Target appveyor
-    - ps: cd..
+    - ps: .\build.ps1 -target appveyor
 
   cache:
     - src\packages -> **\packages.config
-    # - '%USERPROFILE%\.nuget\packages -> **\project.json'
 
   artifacts:
-    - path: \src\Publish\*.*
+    - path: \Publish\*.*
 
   nuget:
     disable_publish_on_pr: true

src/build.cake → build.cake

@@ -52,7 +52,7 @@ var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("master", branchNa
 var isTagged = AppVeyor.Environment.Repository.Tag.IsTag;
 
 // Directories and Paths
-var solution = "MahApps.Metro.sln";
+var solution = "./src/MahApps.Metro.sln";
 var publishDir = "./Publish";
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -145,11 +145,11 @@ Task("Pack")
         Configuration = configuration
         // PlatformTarget = PlatformTarget.MSIL
     };
-    var project = "./MahApps.Metro/MahApps.Metro.csproj";
+    var project = "./src/MahApps.Metro/MahApps.Metro.csproj";
 
     MSBuild(project, msBuildSettings
       .WithTarget("pack")
-      .WithProperty("PackageOutputPath", "../" + publishDir)
+      .WithProperty("PackageOutputPath", "../../" + publishDir)
       .WithProperty("RepositoryBranch", branchName)
       .WithProperty("RepositoryCommit", gitVersion.Sha)
       .WithProperty("Description", "The goal of MahApps.Metro is to allow devs to quickly and easily cobble together a 'Modern' UI for their WPF apps (>= .Net 4.5), with minimal effort.")
@@ -165,16 +165,16 @@ Task("Zip")
 {
     EnsureDirectoryExists(Directory(publishDir));
 
-    Zip("./MahApps.Metro.Samples/MahApps.Metro.Demo/bin/" + configuration, publishDir + "/MahApps.Metro.Demo-v" + gitVersion.NuGetVersion + ".zip");
-    Zip("./MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/bin/" + configuration, publishDir + "/MahApps.Metro.Caliburn.Demo-v" + gitVersion.NuGetVersion + ".zip");
+    Zip("./src/MahApps.Metro.Samples/MahApps.Metro.Demo/bin/" + configuration, publishDir + "/MahApps.Metro.Demo-v" + gitVersion.NuGetVersion + ".zip");
+    Zip("./src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/bin/" + configuration, publishDir + "/MahApps.Metro.Caliburn.Demo-v" + gitVersion.NuGetVersion + ".zip");
 });
 
 Task("Tests")
     .ContinueOnError()
     .Does(() =>
 {
     XUnit2(
-        "./Mahapps.Metro.Tests/bin/" + configuration + "/**/*.Tests.dll",
+        "./src/Mahapps.Metro.Tests/bin/" + configuration + "/**/*.Tests.dll",
         new XUnit2Settings { ToolTimeout = TimeSpan.FromMinutes(5) }
     );
 });
@@ -201,7 +201,7 @@ Task("CreateRelease")
         Name              = gitVersion.AssemblySemFileVer,
         Prerelease        = isDevelopBranch,
         TargetCommitish   = branchName,
-        WorkingDirectory  = "../"
+        WorkingDirectory  = "."
     });
 });
 

src/MahApps.Metro/Styles/Themes/Theme.Template.xaml

@@ -5,7 +5,7 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
                     mc:Ignorable="options">
 
-    <!-- Matadata -->
+    <!--  Matadata  -->
     <system:String x:Key="Theme.Name">{{ThemeName}}</system:String>
     <system:String x:Key="Theme.DisplayName">{{ThemeDisplayName}}</system:String>
     <system:String x:Key="Theme.BaseColorScheme">{{BaseColorScheme}}</system:String>