Merge pull request #26 from cake-contrib/release/1.0.4

Release/1.0.4
cake-contrib · Feb 28, 2018 · 89071b0 · 89071b0
2 parents ec01f89 + 51e59e8
commit 89071b0
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-## Cake.AndroidAppManifest [![Build status](https://ci.appveyor.com/api/projects/status/85o5pruse4h0kotv/branch/master?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-androidappmanifest/branch/master)
+## Cake.AndroidAppManifest [![Build status](https://ci.appveyor.com/api/projects/status/85o5pruse4h0kotv/branch/master?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-androidappmanifest/branch/master) [![NuGet](https://img.shields.io/nuget/v/Cake.AndroidAppManifest.svg?label=NuGet)](https://www.nuget.org/packages/Cake.AndroidAppManifest/) [![NuGet Downloads](https://img.shields.io/nuget/dt/Cake.AndroidAppManifest.svg)](https://www.nuget.org/packages/Cake.AndroidAppManifest/)
+
 
 Cake Build addin for [de]serializing and updating an Android AppManifest.</description>
 

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,3 +1,6 @@
+### New in 1.0.4
+- Fixed 'AndoridAppManifestAliases' typo not corrected in class name #24
+
 ### New in 1.0.3
 - Upgraded to .NET Standard 1.6.
 

diff --git a/build.cake b/build.cake
@@ -28,41 +28,31 @@ var treatWarningsAsErrors = false;
 
 // Get whether or not this is a local build.
 var local = BuildSystem.IsLocalBuild;
-var isRunningOnUnix = IsRunningOnUnix();
 var isRunningOnWindows = IsRunningOnWindows();
-
 var isRunningOnAppVeyor = AppVeyor.IsRunningOnAppVeyor;
-var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
 
 // Parse release notes.
 var releaseNotes = ParseReleaseNotes("RELEASENOTES.md");
 
 // Get version.
 var version = releaseNotes.Version.ToString();
 var epoch = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-var gitSha = GitVersion().Sha;
 
 var semVersion = string.Format("{0}.{1}", version, epoch);
 
-// Define directories.
-var artifactDirectory = "./artifacts/";
-
-Action<string> RestorePackages = (solution) =>
-{
-    NuGetRestore(solution);
-};
+// Define directories. (msbuild /pack requires absolute path)
+var artifactDirectory = MakeAbsolute(File("./artifacts/")).ToString();
+var solutionFile = new FilePath("src/Cake.AndroidAppManifest.sln");
 
 ///////////////////////////////////////////////////////////////////////////////
 // SETUP / TEARDOWN
 ///////////////////////////////////////////////////////////////////////////////
+
 Setup((context) =>
 {
     Information("Building version {0} of Cake.AndroidAppManifest.", semVersion);
-});
-
-Teardown((context) =>
-{
-    // Executed AFTER the last task.
+    Information("isRunningOnAppVeyor: {0}", isRunningOnAppVeyor);
+	Information ("Running on Windows: {0}", isRunningOnWindows);
 });
 
 //////////////////////////////////////////////////////////////////////
@@ -74,24 +64,14 @@ Task("Build")
     .IsDependentOn("UpdateAssemblyInfo")
     .Does (() =>
 {
-    Action<string> build = (filename) =>
-    {
-        var solution = System.IO.Path.Combine("./src/", filename);
-
-        // UWP (project.json) needs to be restored before it will build.
-        RestorePackages(solution);
-
-        Information("Building {0}", solution);
-
-        MSBuild(solution, new MSBuildSettings()
-            .SetConfiguration(configuration)
-            .WithProperty("NoWarn", "1591") // ignore missing XML doc warnings
-            .WithProperty("TreatWarningsAsErrors", treatWarningsAsErrors.ToString())
-            .SetVerbosity(Verbosity.Minimal)
-            .SetNodeReuse(false));
-    };
-
-    build("Cake.AndroidAppManifest.sln");
+    Information("Building {0}", solutionFile);
+
+    MSBuild(solutionFile, new MSBuildSettings()
+        .SetConfiguration(configuration)
+        .WithProperty("NoWarn", "1591") // ignore missing XML doc warnings
+        .WithProperty("TreatWarningsAsErrors", treatWarningsAsErrors.ToString())
+        .SetVerbosity(Verbosity.Minimal)
+        .SetNodeReuse(false));
 });
 
 Task("UpdateAppVeyorBuildNumber")
