Skip to content

Revert 34138d7 #1

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

Merged
AdamEssenmacher merged 6 commits into from
Apr 5, 2023
Merged

Revert 34138d7 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32eeb97
Removing _NativeRefernce workaround from 34138d7 as .NET supports xcf…
AdamEssenmacher Apr 5, 2023
bf6b69e
Removing _NativeRefernce workaround from 34138d7 as .NET supports xcf…
AdamEssenmacher Apr 5, 2023
3dbd6b7
Removing _NativeRefernce workaround from 34138d7 as .NET supports xcf…
AdamEssenmacher Apr 5, 2023
adddd07
Removing _NativeRefernce workaround from 34138d7 as .NET supports xcf…
AdamEssenmacher Apr 5, 2023
4597c25
Removing _NativeRefernce workaround from 34138d7 as .NET supports xcf…
AdamEssenmacher Apr 5, 2023
13ea72a
Removing _NativeRefernce workaround from 34138d7 as .NET supports xcf…
AdamEssenmacher Apr 5, 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
21 changes: 7 additions & 14 deletions source/Firebase/ABTesting/ABTesting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,19 @@
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<None Include="ABTesting.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.ABTesting.targets" />
<None Include="ABTesting.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.ABTesting.targets" />
<None Include="External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
<None Include="License.md" Pack="True" PackagePath="License.md" />
<None Include="../../../icons/firebaseiosabtesting_128x128.png" Pack="True" PackagePath="firebaseiosabtesting_128x128.png" />
</ItemGroup>
<!-- An iOS app project cannot find Xcframeworks within a NuGet if a TFM
previous than net6.0-ios is used.
https://github.com/xamarin/xamarin-macios/issues/13693
You must include the Xcframework's NativeReference tag into the iOS app
project so sidecar can work properly. -->
<!-- This workaround was designed like this to have the same
NativeReference tag for the iOS binding and for the .targets file -->
<Import Project="ABTesting.targets" />
<ItemGroup>
<_NativeReference Include="..\..\..\externals\FirebaseABTesting.xcframework">
<_Id>$(_FirebaseABTestingId)</_Id>
</_NativeReference>
<NativeReference Include="..\..\..\externals\FirebaseABTesting.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
<LinkerFlags>-ObjC -lz</LinkerFlags>
<Frameworks>Security SystemConfiguration</Frameworks>
</NativeReference>
</ItemGroup>
<!-- End of workaround -->
<ItemGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">
<Compile Remove="ApiDefinition.cs" />
<Compile Remove="Enums.cs" />
Expand Down
24 changes: 0 additions & 24 deletions source/Firebase/ABTesting/ABTesting.targets
View file
Open in desktop

This file was deleted.

18 changes: 6 additions & 12 deletions source/Firebase/AppCheck/AppCheck.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,14 @@
<None Include="License.md" Pack="True" PackagePath="License.md" />
<None Include="../../../icons/firebaseiosappcheck_128x128.png" Pack="True" PackagePath="firebaseiosappcheck_128x128.png" />
</ItemGroup>
<!-- An iOS app project cannot find Xcframeworks within a NuGet if a TFM
previous than net6.0-ios is used.
https://github.com/xamarin/xamarin-macios/issues/13693
You must include the Xcframework's NativeReference tag into the iOS app
project so sidecar can work properly. -->
<!-- This workaround was designed like this to have the same
NativeReference tag for the iOS binding and for the .targets file -->
<Import Project="AppCheck.targets" />
<ItemGroup>
<_NativeReference Include="..\..\..\externals\FirebaseAppCheck.xcframework">
<_Id>$(_FirebaseAppCheckId)</_Id>
</_NativeReference>
<NativeReference Include="..\..\..\externals\FirebaseAppCheck.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
<LinkerFlags>-ObjC</LinkerFlags>
</NativeReference>
</ItemGroup>
<!-- End of workaround -->
<ItemGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">
<Compile Remove="ApiDefinition.cs" />
<Compile Remove="Enums.cs" />
Expand Down
23 changes: 0 additions & 23 deletions source/Firebase/AppCheck/AppCheck.targets
View file
Open in desktop

