Skip to content

Commit 95e58fb

Browse files
committed
Added ResolveNearestRuntimeIdentifier. Removed teh Match thing, since it wasn't quite correct.
1 parent c9f5314 commit 95e58fb

6 files changed

+506
-326
lines changed

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<LangVersion Condition=" '$(LangVersion)' == '' ">10.0</LangVersion>
3+
<LangVersion Condition=" '$(LangVersion)' == '' ">12</LangVersion>
44
<UseIkvmCoreTasks>false</UseIkvmCoreTasks>
55
<AutoGenerateBindingRedirects Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">true</AutoGenerateBindingRedirects>
66
<GenerateBindingRedirectsOutputType Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">true</GenerateBindingRedirectsOutputType>

src/IKVM.Core.MSBuild.Tasks.Test/MatchCompatibleRuntimeIdentifierItemsTests.cs

-138
This file was deleted.

src/IKVM.Core.MSBuild.Tasks/IKVM.Core.MSBuild.Tasks.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
1212
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" GeneratePathProperty="true" />
1313
<PackageReference Include="System.Reflection.Metadata" Version="7.0.2" GeneratePathProperty="true" />
14-
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" GeneratePathProperty="true" />
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_Platforms)\runtime.json" LogicalName="runtime.json" Link="runtime.json" />
17+
<EmbeddedResource Include="$(RuntimeIdentifierGraphPath)" LogicalName="runtime.json" Link="runtime.json" />
1918
</ItemGroup>
2019

2120
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

src/IKVM.Core.MSBuild.Tasks/MatchCompatibleRuntimeIdentifierItems.cs

-185
This file was deleted.

0 commit comments

Comments
 (0)