Merge branch 'release/1.0.1'

cake-contrib · Mar 12, 2021 · 0935808 · 0935808
2 parents 63e82c9 + 7b0868a
commit 0935808
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,7 @@
+### New in 1.0.1 (Released 2021/03/12)
+
+* Add cake-addin tag to NuGet package
+
 ### New in 1.0.0 (Released 2021/02/09)
 
 * Update Cake.Git to target Cake v1.0.0

diff --git a/build.cake b/build.cake
@@ -1,5 +1,5 @@
 // Install modules
-#module nuget:?package=Cake.DotNetTool.Module&version=0.4.0
+#module nuget:?package=Cake.DotNetTool.Module&version=1.0.1
 
 
 // Install .NET Global tools.
@@ -54,7 +54,7 @@ var nuGetPackSettings   = new NuGetPackSettings {
                                 License                 = new NuSpecLicense { Type = "expression", Value = "MIT" },
                                 Copyright               = assemblyInfo.Copyright,
                                 ReleaseNotes            = releaseNotes.Notes.ToArray(),
-                                Tags                    = new [] {"Cake", "Script", "Build", "Git"},
+                                Tags                    = new [] { "Cake", "Script", "Build", "Git", "cake-addin" },
                                 RequireLicenseAcceptance= false,
                                 Symbols                 = false,
                                 NoPackageAnalysis       = true,
@@ -67,7 +67,9 @@ var msBuildSettings     = new DotNetCoreMSBuildSettings()
                             .WithProperty("Version", semVersion)
                             .WithProperty("AssemblyVersion", version)
                             .WithProperty("FileVersion", version)
-                            .WithProperty("PackageReleaseNotes", string.Concat("\"", string.Concat(releaseNotes.Notes.ToArray()), "\""));
+                            .WithProperty("PackageReleaseNotes", string.Concat("\"", string.Concat(releaseNotes.Notes.ToArray()), "\""))
+                            .WithProperty("ContinuousIntegrationBuild", AppVeyor.IsRunningOnAppVeyor ? "true" : "false")
+                            .WithProperty("EmbedUntrackedSources", "true");
 
 Context.Tools.RegisterFile("./tools/nuget.exe");
 

diff --git a/src/Cake.Git/Cake.Git.csproj b/src/Cake.Git/Cake.Git.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461;net5.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -18,6 +19,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
     <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0096" />

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("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyInformationalVersion("1.0.1")]
 [assembly: AssemblyCopyright("Copyright © WCOM AB 2021")]
 [assembly: CLSCompliant(true)]