Skip to content

Commit

Permalink
Merge dev.
Browse files Browse the repository at this point in the history
  • Loading branch information
@wasabii
wasabii committed Jan 1, 2025
2 parents 2c9ad62 + 064be94 commit 4b7dfd7
Show file tree
Hide file tree
Showing 38 changed files with 226 additions and 282 deletions.
6 changes: 4 additions & 2 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
<EnabledRuntimes Condition=" '$(EnabledRuntimes)' == '' ">$(SupportedRuntimes)</EnabledRuntimes>
<SupportedImageRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-x64;android-arm64</SupportedImageRuntimes>
<EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>
<SupportedImageBinRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedImageBinRuntimes>
<EnabledImageBinRuntimes Condition=" '$(EnabledImageBinRuntimes)' == '' ">$(SupportedImageBinRuntimes)</EnabledImageBinRuntimes>
<SupportedToolRuntimes>win-x64;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedToolRuntimes>
<EnabledToolRuntimes Condition=" '$(EnabledToolRuntimes)' == '' ">$(SupportedToolRuntimes)</EnabledToolRuntimes>

<_SupportedRuntimes>;$(SupportedRuntimes);</_SupportedRuntimes>
<_EnabledRuntimes>;$(EnabledRuntimes);</_EnabledRuntimes>
<_SupportedImageRuntimes>;$(SupportedImageRuntimes);</_SupportedImageRuntimes>
<_EnabledImageRuntimes>;$(EnabledImageRuntimes);</_EnabledImageRuntimes>
<_SupportedImageBinRuntimes>;$(SupportedImageBinRuntimes);</_SupportedImageBinRuntimes>
<_EnabledImageBinRuntimes>;$(EnabledImageBinRuntimes);</_EnabledImageBinRuntimes>
<_SupportedToolRuntimes>;$(SupportedToolRuntimes);</_SupportedToolRuntimes>
<_EnabledToolRuntimes>;$(EnabledToolRuntimes);</_EnabledToolRuntimes>
</PropertyGroup>
Expand All @@ -33,9 +37,7 @@

<ItemGroup>
<Authors Include="Jeroen Frijters" />
<Authors Include="Windward Studios" />
<Authors Include="Jerome Haltom" />
<Authors Include="Shad Storhaug" />
</ItemGroup>

