Skip to content

Commit 047e7bd

Browse files
authored
Merge pull request #545 from Jericho/net6.0
Fix the problem preventing running under .NET 7.0
2 parents 696a07e + de3ab15 commit 047e7bd

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

nuspec/chocolatey/GitReleaseManager.Portable.nuspec

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
<tags>github release notes create export</tags>
2020
</metadata>
2121
<files>
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" />
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" />
2624
<file src="chocolateyInstall.ps1" target="tools"/>
2725
<file src="chocolateyUninstall.ps1" target="tools"/>
2826
<file src="VERIFICATION.TXT" />

nuspec/nuget/GitReleaseManager.nuspec

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
<tags>github release notes create export</tags>
2121
</metadata>
2222
<files>
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" />
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" />
2826
<file src="..\..\icons\package_icon.png" target="" />
2927
</files>
3028
</package>

src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
<LangVersion>8.0</LangVersion>
44
<OutputType>Exe</OutputType>
55
<AssemblyName>GitReleaseManager</AssemblyName>
6-
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
6+
<TargetFrameworks>net6.0</TargetFrameworks>
7+
<PublishSingleFile>true</PublishSingleFile>
8+
<SelfContained>true</SelfContained>
9+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
710
<Title>GitReleaseManager.Cli</Title>
811
<Description>Create release notes in markdown given a milestone</Description>
912
<IsPackable>false</IsPackable>

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

Lines changed: 1 addition & 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>net48;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>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>

src/GitReleaseManager.Core/GitReleaseManager.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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>
66
<LangVersion>8.0</LangVersion>
7-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
88
<Title>GitReleaseManager.Core</Title>
99
<Description>Create release notes in markdown given a milestone</Description>
1010
<IsPackable>false</IsPackable>
@@ -28,7 +28,7 @@
2828
<PackageReference Include="Scriban" Version="5.7.0" />
2929
<PackageReference Include="seriloganalyzer" Version="0.15.0" />
3030
<PackageReference Include="YamlDotNet" Version="13.7.0" />
31-
<PackageReference Include="AutoMapper" Version="10.1.1" />
31+
<PackageReference Include="AutoMapper" Version="12.0.1" />
3232
</ItemGroup>
3333
<ItemGroup>
3434
<Compile Update="Templates\ReleaseTemplates.g.cs">

src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj

Lines changed: 1 addition & 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>net48;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
<Title>GitReleaseManager.IntegrationTests</Title>
66
<Description>Integration Test Project for GitReleaseManager</Description>
77
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>

src/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj

Lines changed: 1 addition & 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>net48;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
<Title>GitReleaseManager.Tests</Title>
66
<Description>Test Project for GitReleaseManager</Description>
77
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>

0 commit comments

Comments
 (0)