This file was deleted.

18 changes: 6 additions & 12 deletions source/Firebase/AppDistribution/AppDistribution.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,14 @@
<None Include="License.md" Pack="True" PackagePath="License.md" />
<None Include="../../../icons/firebaseiosappdistribution_128x128.png" Pack="True" PackagePath="firebaseiosappdistribution_128x128.png" />
</ItemGroup>
<!-- An iOS app project cannot find Xcframeworks within a NuGet if a TFM
previous than net6.0-ios is used.
https://github.com/xamarin/xamarin-macios/issues/13693
You must include the Xcframework's NativeReference tag into the iOS app
project so sidecar can work properly. -->
<!-- This workaround was designed like this to have the same
NativeReference tag for the iOS binding and for the .targets file -->
<Import Project="AppDistribution.targets" />
<ItemGroup>
<_NativeReference Include="..\..\..\externals\FirebaseAppDistribution.xcframework">
<_Id>$(_FirebaseAppDistributionId)</_Id>
</_NativeReference>
<NativeReference Include="..\..\..\externals\FirebaseAppDistribution.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
<LinkerFlags>-ObjC</LinkerFlags>
</NativeReference>
</ItemGroup>
<!-- End of workaround -->
<ItemGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">
<Compile Remove="ApiDefinition.cs" />
<Compile Remove="Enums.cs" />
Expand Down
23 changes: 0 additions & 23 deletions source/Firebase/AppDistribution/AppDistribution.targets
View file
Open in desktop

This file was deleted.

21 changes: 7 additions & 14 deletions source/Firebase/Auth/Auth.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,19 @@
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<None Include="Auth.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.Auth.targets" />
<None Include="Auth.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.Auth.targets" />
<None Include="External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
<None Include="License.md" Pack="True" PackagePath="License.md" />
<None Include="../../../icons/firebaseiosauth_128x128.png" Pack="True" PackagePath="firebaseiosauth_128x128.png" />
</ItemGroup>
<!-- An iOS app project cannot find Xcframeworks within a NuGet if a TFM
previous than net6.0-ios is used.
https://github.com/xamarin/xamarin-macios/issues/13693
You must include the Xcframework's NativeReference tag into the iOS app
project so sidecar can work properly. -->
<!-- This workaround was designed like this to have the same
NativeReference tag for the iOS binding and for the .targets file -->
<Import Project="Auth.targets" />
<ItemGroup>
<_NativeReference Include="..\..\..\externals\FirebaseAuth.xcframework">
<_Id>$(_FirebaseAuthId)</_Id>
</_NativeReference>
<NativeReference Include="..\..\..\externals\FirebaseAuth.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
<Frameworks>Security SafariServices</Frameworks>
<LinkerFlags>-ObjC -lc++ -lsqlite3 -lz</LinkerFlags>
</NativeReference>
</ItemGroup>
<!-- End of workaround -->
<ItemGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">
<Compile Remove="ApiDefinition.cs" />
<Compile Remove="Enums.cs" />
Expand Down
24 changes: 0 additions & 24 deletions source/Firebase/Auth/Auth.targets
View file
Open in desktop

This file was deleted.