<PropertyGroup Label="Copyright Info">
Expand Down
1 change: 1 addition & 0 deletions IKVM.deps.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<Choose>
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Security" />
Expand Down
35 changes: 0 additions & 35 deletions IKVM.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,40 +111,19 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "wsimport", "src\wsimport\wsimport.csproj", "{004561E2-DED0-464D-A7B9-85D98281FED4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE.runtime.linux-x64", "src\IKVM.Image.JRE.runtime.linux-x64\IKVM.Image.JRE.runtime.linux-x64.csproj", "{8068292D-8B2E-417B-B7CE-0E7159881C50}"
ProjectSection(ProjectDependencies) = postProject
{162A1F6D-7752-4686-A6C2-923633F4E4C0} = {162A1F6D-7752-4686-A6C2-923633F4E4C0}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE.runtime.win-x64", "src\IKVM.Image.JRE.runtime.win-x64\IKVM.Image.JRE.runtime.win-x64.csproj", "{27D0142E-7643-4E64-A6B2-995E76EF00A2}"
ProjectSection(ProjectDependencies) = postProject
{162A1F6D-7752-4686-A6C2-923633F4E4C0} = {162A1F6D-7752-4686-A6C2-923633F4E4C0}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JDK.runtime.linux-x64", "src\IKVM.Image.JDK.runtime.linux-x64\IKVM.Image.JDK.runtime.linux-x64.csproj", "{BE31AC7C-79CC-4180-A5E8-BEB3FD7579DC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JDK.runtime.win-x64", "src\IKVM.Image.JDK.runtime.win-x64\IKVM.Image.JDK.runtime.win-x64.csproj", "{71444CB1-778F-4DD5-9BDF-ACB310C97345}"
ProjectSection(ProjectDependencies) = postProject
{CCE3DE31-5DE7-4157-90D1-BAFA08C181EC} = {CCE3DE31-5DE7-4157-90D1-BAFA08C181EC}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image", "src\IKVM.Image\IKVM.Image.csproj", "{95C8865C-AB87-4998-880E-38B7F76BAC57}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE.runtime.win-x86", "src\IKVM.Image.JRE.runtime.win-x86\IKVM.Image.JRE.runtime.win-x86.csproj", "{CBB5E3B3-2B0F-41F3-8110-FDD9614FCE5D}"
ProjectSection(ProjectDependencies) = postProject
{162A1F6D-7752-4686-A6C2-923633F4E4C0} = {162A1F6D-7752-4686-A6C2-923633F4E4C0}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JDK.runtime.win-x86", "src\IKVM.Image.JDK.runtime.win-x86\IKVM.Image.JDK.runtime.win-x86.csproj", "{3E91FECF-80C0-463C-AD62-40062E0D313F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JDK-bin", "src\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj", "{CCE3DE31-5DE7-4157-90D1-BAFA08C181EC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE-bin", "src\IKVM.Image.JRE-bin\IKVM.Image.JRE-bin.csproj", "{162A1F6D-7752-4686-A6C2-923633F4E4C0}"
ProjectSection(ProjectDependencies) = postProject
{4F7D51D0-F52D-46EF-94DF-C4081587FBB4} = {4F7D51D0-F52D-46EF-94DF-C4081587FBB4}
{7C7BCE2E-88CE-4EA8-863E-37F6B8A824C4} = {7C7BCE2E-88CE-4EA8-863E-37F6B8A824C4}
{B2EF307F-90AA-4CFE-B7F3-FF741545E35B} = {B2EF307F-90AA-4CFE-B7F3-FF741545E35B}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "javac-ref", "src\javac-ref\javac-ref.csproj", "{5DC963FD-6742-47BB-BC96-365B82F73C88}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.JTReg.TestAdapter.Core", "src\IKVM.JTReg.TestAdapter.Core\IKVM.JTReg.TestAdapter.Core.csproj", "{DD5AEB88-DC55-43C8-81C1-2879F73C8DE0}"
Expand Down Expand Up @@ -249,8 +228,6 @@ Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libiava", "src\libiava\libi
EndProject
Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libikvm", "src\libikvm\libikvm.clangproj", "{41254D0C-F8BF-4E1B-8C28-B0F7D91D3CC3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image-bin", "src\IKVM.Image-bin\IKVM.Image-bin.csproj", "{14BA1630-54EC-4983-BB14-C0E97835CB74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.runtime.linux-arm", "src\IKVM.Image.runtime.linux-arm\IKVM.Image.runtime.linux-arm.csproj", "{4FB7E598-95D8-41D8-BF15-D0042EC7EAB6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.runtime.linux-arm64", "src\IKVM.Image.runtime.linux-arm64\IKVM.Image.runtime.linux-arm64.csproj", "{9C89C8FB-BE65-48D4-92CC-3B1CD41AC0A1}"
Expand Down Expand Up @@ -559,14 +536,6 @@ Global
{3E91FECF-80C0-463C-AD62-40062E0D313F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E91FECF-80C0-463C-AD62-40062E0D313F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E91FECF-80C0-463C-AD62-40062E0D313F}.Release|Any CPU.Build.0 = Release|Any CPU
{CCE3DE31-5DE7-4157-90D1-BAFA08C181EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CCE3DE31-5DE7-4157-90D1-BAFA08C181EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CCE3DE31-5DE7-4157-90D1-BAFA08C181EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCE3DE31-5DE7-4157-90D1-BAFA08C181EC}.Release|Any CPU.Build.0 = Release|Any CPU
{162A1F6D-7752-4686-A6C2-923633F4E4C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{162A1F6D-7752-4686-A6C2-923633F4E4C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{162A1F6D-7752-4686-A6C2-923633F4E4C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{162A1F6D-7752-4686-A6C2-923633F4E4C0}.Release|Any CPU.Build.0 = Release|Any CPU
{5DC963FD-6742-47BB-BC96-365B82F73C88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DC963FD-6742-47BB-BC96-365B82F73C88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DC963FD-6742-47BB-BC96-365B82F73C88}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -743,10 +712,6 @@ Global
{41254D0C-F8BF-4E1B-8C28-B0F7D91D3CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{41254D0C-F8BF-4E1B-8C28-B0F7D91D3CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{41254D0C-F8BF-4E1B-8C28-B0F7D91D3CC3}.Release|Any CPU.Build.0 = Release|Any CPU
{14BA1630-54EC-4983-BB14-C0E97835CB74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{14BA1630-54EC-4983-BB14-C0E97835CB74}.Debug|Any CPU.Build.0 = Debug|Any CPU
{14BA1630-54EC-4983-BB14-C0E97835CB74}.Release|Any CPU.ActiveCfg = Release|Any CPU
{14BA1630-54EC-4983-BB14-C0E97835CB74}.Release|Any CPU.Build.0 = Release|Any CPU
{4FB7E598-95D8-41D8-BF15-D0042EC7EAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FB7E598-95D8-41D8-BF15-D0042EC7EAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FB7E598-95D8-41D8-BF15-D0042EC7EAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
72 changes: 0 additions & 72 deletions src/IKVM.Image-bin/IKVM.Image-bin.csproj
View file

This file was deleted.

36 changes: 0 additions & 36 deletions src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj
View file

This file was deleted.

Loading

0 comments on commit 4b7dfd7

Please sign in to comment.