Skip to content

Commit c11c6db

Browse files
committed
Merge branch 'develop' of https://github.com/GitTools/GitReleaseManager into develop
2 parents df62fc7 + cfa3f16 commit c11c6db

File tree

15 files changed

+48
-44
lines changed

15 files changed

+48
-44
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
os: [ windows-2022 ]
2121

2222
env:
23-
GITTOOLS_GITHUB_TOKEN: ${{ secrets.GITTOOLS_GITHUB_TOKEN }}
23+
GITTOOLS_GITHUB_TOKEN: ${{ secrets.NUGET_GITHUB_TOKEN }}
2424
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
2525
NUGET_SOURCE: https://api.nuget.org/v3/index.json
2626
CHOCOLATEY_API_KEY: ${{ secrets.CHOCOLATEY_API_KEY }}
@@ -30,9 +30,6 @@ jobs:
3030
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
3131
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
3232
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
3633
CODECOV_REPO_TOKEN: ${{ secrets.CODECOV_REPO_TOKEN }}
3734
GPR_USER: gittools-bot
3835
GPR_PASSWORD: ${{ secrets.NUGET_GITHUB_TOKEN }}
@@ -43,15 +40,15 @@ jobs:
4340
- name: Fetch all tags and branches
4441
run: git fetch --prune --unshallow
4542

46-
- name: Install .NET SDK 2.1.x, 3.1.x, 5.0.x, 6.0.x, and 7.0.x
43+
- name: Install .NET SDK 2.1.x, 3.1.x, 5.0.x, 8.0.x, and 9.0.x
4744
uses: actions/setup-dotnet@v4
4845
with:
4946
dotnet-version: |
5047
2.1.x
5148
3.1.x
5249
5.0.x
53-
6.0.x
54-
7.0.x
50+
8.0.x
51+
9.0.x
5552
5653
- name: Cache Tools
5754
uses: actions/cache@v4

GitReleaseManager.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ create:
1919
include-sha-section: true
2020
sha-section-heading: "SHA256 Hashes of the release artifacts"
2121
sha-section-line-format: "- `{1}\t{0}`"
22+
include-contributors: true
2223
close:
2324
use-issue-comments: true
25+
set-due-date: true
2426
issue-comment: |-
2527
:tada: This issue has been resolved in version {milestone} :tada:
2628

nuspec/chocolatey/GitReleaseManager.Portable.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<tags>github release notes create export</tags>
2020
</metadata>
2121
<files>
22-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net6.0\*.exe" target="tools" />
23-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net6.0\*.pdb" target="tools" />
22+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net8.0\*.exe" target="tools" />
23+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net8.0\*.pdb" target="tools" />
2424
<file src="chocolateyInstall.ps1" target="tools"/>
2525
<file src="chocolateyUninstall.ps1" target="tools"/>
2626
<file src="VERIFICATION.TXT" />

nuspec/nuget/GitReleaseManager.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<tags>github release notes create export</tags>
2121
</metadata>
2222
<files>
23-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net6.0\*.exe" target="tools" />
24-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net6.0\*.xml" target="tools" />
25-
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net6.0\*.pdb" target="tools" />
23+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net8.0\*.exe" target="tools" />
24+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net8.0\*.xml" target="tools" />
25+
<file src="..\..\BuildArtifacts\temp\_PublishedApplications\GitReleaseManager.Cli\net8.0\*.pdb" target="tools" />
2626
<file src="..\..\icons\package_icon.png" target="" />
2727
</files>
2828
</package>

recipe.cake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ BuildParameters.SetParameters(context: Context,
1919
twitterMessage: standardNotificationMessage,
2020
preferredBuildProviderType: BuildProviderType.GitHubActions,
2121
gitterMessage: "@/all " + standardNotificationMessage,
22-
shouldRunCodecov: false);
22+
shouldRunCodecov: false,
23+
shouldGenerateDocumentation: false);
2324

2425
BuildParameters.PackageSources.Add(new PackageSourceData(Context, "GPR", "https://nuget.pkg.github.com/GitTools/index.json", FeedType.NuGet, false));
2526

