Merge branch 'release/0.6.0'

cake-contrib · May 9, 2019 · a1740e7 · a1740e7
2 parents b2a54b9 + 689adf4
commit a1740e7
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 62 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -28,4 +28,4 @@ branches:
 #---------------------------------#
 cache:
 - src\packages -> src\**\packages.config
-- tools -> setup.cake
+- tools -> setup.cake, tools/packages.config
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,19 @@
 language: csharp
 script:
-  - ./build.sh -v diagnostic
+  - ./build.sh --verbosity=diagnostic
+
 os:
   - linux
   - osx
+
+# Ubuntu 16.04
+sudo: required
+dist: xenial
+
+mono:
+  - latest
+dotnet: 2.1.502
+
 cache:
   directories:
     - packages

diff --git a/nuspec/nuget/Cake.Plist.nuspec b/nuspec/nuget/Cake.Plist.nuspec
@@ -10,7 +10,7 @@
     <summary>The Plist Addin for Cake allows you to serialize and deserialize xml plists directly from .NET source code.</summary>
     <licenseUrl>https://github.com/cake-contrib/Cake.Plist/blob/develop/LICENSE</licenseUrl>
     <projectUrl>https://github.com/cake-contrib/Cake.Plist</projectUrl>
-    <iconUrl>https://cdn.rawgit.com/cake-contrib/graphics/a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
+    <iconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright (c) Cake Contributions 2016 - Present</copyright>
     <tags>Cake Script Plist</tags>

diff --git a/setup.cake b/setup.cake
@@ -15,7 +15,7 @@ BuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(context: Context,
                             dupFinderExcludePattern: new string[] {
-                                BuildParameters.RootDirectoryPath + "/src/Cake.Plist.Tests/*.cs", BuildParameters.RootDirectoryPath + "/Src/Cake.Plist/**/*.AssemblyInfo.cs" },
+                                BuildParameters.RootDirectoryPath + "/src/Cake.Plist.Tests/*.cs", BuildParameters.RootDirectoryPath + "/src/Cake.Plist/**/*.AssemblyInfo.cs" },
                             testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");

diff --git a/src/Cake.Plist.Tests/Cake.Plist.Tests.csproj b/src/Cake.Plist.Tests/Cake.Plist.Tests.csproj
@@ -5,16 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.26.0">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Cake.Testing" Version="0.26.0">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="NSubstitute" Version="3.1.0" />
+    <PackageReference Include="Cake.Core" Version="0.33.0" />
+    <PackageReference Include="Cake.Testing" Version="0.33.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="NSubstitute" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cake.Plist.Tests/Issues/Issue3Tests.cs b/src/Cake.Plist.Tests/Issues/Issue3Tests.cs
@@ -1,15 +1,13 @@
 using Cake.Core;
 using Cake.Testing;
 using NSubstitute;
+using Xunit;
 
 namespace Cake.Plist.Tests.Issues
 {
-    using Core.IO;
-    using Xunit;
-
     public class Issue3Tests
     {
-        [Fact]
+        [WindowsFact]
         public void CanDeserializePlist()
         {
             // Arrange
@@ -26,4 +24,4 @@ public void CanDeserializePlist()
             Assert.NotNull(plist);
         }
     }
-}
+}
diff --git a/src/Cake.Plist.Tests/PlistAliasTests.cs b/src/Cake.Plist.Tests/PlistAliasTests.cs
@@ -1,18 +1,16 @@
-using Cake.Core;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Cake.Core;
 using Cake.Testing;
 using NSubstitute;
+using Xunit;
 
 namespace Cake.Plist.Tests
 {
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using Core.IO;
-    using Xunit;
-
     public class PlistAliasTests
     {
-        [Fact]
+        [WindowsFact]
         public void Deserialize_missing_file_throws_exception()
         {
             var environment = FakeEnvironment.CreateWindowsEnvironment();
@@ -24,7 +22,7 @@ public void Deserialize_missing_file_throws_exception()
             Assert.Throws<FileNotFoundException>(() => PlistAliases.DeserializePlist(context, "./file-doesnt-exist"));
         }
 
-        [Fact]
+        [WindowsFact]
         public void Read_write_compare()
         {
             // Arrange

diff --git a/src/Cake.Plist.Tests/PlistConvertTests.cs b/src/Cake.Plist.Tests/PlistConvertTests.cs
@@ -1,15 +1,14 @@
-using Cake.Core;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+using Cake.Core;
+using Xunit;
 
 namespace Cake.Plist.Tests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using System.Xml.Linq;
-    using Xunit;
-
     public sealed class PlistConvertTests
     {
         [Theory]

diff --git a/src/Cake.Plist.Tests/WindowsFact.cs b/src/Cake.Plist.Tests/WindowsFact.cs
@@ -0,0 +1,24 @@
+using System.Runtime.InteropServices;
+using Cake.Core;
+using Xunit;
+
+namespace Cake.Plist.Tests
+{
+    public sealed class WindowsFact : FactAttribute
+    {
+        private static readonly PlatformFamily _family;
+
+        static WindowsFact()
+        {
+            _family = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? PlatformFamily.Windows : PlatformFamily.Unknown;
+        }
+
+        public WindowsFact(string reason = null)
+        {
+            if (_family != PlatformFamily.Windows)
+            {
+                Skip = reason ?? "Windows test.";
+            }
+        }
+    }
+}
diff --git a/src/Cake.Plist.Tests/packages.config b/src/Cake.Plist.Tests/packages.config
diff --git a/src/Cake.Plist/Cake.Plist.csproj b/src/Cake.Plist/Cake.Plist.csproj
@@ -3,9 +3,6 @@
     <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup>
-    <CodeAnalysisRuleSet>Cake.Plist.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;net46;</DefineConstants>
   </PropertyGroup>
@@ -20,10 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.26.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Cake.Plist/packages.config b/src/Cake.Plist/packages.config
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.25.0" />
+	<package id="Cake" version="0.32.1" />
 </packages>