Skip to content

Commit 6428466

Browse files
wasabiiwasabii
committed
Merge branch 'develop' into osx14
2 parents c423980 + bce1bc7 commit 6428466

File tree

155 files changed

+4395
-6999
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+4395
-6999
lines changed

‎IKVM.sln

+24-6
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ EndProject
5353
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.MSBuild.Tasks.Tests", "src\IKVM.MSBuild.Tasks.Tests\IKVM.MSBuild.Tasks.Tests.csproj", "{E7C0E8FA-F34C-48C6-AD55-FD9798F5BC71}"
5454
EndProject
5555
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java", "src\IKVM.Java\IKVM.Java.msbuildproj", "{ABD81C7E-F986-4018-986E-ACAF82C64D3A}"
56-
ProjectSection(ProjectDependencies) = postProject
57-
{0A87FF49-AC9D-479A-ACBB-F4028A0BE1F7} = {0A87FF49-AC9D-479A-ACBB-F4028A0BE1F7}
58-
{17979A73-C0CE-41CD-B54F-4E72B998E6D0} = {17979A73-C0CE-41CD-B54F-4E72B998E6D0}
59-
{2F29E48C-63C3-4E47-BCBA-A7454B9119CF} = {2F29E48C-63C3-4E47-BCBA-A7454B9119CF}
60-
{50954AE0-E513-4CE7-AC8E-F3896CA0BEB7} = {50954AE0-E513-4CE7-AC8E-F3896CA0BEB7}
61-
EndProjectSection
56+
EndProject
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java.runtime.linux", "src\IKVM.Java.runtime.linux\IKVM.Java.runtime.linux.msbuildproj", "{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}"
58+
EndProject
59+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java.runtime.win", "src\IKVM.Java.runtime.win\IKVM.Java.runtime.win.msbuildproj", "{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}"
60+
EndProject
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java.runtime.osx", "src\IKVM.Java.runtime.osx\IKVM.Java.runtime.osx.msbuildproj", "{C6BC9419-F394-4B59-A707-F9A82A3FE625}"
6262
EndProject
6363
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.NET.Sdk", "src\IKVM.NET.Sdk\IKVM.NET.Sdk.msbuildproj", "{704BD7C7-7746-4D72-A86E-ECFE7BBD80CC}"
6464
EndProject
@@ -325,6 +325,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.runtime.win-arm6
325325
EndProject
326326
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Reflection.Tests", "src\IKVM.Reflection.Tests\IKVM.Reflection.Tests.csproj", "{17755A44-22EC-4D28-B219-3C5CAE6317C8}"
327327
EndProject
328+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java.Tests.Util", "src\IKVM.Java.Tests.Util\IKVM.Java.Tests.Util.csproj", "{00AFE142-5F4F-48DD-90C1-20CC0512C43C}"
329+
EndProject
328330
Global
329331
GlobalSection(SolutionConfigurationPlatforms) = preSolution
330332
Debug|Any CPU = Debug|Any CPU
@@ -387,6 +389,18 @@ Global
387389
{ABD81C7E-F986-4018-986E-ACAF82C64D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
388390
{ABD81C7E-F986-4018-986E-ACAF82C64D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
389391
{ABD81C7E-F986-4018-986E-ACAF82C64D3A}.Release|Any CPU.Build.0 = Release|Any CPU
392+
{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
393+
{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}.Debug|Any CPU.Build.0 = Debug|Any CPU
394+
{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}.Release|Any CPU.ActiveCfg = Release|Any CPU
395+
{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}.Release|Any CPU.Build.0 = Release|Any CPU
396+
{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
397+
{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}.Debug|Any CPU.Build.0 = Debug|Any CPU
398+
{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}.Release|Any CPU.ActiveCfg = Release|Any CPU
399+
{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}.Release|Any CPU.Build.0 = Release|Any CPU
400+
{C6BC9419-F394-4B59-A707-F9A82A3FE625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
401+
{C6BC9419-F394-4B59-A707-F9A82A3FE625}.Debug|Any CPU.Build.0 = Debug|Any CPU
402+
{C6BC9419-F394-4B59-A707-F9A82A3FE625}.Release|Any CPU.ActiveCfg = Release|Any CPU
403+
{C6BC9419-F394-4B59-A707-F9A82A3FE625}.Release|Any CPU.Build.0 = Release|Any CPU
390404
{704BD7C7-7746-4D72-A86E-ECFE7BBD80CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
391405
{704BD7C7-7746-4D72-A86E-ECFE7BBD80CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
392406
{704BD7C7-7746-4D72-A86E-ECFE7BBD80CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -803,6 +817,10 @@ Global
803817
{17755A44-22EC-4D28-B219-3C5CAE6317C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
804818
{17755A44-22EC-4D28-B219-3C5CAE6317C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
805819
{17755A44-22EC-4D28-B219-3C5CAE6317C8}.Release|Any CPU.Build.0 = Release|Any CPU
820+
{00AFE142-5F4F-48DD-90C1-20CC0512C43C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
821+
{00AFE142-5F4F-48DD-90C1-20CC0512C43C}.Debug|Any CPU.Build.0 = Debug|Any CPU
822+
{00AFE142-5F4F-48DD-90C1-20CC0512C43C}.Release|Any CPU.ActiveCfg = Release|Any CPU
823+
{00AFE142-5F4F-48DD-90C1-20CC0512C43C}.Release|Any CPU.Build.0 = Release|Any CPU
806824
EndGlobalSection
807825
GlobalSection(SolutionProperties) = preSolution
808826
HideSolutionNode = FALSE

‎openjdk.props

+11-75
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22
<ItemDefinitionGroup>
33
<OpenJdkSource>
44
<SourcePath>%(Identity)</SourcePath>
5+
<PackagePath></PackagePath>
6+
<RuntimeIdentifier></RuntimeIdentifier>
57
</OpenJdkSource>
8+
<OpenJdkClass>
9+
<RuntimeIdentifier></RuntimeIdentifier>
10+
</OpenJdkClass>
11+
<OpenJdkResource>
12+
<RuntimeIdentifier></RuntimeIdentifier>
13+
</OpenJdkResource>
614
</ItemDefinitionGroup>
715

816
<ItemGroup>
@@ -1348,33 +1356,7 @@
13481356
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\ftp\FtpReplyCode.java" />
13491357
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\ftp\impl\DefaultFtpClientProvider.java" />
13501358
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\ftp\impl\FtpClient.java" />
1351-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\AuthFilter.java" />
1352-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ChunkedInputStream.java" />
1353-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ChunkedOutputStream.java" />
1354-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\Code.java" />
1355-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ContextList.java" />
1356-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\DefaultHttpServerProvider.java" />
1357-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\Event.java" />
1358-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ExchangeImpl.java" />
1359-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\FixedLengthInputStream.java" />
1360-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\FixedLengthOutputStream.java" />
1361-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpConnection.java" />
1362-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpContextImpl.java" />
1363-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpError.java" />
1364-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpExchangeImpl.java" />
1365-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpServerImpl.java" />
1366-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpsExchangeImpl.java" />
1367-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpsServerImpl.java" />
1368-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\LeftOverInputStream.java" />
1369-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\Request.java" />
1370-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ServerConfig.java" />
1371-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ServerImpl.java" />
1372-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\SSLStreams.java" />
1373-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\StreamClosedException.java" />
1374-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\TimeSource.java" />
1375-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\UndefLengthOutputStream.java" />
1376-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\UnmodifiableHeaders.java" />
1377-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\WriteFinishedEvent.java" />
1359+
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\**\*.java" PackagePath="sun\net\httpserver" />
13781360
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\idn\Punycode.java" />
13791361
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\idn\StringPrep.java" />
13801362
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\idn\StringPrepDataReader.java" />
@@ -1537,42 +1519,7 @@
15371519
<OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\share\classes\sun\security\jgss\wrapper\SunNativeProvider.java" />
15381520
<OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\share\classes\sun\security\pkcs11\**\*.java" />
15391521
<OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\share\classes\sun\security\smartcardio\**\*.java" />
1540-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\AccumulativeRunnable.java" />
1541-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\BakedArrayList.java" />
1542-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\CachedPainter.java" />
1543-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\DefaultLayoutStyle.java" />
1544-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\DefaultLookup.java" />
1545-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\FilePane.java" />
1546-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\icon\SortArrowIcon.java" />
1547-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\ImageCache.java" />
1548-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\ImageIconUIResource.java" />
1549-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\JLightweightFrame.java" />
1550-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\LightweightContent.java" />
1551-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\MenuItemCheckIconFactory.java" />
1552-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\MenuItemLayoutHelper.java" />
1553-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\GTKKeybindings.java" />
1554-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\DefaultSynthStyle.java" />
1555-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\Paint9Painter.java" />
1556-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\StyleAssociation.java" />
1557-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\SynthFileChooserUI.java" />
1558-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\SynthFileChooserUIImpl.java" />
1559-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\SynthIcon.java" />
1560-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\windows\ClassicSortArrowIcon.java" />
1561-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\WindowsKeybindings.java" />
1562-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\PrintColorUIResource.java" />
1563-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\PrintingStatus.java" />
1564-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\StringUIClientPropertyKey.java" />
1565-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\SwingAccessor.java" />
1566-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\SwingLazyValue.java" />
1567-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\SwingUtilities2.java" />
1568-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\table\DefaultTableCellHeaderRenderer.java" />
1569-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\text\CompoundPrintable.java" />
1570-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\text\CountingPrintable.java" />
1571-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\text\html\FrameEditorPaneTag.java" />
1572-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\text\TextComponentPrintable.java" />
1573-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\UIAction.java" />
1574-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\UIClientPropertyKey.java" />
1575-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\WindowsPlacesBar.java" />
1522+
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\**\*.java" PackagePath="sun\swing" />
15761523
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\text\**\*.java" PackagePath="sun\text" />
15771524
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\tools\**\*.java" PackagePath="sun\tools" />
15781525
<OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\share\classes\sun\tools\attach\**\*.java" />
@@ -1674,18 +1621,7 @@
16741621
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\util\spi\CalendarProvider.java" />
16751622
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\util\spi\XmlPropertiesProvider.java" />
16761623
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\util\xml\PlatformXmlPropertiesProvider.java" />
1677-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\JarFileSystemProvider.java" />
1678-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipCoder.java" />
1679-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipConstants.java" />
1680-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipDirectoryStream.java" />
1681-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileAttributes.java" />
1682-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileAttributeView.java" />
1683-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileStore.java" />
1684-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileSystem.java" />
1685-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileSystemProvider.java" />
1686-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipInfo.java" />
1687-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipPath.java" />
1688-
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipUtils.java" />
1624+
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\**\*.java" PackagePath="com\sun\nio\zipfs" />
16891625
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\solaris\classes\java\io\UnixFileSystem.java" />
16901626
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\solaris\classes\java\util\prefs\FileSystemPreferences.java" />
16911627
<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\solaris\classes\java\util\prefs\FileSystemPreferencesFactory.java" />

‎src/IKVM.Image.JDK.runtime.win-arm64/IKVM.Image.JDK.runtime.win-arm64.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<IncludeSymbols>false</IncludeSymbols>
88
<ImageRuntimeIdentifier>win-arm64</ImageRuntimeIdentifier>
99
<ImageBinProject>..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj</ImageBinProject>
10-
<SupportedImageTargetFrameworks>net6.0</SupportedImageTargetFrameworks>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎src/IKVM.Image.JDK.runtime.win-arm64/buildTransitive/IKVM.Image.JDK.runtime.win-arm64.props

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
1010
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
1111
</IkvmImageItem>
12+
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\win-arm64\**\*">
13+
<TargetFramework>net472</TargetFramework>
14+
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
15+
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
16+
</IkvmImageItem>
1217
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\win-arm64\**\*">
1318
<TargetFramework>net6.0</TargetFramework>
1419
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>

‎src/IKVM.Image.JRE.runtime.win-arm64/IKVM.Image.JRE.runtime.win-arm64.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<IncludeSymbols>false</IncludeSymbols>
88
<ImageRuntimeIdentifier>win-arm64</ImageRuntimeIdentifier>
99
<ImageBinProject>..\IKVM.Image.JRE-bin\IKVM.Image.JRE-bin.csproj</ImageBinProject>
10-
<SupportedImageTargetFrameworks>net6.0</SupportedImageTargetFrameworks>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎src/IKVM.Image.JRE.runtime.win-arm64/buildTransitive/IKVM.Image.JRE.runtime.win-arm64.props

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
1010
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
1111
</IkvmImageItem>
12+
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\win-arm64\**\*">
13+
<TargetFramework>net472</TargetFramework>
14+
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
15+
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
16+
</IkvmImageItem>
1217
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\win-arm64\**\*">
1318
<TargetFramework>net6.0</TargetFramework>
1419
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>

‎src/IKVM.Image.runtime.win-arm64/IKVM.Image.runtime.win-arm64.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<IncludeSymbols>false</IncludeSymbols>
88
<ImageRuntimeIdentifier>win-arm64</ImageRuntimeIdentifier>
99
<ImageBinProject>..\IKVM.Image-bin\IKVM.Image-bin.csproj</ImageBinProject>
10-
<SupportedImageTargetFrameworks>net6.0</SupportedImageTargetFrameworks>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎src/IKVM.Image.runtime.win-arm64/buildTransitive/IKVM.Image.runtime.win-arm64.props

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
1010
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
1111
</IkvmImageItem>
12+
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\win-arm64\**\*">
13+
<TargetFramework>net472</TargetFramework>
14+
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
15+
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
16+
</IkvmImageItem>
1217
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\win-arm64\**\*">
1318
<TargetFramework>net6.0</TargetFramework>
1419
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>

‎src/IKVM.Java.Tests.Util/IKVM.Java.Tests.Util.csproj

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
4+
</PropertyGroup>
5+
6+
<ItemGroup>
7+
<PackageReference Include="CliWrap" Version="3.4.1" />
8+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" />
9+
<PackageReference Include="System.Reflection.Metadata" Version="8.0.0" />
10+
</ItemGroup>
11+
12+
<Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.deps.targets" />
13+
<Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.refs.targets" />
14+
</Project>

‎src/IKVM.Tests.Util/InMemoryCodeUnit.cs ‎src/IKVM.Java.Tests.Util/InMemoryCodeUnit.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace IKVM.Tests.Util
3+
namespace IKVM.Java.Tests.Util
44
{
55
/// <summary>
66
/// Represents a unit of code to compile.

‎src/IKVM.Tests.Util/InMemoryCompiler.cs ‎src/IKVM.Java.Tests.Util/InMemoryCompiler.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
using javax.tools;
1010

11-
namespace IKVM.Tests.Util
11+
namespace IKVM.Java.Tests.Util
1212
{
1313

1414
/// <summary>
@@ -174,7 +174,6 @@ public override CharSequence getCharContent(bool ignoreEncodingErrors)
174174
public InMemoryCompiler(InMemoryCodeUnit[] source)
175175
{
176176
this.compiler = ToolProvider.getSystemJavaCompiler() ?? throw new System.Exception();
177-
178177
this.units = source ?? throw new ArgumentNullException(nameof(source));
179178
this.files = new InMemoryForwardingJavaFileManager(compiler.getStandardFileManager(null, null, null), streams);
180179
}

0 commit comments

Comments
 (0)