Merge pull request #44 from oelderinkX/netstandard2.1_support

issue #43 - support .net standard 2.1
acarteas · Sep 2, 2020 · 2ad1569 · 2ad1569
2 parents ea39af8 + 138614e
commit 2ad1569
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 23 deletions.
diff --git 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

diff --git 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 <IsPackable> 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
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;net48;netstandard2.0;netstandard2.1</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>cache objectcache System.Runtime.Caching.ObjectCache</PackageTags>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -39,7 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
-    <PackageReference Include="GitVersionTask" Version="5.1.2">
+    <PackageReference Include="GitVersionTask" Version="5.3.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
@@ -50,7 +50,13 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System.Runtime.Caching" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+    <Reference Include="System.Runtime.Caching" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
+  </ItemGroup>
 </Project>
diff --git a/src/FileCache/FileCache.csproj b/src/FileCache/FileCache.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;net48;netstandard2.0;netstandard2.1</TargetFrameworks>
 	  <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>cache objectcache System.Runtime.Caching.ObjectCache</PackageTags>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -29,7 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
-    <PackageReference Include="GitVersionTask" Version="5.1.2">
+    <PackageReference Include="GitVersionTask" Version="5.3.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
@@ -40,7 +40,13 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System.Runtime.Caching" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+    <Reference Include="System.Runtime.Caching" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
+  </ItemGroup>
 </Project>