Skip to content

Commit f40b2c9

Browse files
gep13gep13
committed
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
2 parents dd68f2f + ae25291 commit f40b2c9

File tree

13 files changed

+47
-68
lines changed

13 files changed

+47
-68
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.github/workflows/build.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,38 @@ jobs:
1919
matrix:
2020
os: [ windows-2022 ]
2121

22+
env:
23+
GITTOOLS_GITHUB_TOKEN: ${{ secrets.GITOOLS_GITHUB_TOKEN }}
24+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
25+
NUGET_SOURCE: https://api.nuget.org/v3/index.json
26+
CHOCOLATEY_API_KEY: ${{ secrets.CHOCOLATEY_API_KEY }}
27+
CHOCOLATEY_SOURCE: https://push.chocolatey.org/
28+
TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
29+
TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
30+
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
31+
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
32+
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
33+
WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
34+
WYAM_DEPLOY_BRANCH: gh-pages
35+
WYAM_DEPLOY_REMOTE: https://github.com/GitTools/GitReleaseManager
36+
CODECOV_REPO_TOKEN: ${{ secrets.CODECOV_REPO_TOKEN }}
37+
GPR_USER: gittools-bot
38+
GPR_PASSWORD: ${{ secrets.GPR_PASSWORD }}
2239
steps:
2340
- name: Checkout the repository
2441
uses: actions/checkout@v2
2542

2643
- name: Fetch all tags and branches
2744
run: git fetch --prune --unshallow
2845

29-
- name: Install .NET SDK 3.1.x and 5.0.x
46+
- name: Install .NET SDK 2.1.x and 5.0.x
3047
uses: actions/setup-dotnet@v3
3148
with:
3249
dotnet-version: |
50+
2.1.x
3351
3.1.x
3452
5.0.x
53+
6.0.x
3554
3655
- name: Cache Tools
3756
uses: actions/cache@v2

‎docs/input/docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ then used to create a Release on GitHub.
1010

1111
In addition to creating a Release, GitReleaseManager can be used to publish a
1212
release, close a milestone, and also to export the complete set of release notes
13-
for your application/product.
13+
for your application/product.

‎nuspec/chocolatey/GitReleaseManager.Portable.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<tags>github release notes create export</tags>
2020
</metadata>
2121
<files>
22-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.exe" target="tools" />
23-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.dll" target="tools" exclude="**\Serilog.Sinks.Debug.dll" />
24-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.pdb" target="tools" />
25-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.exe.config" target="tools" />
22+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.exe" target="tools" />
23+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.dll" target="tools" exclude="**\Serilog.Sinks.Debug.dll" />
24+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.pdb" target="tools" />
25+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.exe.config" target="tools" />
2626
<file src="chocolateyInstall.ps1" target="tools"/>
2727
<file src="chocolateyUninstall.ps1" target="tools"/>
2828
<file src="VERIFICATION.TXT" />

‎nuspec/nuget/GitReleaseManager.nuspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<tags>github release notes create export</tags>
2121
</metadata>
2222
<files>
23-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.exe" target="tools" />
24-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.exe.config" target="tools" />
25-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.xml" target="tools" />
26-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.dll" target="tools" exclude="**\Serilog.Sinks.Debug.dll" />
27-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net472\*.pdb" target="tools" />
23+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.exe" target="tools" />
24+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.exe.config" target="tools" />
25+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.xml" target="tools" />
26+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.dll" target="tools" exclude="**\Serilog.Sinks.Debug.dll" />
27+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net48\*.pdb" target="tools" />
2828
<file src="..\..\icons\package_icon.png" target="" />
2929
</files>
3030
</package>

‎recipe.cake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
#load nuget:?package=Cake.Recipe&version=3.0.1
1+
#load nuget:?package=Cake.Recipe&version=3.1.1
22
#tool dotnet:?package=dotnet-t4&version=2.2.1
3+
#addin nuget:?package=Cake.Git&version=1.0.0
34

45
Environment.SetVariableNames(githubTokenVariable: "GITTOOLS_GITHUB_TOKEN");
56

@@ -16,6 +17,7 @@ BuildParameters.SetParameters(context: Context,
1617
shouldRunIntegrationTests: true,
1718
integrationTestScriptPath: "./tests/integration/tests.cake",
1819
twitterMessage: standardNotificationMessage,
20+
preferredBuildProviderType: BuildProviderType.GitHubActions,
1921
gitterMessage: "@/all " + standardNotificationMessage);
2022

