Merge branch 'hotfix/8.4.4'

ikvmnet · Jan 2, 2023 · 103f784 · 103f784
2 parents 2732eae + bd9e790
commit 103f784
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml
@@ -447,7 +447,7 @@ jobs:
         path: ${{ env.IKVMPATH }}/dist/TestResults
   release:
     name: Release
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/release/')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/hotfix/')
     needs:
     - test
     runs-on: ubuntu-latest

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -6,5 +6,8 @@ branches:
     regex: ^dev(elop)?(ment)?$
     tag: develop
   release:
-    regex: ^releases?[/-]
+    regex: ^release?[/-]
+    tag: prerelease
+  hotfix:
+    regex: ^hotfix?[/-]
     tag: prerelease
diff --git a/src/IKVM/IKVM.csproj b/src/IKVM/IKVM.csproj
@@ -21,7 +21,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="build\**\*" Pack="true" PackagePath="build\%(RecursiveDir)%(Filename)%(Extension)" />
         <None Include="buildTransitive\**\*" Pack="true" PackagePath="buildTransitive\%(RecursiveDir)%(Filename)%(Extension)" />
     </ItemGroup>
 
@@ -46,13 +45,13 @@
 
     <Target Name="GetProjectReferenceBuildOutputInPackage" DependsOnTargets="ResolveReferences">
         <ItemGroup>
-            <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'all'))" />
+            <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('PrivateAssets', 'all'))" />
         </ItemGroup>
     </Target>
 
     <Target Name="GetProjectReferenceDebugSymbolsInPackage" DependsOnTargets="ResolveReferences">
         <ItemGroup>
-            <TfmSpecificDebugSymbolsFile Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'all')->'%(RootDir)%(Directory)%(Filename).pdb')" Condition="Exists('%(RootDir)%(Directory)%(Filename).pdb')">
+            <TfmSpecificDebugSymbolsFile Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('PrivateAssets', 'all')-&gt;'%(RootDir)%(Directory)%(Filename).pdb')" Condition="Exists('%(RootDir)%(Directory)%(Filename).pdb')">
                 <TargetFramework>$(TargetFramework)</TargetFramework>
             </TfmSpecificDebugSymbolsFile>
         </ItemGroup>

diff --git a/src/IKVM/build/net461/IKVM.targets b/src/IKVM/build/net461/IKVM.targets
diff --git a/src/IKVM/buildTransitive/netstandard2.0/IKVM.targets b/src/IKVM/buildTransitive/netstandard2.0/IKVM.targets
@@ -3,6 +3,15 @@
         <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     </PropertyGroup>
 
+    <!-- Ensure runtime items get copied to output on Framework targets. NuGet doesn't do this automatically.  -->
+    <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))"> 
+        <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <TargetPath>runtimes\%(RecursiveDir)%(FileName)%(Extension)</TargetPath>
+            <Pack>false</Pack>
+        </ContentWithTargetPath>
+    </ItemGroup>
+
     <!-- Transforms the IkvmReference item group into IkvmReferenceItem items. -->
     <Target Name="GetIkvmReferenceItemsFromIkvmReferences">
         <ItemGroup>