Merge pull request #34 from maldworth/feat/update-packages-and-build

Update nuget packages and cake build
acarteas · Nov 22, 2019 · 6e3776e · 6e3776e
2 parents 9cd79bb + fb865bb
commit 6e3776e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/build.cake b/build.cake
@@ -41,7 +41,6 @@ Task("Restore-NuGet-Packages")
         settings
             .WithTarget("Restore")
             .SetConfiguration(configuration)
-            .UseToolVersion(MSBuildToolVersion.VS2017)
             );
 });
 
@@ -54,7 +53,6 @@ Task("Build")
 		settings
             .WithTarget("Build")
             .SetConfiguration(configuration)
-            .UseToolVersion(MSBuildToolVersion.VS2017)
             );
 });
 
@@ -78,7 +76,6 @@ Task("Create-NuGet-Packages")
     var settings = new MSBuildSettings()
         .WithTarget("Pack")
         .SetConfiguration(configuration)
-        .UseToolVersion(MSBuildToolVersion.VS2017)
         .WithProperty("PackageOutputPath",artifactDirectory);
 
     // Pack the Sln (unit tests has the <IsPackable> to false)

diff --git a/src/FileCache.Signed/FileCache.Signed.csproj b/src/FileCache.Signed/FileCache.Signed.csproj
@@ -3,8 +3,7 @@
     <TargetFrameworks>net40;net45;netstandard2.0</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>cache objectcache System.Runtime.Caching.ObjectCache</PackageTags>
-    <PackageLicenseUrl>https://github.com/acarteas/FileCache/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/acarteas/FileCache</PackageProjectUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <Authors>Adam Carter</Authors>
     <Description>FileCache is a concrete implementation of the .NET System.Runtime.Caching.ObjectCache that uses the local filesystem as the target location.</Description>
     <Copyright>Copyright (c) 2012, 2013, 2017 Adam Carter (http://adam-carter.com)</Copyright>
@@ -14,6 +13,16 @@
     <UpdateVersionProperties>true</UpdateVersionProperties>
     <Version>0.0.0</Version>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>portable</DebugType>
+
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <!-- SourceLink Config, needs nuget package in each csproj Microsoft.SourceLink.GitHub in order to work -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\FileCache\BasicFileCacheManager.cs" Link="BasicFileCacheManager.cs" />
@@ -29,7 +38,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="4.0.0-beta*">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
+    <PackageReference Include="GitVersionTask" Version="5.1.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/src/FileCache.UnitTests/FileCache.UnitTests.csproj b/src/FileCache.UnitTests/FileCache.UnitTests.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.3.1" />
-    <PackageReference Include="FluentAssertions" Version="5.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+    <PackageReference Include="FluentAssertions" Version="5.9.0" />
 
   </ItemGroup>
 

diff --git a/src/FileCache/FileCache.csproj b/src/FileCache/FileCache.csproj
@@ -3,8 +3,7 @@
     <TargetFrameworks>net40;net45;netstandard2.0</TargetFrameworks>
 	  <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>cache objectcache System.Runtime.Caching.ObjectCache</PackageTags>
-    <PackageLicenseUrl>https://github.com/acarteas/FileCache/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/acarteas/FileCache</PackageProjectUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <Authors>Adam Carter</Authors>
     <Description>FileCache is a concrete implementation of the .NET System.Runtime.Caching.ObjectCache that uses the local filesystem as the target location.</Description>
     <Copyright>Copyright (c) 2012, 2013, 2017 Adam Carter (http://adam-carter.com)</Copyright>
@@ -13,13 +12,24 @@
     <Company>Adam Carter</Company>
     <RootNamespace>System.Runtime.Caching</RootNamespace>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>portable</DebugType>
+
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <!-- SourceLink Config, needs nuget package in each csproj Microsoft.SourceLink.GitHub in order to work -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net40|AnyCPU'">
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="4.0.0-beta*">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
+    <PackageReference Include="GitVersionTask" Version="5.1.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>