From c156594cff68ee2d13301b41c509a5d0aeede561 Mon Sep 17 00:00:00 2001 From: Jared Oelderink-Wale Date: Wed, 26 Aug 2020 15:29:34 +1200 Subject: [PATCH 1/6] issue #41 - support .net standard 2.1 --- src/FileCache.Signed/FileCache.Signed.csproj | 8 +++++++- src/FileCache/FileCache.csproj | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/FileCache.Signed/FileCache.Signed.csproj b/src/FileCache.Signed/FileCache.Signed.csproj index 3316508..7c3c442 100644 --- a/src/FileCache.Signed/FileCache.Signed.csproj +++ b/src/FileCache.Signed/FileCache.Signed.csproj @@ -1,6 +1,6 @@  - net40;net45;netstandard2.0 + net40;net45;net48;netstandard2.0;netstandard2.1 false cache objectcache System.Runtime.Caching.ObjectCache Apache-2.0 @@ -50,7 +50,13 @@ + + + + + + \ No newline at end of file diff --git a/src/FileCache/FileCache.csproj b/src/FileCache/FileCache.csproj index f184cee..e63a6ad 100644 --- a/src/FileCache/FileCache.csproj +++ b/src/FileCache/FileCache.csproj @@ -1,6 +1,6 @@  - net40;net45;netstandard2.0 + net40;net45;net48;netstandard2.0;netstandard2.1 false cache objectcache System.Runtime.Caching.ObjectCache Apache-2.0 @@ -40,7 +40,13 @@ + + + + + + \ No newline at end of file From c1128d26b57b1bce9f1e9f8f8cab476fb881c4d8 Mon Sep 17 00:00:00 2001 From: Jared Oelderink-Wale Date: Thu, 27 Aug 2020 13:35:13 +1200 Subject: [PATCH 2/6] issue #43 - update image to VS 2019 and see if build is successful --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1db7862..8418e16 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ artifacts: configuration: Debug -image: Visual Studio 2017 +image: Visual Studio 2019 build_script: - cmd: powershell -NoProfile -ExecutionPolicy unrestricted -Command .\build.ps1 From c50f627bcb066f280f8c224856ce1f9fd7092b91 Mon Sep 17 00:00:00 2001 From: Jared Oelderink-Wale Date: Wed, 2 Sep 2020 17:02:57 +1200 Subject: [PATCH 3/6] Convert .cake to use DotNetCore* instead of MSBuild Update GitVersionTask to 5.3.7 because of issue with dotnet build https://github.com/GitTools/GitVersion/issues/2063 --- build.cake | 28 +++++++------------- src/FileCache.Signed/FileCache.Signed.csproj | 4 +-- src/FileCache/FileCache.csproj | 4 +-- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/build.cake b/build.cake index 159152f..4bb8a9d 100644 --- a/build.cake +++ b/build.cake @@ -37,23 +37,17 @@ Task("Clean") Task("Restore-NuGet-Packages") .Does(() => { - MSBuild(solutionFile, settings => - settings - .WithTarget("Restore") - .SetConfiguration(configuration) - ); + DotNetCoreRestore(solutionFile); }); Task("Build") .IsDependentOn("Restore-NuGet-Packages") .Does(() => { - // Use MSBuild for the Sln, but deploy - MSBuild(solutionFile, settings => - settings - .WithTarget("Build") - .SetConfiguration(configuration) - ); + DotNetCoreBuild(solutionFile, new DotNetCoreBuildSettings + { + Configuration = Argument("configuration", configuration) + }); }); Task("Test") @@ -73,13 +67,11 @@ Task("Create-NuGet-Packages") .IsDependentOn("Build") .Does(() => { - var settings = new MSBuildSettings() - .WithTarget("Pack") - .SetConfiguration(configuration) - .WithProperty("PackageOutputPath",artifactDirectory); - - // Pack the Sln (unit tests has the to false) - MSBuild(solutionFile, settings); + DotNetCorePack(solutionFile, new DotNetCorePackSettings + { + Configuration = configuration, + OutputDirectory = artifactDirectory + }); }); ////////////////////////////////////////////////////////////////////// diff --git a/src/FileCache.Signed/FileCache.Signed.csproj b/src/FileCache.Signed/FileCache.Signed.csproj index 7c3c442..05f23aa 100644 --- a/src/FileCache.Signed/FileCache.Signed.csproj +++ b/src/FileCache.Signed/FileCache.Signed.csproj @@ -39,7 +39,7 @@ - + All @@ -57,6 +57,6 @@ - + \ No newline at end of file diff --git a/src/FileCache/FileCache.csproj b/src/FileCache/FileCache.csproj index e63a6ad..f0b9dd1 100644 --- a/src/FileCache/FileCache.csproj +++ b/src/FileCache/FileCache.csproj @@ -29,7 +29,7 @@ - + All @@ -47,6 +47,6 @@ - + \ No newline at end of file From 2344f35c4051ce3f947d202372c73ddb153c22cd Mon Sep 17 00:00:00 2001 From: Jared Oelderink-Wale Date: Wed, 2 Sep 2020 17:21:57 +1200 Subject: [PATCH 4/6] Downgrade GitVersionTask to an expected working one --- src/FileCache.Signed/FileCache.Signed.csproj | 2 +- src/FileCache/FileCache.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileCache.Signed/FileCache.Signed.csproj b/src/FileCache.Signed/FileCache.Signed.csproj index 05f23aa..b0a47a9 100644 --- a/src/FileCache.Signed/FileCache.Signed.csproj +++ b/src/FileCache.Signed/FileCache.Signed.csproj @@ -39,7 +39,7 @@ - + All diff --git a/src/FileCache/FileCache.csproj b/src/FileCache/FileCache.csproj index f0b9dd1..5116bfd 100644 --- a/src/FileCache/FileCache.csproj +++ b/src/FileCache/FileCache.csproj @@ -29,7 +29,7 @@ - + All From 6f6cb67bdc93d692af3f7e383a59ec8e0e1e51b8 Mon Sep 17 00:00:00 2001 From: Jared Oelderink-Wale Date: Wed, 2 Sep 2020 17:28:53 +1200 Subject: [PATCH 5/6] Identify a version of GitVersionTask that works locally and on AppVeyor - version 5.3.1 --- src/FileCache.Signed/FileCache.Signed.csproj | 2 +- src/FileCache/FileCache.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileCache.Signed/FileCache.Signed.csproj b/src/FileCache.Signed/FileCache.Signed.csproj index b0a47a9..d33edd4 100644 --- a/src/FileCache.Signed/FileCache.Signed.csproj +++ b/src/FileCache.Signed/FileCache.Signed.csproj @@ -39,7 +39,7 @@ - + All diff --git a/src/FileCache/FileCache.csproj b/src/FileCache/FileCache.csproj index 5116bfd..62edff9 100644 --- a/src/FileCache/FileCache.csproj +++ b/src/FileCache/FileCache.csproj @@ -29,7 +29,7 @@ - + All From 138614efea57ec2785560586862baf020ce1e589 Mon Sep 17 00:00:00 2001 From: Jared Oelderink-Wale Date: Wed, 2 Sep 2020 17:39:07 +1200 Subject: [PATCH 6/6] Bump GitVersionTask to 5.3.2 and see if tests run successfully in AppVeyor --- src/FileCache.Signed/FileCache.Signed.csproj | 2 +- src/FileCache/FileCache.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileCache.Signed/FileCache.Signed.csproj b/src/FileCache.Signed/FileCache.Signed.csproj index d33edd4..97a3cb7 100644 --- a/src/FileCache.Signed/FileCache.Signed.csproj +++ b/src/FileCache.Signed/FileCache.Signed.csproj @@ -39,7 +39,7 @@ - + All diff --git a/src/FileCache/FileCache.csproj b/src/FileCache/FileCache.csproj index 62edff9..7a2cb3a 100644 --- a/src/FileCache/FileCache.csproj +++ b/src/FileCache/FileCache.csproj @@ -29,7 +29,7 @@ - + All