@@ -118,7 +98,7 @@ Task("UpdateAssemblyInfo")
 
 Task("RestorePackages").Does (() =>
 {
-    RestorePackages("./src/Cake.AndroidAppManifest.sln");
+    NuGetRestore(solutionFile);
 });
 
 Task("RunUnitTests")
@@ -127,8 +107,7 @@ Task("RunUnitTests")
 {
     XUnit2("./src/Cake.AndroidAppManifest.Tests/bin/Release/Cake.AndroidAppManifest.Tests.dll", new XUnit2Settings {
         OutputDirectory = artifactDirectory,
-        XmlReportV1 = false,
-        NoAppDomain = true
+        XmlReport = true
     });
 });
 
@@ -140,19 +119,15 @@ Task("Package")
     // switched to msbuild-based nuget creation
     // see here for parameters: https://docs.microsoft.com/en-us/nuget/schema/msbuild-targets
     MSBuild ("./src/Cake.AndroidAppManifest/Cake.AndroidAppManifest.csproj", c => {
-     c.Configuration = configuration;
-     c.Targets.Add ("pack");
-     c.Properties.Add("IncludeSymbols", new List<string> { "true" });
-     c.Properties.Add("PackageReleaseNotes", new List<string>(releaseNotes.Notes));
-     c.Properties.Add("PackageVersion", new List<string> { version });
+        c.Configuration = configuration;
+        c.Targets.Add ("pack");
+        c.Properties.Add("IncludeSymbols", new List<string> { "true" });
+        c.Properties.Add("PackageReleaseNotes", new List<string>(releaseNotes.Notes));
+        c.Properties.Add("PackageVersion", new List<string> { version });
+        c.Properties.Add("PackageOutputPath", new List<string> { artifactDirectory });
     });
 });
 
-//////////////////////////////////////////////////////////////////////
-// TASK TARGETS
-//////////////////////////////////////////////////////////////////////
-
-
 //////////////////////////////////////////////////////////////////////
 // EXECUTION
 //////////////////////////////////////////////////////////////////////

diff --git a/src/Cake.AndroidAppManifest.Tests/AndroidAppManifestAliasesTest.cs b/src/Cake.AndroidAppManifest.Tests/AndroidAppManifestAliasesTest.cs
@@ -1,22 +1,24 @@
 using System.IO;
 using Cake.Core;
-using Cake.Core.Diagnostics;
 using Cake.Core.IO;
-using Cake.Core.Tooling;
 using FluentAssertions;
+using NSubstitute;
 using Xunit;
 
 namespace Cake.AndroidAppManifest.Tests
 {
     public class AndroidManifestAliasesTest
     {
+        private const string SaveTestPath = "Test.xml";
+        private ICakeContext Cake { get; }
+
         public AndroidManifestAliasesTest()
         {
-            Cake = new CakeContextMock();
+            Cake = Substitute.For<ICakeContext>();
         }
 
         [Fact]
-        public void SerializeTest()
+        public void DeserializeTest()
         {
             var manifest = Cake.DeserializeAppManifest(new FilePath("AndroidManifest.xml"));
             manifest.MinSdkVersion.Should().Be(15);
@@ -25,15 +27,10 @@ public void SerializeTest()
             manifest.VersionCode.Should().Be(1);
             manifest.ApplicationIcon.Should().Be("@drawable/icon");
             manifest.ApplicationLabel.Should().Be("Android Application");
-        }
-
-
-        const string SaveTestPath = "Test.xml";
-
-        private CakeContextMock Cake { get; }
+        }      
 
         [Fact]
-        public void SaveTest()
+        public void SerializeTest()
         {
             if (File.Exists(SaveTestPath))
             {
@@ -56,17 +53,5 @@ public void SaveTest()
             modifiedManifest.VersionName.Should().Be("3.3");
             modifiedManifest.VersionCode.Should().Be(2);
         }
-
-        private class CakeContextMock : ICakeContext
-        {
-            public IFileSystem FileSystem { get; }
-            public ICakeEnvironment Environment { get; }
-            public IGlobber Globber { get; }
-            public ICakeLog Log { get; }
-            public ICakeArguments Arguments { get; }
-            public IProcessRunner ProcessRunner { get; }
-            public IRegistry Registry { get; }
-            public IToolLocator Tools { get; }
-        }
     }
 }
