Merge branch 'release/v0.2.6' into main

RocketSurgeonsGuild · Oct 8, 2018 · acb1d36 · acb1d36
2 parents af61792 + a53af94
commit acb1d36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Xamarin.Recipe/Content/test.cake b/Xamarin.Recipe/Content/test.cake
@@ -12,7 +12,8 @@ Task("Unit-Test")
                 { 
                     Configuration = BuildParameters.Configuration,
                     Framework = ToolSettings.TestFramework,
-                    NoBuild = ToolSettings.TestNoBuild
+                    NoBuild = ToolSettings.TestNoBuild,
+                    NoRestore = ToolSettings.TestNoRestore
                 });
         }
     });

diff --git a/Xamarin.Recipe/Content/toolsettings.cake b/Xamarin.Recipe/Content/toolsettings.cake
@@ -7,8 +7,9 @@ public static class ToolSettings
     public static string TestCoverageFilter { get; private set; }
     public static string TestCoverageExcludeByAttribute { get; private set; }
     public static string TestCoverageExcludeByFile { get; private set; }
-    public static string TestFramework { get; set; }
-    public static bool TestNoBuild { get; set; }
+    public static string TestFramework { get; private set; }
+    public static bool TestNoBuild { get; private set; }
+    public static bool TestNoRestore { get; private set; }
     public static PlatformTarget BuildPlatformTarget { get; private set; }
     public static MSBuildToolVersion MSBuildToolVersion { get; private set; }
     public static Verbosity MSBuildVerbosity { get; private set; }
@@ -24,14 +25,15 @@ public static class ToolSettings
         string testCoverageExcludeByFile = null,
         string testFramework = "netcoreapp2.0",
         bool testNoBuild = true,
+        bool testNoRestore = true,
         PlatformTarget? buildPlatformTarget = null,
         MSBuildToolVersion msBuildToolVersion = MSBuildToolVersion.Default,
+        Verbosity msBuildVerbosity = Verbosity.Quiet,
         int? maxCpuCount = null,
         DirectoryPath outputDirectory = null,
         string[] dupFinderExcludeFilesByStartingCommentSubstring = null,
         int? dupFinderDiscardCost = null,
         bool? dupFinderThrowExceptionOnFindingDuplicates = null,
-        Verbosity msBuildVerbosity = Verbosity.Quiet,
         string androidBuildToolVersion = "27.0.2"
     )
     {
@@ -53,6 +55,7 @@ public static class ToolSettings
         TestCoverageExcludeByFile = testCoverageExcludeByFile ?? "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs";
         TestFramework = testFramework;
         TestNoBuild = testNoBuild;
+        TestNoRestore = testNoRestore;
         BuildPlatformTarget = buildPlatformTarget ?? PlatformTarget.MSIL;
         MSBuildToolVersion = msBuildToolVersion;
         MaxCpuCount = maxCpuCount ?? 0;

diff --git a/Xamarin.Recipe/Rocket.Surgery.Xamarin.Recipe.nuspec b/Xamarin.Recipe/Rocket.Surgery.Xamarin.Recipe.nuspec
@@ -8,6 +8,7 @@
     <copyright>Copyright Rodney Littles, II © 2018</copyright>
     <projectUrl>https://github.com/RocketSurgeonsGuild/Xamarin.Recipe</projectUrl>
     <licenseUrl>https://github.com/RocketSurgeonsGuild/Xamarin.Recipe/blob/main/LICENSE</licenseUrl>
+    <iconUrl>https://raw.githubusercontent.com/RocketSurgeonsGuild/graphics/master/png/rsg-patch-circle-color.png</iconUrl>
     <description>Re-usable build script for Cake that is focused on building and deploying Xamarin Mobile Applications.</description>
     <tags>Build Cake Xamarin Mobile</tags>
   </metadata>