2123
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);
2527
ToolSettings.SetToolSettings(context: Context,
2628
testCoverageFilter: "+[GitReleaseManager*]* -[GitReleaseManager.Core.Tests*]* -[GitReleaseManager.Tests*]*",
2729
testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
28-
testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
30+
testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs",
31+
kuduSyncIgnore: ".git;CNAME;_git2");
2932

3033
BuildParameters.Tasks.DotNetCoreBuildTask.Does((context) =>
3134
{

‎src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Serilog" Version="2.10.0" />
21+
<PackageReference Include="Serilog" Version="3.0.1" />
2222
<PackageReference Include="IDisposableAnalyzers" Version="4.0.6">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<LangVersion>8.0</LangVersion>
44
<OutputType>Exe</OutputType>
55
<AssemblyName>GitReleaseManager</AssemblyName>
6-
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
6+
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
77
<Title>GitReleaseManager.Cli</Title>
88
<Description>Create release notes in markdown given a milestone</Description>
99
<IsPackable>false</IsPackable>
@@ -20,7 +20,7 @@
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>
23-
<PackageReference Include="Octokit" Version="0.50.0" />
23+
<PackageReference Include="Octokit" Version="7.1.0" />
2424
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
2525
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" PrivateAssets="All" />
2626
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

‎src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>8.0</LangVersion>
4-
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
55
<Title>GitReleaseManager.Core.Tests</Title>
66
<Description>Test Project for GitReleaseManager.Core</Description>
77
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -26,7 +26,7 @@
2626
<PackageReference Include="NSubstitute" Version="5.0.0" />
2727
<PackageReference Include="NUnit" Version="3.13.3" />
2828
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
29-
<PackageReference Include="Octokit" Version="0.50.0" />
29+
<PackageReference Include="Octokit" Version="7.1.0" />
3030
<PackageReference Include="Shouldly" Version="4.2.1" />
3131
</ItemGroup>
3232
</Project>

‎src/GitReleaseManager.Core/GitReleaseManager.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>
26-
<PackageReference Include="Octokit" Version="0.50.0" />
26+
<PackageReference Include="Octokit" Version="7.1.0" />
2727
<PackageReference Include="Scriban" Version="5.7.0" />
2828
<PackageReference Include="seriloganalyzer" Version="0.15.0" />
2929
<PackageReference Include="YamlDotNet" Version="11.2.1" />

‎src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>8.0</LangVersion>
4-
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
55
<Title>GitReleaseManager.IntegrationTests</Title>
66
<Description>Integration Test Project for GitReleaseManager</Description>
77
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -27,5 +27,6 @@
2727
<PackageReference Include="Shouldly" Version="4.2.1" />
2828
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
2929
<PackageReference Include="TextCopy" Version="6.2.1" />
30+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3031
</ItemGroup>
3132
</Project>

‎src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>8.0</LangVersion>
4-
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
55
<Title>GitReleaseManager.Tests</Title>
66
<Description>Test Project for GitReleaseManager</Description>
77
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -26,6 +26,6 @@
2626
<PackageReference Include="NSubstitute" Version="5.0.0" />
2727
<PackageReference Include="NUnit" Version="3.13.3" />
2828
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
29-
<PackageReference Include="Octokit" Version="0.50.0" />
29+
<PackageReference Include="Octokit" Version="7.1.0" />
3030
</ItemGroup>
3131
</Project>

‎src/GitReleaseManager.Tool/GitReleaseManager.Tool.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyName>GitReleaseManager</AssemblyName>
77

88
<PackAsTool>true</PackAsTool>
9-
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
9+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
1010
<ToolCommandName>dotnet-gitreleasemanager</ToolCommandName>
1111
<PackageId>GitReleaseManager.Tool</PackageId>
1212

@@ -38,7 +38,7 @@
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
<PrivateAssets>all</PrivateAssets>
4040
</PackageReference>
41-
<PackageReference Include="Octokit" Version="0.50.0" />
41+
<PackageReference Include="Octokit" Version="7.1.0" />
4242
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
4343
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" PrivateAssets="All" />
4444
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

0 commit comments

Comments
 (0)