Merge branch 'release/0.21.0'

cake-contrib · Jul 5, 2019 · 87e6b40 · 87e6b40
2 parents 65c9582 + dc9ff79
commit 87e6b40
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,7 @@
+### New in 0.21.0 (Released 2019/07/05)
+
+* Update to LibGit2Sharp 0.26.0
+
 ### New in 0.20.0 (Released 2019/06/22)
 
 * Bumped Cake.Core to 0.33.0

diff --git a/build.cake b/build.cake
@@ -203,13 +203,15 @@ Task("Create-NuGet-Package")
     var cakeGit = GetFiles(artifactsRoot.FullPath + "/**/Cake.Git.dll");
     var libGit = GetFiles(artifactsRoot.FullPath + "/**/LibGit2Sharp*");
     var coreNative = GetFiles(artifactsRoot.FullPath + "/netstandard2.0/runtimes/**/*")
-                        - GetFiles(artifactsRoot.FullPath + "/netstandard2.0/runtimes/win7-x86/**/*");
+                        - GetFiles(artifactsRoot.FullPath + "/netstandard2.0/runtimes/win-x86/**/*");
+
     nuGetPackSettings.Files =  (native + libGit + cakeGit)
                                     .Where(file=>!file.FullPath.Contains("Cake.Core.") && !file.FullPath.Contains("/runtimes/"))
                                     .Select(file=>file.FullPath.Substring(artifactsRoot.FullPath.Length+1))
                                     .Select(file=>new NuSpecContent {Source = file, Target = "lib/" + file})
                                     .Union(
                                         coreNative
+                                            .Where(file=>file.FullPath.Contains("/linux-x64/") || file.FullPath.Contains("/win-x64/") || file.FullPath.Contains("/osx/"))
                                             .Select(file=>new NuSpecContent {
                                                 Source = file.FullPath.Substring(artifactsRoot.FullPath.Length+1),
                                                 Target = "lib/netstandard2.0/" + file.GetFilename()

diff --git a/src/Cake.Git/Cake.Git.csproj b/src/Cake.Git/Cake.Git.csproj
@@ -18,8 +18,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
-    <PackageReference Include="LibGit2Sharp" Version="0.25.2" />
-    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="1.0.217" />
+    <PackageReference Include="LibGit2Sharp" Version="0.26.0" />
+    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="2.0.267" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="Microsoft.CSharp" />

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
@@ -10,9 +10,9 @@
 [assembly: AssemblyDescription("Cake Git AddIn")]
 [assembly: AssemblyCompany("WCOM AB")]
 [assembly: AssemblyProduct("Cake.Git")]
-[assembly: AssemblyVersion("0.20.0")]
-[assembly: AssemblyFileVersion("0.20.0")]
-[assembly: AssemblyInformationalVersion("0.20.0")]
+[assembly: AssemblyVersion("0.21.0")]
+[assembly: AssemblyFileVersion("0.21.0")]
+[assembly: AssemblyInformationalVersion("0.21.0")]
 [assembly: AssemblyCopyright("Copyright © WCOM AB 2019")]
 [assembly: CLSCompliant(true)]