@@ -35,9 +36,9 @@ BuildParameters.Tasks.DotNetCoreBuildTask.Does((context) =>
3536
{
3637
var buildDir = BuildParameters.Paths.Directories.PublishedApplications;
3738

38-
var grmExecutable = context.GetFiles(buildDir + "/**/*.exe").First();
39+
var grmExecutable = context.GetFiles(buildDir + "/GitReleaseManager.Tool/**/*.exe").First();
3940

40-
context.Information("Registering Built GRM executable...");
41+
context.Information("Registering Built GRM executable... {0}", grmExecutable.FullPath);
4142
context.Tools.RegisterFile(grmExecutable);
4243
});
4344

src/Directory.Build.props

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
<Project>
22
<PropertyGroup>
3+
<LangVersion>8.0</LangVersion>
4+
5+
<Authors>GitTools Contributors</Authors>
6+
<PackageProjectUrl>https://github.com/GitTools/GitReleaseManager</PackageProjectUrl>
7+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
8+
<PackageTags>github release notes create export</PackageTags>
9+
<Copyright>Copyright (c) 2015 - Present - GitTools Contributors</Copyright>
10+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
11+
<PackageIcon>package_icon.png</PackageIcon>
12+
<PackageReleaseNotes>https://github.com/GitTools/GitReleaseManager/releases</PackageReleaseNotes>
13+
<RepositoryType>git</RepositoryType>
14+
<RepositoryUrl>https://github.com/GitTools/GitReleaseManager.git</RepositoryUrl>
15+
316
<DebugType>pdbonly</DebugType>
417
<GenerateDocumentationFile>true</GenerateDocumentationFile>
5-
<NoWarn>CS1591</NoWarn>
18+
<NoWarn>$(NoWarn);CS1591;CA1707;Serilog004</NoWarn>
619
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
720
</PropertyGroup>
821

src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<LangVersion>8.0</LangVersion>
43
<OutputType>Exe</OutputType>
54
<AssemblyName>GitReleaseManager</AssemblyName>
6-
<TargetFrameworks>net6.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
76
<PublishSingleFile>true</PublishSingleFile>
87
<SelfContained>true</SelfContained>
98
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
109
<Title>GitReleaseManager.Cli</Title>
1110
<Description>Create release notes in markdown given a milestone</Description>
1211
<IsPackable>false</IsPackable>
13-
<NoWarn>$(NoWarn);CA1707;</NoWarn>
1412
</PropertyGroup>
1513
<ItemGroup>
1614
<ProjectReference Include="..\GitReleaseManager.Core\GitReleaseManager.Core.csproj" />

src/GitReleaseManager.Core.Tests/Commands/ExportCommandTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public void Setup()
2727
}
2828

2929
[Test]
30+
[NonParallelizable]
3031
public async Task Should_Execute_Command()
3132
{
3233
var options = new ExportSubOptions

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<LangVersion>9.0</LangVersion>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
54
<Title>GitReleaseManager.Core.Tests</Title>
65
<Description>Test Project for GitReleaseManager.Core</Description>
7-
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
86
</PropertyGroup>
97
<ItemGroup>
108
<Compile Include="..\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />

src/GitReleaseManager.Core/GitReleaseManager.Core.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\TextTemplating\Microsoft.TextTemplating.targets" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\TextTemplating\Microsoft.TextTemplating.targets')" />
44
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\TextTemplating\Microsoft.TextTemplating.targets" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\TextTemplating\Microsoft.TextTemplating.targets')" />
55
<PropertyGroup>
6-
<LangVersion>8.0</LangVersion>
7-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
87
<Title>GitReleaseManager.Core</Title>
98
<Description>Create release notes in markdown given a milestone</Description>
109
<IsPackable>false</IsPackable>
11-
<NoWarn>$(NoWarn);CA1707;</NoWarn>
1210
<TransformOnBuild>true</TransformOnBuild>
1311
</PropertyGroup>
1412

0 commit comments

Comments
 (0)