epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Microsoft.DotNet.PlatformAbstractions

Browse Source
This commit is contained in:
teinarss
2021-09-26 15:44:12 +02:00
committed by abcdefg30
parent 80b6a5a27f
commit 289c4ef2b7
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -7,7 +7,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(Mono)' == ''"> <ItemGroup Condition="'$(Mono)' == ''">
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" /> <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
OpenRA.Game/Support/AssemblyLoader.cs
View File

@@ -310,7 +310,7 @@ namespace OpenRA.Support
? dependencyContext.RuntimeGraph ? dependencyContext.RuntimeGraph
: DependencyContext.Default.RuntimeGraph; : DependencyContext.Default.RuntimeGraph;
var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier(); var rid = RuntimeInformation.RuntimeIdentifier;
var fallbackRid = GetFallbackRid(); var fallbackRid = GetFallbackRid();
var fallbackGraph = ridGraph.FirstOrDefault(g => g.Runtime == rid) var fallbackGraph = ridGraph.FirstOrDefault(g => g.Runtime == rid)
?? ridGraph.FirstOrDefault(g => g.Runtime == fallbackRid) ?? ridGraph.FirstOrDefault(g => g.Runtime == fallbackRid)