Skip to content

Commit 85a096b

Browse files
tmarkovskitmarkovski
committed
Add simulator target correctly and use full path resolution
Corrects a bug - dotnet/runtime#62410
1 parent a02c15f commit 85a096b

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

‎dotnet/Library/Okapi/Okapi.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFrameworks>net6.0;net6.0-ios</TargetFrameworks>
77
<LangVersion>latest</LangVersion>
88
<SkipNativeLibsCopy>false</SkipNativeLibsCopy>
9-
<Protobuf_ToolsOs Condition="'$([MSBuild]::IsOsPlatform(OSX))'">macosx</Protobuf_ToolsOs>
109
</PropertyGroup>
1110

1211
<PropertyGroup>
@@ -17,14 +16,24 @@
1716

1817
<ItemGroup>
1918
<PackageReference Include="Google.Protobuf" Version="3.17.3" />
20-
<PackageReference Include="Grpc" Version="2.38.0" />
19+
<PackageReference Include="Grpc" Version="2.38.0" PrivateAssets="All" />
2120
<PackageReference Include="Grpc.Tools" Version="2.38.0" PrivateAssets="All" />
2221
</ItemGroup>
2322

23+
<ItemGroup>
24+
<Protobuf Include="..\..\..\proto\okapi\keys\v1\keys.proto" Link="Protobuf/keys.proto" ProtoRoot="..\..\..\proto" />
25+
<Protobuf Include="..\..\..\proto\okapi\transport\v1\transport.proto" Link="Protobuf/transport.proto" ProtoRoot="..\..\..\proto" />
26+
<Protobuf Include="..\..\..\proto\okapi\proofs\v1\proofs.proto" Link="Protobuf/proofs.proto" ProtoRoot="..\..\..\proto" />
27+
<Protobuf Include="..\..\..\proto\okapi\security\v1\security.proto" Link="Protobuf/security.proto" ProtoRoot="..\..\..\proto"/>
28+
<Protobuf Include="..\..\..\proto\pbmse\v1\pbmse.proto" Link="Protobuf/pbmse/pbmse.proto" ProtoRoot="..\..\..\proto" />
29+
<Protobuf Include="..\..\..\proto\okapi\examples\v1\examples.proto" Link="Protobuf/examples.proto" ProtoRoot="..\..\..\proto" />
30+
</ItemGroup>
31+
2432
<ItemGroup>
2533
<None Include="..\..\..\libs\macos\libokapi.dylib" PackagePath="native/macos/libokapi.dylib" Pack="true" Visible="false" />
2634
<None Include="..\..\..\libs\ios\libokapi.a" PackagePath="native/ios/libokapi.a" Pack="true" Visible="false" />
2735
<None Include="..\..\..\libs\ios\libokapi_simulator.a" PackagePath="native/ios/libokapi_simulator.a" Pack="true" Visible="false" />
36+
<None Include="..\..\..\libs\ios\libokapi_maccatalyst.a" PackagePath="native/ios/libokapi_maccatalyst.a" Pack="true" Visible="false" />
2837
<None Include="..\..\..\libs\linux\libokapi.so" PackagePath="native/linux/libokapi.so" Pack="true" Visible="false" />
2938
<None Include="..\..\..\libs\windows\okapi.dll" PackagePath="native/windows/okapi.dll" Pack="true" Visible="false" />
3039
<None Include="..\..\..\libs\android\arm64-v8a\libokapi.so" PackagePath="native/android/arm64-v8a/libokapi.so" Pack="true" Visible="false" />
@@ -34,26 +43,17 @@
3443
<None Include="..\..\..\libs\wasm\libokapi.a" PackagePath="native/wasm/okapi.a" Pack="true" Visible="false" />
3544
</ItemGroup>
3645

37-
<ItemGroup>
38-
<Protobuf Include="..\..\..\proto\okapi\keys\v1\keys.proto" Link="Protobuf/keys.proto" ProtoRoot="..\..\..\proto" />
39-
<Protobuf Include="..\..\..\proto\okapi\transport\v1\transport.proto" Link="Protobuf/transport.proto" ProtoRoot="..\..\..\proto" />
40-
<Protobuf Include="..\..\..\proto\okapi\proofs\v1\proofs.proto" Link="Protobuf/proofs.proto" ProtoRoot="..\..\..\proto" />
41-
<Protobuf Include="..\..\..\proto\okapi\security\v1\security.proto" Link="Protobuf/security.proto" ProtoRoot="..\..\..\proto"/>
42-
<Protobuf Include="..\..\..\proto\pbmse\v1\pbmse.proto" Link="Protobuf/pbmse/pbmse.proto" ProtoRoot="..\..\..\proto" />
43-
<Protobuf Include="..\..\..\proto\okapi\examples\v1\examples.proto" Link="Protobuf/examples.proto" ProtoRoot="..\..\..\proto" />
44-
</ItemGroup>
45-
4646
<ItemGroup>
4747
<Content Include="build\net\Okapi.Net.targets" Pack="true" PackagePath="build/net6.0" Visible="false" />
4848
<Content Include="build\ios\Okapi.Net.targets" Pack="true" PackagePath="build/net6.0-ios15.0" Visible="false" />
4949
<Content Include="build\android\Okapi.Net.targets" Pack="true" PackagePath="build/net6.0-android31.0" Visible="false" />
50-
<Content Include="build\iossimulator\Okapi.Net.targets" Pack="true" PackagePath="build/net6.0-iossimulator15.0" Visible="false" />
50+
<Content Include="build\maccatalyst\Okapi.Net.targets" Pack="true" PackagePath="build/net6.0-maccatalyst15.0" Visible="false" />
5151
</ItemGroup>
5252

5353
<ItemGroup>
5454
<None Update="build\net\Okapi.Net.targets" Visible="false" />
5555
<None Update="build\ios\Okapi.Net.targets" Visible="false" />
56-
<None Update="build\iossimulator\Okapi.Net.targets" Visible="false" />
56+
<None Update="build\maccatalyst\Okapi.Net.targets" Visible="false" />
5757
<None Update="build\android\Okapi.Net.targets" Visible="false" />
5858
</ItemGroup>
5959

‎dotnet/Library/Okapi/build/ios/Okapi.Net.targets‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<ItemGroup>
5-
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\native\ios\libokapi.a">
4+
<ItemGroup Condition="!$(RuntimeIdentifier.Contains('iossimulator'))">
5+
<NativeReference Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\native\ios\libokapi.a'))">
6+
<Kind>Static</Kind>
7+
<ForceLoad>True</ForceLoad>
8+
</NativeReference>
9+
</ItemGroup>
10+
11+
<ItemGroup Condition="$(RuntimeIdentifier.Contains('iossimulator'))">
12+
<NativeReference Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\native\ios\libokapi_simulator.a'))">
613
<Kind>Static</Kind>
714
<ForceLoad>True</ForceLoad>
815
</NativeReference>

dotnet/Library/Okapi/build/iossimulator/Okapi.Net.targets renamed to dotnet/Library/Okapi/build/maccatalyst/Okapi.Net.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

44
<ItemGroup>
5-
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\native\ios\libokapi_simulator.a">
5+
<NativeReference Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\native\ios\libokapi_maccatalyst.a'))">
66
<Kind>Static</Kind>
77
<ForceLoad>True</ForceLoad>
88
</NativeReference>

0 commit comments

Comments
 (0)