diff --git a/src/Cake.AndroidAppManifest.Tests/Cake.AndroidAppManifest.Tests.csproj b/src/Cake.AndroidAppManifest.Tests/Cake.AndroidAppManifest.Tests.csproj
@@ -48,15 +48,16 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.22.0" />
-    <PackageReference Include="Cake.Testing" Version="0.23.0" />
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.abstractions" Version="2.0.1" />
     <PackageReference Include="xunit.assert" Version="2.3.1" />
     <PackageReference Include="xunit.core" Version="2.3.1" />
     <PackageReference Include="xunit.extensibility.core" Version="2.3.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
+    <PackageReference Include="Cake.Core" Version="0.25.0" />
+    <PackageReference Include="Cake.Testing" Version="0.25.0" />
+    <PackageReference Include="NSubstitute" Version="3.1.0" />
+    <PackageReference Include="FluentAssertions" Version="5.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cake.AndroidAppManifest\Cake.AndroidAppManifest.csproj">

diff --git a/src/Cake.AndroidAppManifest/AndroidAppManifest.cs b/src/Cake.AndroidAppManifest/AndroidAppManifest.cs
@@ -11,6 +11,7 @@ namespace Cake.AndroidAppManifest
 {
     public class AndroidAppManifest
     {
+        private static readonly int MaxApiLevel = 27;
         private static readonly XNamespace aNS = "http://schemas.android.com/apk/res/android";
         private static readonly XName aName = aNS + "name";
         private readonly XDocument doc;
@@ -139,12 +140,12 @@ public static string CanonicalizePackageName(string packageNameOrAssemblyName)
         {
             if (packageNameOrAssemblyName == null)
             {
-                throw new ArgumentNullException("packageNameOrAssemblyName");
+                throw new ArgumentNullException(nameof(packageNameOrAssemblyName));
             }
 
             if (string.IsNullOrEmpty(packageNameOrAssemblyName = packageNameOrAssemblyName.Trim()))
             {
-                throw new ArgumentException("Must specify a package name or assembly name", "packageNameOrAssemblyName");
+                throw new ArgumentException("Must specify a package name or assembly name", nameof(packageNameOrAssemblyName));
             }
 
             var packageParts = packageNameOrAssemblyName.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
@@ -240,7 +241,7 @@ int ParseRequiredInt(XAttribute attribute)
             int vn;
             if (!int.TryParse(version, out vn))
             {
-                vn = AndroidVersion.MaxApiLevel;
+                vn = MaxApiLevel;
             }
             return vn;
         }

diff --git a/src/Cake.AndroidAppManifest/AndroidAppManifestAliases.cs b/src/Cake.AndroidAppManifest/AndroidAppManifestAliases.cs
@@ -9,7 +9,7 @@ namespace Cake.AndroidAppManifest
     ///     Contains functionality to work with Android AppManifest files.
     /// </summary>
     [CakeAliasCategory("AndroidAppManifest")]
-    public static class AndoridAppManifestAliases
+    public static class AndroidAppManifestAliases
     {
 
       /// <summary>

diff --git a/src/Cake.AndroidAppManifest/AndroidVersion.cs b/src/Cake.AndroidAppManifest/AndroidVersion.cs
diff --git a/src/Cake.AndroidAppManifest/Cake.AndroidAppManifest.csproj b/src/Cake.AndroidAppManifest/Cake.AndroidAppManifest.csproj
@@ -28,7 +28,6 @@
     <OutputPath>bin\Release</OutputPath>
   </PropertyGroup>
 
-
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
     <OutputPath>bin\Debug</OutputPath>
   </PropertyGroup>

diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
@@ -6,8 +6,8 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("Cake.AndroidAppManifest")]
-[assembly: AssemblyVersion("1.0.3")]
-[assembly: AssemblyFileVersion("1.0.3")]
-[assembly: AssemblyInformationalVersion("1.0.3.1512253012")]
+[assembly: AssemblyVersion("1.0.4")]
+[assembly: AssemblyFileVersion("1.0.4")]
+[assembly: AssemblyInformationalVersion("1.0.4.1519853365")]
 [assembly: AssemblyCopyright("Copyright (c) Geoffrey Huntley")]
 
diff --git a/tools/packages.config b/tools/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.23.0" />
+    <package id="Cake" version="0.25.0" />
 </packages>