Merge branch 'release/0.15.0'

* release/0.15.0: (build) Let's try that again with a doc change... (build) Try with Cake.Git 1.0.0 (build) Bump to Cake.Recipe 3.1.1 (build) Force installation of older Cake.Git (build) Install all the .NET's (maint) Moar testing of docs... (build) Add installation of .NET 2.1.x (maint) Testing build and publish of docs (#517) Switch to GtiHub Actions as preferred CI Bump Octokit from 0.50.0 to 7.1.0 in /src (#518) Bump version of Serilog being used (#514) Add support for .NET 7 (#516) Remove compiling for .netcoreapp3.1 (#515) Switch to net48 rather than net472
GitTools · Aug 23, 2023 · f40b2c9 · f40b2c9
2 parents dd68f2f + ae25291
commit f40b2c9
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 68 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,19 +19,38 @@ jobs:
       matrix:
         os: [ windows-2022 ]
 
+    env:
+      GITTOOLS_GITHUB_TOKEN: ${{ secrets.GITOOLS_GITHUB_TOKEN }}
+      NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+      NUGET_SOURCE: https://api.nuget.org/v3/index.json
+      CHOCOLATEY_API_KEY: ${{ secrets.CHOCOLATEY_API_KEY }}
+      CHOCOLATEY_SOURCE: https://push.chocolatey.org/
+      TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
+      TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
+      TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
+      TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
+      COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+      WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
+      WYAM_DEPLOY_BRANCH: gh-pages
+      WYAM_DEPLOY_REMOTE: https://github.com/GitTools/GitReleaseManager
+      CODECOV_REPO_TOKEN: ${{ secrets.CODECOV_REPO_TOKEN }}
+      GPR_USER: gittools-bot
+      GPR_PASSWORD: ${{ secrets.GPR_PASSWORD }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
 
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
 
-      - name: Install .NET SDK 3.1.x and 5.0.x
+      - name: Install .NET SDK 2.1.x and 5.0.x
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
+            2.1.x
             3.1.x
             5.0.x
+            6.0.x
 
       - name: Cache Tools
         uses: actions/cache@v2

diff --git a/docs/input/docs/index.md b/docs/input/docs/index.md
@@ -10,4 +10,4 @@ then used to create a Release on GitHub.
 
 In addition to creating a Release, GitReleaseManager can be used to publish a
 release, close a milestone, and also to export the complete set of release notes
-for your application/product.
+for your application/product.
diff --git a/nuspec/chocolatey/GitReleaseManager.Portable.nuspec b/nuspec/chocolatey/GitReleaseManager.Portable.nuspec
@@ -19,10 +19,10 @@
         <tags>github release notes create export</tags>
     </metadata>
     <files>
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.exe" target="tools" />
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.dll" target="tools" exclude="**\Serilog.Sinks.Debug.dll" />
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.pdb" target="tools" />
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.exe.config" target="tools" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.exe" target="tools" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.dll" target="tools" exclude="**\Serilog.Sinks.Debug.dll" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.pdb" target="tools" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.exe.config" target="tools" />
         <file src="chocolateyInstall.ps1" target="tools"/>
         <file src="chocolateyUninstall.ps1" target="tools"/>
         <file src="VERIFICATION.TXT" />

diff --git a/nuspec/nuget/GitReleaseManager.nuspec b/nuspec/nuget/GitReleaseManager.nuspec
@@ -20,11 +20,11 @@
         <tags>github release notes create export</tags>
     </metadata>
     <files>
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.exe" target="tools" />
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.exe.config" target="tools" />
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.xml" target="tools" />
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.dll" target="tools" exclude="**\Serilog.Sinks.Debug.dll" />
-        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.pdb" target="tools" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.exe" target="tools" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.exe.config" target="tools" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.xml" target="tools" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.dll" target="tools" exclude="**\Serilog.Sinks.Debug.dll" />
+        <file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.pdb" target="tools" />
         <file src="..\..\icons\package_icon.png" target="" />
     </files>
 </package>
diff --git a/recipe.cake b/recipe.cake
@@ -1,5 +1,6 @@
-#load nuget:?package=Cake.Recipe&version=3.0.1
+#load nuget:?package=Cake.Recipe&version=3.1.1
 #tool dotnet:?package=dotnet-t4&version=2.2.1
+#addin nuget:?package=Cake.Git&version=1.0.0
 
 Environment.SetVariableNames(githubTokenVariable: "GITTOOLS_GITHUB_TOKEN");
 
@@ -16,6 +17,7 @@ BuildParameters.SetParameters(context: Context,
                             shouldRunIntegrationTests: true,
                             integrationTestScriptPath: "./tests/integration/tests.cake",
                             twitterMessage: standardNotificationMessage,
+                            preferredBuildProviderType: BuildProviderType.GitHubActions,
                             gitterMessage: "@/all " + standardNotificationMessage);
 
 BuildParameters.PackageSources.Add(new PackageSourceData(Context, "GPR", "https://nuget.pkg.github.com/GitTools/index.json", FeedType.NuGet, false));
@@ -25,7 +27,8 @@ BuildParameters.PrintParameters(Context);
 ToolSettings.SetToolSettings(context: Context,
                             testCoverageFilter: "+[GitReleaseManager*]* -[GitReleaseManager.Core.Tests*]* -[GitReleaseManager.Tests*]*",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
-                            testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
+                            testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs",
+                            kuduSyncIgnore: ".git;CNAME;_git2");
 
 BuildParameters.Tasks.DotNetCoreBuildTask.Does((context) =>
 {

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -18,7 +18,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Serilog" Version="2.10.0" />
+        <PackageReference Include="Serilog" Version="3.0.1" />
         <PackageReference Include="IDisposableAnalyzers" Version="4.0.6">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj b/src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj
@@ -3,7 +3,7 @@
         <LangVersion>8.0</LangVersion>
         <OutputType>Exe</OutputType>
         <AssemblyName>GitReleaseManager</AssemblyName>
-        <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
         <Title>GitReleaseManager.Cli</Title>
         <Description>Create release notes in markdown given a milestone</Description>
         <IsPackable>false</IsPackable>
@@ -20,7 +20,7 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Octokit" Version="0.50.0" />
+        <PackageReference Include="Octokit" Version="7.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
         <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" PrivateAssets="All" />
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

diff --git a/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj b/src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <LangVersion>8.0</LangVersion>
-        <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
         <Title>GitReleaseManager.Core.Tests</Title>
         <Description>Test Project for GitReleaseManager.Core</Description>
         <NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -26,7 +26,7 @@
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="Octokit" Version="0.50.0" />
+        <PackageReference Include="Octokit" Version="7.1.0" />
         <PackageReference Include="Shouldly" Version="4.2.1" />
     </ItemGroup>
 </Project>
diff --git a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj
@@ -23,7 +23,7 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Octokit" Version="0.50.0" />
+        <PackageReference Include="Octokit" Version="7.1.0" />
         <PackageReference Include="Scriban" Version="5.7.0" />
         <PackageReference Include="seriloganalyzer" Version="0.15.0" />
         <PackageReference Include="YamlDotNet" Version="11.2.1" />

diff --git a/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj b/src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <LangVersion>8.0</LangVersion>
-        <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
         <Title>GitReleaseManager.IntegrationTests</Title>
         <Description>Integration Test Project for GitReleaseManager</Description>
         <NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -27,5 +27,6 @@
         <PackageReference Include="Shouldly" Version="4.2.1" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
         <PackageReference Include="TextCopy" Version="6.2.1" />
+        <PackageReference Include="System.Net.Http" Version="4.3.4" />
     </ItemGroup>
 </Project>
diff --git a/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj b/src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <LangVersion>8.0</LangVersion>
-        <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
         <Title>GitReleaseManager.Tests</Title>
         <Description>Test Project for GitReleaseManager</Description>
         <NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -26,6 +26,6 @@
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="Octokit" Version="0.50.0" />
+        <PackageReference Include="Octokit" Version="7.1.0" />
     </ItemGroup>
 </Project>
diff --git a/src/GitReleaseManager.Tool/GitReleaseManager.Tool.csproj b/src/GitReleaseManager.Tool/GitReleaseManager.Tool.csproj
@@ -6,7 +6,7 @@
         <AssemblyName>GitReleaseManager</AssemblyName>
 
         <PackAsTool>true</PackAsTool>
-        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <ToolCommandName>dotnet-gitreleasemanager</ToolCommandName>
         <PackageId>GitReleaseManager.Tool</PackageId>
 
@@ -38,7 +38,7 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Octokit" Version="0.50.0" />
+        <PackageReference Include="Octokit" Version="7.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
         <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" PrivateAssets="All" />
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />