From 29bad2bf849fe11efb7da931156a29e1a0ce444a Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 22 Mar 2024 23:18:32 -0500 Subject: [PATCH 1/4] Update CONTRIBUTING.md Signed-off-by: Jerome Haltom --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d4f44cf844..c8da98f490 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Prerequisites for building the project: * We use IKVM.Clang projects to build the native libraries. This project type supports inner builds for TargetMachine, much as .NET supports inner builds for TFMs. * There is an IKVM.Clang Visual Studio extension for these projects to load properly in Visual Studio: https://marketplace.visualstudio.com/items?itemName=ikvm.clang * When on Windows, the Windows SDK distributed through this project is not required. But it is required that you have a Windows SDK installed. Building on other operating systems requires all of the SDKs. - * A few of the SDKs contain symlinks for which there is no way to extract them properly (osx) on Windows. We find 7zip has the best capability to produce SYMLINK files, though it incorrectly interpretes symlinks to directories as symlinks to files. The Fix-SymbolicLinks.ps1 script is provided to patch these up post extraction. + * A few of the SDKs contain symlinks for which there is no way to extract them properly (osx) on Windows. We find 7zip has the best capability to produce SYMLINK files, though it incorrectly interpretes symlinks to directories as symlinks to files. The Fix-SymbolicLinks.ps1 script is provided to patch these up post extraction. For building Linux, the `win` SDK package is required. For building on OS X the `win-ci` package is required. The former has symbolic links setup for various versions of header files that exist with different required cases. While the latter is suitable for a case-insensitive OS. * The Linux SDK contains a version for all of the required platforms. These are required to cross compile to each supported platform. They must all be present. * LLVM installed with `clang` available on the path. LLVM is shipped with Visual Studio, but you will need to update your PATH to include the relevant bin directory (typically: `C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\Llvm\bin`) or you can install a [standalone distribution of LLVM](https://releases.llvm.org/). If building on Windows, ensure you do not build within the Visual Studio Developer Command Prompt as clang is unable to properly discover the Windows SDK when this is applied. * 200GB of free disk space From 9c30f9e3169789dea4441cff8af51767d69352e1 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Wed, 3 Apr 2024 11:19:29 -0500 Subject: [PATCH 2/4] 65534 is actually the highest version. Fixes #150 Signed-off-by: Jerome Haltom --- src/IKVM.MSBuild.Tasks/IkvmReferenceItemPrepare.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.MSBuild.Tasks/IkvmReferenceItemPrepare.cs b/src/IKVM.MSBuild.Tasks/IkvmReferenceItemPrepare.cs index 2fedec3e22..9fc5330a82 100644 --- a/src/IKVM.MSBuild.Tasks/IkvmReferenceItemPrepare.cs +++ b/src/IKVM.MSBuild.Tasks/IkvmReferenceItemPrepare.cs @@ -456,7 +456,7 @@ static Version ToAssemblyVersion(ModuleVersion version) /// static int? GetAssemblyVersionComponent(ModuleVersion version, int index) { - return version.Number.Count > index && version.Number[index] is int i ? Math.Min(i, ushort.MaxValue) : null; + return version.Number.Count > index && version.Number[index] is int i ? Math.Min(i, ushort.MaxValue - 1) : null; } /// From c907d8d66a5a2db387419a0bb567009eff280a33 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Wed, 3 Apr 2024 12:46:07 -0500 Subject: [PATCH 3/4] Update git actions. Seem to be broken in Main. Signed-off-by: Jerome Haltom --- .github/workflows/IKVM.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml index 8b47f03465..ba533b61f9 100644 --- a/.github/workflows/IKVM.yml +++ b/.github/workflows/IKVM.yml @@ -128,7 +128,7 @@ jobs: Add-Content $env:GITHUB_ENV "`nNUGET_PACKAGES=$WORKPATH\nuget\packages" New-Item -Path "$env:GITHUB_WORKSPACE\work" -ItemType SymbolicLink -Value "$WORKPATH\ikvm" - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: work fetch-depth: 0 @@ -162,11 +162,11 @@ jobs: crate: apple-codesign version: latest - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0 + uses: gittools/actions/gitversion/setup@v1 with: versionSpec: 5.x - name: Execute GitVersion - uses: gittools/actions/gitversion/execute@v0 + uses: gittools/actions/gitversion/execute@v1 with: targetPath: ${{ env.WORKPATH }}\ikvm useConfigFile: true @@ -669,7 +669,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup .NET @@ -680,12 +680,12 @@ jobs: with: dotnet-version: 7.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0 + uses: gittools/actions/gitversion/setup@v1 with: versionSpec: 5.x - name: Execute GitVersion id: GitVersion - uses: gittools/actions/gitversion/execute@v0 + uses: gittools/actions/gitversion/execute@v1 with: useConfigFile: true - name: Download NuGet Packages From f331bc72363dba47105d007636348dd7312bfa72 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Wed, 3 Apr 2024 14:17:46 -0500 Subject: [PATCH 4/4] badssl broke another service Signed-off-by: Jerome Haltom --- src/IKVM.Tests/Java/java/net/URLTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Tests/Java/java/net/URLTests.cs b/src/IKVM.Tests/Java/java/net/URLTests.cs index c6af36ddca..b51ef08888 100644 --- a/src/IKVM.Tests/Java/java/net/URLTests.cs +++ b/src/IKVM.Tests/Java/java/net/URLTests.cs @@ -58,7 +58,7 @@ public void CanCreateUnixFileURL() //[DataRow("sha512")] [DataRow("rsa2048")] [DataRow("rsa4096")] - [DataRow("rsa8192")] + //[DataRow("rsa8192")] [DataRow("ecc256")] [DataRow("ecc384")] //[DataRow("dh480")]