diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml
index 4c6cf6bfc..364f03819 100644
--- a/.github/workflows/IKVM.yml
+++ b/.github/workflows/IKVM.yml
@@ -19,7 +19,7 @@ on:
- created
env:
- NATIVE_SDK_VERSION: "20240413.1"
+ NATIVE_SDK_VERSION: "20240606.1"
jobs:
build-openjdk:
@@ -115,27 +115,36 @@ jobs:
needs:
- build-openjdk
timeout-minutes: 720
- runs-on: windows-latest
+ runs-on: ubuntu-24.04
+ env:
+ DOTNET_INSTALL_DIR: ${{ github.workspace }}/.dotnet
+ NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps:
- - name: Set Paths (Windows)
- shell: pwsh
+ - name: Uninstall Packages
run: |
- $WORKPATH="C:\work"
- mkdir $WORKPATH
- mkdir $WORKPATH\temp
- mkdir $WORKPATH\dotnet
- mkdir $WORKPATH\nuget
- mkdir $WORKPATH\nuget\packages
- mkdir $WORKPATH\ikvm
- Add-Content $env:GITHUB_ENV "`nWORKPATH=$WORKPATH"
- Add-Content $env:GITHUB_ENV "`nTMP=$WORKPATH\temp`nTEMP=$WORKPATH\temp`nTMPDIR=$WORKPATH\temp"
- Add-Content $env:GITHUB_ENV "`nDOTNET_INSTALL_DIR=$WORKPATH\dotnet"
- Add-Content $env:GITHUB_ENV "`nNUGET_PACKAGES=$WORKPATH\nuget\packages"
- New-Item -Path "$env:GITHUB_WORKSPACE\work" -ItemType SymbolicLink -Value "$WORKPATH\ikvm"
+ sudo apt-get remove --purge -y \
+ temurin-\* \
+ mono-complete \
+ unixodbc-dev \
+ nginx \
+ php\* \
+ postgresql\* \
+ python3-dev python3-pip python3-venv \
+ ruby-full \
+ firefox \
+ apache2 \
+ ant && \
+ sudo apt-get --purge autoremove -y && \
+ sudo apt-get clean && \
+ sudo rm -rf /usr/share/swift
+ - name: Free Disk Space (Linux)
+ if: runner.os == 'Linux'
+ uses: jlumbroso/free-disk-space@main
+ with:
+ swap-storage: false
- name: Checkout Source
uses: actions/checkout@v4
with:
- path: work
fetch-depth: 0
submodules: recursive
- name: Setup .NET 6.0
@@ -150,17 +159,23 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- - name: Cache LLVM and Clang
- id: cache-llvm
- uses: actions/cache@v4
- with:
- path: C:/Program Files/LLVM
- key: llvm-17.0
+ - name: Install Mono
+ run: |
+ sudo apt-get update && \
+ sudo apt-get install -y \
+ mono-runtime \
+ mono-devel
+ - name: Install Java
+ run: |
+ sudo apt-get update && \
+ sudo apt-get install -y \
+ openjdk-8-jdk-headless && \
+ echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $GITHUB_ENV
- name: Install LLVM and Clang
- uses: KyleMayes/install-llvm-action@v1
- with:
- version: "17.0"
- cached: ${{ steps.cache-llvm.outputs.cache-hit }}
+ run: |
+ sudo apt-get update && \
+ sudo apt-get install -y clang-17 llvm-17 && \
+ echo "PATH=/usr/lib/llvm-17/bin:$PATH" >> $GITHUB_ENV
- name: Install apple-codesign
uses: baptiste0928/cargo-install@v3
with:
@@ -173,264 +188,227 @@ jobs:
- name: Execute GitVersion
uses: gittools/actions/gitversion/execute@v1
with:
- targetPath: ${{ env.WORKPATH }}\ikvm
useConfigFile: true
- configFilePath: ${{ env.WORKPATH }}\ikvm\GitVersion.yml
- - name: Cache NuGet
- uses: actions/cache@v4
- with:
- path: ${{ env.NUGET_PACKAGES }}
- key: nuget--${{ runner.os }}--${{ hashFiles('IKVM.sln', 'src/**/*.csproj', 'src/**/*.msbuildproj') }}--1
- restore-keys: ${{ runner.os }}-nuget-2-
- - name: Add msbuild to PATH
- uses: microsoft/setup-msbuild@v2
- with:
- msbuild-architecture: x64
+ configFilePath: GitVersion.yml
- name: Download OpenJDK 8 Build
uses: actions/download-artifact@v4
with:
name: openjdk-build-linux-x86_64-normal-server-release
- path: ${{ env.WORKPATH }}/temp
+ path: /tmp
- name: Restore OpenJDK 8 Build
- shell: pwsh
- run: New-Item -Type Directory -Force ${{ env.WORKPATH }}/ikvm/openjdk/build; Expand-Archive ${{ env.WORKPATH }}/temp/openjdk-build-linux-x86_64-normal-server-release.zip -DestinationPath ${{ env.WORKPATH }}/ikvm/openjdk/build
+ run: mkdir -p openjdk/build && cd openjdk/build && unzip /tmp/openjdk-build-linux-x86_64-normal-server-release.zip && rm /tmp/openjdk-build-linux-x86_64-normal-server-release.zip
- name: Download JTReg Build
uses: actions/download-artifact@v4
with:
name: jtreg-build
- path: ${{ env.WORKPATH }}/temp
+ path: /tmp
- name: Restore JTReg Build
- shell: pwsh
- run: New-Item -Type Directory -Force ${{ env.WORKPATH }}/ikvm/jtreg; Expand-Archive ${{ env.WORKPATH }}/temp/jtreg-build.zip -DestinationPath ${{ env.WORKPATH }}/ikvm/jtreg
+ run: mkdir -p jtreg && cd jtreg && unzip /tmp/jtreg-build.zip && rm /tmp/jtreg-build.zip
- name: Download Native SDKs
uses: robinraju/release-downloader@v1.9
with:
repository: ikvmnet/ikvm-native-sdk
tag: ${{ env.NATIVE_SDK_VERSION }}
fileName: "*.tar.gz"
- out-file-path: ${{ env.WORKPATH }}/ikvm/ext/ikvm-native-sdk
+ out-file-path: ext/ikvm-native-sdk
extract: true
- - name: Fix Symbolic Links
- shell: pwsh
- run: ri win -Recurse; .\Fix-SymbolicLinks.ps1
- working-directory: ${{ env.WORKPATH }}/ikvm/ext/ikvm-native-sdk
- name: NuGet Restore
run: dotnet restore IKVM.sln
- working-directory: ${{ env.WORKPATH }}/ikvm
- name: Build Artifacts
run: |
- msbuild /m /bl `
- /p:Configuration="Release" `
- /p:Platform="Any CPU" `
- /p:PreReleaseLabel=${env:GitVersion_PreReleaseLabel} `
- /p:PreReleaseNumber=${env:GitVersion_WeightedPreReleaseNumber} `
- /p:Version=${env:GitVersion_FullSemVer} `
- /p:AssemblyVersion=${env:GitVersion_AssemblySemVer} `
- /p:InformationalVersion=${env:GitVersion_InformationalVersion} `
- /p:FileVersion=${env:GitVersion_AssemblySemFileVer} `
- /p:PackageVersion=${env:GitVersion_FullSemVer} `
- /p:RepositoryUrl="${env:GITHUB_SERVER_URL}/${env:GITHUB_REPOSITORY}.git" `
- /p:PackageProjectUrl="${env:GITHUB_SERVER_URL}/${env:GITHUB_REPOSITORY}" `
- /p:BuildInParallel=true `
- /p:CreateHardLinksForAdditionalFilesIfPossible=true `
- /p:CreateHardLinksForCopyAdditionalFilesIfPossible=true `
- /p:CreateHardLinksForCopyFilesToOutputDirectoryIfPossible=true `
- /p:CreateHardLinksForCopyLocalIfPossible=true `
- /p:CreateHardLinksForPublishFilesIfPossible=true `
- /p:ContinuousIntegrationBuild=true `
+ dotnet msbuild /m /bl \
+ /p:Configuration="Release" \
+ /p:Platform="Any CPU" \
+ /p:PreReleaseLabel=${GitVersion_PreReleaseLabel} \
+ /p:PreReleaseNumber=${GitVersion_WeightedPreReleaseNumber} \
+ /p:Version=${GitVersion_FullSemVer} \
+ /p:AssemblyVersion=${GitVersion_AssemblySemVer} \
+ /p:InformationalVersion=${GitVersion_InformationalVersion} \
+ /p:FileVersion=${GitVersion_AssemblySemFileVer} \
+ /p:PackageVersion=${GitVersion_FullSemVer} \
+ /p:RepositoryUrl="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git" \
+ /p:PackageProjectUrl="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" \
+ /p:BuildInParallel=true \
+ /p:CreateHardLinksForAdditionalFilesIfPossible=true \
+ /p:CreateHardLinksForCopyAdditionalFilesIfPossible=true \
+ /p:CreateHardLinksForCopyFilesToOutputDirectoryIfPossible=true \
+ /p:CreateHardLinksForCopyLocalIfPossible=true \
+ /p:CreateHardLinksForPublishFilesIfPossible=true \
+ /p:ContinuousIntegrationBuild=true \
IKVM.dist.msbuildproj
- working-directory: ${{ env.WORKPATH }}\ikvm
- name: Upload MSBuild Log
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: msbuild.binlog
- path: ${{ env.WORKPATH }}\ikvm\msbuild.binlog
+ path: msbuild.binlog
- name: Package NuGet Packages
- run: tar czvf C:\nuget.tar.gz nuget
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/nuget.tar.gz nuget
+ working-directory: dist
- name: Upload NuGet Packages
uses: actions/upload-artifact@v4
with:
name: nuget
- path: C:\nuget.tar.gz
+ path: /tmp/nuget.tar.gz
- name: Delete NuGet Packages
- shell: pwsh
- run: ri C:\nuget.tar.gz
+ run: rm /tmp/nuget.tar.gz
- name: Package Binaries
- run: tar czvf C:\bin.tar.gz bin
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/bin.tar.gz bin
+ working-directory: dist
- name: Upload Binaries
uses: actions/upload-artifact@v4
with:
name: bin
- path: C:\bin.tar.gz
+ path: /tmp/bin.tar.gz
- name: Delete Binaries
- shell: pwsh
- run: ri C:\bin.tar.gz
+ run: rm /tmp/bin.tar.gz
- name: Package Tools
- run: tar czvf C:\tools.tar.gz tools
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tools.tar.gz tools
+ working-directory: dist
- name: Upload Tools
uses: actions/upload-artifact@v4
with:
name: tools
- path: C:\tools.tar.gz
+ path: /tmp/tools.tar.gz
- name: Delete Tools
- shell: pwsh
- run: ri C:\tools.tar.gz
+ run: rm /tmp/tools.tar.gz
- name: Package Image
- run: tar czvf C:\image.tar.gz image
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/image.tar.gz image
+ working-directory: dist
- name: Upload Image
uses: actions/upload-artifact@v4
with:
name: image
- path: C:\image.tar.gz
+ path: /tmp/image.tar.gz
- name: Delete Image
- shell: pwsh
- run: ri C:\image.tar.gz
+ run: rm /tmp/image.tar.gz
- name: Package Tests (IKVM.ByteCode.Tests)
- run: tar czvf C:\tests--IKVM.ByteCode.Tests.tar.gz tests\IKVM.ByteCode.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.ByteCode.Tests.tar.gz tests/IKVM.ByteCode.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.ByteCode.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.ByteCode.Tests
- path: C:\tests--IKVM.ByteCode.Tests.tar.gz
+ path: /tmp/tests--IKVM.ByteCode.Tests.tar.gz
- name: Delete Tests (IKVM.ByteCode.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.ByteCode.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.ByteCode.Tests.tar.gz
- name: Package Tests (IKVM.Reflection.Tests)
- run: tar czvf C:\tests--IKVM.Reflection.Tests.tar.gz tests\IKVM.Reflection.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.Reflection.Tests.tar.gz tests/IKVM.Reflection.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.Reflection.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.Reflection.Tests
- path: C:\tests--IKVM.Reflection.Tests.tar.gz
+ path: /tmp/tests--IKVM.Reflection.Tests.tar.gz
- name: Delete Tests (IKVM.Reflection.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.Reflection.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.Reflection.Tests.tar.gz
- name: Package Tests (IKVM.Tests)
- run: tar czvf C:\tests--IKVM.Tests.tar.gz tests\IKVM.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.Tests.tar.gz tests/IKVM.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.Tests
- path: C:\tests--IKVM.Tests.tar.gz
+ path: /tmp/tests--IKVM.Tests.tar.gz
- name: Delete Tests (IKVM.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.Tests.tar.gz
- name: Package Tests (IKVM.Java.Tests)
- run: tar czvf C:\tests--IKVM.Java.Tests.tar.gz tests\IKVM.Java.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.Java.Tests.tar.gz tests/IKVM.Java.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.Java.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.Java.Tests
- path: C:\tests--IKVM.Java.Tests.tar.gz
+ path: /tmp/tests--IKVM.Java.Tests.tar.gz
- name: Delete Tests (IKVM.Java.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.Java.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.Java.Tests.tar.gz
- name: Package Tests (IKVM.Tools.Tests)
- run: tar czvf C:\tests--IKVM.Tools.Tests.tar.gz tests\IKVM.Tools.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.Tools.Tests.tar.gz tests/IKVM.Tools.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.Tools.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.Tools.Tests
- path: C:\tests--IKVM.Tools.Tests.tar.gz
+ path: /tmp/tests--IKVM.Tools.Tests.tar.gz
- name: Delete Tests (IKVM.Tools.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.Tools.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.Tools.Tests.tar.gz
- name: Package Tests (IKVM.Tools.Exporter.Tests)
- run: tar czvf C:\tests--IKVM.Tools.Exporter.Tests.tar.gz tests\IKVM.Tools.Exporter.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.Tools.Exporter.Tests.tar.gz tests/IKVM.Tools.Exporter.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.Tools.Exporter.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.Tools.Exporter.Tests
- path: C:\tests--IKVM.Tools.Exporter.Tests.tar.gz
+ path: /tmp/tests--IKVM.Tools.Exporter.Tests.tar.gz
- name: Delete Tests (IKVM.Tools.Exporter.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.Tools.Exporter.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.Tools.Exporter.Tests.tar.gz
- name: Package Tests (IKVM.Tools.Importer.Tests)
- run: tar czvf C:\tests--IKVM.Tools.Importer.Tests.tar.gz tests\IKVM.Tools.Importer.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.Tools.Importer.Tests.tar.gz tests/IKVM.Tools.Importer.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.Tools.Importer.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.Tools.Importer.Tests
- path: C:\tests--IKVM.Tools.Importer.Tests.tar.gz
+ path: /tmp/tests--IKVM.Tools.Importer.Tests.tar.gz
- name: Delete Tests (IKVM.Tools.Importer.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.Tools.Importer.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.Tools.Importer.Tests.tar.gz
- name: Package Tests (IKVM.MSBuild.Tasks.Tests)
- run: tar czvf C:\tests--IKVM.MSBuild.Tasks.Tests.tar.gz tests\IKVM.MSBuild.Tasks.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.MSBuild.Tasks.Tests.tar.gz tests/IKVM.MSBuild.Tasks.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.MSBuild.Tasks.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.MSBuild.Tasks.Tests
- path: C:\tests--IKVM.MSBuild.Tasks.Tests.tar.gz
+ path: /tmp/tests--IKVM.MSBuild.Tasks.Tests.tar.gz
- name: Delete Tests (IKVM.MSBuild.Tasks.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.MSBuild.Tasks.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.MSBuild.Tasks.Tests.tar.gz
- name: Package Tests (IKVM.MSBuild.Tests)
- run: tar czvf C:\tests--IKVM.MSBuild.Tests.tar.gz tests\IKVM.MSBuild.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.MSBuild.Tests.tar.gz tests/IKVM.MSBuild.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.MSBuild.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.MSBuild.Tests
- path: C:\tests--IKVM.MSBuild.Tests.tar.gz
+ path: /tmp/tests--IKVM.MSBuild.Tests.tar.gz
- name: Delete Tests (IKVM.MSBuild.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.MSBuild.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.MSBuild.Tests.tar.gz
- name: Package Tests (IKVM.NET.Sdk.Tests)
- run: tar czvf C:\tests--IKVM.NET.Sdk.Tests.tar.gz tests\IKVM.NET.Sdk.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.NET.Sdk.Tests.tar.gz tests/IKVM.NET.Sdk.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.NET.Sdk.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.NET.Sdk.Tests
- path: C:\tests--IKVM.NET.Sdk.Tests.tar.gz
+ path: /tmp/tests--IKVM.NET.Sdk.Tests.tar.gz
- name: Delete Tests (IKVM.NET.Sdk.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.NET.Sdk.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.NET.Sdk.Tests.tar.gz
- name: Package Tests (IKVM.JTReg.TestAdapter.Tests)
- run: tar czvf C:\tests--IKVM.JTReg.TestAdapter.Tests.tar.gz tests\IKVM.JTReg.TestAdapter.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.JTReg.TestAdapter.Tests.tar.gz tests/IKVM.JTReg.TestAdapter.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.JTReg.TestAdapter.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.JTReg.TestAdapter.Tests
- path: C:\tests--IKVM.JTReg.TestAdapter.Tests.tar.gz
+ path: /tmp/tests--IKVM.JTReg.TestAdapter.Tests.tar.gz
- name: Delete Tests (IKVM.JTReg.TestAdapter.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.JTReg.TestAdapter.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.JTReg.TestAdapter.Tests.tar.gz
- name: Package Tests (IKVM.OpenJDK.Tests)
- run: tar czvf C:\tests--IKVM.OpenJDK.Tests.tar.gz tests\IKVM.OpenJDK.Tests
- working-directory: ${{ env.WORKPATH }}\ikvm\dist
+ run: tar czvf /tmp/tests--IKVM.OpenJDK.Tests.tar.gz tests/IKVM.OpenJDK.Tests
+ working-directory: dist
- name: Upload Tests (IKVM.OpenJDK.Tests)
uses: actions/upload-artifact@v4
with:
name: tests--IKVM.OpenJDK.Tests
- path: C:\tests--IKVM.OpenJDK.Tests.tar.gz
+ path: /tmp/tests--IKVM.OpenJDK.Tests.tar.gz
- name: Delete Tests (IKVM.OpenJDK.Tests)
- shell: pwsh
- run: ri C:\tests--IKVM.OpenJDK.Tests.tar.gz
+ run: rm /tmp/tests--IKVM.OpenJDK.Tests.tar.gz
- name: Package Documentation
- shell: pwsh
- run: Compress-Archive -Path doc\* -DestinationPath C:\doc.zip
- working-directory: ${{ env.WORKPATH }}\ikvm
+ run: cd doc && zip /tmp/doc.zip *
- name: Upload Documentation
uses: actions/upload-artifact@v4
with:
name: doc
- path: C:\doc.zip
+ path: /tmp/doc.zip
test-vars:
name: Test Variables
needs:
@@ -696,16 +674,12 @@ jobs:
- name: Free Disk Space (Linux)
uses: jlumbroso/free-disk-space@main
with:
- dotnet: false
swap-storage: false
large-packages: false
- name: Checkout Source
uses: actions/checkout@v4
with:
fetch-depth: 0
- - name: Setup .NET
- shell: pwsh
- run: Add-Content $env:GITHUB_ENV "`nDOTNET_INSTALL_DIR=${{ runner.temp }}/dotnet"
- name: Setup .NET 8.0
uses: actions/setup-dotnet@v4
with:
diff --git a/openjdk b/openjdk
index 093abf41e..e31ddd980 160000
--- a/openjdk
+++ b/openjdk
@@ -1 +1 @@
-Subproject commit 093abf41ee786c5356721c85f074dd77187e98ca
+Subproject commit e31ddd980b1a22a42a741b5a45e9723445f11bc1
diff --git a/src/libawt/libawt.clangproj b/src/libawt/libawt.clangproj
index 2b2281a1f..90884f85d 100644
--- a/src/libawt/libawt.clangproj
+++ b/src/libawt/libawt.clangproj
@@ -194,20 +194,20 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
diff --git a/src/libfontmanager/libfontmanager.clangproj b/src/libfontmanager/libfontmanager.clangproj
index cfc597361..ad8df0a00 100644
--- a/src/libfontmanager/libfontmanager.clangproj
+++ b/src/libfontmanager/libfontmanager.clangproj
@@ -39,9 +39,9 @@
-
-
-
+
+
+
@@ -59,4 +59,4 @@
-
\ No newline at end of file
+
diff --git a/src/libiava/libiava.clangproj b/src/libiava/libiava.clangproj
index 801509c0f..d8c5b8581 100644
--- a/src/libiava/libiava.clangproj
+++ b/src/libiava/libiava.clangproj
@@ -70,7 +70,7 @@
-
+
diff --git a/src/libjaas/libjaas.clangproj b/src/libjaas/libjaas.clangproj
index 6cf596dc3..7bcfcaa80 100644
--- a/src/libjaas/libjaas.clangproj
+++ b/src/libjaas/libjaas.clangproj
@@ -20,10 +20,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/libjawt/libjawt.clangproj b/src/libjawt/libjawt.clangproj
index 78c402386..c5ae29792 100644
--- a/src/libjawt/libjawt.clangproj
+++ b/src/libjawt/libjawt.clangproj
@@ -22,7 +22,7 @@
-
+
diff --git a/src/libjsound/libjsound.clangproj b/src/libjsound/libjsound.clangproj
index 3622a91a1..2ba9bcb64 100644
--- a/src/libjsound/libjsound.clangproj
+++ b/src/libjsound/libjsound.clangproj
@@ -41,7 +41,7 @@
-
+
diff --git a/src/libjsoundds/libjsoundds.clangproj b/src/libjsoundds/libjsoundds.clangproj
index 88ff0e465..354f58460 100644
--- a/src/libjsoundds/libjsoundds.clangproj
+++ b/src/libjsoundds/libjsoundds.clangproj
@@ -19,7 +19,7 @@
-
+
diff --git a/src/libjvm/libjvm.clangproj b/src/libjvm/libjvm.clangproj
index fd20754bd..a3afd14fa 100644
--- a/src/libjvm/libjvm.clangproj
+++ b/src/libjvm/libjvm.clangproj
@@ -38,7 +38,7 @@
-
+
@@ -82,4 +82,4 @@
-
\ No newline at end of file
+
diff --git a/src/libkrb5/libkrb5.clangproj b/src/libkrb5/libkrb5.clangproj
index e1a007af4..f93b3ccbe 100644
--- a/src/libkrb5/libkrb5.clangproj
+++ b/src/libkrb5/libkrb5.clangproj
@@ -20,21 +20,21 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
diff --git a/src/libmanagement/libmanagement.clangproj b/src/libmanagement/libmanagement.clangproj
index 6f9daa525..eae94019e 100644
--- a/src/libmanagement/libmanagement.clangproj
+++ b/src/libmanagement/libmanagement.clangproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
@@ -39,4 +39,4 @@
-
\ No newline at end of file
+
diff --git a/src/libnet/libnet.clangproj b/src/libnet/libnet.clangproj
index ddda9a2cd..4942675be 100644
--- a/src/libnet/libnet.clangproj
+++ b/src/libnet/libnet.clangproj
@@ -26,7 +26,7 @@
-
+
diff --git a/src/libnio/libnio.clangproj b/src/libnio/libnio.clangproj
index a6bda33f1..91e3825c6 100644
--- a/src/libnio/libnio.clangproj
+++ b/src/libnio/libnio.clangproj
@@ -42,7 +42,7 @@
-
+
@@ -149,4 +149,4 @@ public class JoinPathsAndFiles : Task
-
\ No newline at end of file
+
diff --git a/src/libsunec/libsunec.clangproj b/src/libsunec/libsunec.clangproj
index 40453b118..98203e921 100644
--- a/src/libsunec/libsunec.clangproj
+++ b/src/libsunec/libsunec.clangproj
@@ -19,7 +19,7 @@
-
+
diff --git a/src/libsunmscapi/libsunmscapi.clangproj b/src/libsunmscapi/libsunmscapi.clangproj
index e99bacc20..66f0005fe 100644
--- a/src/libsunmscapi/libsunmscapi.clangproj
+++ b/src/libsunmscapi/libsunmscapi.clangproj
@@ -14,7 +14,9 @@
-
+
+
+
diff --git a/targets/lib.props b/targets/lib.props
index 435dfaa2d..5caee0330 100644
--- a/targets/lib.props
+++ b/targets/lib.props
@@ -63,14 +63,15 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -144,4 +145,4 @@
-
\ No newline at end of file
+