Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
wasabii committed Apr 3, 2024
2 parents 09c37b6 + f331bc7 commit 5e2c5a8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.MSBuild.Tasks/IkvmReferenceItemPrepare.cs
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ static Version ToAssemblyVersion(ModuleVersion version)
/// <returns></returns>
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;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Tests/Java/java/net/URLTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void CanCreateUnixFileURL()
//[DataRow("sha512")]
[DataRow("rsa2048")]
[DataRow("rsa4096")]
[DataRow("rsa8192")]
//[DataRow("rsa8192")]
[DataRow("ecc256")]
[DataRow("ecc384")]
//[DataRow("dh480")]
Expand Down

0 comments on commit 5e2c5a8

Please sign in to comment.