Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.NET 4.7.2 and .NET 6.0 #406

Merged
merged 11 commits into from
Aug 11, 2023
Merged

.NET 4.7.2 and .NET 6.0 #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a563604
Update all projects to at least NET472
wasabii Aug 3, 2023
e198a2c
Missed.
wasabii Aug 3, 2023
3cb14e3
Update supported versions.
wasabii Aug 4, 2023
6d473b1
Merge branch 'osxarm64' into net472
wasabii Aug 4, 2023
429a4ff
Merge branch 'osxarm64' into net472
wasabii Aug 6, 2023
be6fc59
Merge branch 'osxarm64' into net472
wasabii Aug 6, 2023
567eecc
Remove netcoreapp3.1 completely.
wasabii Aug 6, 2023
b2e6eb9
Upgrade Castle.Core.
wasabii Aug 6, 2023
20cb1e4
Merge osxarm64
wasabii Aug 9, 2023
1eae658
Merge remote-tracking branch 'origin/develop' into net472
wasabii Aug 10, 2023
188796a
Move net461 to net472. Remove core3.1.
wasabii Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,14 @@ These tasks can be done **without porting source code** to .NET.

## Support

- .NET Framework 4.6.1 and higher (SDK-style projects)
- .NET Core 3.1 and higher
- .NET 5 and higher
- .NET Framework 4.7.2 and higher (SDK-style projects)
- .NET 6 and higher
- Java SE 8
- Windows x86/x64/ARM/ARM64
- Linux x64/ARM/ARM64 (GLIBC and MUSL)
- Mac OS X x64/arm64 (with bugs)
- Mac OS X x64/arm64

Various differences exist between support for all of our different artifacts. For instance, there are some platforms we cannot distribute images for, and some platforms we cannot distribute tools for.
Various differences exist between support for all of our different artifacts. For instance, there are some platforms we cannot distribute images for and some platforms we cannot distribute tools for.

## Installation

Expand Down
0 ...loworld/net461/HelloWorldDotNet.deps.json → ...loworld/net472/HelloWorldDotNet.deps.json
View file
Open in desktop
File renamed without changes.
0 ext/helloworld/net461/HelloWorldDotNet.dll → ext/helloworld/net472/HelloWorldDotNet.dll
View file
Open in desktop
File renamed without changes.
23 changes: 0 additions & 23 deletions ext/helloworld/netcoreapp3.1/HelloWorldDotNet.deps.json
View file
Open in desktop

This file was deleted.

Binary file removed ext/helloworld/netcoreapp3.1/HelloWorldDotNet.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.ByteCode/IKVM.ByteCode.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
<LangVersion>11</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/IKVM.Image.JDK.runtime.linux-arm/IKVM.Image.JDK.runtime.linux-arm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand All @@ -20,9 +20,9 @@

<ItemGroup Condition=" '$(TargetFramework)' == '' ">
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
<SetRuntimeIdentifier>RuntimeIdentifier=linux-arm</SetRuntimeIdentifier>
<ProjectPackagePath>ikvm\net461\linux-arm\bin</ProjectPackagePath>
<ProjectPackagePath>ikvm\net472\linux-arm\bin</ProjectPackagePath>
</PublishProjectReference>
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Image.JDK.runtime.linux-arm/buildTransitive/IKVM.Image.JDK.runtime.linux-arm.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\linux-arm\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\linux-arm\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>linux-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.linux-arm/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/IKVM.Image.JDK.runtime.linux-arm64/IKVM.Image.JDK.runtime.linux-arm64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand Down
4 changes: 2 additions & 2 deletions ...VM.Image.JDK.runtime.linux-arm64/buildTransitive/IKVM.Image.JDK.runtime.linux-arm64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\linux-arm64\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\linux-arm64\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.linux-arm64/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/IKVM.Image.JDK.runtime.linux-musl-arm/IKVM.Image.JDK.runtime.linux-musl-arm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand All @@ -20,9 +20,9 @@

<ItemGroup Condition=" '$(TargetFramework)' == '' ">
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
<SetRuntimeIdentifier>RuntimeIdentifier=linux-musl-arm</SetRuntimeIdentifier>
<ProjectPackagePath>ikvm\net461\linux-musl-arm\bin</ProjectPackagePath>
<ProjectPackagePath>ikvm\net472\linux-musl-arm\bin</ProjectPackagePath>
</PublishProjectReference>
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions ...ge.JDK.runtime.linux-musl-arm/buildTransitive/IKVM.Image.JDK.runtime.linux-musl-arm.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\linux-musl-arm\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\linux-musl-arm\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>linux-musl-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.linux-musl-arm/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/IKVM.Image.JDK.runtime.linux-musl-arm64/IKVM.Image.JDK.runtime.linux-musl-arm64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.linux-musl-arm64/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/IKVM.Image.JDK.runtime.linux-musl-x64/IKVM.Image.JDK.runtime.linux-musl-x64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand All @@ -20,9 +20,9 @@

