fix: Fix broken release / Manually craft release notes

IngeniumSE · Apr 1, 2024 · 0e43d60 · 0e43d60
1 parent 6fe30f2
commit 0e43d60
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,8 +15,5 @@ jobs:
         fetch-tags: true
         submodules: true
         ssh-key: ${{ secrets.ACCESS_KEY }}
-    - name: Release Notes
-      run: |
-        git log --pretty=format:'%d %s' ${GITHUB_REF} | perl -pe 's| \(.*tag: (\d+.\d+.\d+(-preview\d{3})?)(, .*?)*\)|\n## \1\n|g' > RELEASE_NOTES.md
     - name: Build
       run: ./build.sh --target Publish --publish --source GitHUb --feed ${{ vars.ISE_NUGET_FEED }} --username ${{ vars.ISE_NUGET_USERNAME }} --token ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,12 +16,8 @@ jobs:
       uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 999
-        fetch-tags: true
         submodules: true
         ssh-key: ${{ secrets.ACCESS_KEY }}
-    - name: Release Notes
-      run: |
-        git log --pretty=format:'%d %s' ${GITHUB_REF} | perl -pe 's| \(.*tag: (\d+.\d+.\d+(-preview\d{3})?)(, .*?)*\)|\n## \1\n|g' > RELEASE_NOTES.md
     - name: Build
       run: ./build.sh --target Publish --publish --nuget --token ${{ secrets.PUBLIC_NUGET_APIKEY }}
   release:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.2.0
+
+- Added support for Issuu API v2's /publication/ operations
+
+## 0.1.0
+
+### Added
+
+- Support for Issuu API v2's /draft/ operations
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,9 +4,11 @@
 		<ImplicitPackageReferences Condition="'$(ImplicitPackageReferences)'==''">true</ImplicitPackageReferences>
 
 		<!-- RELEASE_NOTES is generated by the build using commit history -->
-		<PackageDescription>$([System.IO.File]::ReadAllText("$(MSBuildThisFileDirectory)RELEASE_NOTES.md"))</PackageDescription>
+		<PackageDescription>$([System.IO.File]::ReadAllText("$(MSBuildThisFileDirectory)CHANGELOG.md"))</PackageDescription>
 
 		<!-- Include the GIT URL in the published output, and include untracked source files -->
+		<RepositoryUrl>https://github.com/IngeniumSE/IssuuSDK</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
 		<PublishReposityUrl>true</PublishReposityUrl>
 		<EmbedUntractSources>true</EmbedUntractSources>
 	</PropertyGroup>

diff --git a/IssuuSDK.sln b/IssuuSDK.sln
@@ -9,13 +9,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repo", "repo", "{1217150D-D
 		.gitignore = .gitignore
 		build.cmd = build.cmd
 		build.sh = build.sh
+		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 		LICENSE = LICENSE
 		NuGet.config = NuGet.config
 		README.md = README.md
-		RELEASE_NOTES.md = RELEASE_NOTES.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{58023753-CB7E-471D-A8EF-103389504D8B}"

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
diff --git a/libs/IssuuSDK/IssuuSDK.csproj b/libs/IssuuSDK/IssuuSDK.csproj
@@ -7,8 +7,20 @@
 		<Nullable>enable</Nullable>
 		<RootNamespace>IssuuSDK</RootNamespace>
 		<ImplicitPackageReferences>false</ImplicitPackageReferences>
+		<Title>IssuuSDK</Title>
+		<Authors>IngeniumSoftwareDev</Authors>
+		<Company>Ingenium Software Development</Company>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<PackageProjectUrl>https://github.com/IngeniumSE/IssuuSDK</PackageProjectUrl>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Include="..\..\README.md">
+	    <Pack>True</Pack>
+	    <PackagePath>\</PackagePath>
+	  </None>
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Ben.Demystifier" />
 		<PackageReference Include="FluentValidation" />
@@ -39,4 +51,13 @@
 	  </EmbeddedResource>
 	</ItemGroup>
 
+	<Target Name="PreparePackageReleaseNotesFromFile" BeforeTargets="GenerateNuspec">
+		<ReadLinesFromFile File="../../CHANGELOG.md">
+			<Output TaskParameter="Lines" ItemName="ReleaseNoteLines" />
+		</ReadLinesFromFile>
+		<PropertyGroup>
+			<PackageReleaseNotes>@(ReleaseNoteLines, '%0a')</PackageReleaseNotes>
+		</PropertyGroup>
+	</Target>
+
 </Project>