Skip to content

Commit

Permalink
Merge pull request ikvmnet#521 from ikvmnet/platio
Browse files Browse the repository at this point in the history
Platform Specific IO, Security, Base Libs
  • Loading branch information
wasabii authored May 20, 2024
2 parents 30ba2f5 + 55499ff commit 63c9721
Show file tree
Hide file tree
Showing 311 changed files with 9,108 additions and 27,149 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/IKVM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,12 @@ jobs:
- test
runs-on: ubuntu-latest
steps:
- name: Free Disk Space (Linux)
uses: jlumbroso/free-disk-space@main
with:
dotnet: false
swap-storage: false
large-packages: false
- name: Checkout Source
uses: actions/checkout@v4
with:
Expand Down
12 changes: 6 additions & 6 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<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</SupportedImageRuntimes>
<EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>

<!--<EnabledRuntimes>win-x64</EnabledRuntimes>
<EnabledToolRuntimes>win-x64</EnabledToolRuntimes>
<EnabledImageRuntimes>win-x64</EnabledImageRuntimes>-->
<!--<EnabledRuntimes>win-x64;win-x86;linux-x64</EnabledRuntimes>
<EnabledToolRuntimes>win-x64;win-x86;linux-x64</EnabledToolRuntimes>
<EnabledImageRuntimes>win-x64;win-x86;linux-x64</EnabledImageRuntimes>-->

<_SupportedRuntimes>;$(SupportedRuntimes);</_SupportedRuntimes>
<_EnabledRuntimes>;$(EnabledRuntimes);</_EnabledRuntimes>
Expand Down Expand Up @@ -101,13 +101,13 @@
<IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmc\ikvmc.csproj" IsIkvmCompiler="true" />
<IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmstub\ikvmstub.csproj" IsIkvmExporter="true" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="IKVM.Core.MSBuild" Version="0.1.93">
<PackageReference Include="IKVM.Core.MSBuild" Version="0.1.102">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion IKVM.deps.targets
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.Text.Json" Version="6.0.6" />
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>
</When>
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
Expand Down
10 changes: 5 additions & 5 deletions IKVM.libs.targets
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project>
<ItemGroup>
<_ReferencedClangProjects Include="$(MSBuildThisFileDirectory)src\libikvm\libikvm.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)src\libikvm\libikvm.clangproj" />
</ItemGroup>

<Target Name="GetClangProjectReferencesByRuntime" Inputs="@(_ReferencedClangProjects)" Outputs="%(_ReferencedClangProjects.Identity)\null" BeforeTargets="AssignClangProjectConfiguration">
<Target Name="GetDotNetClangProjectReferencesByRuntime" Inputs="@(DotNetClangProjectReference)" Outputs="%(DotNetClangProjectReference.Identity)\null" BeforeTargets="AssignClangProjectConfiguration">
<PropertyGroup>
<__SupportedRuntimes>%(_ReferencedClangProjects.SupportedRuntimes)</__SupportedRuntimes>
<__SupportedRuntimes>%(DotNetClangProjectReference.SupportedRuntimes)</__SupportedRuntimes>
<__SupportedRuntimes Condition=" '$(__SupportedRuntimes)' == '' ">$(_SupportedRuntimes)</__SupportedRuntimes>
</PropertyGroup>
<ItemGroup>
<__SupportedRuntimes Include="$(__SupportedRuntimes)" />
</ItemGroup>
<ItemGroup>
<_ReferencedClangProjectReference Remove="@(_ReferencedClangProjectReference)" />
<_ReferencedClangProjectReference Include="@(_ReferencedClangProjects)">
<_ReferencedClangProjectReference Include="@(DotNetClangProjectReference)">
<RuntimeIdentifier>%(__SupportedRuntimes.Identity)</RuntimeIdentifier>
</_ReferencedClangProjectReference>
<ClangProjectReference Include="@(_ReferencedClangProjectReference)" Condition="$(_EnabledRuntimes.Contains(';%(RuntimeIdentifier);'))">
Expand All @@ -25,7 +25,7 @@
<PropertyGroup>
<GetClangProjectReferencesDependsOn>
$(GetClangProjectReferencesDependsOn);
GetClangProjectReferencesByRuntime;
GetDotNetClangProjectReferencesByRuntime;
</GetClangProjectReferencesDependsOn>
</PropertyGroup>

Expand Down
Loading

0 comments on commit 63c9721

Please sign in to comment.