55 changes: 29 additions & 26 deletions source/Firebase/CloudFirestore/CloudFirestore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,38 +35,41 @@
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<None Include="CloudFirestore.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.CloudFirestore.targets" />
<None Include="CloudFirestore.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.CloudFirestore.targets" />
<None Include="External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
<None Include="License.md" Pack="True" PackagePath="License.md" />
<None Include="../../../icons/firebaseioscloudfirestore_128x128.png" Pack="True" PackagePath="firebaseioscloudfirestore_128x128.png" />
</ItemGroup>
<!-- An iOS app project cannot find Xcframeworks within a NuGet if a TFM
previous than net6.0-ios is used.
https://github.com/xamarin/xamarin-macios/issues/13693
You must include the Xcframework's NativeReference tag into the iOS app
project so sidecar can work properly. -->
<!-- This workaround was designed like this to have the same
NativeReference tag for the iOS binding and for the .targets file -->
<Import Project="CloudFirestore.targets" />
<ItemGroup>
<_NativeReference Include="..\..\..\externals\FirebaseFirestore.xcframework">
<_Id>$(_FirebaseFirestoreId)</_Id>
</_NativeReference>
<_NativeReference Include="..\..\..\externals\grpc.xcframework">
<_Id>$(_grpcId)</_Id>
</_NativeReference>
<_NativeReference Include="..\..\..\externals\grpcpp.xcframework">
<_Id>$(_grpcppId)</_Id>
</_NativeReference>
<_NativeReference Include="..\..\..\externals\openssl_grpc.xcframework">
<_Id>$(_openssl_grpcId)</_Id>
</_NativeReference>
<_NativeReference Include="..\..\..\externals\absl.xcframework">
<_Id>$(_abslId)</_Id>
</_NativeReference>
<NativeReference Include="..\..\..\externals\FirebaseFirestore.xcframework">
<Kind>Framework</Kind>
<Frameworks>MobileCoreServices SystemConfiguration</Frameworks>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
<LinkerFlags>-ObjC -lc++</LinkerFlags>
</NativeReference>
<NativeReference Include="..\..\..\externals\grpc.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
<LinkerFlags>-lc++ -lz</LinkerFlags>
</NativeReference>
<NativeReference Include="..\..\..\externals\grpcpp.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
</NativeReference>
<NativeReference Include="..\..\..\externals\openssl_grpc.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
</NativeReference>
<NativeReference Include="..\..\..\externals\absl.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
<LinkerFlags>-lc++</LinkerFlags>
</NativeReference>
</ItemGroup>
<!-- End of workaround -->
<ItemGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">
<Compile Remove="ApiDefinition.cs" />
<Compile Remove="Enums.cs" />
Expand Down
62 changes: 0 additions & 62 deletions source/Firebase/CloudFirestore/CloudFirestore.targets
View file
Open in desktop

This file was deleted.

20 changes: 6 additions & 14 deletions source/Firebase/CloudFunctions/CloudFunctions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,18 @@
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<None Include="CloudFunctions.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.CloudFunctions.targets" />
<None Include="CloudFunctions.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.CloudFunctions.targets" />
<None Include="External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
<None Include="License.md" Pack="True" PackagePath="License.md" />
<None Include="../../../icons/firebaseioscloudfunctions_128x128.png" Pack="True" PackagePath="firebaseioscloudfunctions_128x128.png" />
</ItemGroup>
<!-- An iOS app project cannot find Xcframeworks within a NuGet if a TFM
previous than net6.0-ios is used.
https://github.com/xamarin/xamarin-macios/issues/13693
You must include the Xcframework's NativeReference tag into the iOS app
project so sidecar can work properly. -->
<!-- This workaround was designed like this to have the same
NativeReference tag for the iOS binding and for the .targets file -->
<Import Project="CloudFunctions.targets" />
<ItemGroup>
<_NativeReference Include="..\..\..\externals\FirebaseFunctions.xcframework">
<_Id>$(_FirebaseFunctionsId)</_Id>
</_NativeReference>
<NativeReference Include="..\..\..\externals\FirebaseFunctions.xcframework">
<Kind>Framework</Kind>
<SmartLink>True</SmartLink>
<ForceLoad>True</ForceLoad>
<LinkerFlags>-ObjC</LinkerFlags>
</NativeReference>
</ItemGroup>
<!-- End of workaround -->
<ItemGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">
<Compile Remove="ApiDefinition.cs" />
<Compile Remove="Enums.cs" />
Expand Down
Loading