<ItemGroup Condition=" '$(TargetFramework)' == '' ">
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
<SetRuntimeIdentifier>RuntimeIdentifier=linux-musl-x64</SetRuntimeIdentifier>
<ProjectPackagePath>ikvm\net461\linux-musl-x64\bin</ProjectPackagePath>
<ProjectPackagePath>ikvm\net472\linux-musl-x64\bin</ProjectPackagePath>
</PublishProjectReference>
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions ...ge.JDK.runtime.linux-musl-x64/buildTransitive/IKVM.Image.JDK.runtime.linux-musl-x64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\linux-musl-x64\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\linux-musl-x64\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>linux-musl-x64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.linux-musl-x64/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/IKVM.Image.JDK.runtime.linux-x64/IKVM.Image.JDK.runtime.linux-x64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand All @@ -20,9 +20,9 @@

<ItemGroup Condition=" '$(TargetFramework)' == '' ">
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
<SetRuntimeIdentifier>RuntimeIdentifier=linux-x64</SetRuntimeIdentifier>
<ProjectPackagePath>ikvm\net461\linux-x64\bin</ProjectPackagePath>
<ProjectPackagePath>ikvm\net472\linux-x64\bin</ProjectPackagePath>
</PublishProjectReference>
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Image.JDK.runtime.linux-x64/buildTransitive/IKVM.Image.JDK.runtime.linux-x64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\linux-x64\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\linux-x64\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.linux-x64/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/IKVM.Image.JDK.runtime.osx-arm64/IKVM.Image.JDK.runtime.osx-arm64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Image.JDK.runtime.osx-arm64/buildTransitive/IKVM.Image.JDK.runtime.osx-arm64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\osx-arm64\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\osx-arm64\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.osx-arm64/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/IKVM.Image.JDK.runtime.osx-x64/IKVM.Image.JDK.runtime.osx-x64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand All @@ -20,9 +20,9 @@

<ItemGroup Condition=" '$(TargetFramework)' == '' ">
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
<SetRuntimeIdentifier>RuntimeIdentifier=osx-x64</SetRuntimeIdentifier>
<ProjectPackagePath>ikvm\net461\osx-x64\bin</ProjectPackagePath>
<ProjectPackagePath>ikvm\net472\osx-x64\bin</ProjectPackagePath>
</PublishProjectReference>
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Image.JDK.runtime.osx-x64/buildTransitive/IKVM.Image.JDK.runtime.osx-x64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\osx-x64\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\osx-x64\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.osx-x64/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/IKVM.Image.JDK.runtime.win7-x64/IKVM.Image.JDK.runtime.win7-x64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand All @@ -20,9 +20,9 @@

<ItemGroup Condition=" '$(TargetFramework)' == '' ">
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
<SetRuntimeIdentifier>RuntimeIdentifier=win7-x64</SetRuntimeIdentifier>
<ProjectPackagePath>ikvm\net461\win7-x64\bin</ProjectPackagePath>
<ProjectPackagePath>ikvm\net472\win7-x64\bin</ProjectPackagePath>
</PublishProjectReference>
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Image.JDK.runtime.win7-x64/buildTransitive/IKVM.Image.JDK.runtime.win7-x64.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\win7-x64\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\win7-x64\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.win7-x64/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/IKVM.Image.JDK.runtime.win7-x86/IKVM.Image.JDK.runtime.win7-x86.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand All @@ -20,9 +20,9 @@

<ItemGroup Condition=" '$(TargetFramework)' == '' ">
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
<SetRuntimeIdentifier>RuntimeIdentifier=win7-x86</SetRuntimeIdentifier>
<ProjectPackagePath>ikvm\net461\win7-x86\bin</ProjectPackagePath>
<ProjectPackagePath>ikvm\net472\win7-x86\bin</ProjectPackagePath>
</PublishProjectReference>
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Image.JDK.runtime.win7-x86/buildTransitive/IKVM.Image.JDK.runtime.win7-x86.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\win7-x86\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\win7-x86\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.win7-x86/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/IKVM.Image.JDK.runtime.win81-arm/IKVM.Image.JDK.runtime.win81-arm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">
<PropertyGroup>
<TargetFrameworks>net461;net6.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM JDK Runtime Image</Description>
Expand All @@ -20,9 +20,9 @@

<ItemGroup Condition=" '$(TargetFramework)' == '' ">
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
<SetRuntimeIdentifier>RuntimeIdentifier=win81-arm</SetRuntimeIdentifier>
<ProjectPackagePath>ikvm\net461\win81-arm\bin</ProjectPackagePath>
<ProjectPackagePath>ikvm\net472\win81-arm\bin</ProjectPackagePath>
</PublishProjectReference>
<PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
<SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Image.JDK.runtime.win81-arm/buildTransitive/IKVM.Image.JDK.runtime.win81-arm.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\win81-arm\**\*">
<TargetFramework>net461</TargetFramework>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net472\win81-arm\**\*">
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifier>win81-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
Expand Down
1 change: 0 additions & 1 deletion src/IKVM.Image.JDK.runtime.win81-arm/lib/netcoreapp3.1/_._
View file
Open in desktop

This file was deleted.

Loading