Merge branch 'hotfix/8.3.1'

ikvmnet · Nov 17, 2022 · ac66ffb · ac66ffb
2 parents 43c382f + 51f7fc9
commit ac66ffb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml
@@ -120,6 +120,17 @@ jobs:
       with:
         fetch-depth: 0
         submodules: recursive
+    - name: Setup .NET
+      shell: pwsh
+      run: Add-Content $env:GITHUB_ENV "`nDOTNET_INSTALL_DIR=${{ runner.temp }}\dotnet"
+    - name: Setup .NET 3.1
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 3.1.x
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 6.0.x
     - name: Install GitVersion
       uses: gittools/actions/gitversion/[email protected]
       with:
@@ -134,17 +145,6 @@ jobs:
         additional-packages:
           gcc
           g++
-    - name: Setup .NET
-      shell: pwsh
-      run: Add-Content $env:GITHUB_ENV "`nDOTNET_INSTALL_DIR=${{ runner.temp }}\dotnet"
-    - name: Setup .NET 3.1
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 3.1.x
-    - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 6.0.x
     - name: Move Temporary Directory
       shell: pwsh
       run: Add-Content $env:GITHUB_ENV "`nTMP=${{ runner.temp }}`nTEMP=${{ runner.temp }}`nTMPDIR=${{ runner.temp }}"
@@ -396,6 +396,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         fetch-depth: 0
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 6.0.x
     - name: Install GitVersion
       uses: gittools/actions/gitversion/[email protected]
       with:

diff --git a/src/IKVM.Image/IKVM.Image.csproj b/src/IKVM.Image/IKVM.Image.csproj
@@ -49,7 +49,8 @@
         <!-- openjdk contents -->
         <None Include="@(OpenJdkImageContent)">
             <Pack>true</Pack>
-            <PackagePath>$([System.IO.Path]::GetDirectoryName('ikvm\any\any\%(ImagePath)'))</PackagePath>
+            <PackagePath>ikvm\any\any\%(ImagePath)</PackagePath>
+            <PackagePath Condition="!$([System.IO.Path]::HasExtension('%(ImagePath)'))">$([System.IO.Path]::GetDirectoryName('ikvm\any\any\%(ImagePath)'))</PackagePath>
             <Link>ikvm\any\any\%(ImagePath)</Link>
         </None>
     </ItemGroup>