support multitargeting too

Author: baronfel

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.4] - 2022.03.20
+
+### Fixed
+
+- Support supplying package versions for project-to-project references in multitargeting scenarios.
+
+
 ## [0.1.3] - 2022.03.20
 
 ### Fixed

src/Directory.Build.props

@@ -0,0 +1,10 @@
+<Project>
+    <PropertyGroup>
+        <Version>0.1.4</Version>
+        <PackageReleaseNotes>
+### Fixed
+
+- Support supplying package versions for project-to-project references in multitargeting scenarios.
+        </PackageReleaseNotes>
+    </PropertyGroup>
+</Project>

src/Ionide.KeepAChangelog.Tasks/Ionide.KeepAChangelog.Tasks.fsproj

@@ -8,12 +8,6 @@
     <DebugType>embedded</DebugType>
     <IsPackable>true</IsPackable>
     <Description>MSBuild Tasks and Targets that set your Assembly Version, Package Version, and Package Release Notes from your KeepAChangelog-compatible Changelogs.</Description>
-    <Version>0.1.3</Version>
-    <PackageReleaseNotes>
-### Fixed
-
-- Support supplying package versions for project-to-project references.
-</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

src/Ionide.KeepAChangelog.Tasks/build/Ionide.KeepAChangelog.Tasks.targets

@@ -12,8 +12,8 @@
           </PrepareForBuildDependsOn>
         <!-- For project-to-project dependencies, GetPackageVersionDependsOn can be used as a well-known hook to ensure the project's versioning properties are run. -->
         <GetPackageVersionDependsOn>
-            $(GetPackageVersionDependsOn);
             SetVersionFromChangelog
+            $(GetPackageVersionDependsOn);
         </GetPackageVersionDependsOn>
     </PropertyGroup>
 

src/Ionide.KeepAChangelog.Tasks/buildMultiTargeting/Ionide.KeepAChangelog.Tasks.targets

@@ -1,5 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)../lib/netstandard2.0/Ionide.KeepAChangelog.Tasks.dll" TaskName="Ionide.KeepAChangelog.Tasks.ParseChangeLogs" />
+    <UsingTask
+            AssemblyFile="$(MSBuildThisFileDirectory)../lib/netstandard2.0/Ionide.KeepAChangelog.Tasks.dll"
+            TaskName="Ionide.KeepAChangelog.Tasks.ParseChangeLogs" />
 
     <PropertyGroup>
         <!-- For multitargeting builds, the 'outer' build is used for things like packing, and so never hits the `PrepareForBuildDependsOn` condition group
@@ -9,27 +11,47 @@
         <GenerateNuspecDependsOn>
             SetVersionFromChangelog;
             $(GenerateNuspecDependsOn)
-          </GenerateNuspecDependsOn>
+        </GenerateNuspecDependsOn>
+        <GetPackageVersionDependsOn>
+            SetVersionFromChangelog
+            $(GetPackageVersionDependsOn);
+        </GetPackageVersionDependsOn>
     </PropertyGroup>
 
-    <Target Name="GetChangelogVersion" Condition="'$(ChangelogFile)' != '' and Exists('$(ChangelogFile)')" Inputs="$(ChangelogFile)" Outputs="UnreleasedChangelog;CurrentReleaseChangelog;AllReleasedChangelogslLatestReleaseNotes">
+    <Target
+            Name="GetChangelogVersion"
+            Condition="'$(ChangelogFile)' != '' and Exists('$(ChangelogFile)')"
+            Inputs="$(ChangelogFile)"
+            Outputs="UnreleasedChangelog;CurrentReleaseChangelog;AllReleasedChangelogslLatestReleaseNotes">
         <Ionide.KeepAChangelog.Tasks.ParseChangeLogs ChangelogFile="$(ChangelogFile)">
-            <Output TaskParameter="UnreleasedChangelog" ItemName="UnreleasedChangelog" />
-            <Output TaskParameter="CurrentReleaseChangelog" ItemName="CurrentReleaseChangelog" />
-            <Output TaskParameter="AllReleasedChangelogs" ItemName="AllReleasedChangelogs" />
-            <Output TaskParameter="LatestReleaseNotes" ItemName="LatestReleaseNotes" />
+            <Output
+                    TaskParameter="UnreleasedChangelog"
+                    ItemName="UnreleasedChangelog" />
+            <Output
+                    TaskParameter="CurrentReleaseChangelog"
+                    ItemName="CurrentReleaseChangelog" />
+            <Output
+                    TaskParameter="AllReleasedChangelogs"
+                    ItemName="AllReleasedChangelogs" />
+            <Output
+                    TaskParameter="LatestReleaseNotes"
+                    ItemName="LatestReleaseNotes" />
         </Ionide.KeepAChangelog.Tasks.ParseChangeLogs>
     </Target>
 
-    <Target Name="SetVersionFromChangelog" DependsOnTargets="GetChangelogVersion">
+    <Target
+            Name="SetVersionFromChangelog"
+            DependsOnTargets="GetChangelogVersion">
         <PropertyGroup Condition="'@(CurrentReleaseChangelog)' != ''">
             <Version>%(CurrentReleaseChangelog.Identity)</Version>
             <PackageVersion>%(CurrentReleaseChangelog.Identity)</PackageVersion>
             <PackageReleaseNotes>@(LatestReleaseNotes)</PackageReleaseNotes>
         </PropertyGroup>
 
         <ItemGroup Condition="'@(CurrentReleaseChangelog)' != '' and '$(GenerateAssemblyInfo)' == 'true'">
-            <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(GenerateRepositoryUrlAttribute)' == 'true' and ('$(RepositoryUrl)' != '' or '$(PublishRepositoryUrl)' == 'true')">
+            <AssemblyAttribute
+                    Include="System.Reflection.AssemblyMetadataAttribute"
+                    Condition="'$(GenerateRepositoryUrlAttribute)' == 'true' and ('$(RepositoryUrl)' != '' or '$(PublishRepositoryUrl)' == 'true')">
                 <_Parameter1>BuildDate</_Parameter1>
                 <_Parameter2>%(CurrentReleaseChangelog.Date)</_Parameter2>
             </AssemblyAttribute>

src/Ionide.KeepAChangelog/Ionide.KeepAChangelog.fsproj

@@ -6,12 +6,6 @@
     <DebugType>embedded</DebugType>
     <IsPackable>true</IsPackable>
     <Description>A self-contained parser for the KeepAChangelog format.</Description>
-    <Version>0.1.3</Version>
-    <PackageReleaseNotes>
-### Fixed
-
-- Support supplying package versions for project-to-project references.
-    </PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>