Skip to content

Commit 60a1233

Browse files
iodesiodes
authored
Merge pull request #12 from chequer-io/feature/jre21
Update to JRE21 & Support Alpine ARM64
2 parents 905a6b0 + 1f2ada8 commit 60a1233

File tree

13 files changed

+25
-26
lines changed

13 files changed

+25
-26
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Provides an environment for running Java in .NET
1010
| Linux | X64 | [![J2NET.Runtime.linux-x64](https://img.shields.io/nuget/v/J2NET.Runtime.linux-x64)](https://www.nuget.org/packages/J2NET.Runtime.linux-x64/) |
1111
| Linux | ARM64 | [![J2NET.Runtime.linux-arm64](https://img.shields.io/nuget/v/J2NET.Runtime.linux-arm64)](https://www.nuget.org/packages/J2NET.Runtime.linux-arm64/) |
1212
| Alpine | X64 | [![J2NET.Runtime.linux-musl-x64](https://img.shields.io/nuget/v/J2NET.Runtime.linux-musl-x64)](https://www.nuget.org/packages/J2NET.Runtime.linux-musl-x64/) |
13+
| Alpine | ARM64 | [![J2NET.Runtime.linux-musl-arm64](https://img.shields.io/nuget/v/J2NET.Runtime.linux-musl-arm64)](https://www.nuget.org/packages/J2NET.Runtime.linux-musl-arm64/) |
1314
| Windows | X64 | [![J2NET.Runtime.win-x64](https://img.shields.io/nuget/v/J2NET.Runtime.win-x64)](https://www.nuget.org/packages/J2NET.Runtime.win-x64/) |
14-
| Windows | X86 | [![J2NET.Runtime.win-x86](https://img.shields.io/nuget/v/J2NET.Runtime.win-x86)](https://www.nuget.org/packages/J2NET.Runtime.win-x86/) |
1515

1616
## Getting Started
1717
### 1. Install NuGet package
@@ -22,7 +22,7 @@ Paste the following XML into your Project(*.csproj / .vbproj / .fsproj*) file.
2222

2323
```xml
2424
<PropertyGroup>
25-
<RuntimeVersion>1.3.1</RuntimeVersion>
25+
<RuntimeVersion>1.4.0</RuntimeVersion>
2626
<OSPlatform Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">OSX</OSPlatform>
2727
<OSPlatform Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">Linux</OSPlatform>
2828
<OSPlatform Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">Windows</OSPlatform>

‎src/J2NET.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J2NET.Runtime.linux-musl-x6
2121
EndProject
2222
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J2NET.Runtime.linux-x64", "runtimes\J2NET.Runtime.linux-x64\J2NET.Runtime.linux-x64.csproj", "{087ED79D-1C8B-4CC3-80BD-4CBDD1A6CF83}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J2NET.Runtime.win-x86", "runtimes\J2NET.Runtime.win-x86\J2NET.Runtime.win-x86.csproj", "{1DBD4AA2-2CE5-4A26-87FE-4B655FA6F2A7}"
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J2NET.Runtime.linux-musl-arm64", "runtimes\J2NET.Runtime.linux-musl-arm64\J2NET.Runtime.linux-musl-arm64.csproj", "{9FCD7D3E-927B-4D84-812B-39FE7EF0ED4A}"
2525
EndProject
2626
Global
2727
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -61,10 +61,10 @@ Global
6161
{087ED79D-1C8B-4CC3-80BD-4CBDD1A6CF83}.Debug|Any CPU.Build.0 = Debug|Any CPU
6262
{087ED79D-1C8B-4CC3-80BD-4CBDD1A6CF83}.Release|Any CPU.ActiveCfg = Release|Any CPU
6363
{087ED79D-1C8B-4CC3-80BD-4CBDD1A6CF83}.Release|Any CPU.Build.0 = Release|Any CPU
64-
{1DBD4AA2-2CE5-4A26-87FE-4B655FA6F2A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65-
{1DBD4AA2-2CE5-4A26-87FE-4B655FA6F2A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
66-
{1DBD4AA2-2CE5-4A26-87FE-4B655FA6F2A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
67-
{1DBD4AA2-2CE5-4A26-87FE-4B655FA6F2A7}.Release|Any CPU.Build.0 = Release|Any CPU
64+
{9FCD7D3E-927B-4D84-812B-39FE7EF0ED4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65+
{9FCD7D3E-927B-4D84-812B-39FE7EF0ED4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
66+
{9FCD7D3E-927B-4D84-812B-39FE7EF0ED4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
67+
{9FCD7D3E-927B-4D84-812B-39FE7EF0ED4A}.Release|Any CPU.Build.0 = Release|Any CPU
6868
EndGlobalSection
6969
GlobalSection(SolutionProperties) = preSolution
7070
HideSolutionNode = FALSE
@@ -79,6 +79,6 @@ Global
7979
{3E684521-279B-4D86-ABE9-1A88F40EFDB0} = {CA46376A-0FAA-4AA1-9B21-995EFE3954D4}
8080
{DF848049-6392-47A1-8E8D-07D34578F45C} = {CA46376A-0FAA-4AA1-9B21-995EFE3954D4}
8181
{087ED79D-1C8B-4CC3-80BD-4CBDD1A6CF83} = {CA46376A-0FAA-4AA1-9B21-995EFE3954D4}
82-
{1DBD4AA2-2CE5-4A26-87FE-4B655FA6F2A7} = {CA46376A-0FAA-4AA1-9B21-995EFE3954D4}
82+
{9FCD7D3E-927B-4D84-812B-39FE7EF0ED4A} = {CA46376A-0FAA-4AA1-9B21-995EFE3954D4}
8383
EndGlobalSection
8484
EndGlobal

‎src/runtimes/J2NET.Runtime.linux-arm64/openjre.zip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:42ae56f004468f75239b7959425afb10ad41de822da37388c749494e80669a8f
3-
size 46413665
2+
oid sha256:891a4f4249661c90f54e68f8fa41681b7e6791995a1f6f3e28d13f5b56f27e3a
3+
size 52005298

src/runtimes/J2NET.Runtime.win-x86/J2NET.Runtime.win-x86.csproj renamed to src/runtimes/J2NET.Runtime.linux-musl-arm64/J2NET.Runtime.linux-musl-arm64.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Module</OutputType>
55
<TargetFramework>netstandard2.1</TargetFramework>
6-
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
7-
<NoWarn>NU5100</NoWarn>
6+
<RuntimeIdentifier>linux-musl-arm64</RuntimeIdentifier>
87
</PropertyGroup>
98

109
</Project>

src/runtimes/J2NET.Runtime.win-x86/Logo.jpg renamed to src/runtimes/J2NET.Runtime.linux-musl-arm64/Logo.jpg

File renamed without changes.

src/runtimes/J2NET.Runtime.win-x86/build/J2NET.Runtime.win-x86.targets renamed to src/runtimes/J2NET.Runtime.linux-musl-arm64/build/J2NET.Runtime.linux-musl-arm64.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<_J2NET_Runtime_Path>runtimes\win-x86\openjre</_J2NET_Runtime_Path>
3+
<_J2NET_Runtime_Path>runtimes\linux-musl-arm64\openjre</_J2NET_Runtime_Path>
44
</PropertyGroup>
55

66
<ItemGroup>

‎src/runtimes/J2NET.Runtime.linux-musl-arm64/openjre.zip‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:fd2e077407654f453d4313c01f6922faf4a082ae85392580a85bb664ae001bd5
3+
size 52107406

‎src/runtimes/J2NET.Runtime.linux-musl-x64/openjre.zip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:cceba42e23048159ec60b60b221277dd4286993755587d09fa7c2eafb996d4f1
3-
size 46853219
2+
oid sha256:c1790273d4f7e1eb3ccbdf83fb92ad5165b3bbb3c12794813cba79af6d4cfa08
3+
size 53195686

‎src/runtimes/J2NET.Runtime.linux-x64/openjre.zip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6f08e750df53d2c38bb1acc5283379a1bc8bf0cb95b7034e646f544cb2d6e01d
3-
size 47082727
2+
oid sha256:df9052ebd205ebb9a802a7ba12bcc834d2932e4248adae339dd2517941ea8508
3+
size 53014266

‎src/runtimes/J2NET.Runtime.macOS-arm64/openjre.zip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2017d5d662b412483b01eec30896cb59307c38c66f3c7f7c6753a26bd21b6c57
3-
size 36919613
2+
oid sha256:8cc349bcf85c78ea56b7c05eab36f7dac20ee4e70d2be69aa040cff099123686
3+
size 41770548

0 commit comments

Comments
 (0)