Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 6cb0a39

Browse files
SotoiGhostSotoiGhost
SotoiGhost
authored and
SotoiGhost
committed
Added the buildTransitive compatibility
* This closes #345
1 parent f643535 commit 6cb0a39

File tree

32 files changed

+119
-96
lines changed

32 files changed

+119
-96
lines changed

‎source/Firebase/ABTesting/ABTesting.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
<ItemGroup>
3838
<None Include="ABTesting.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.ABTesting.targets" />
39+
<None Include="ABTesting.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.ABTesting.targets" />
3940
<None Include="License.md" Pack="True" PackagePath="License.md" />
4041
<None Include="../../../icons/firebaseiosabtesting_128x128.png" Pack="True" PackagePath="firebaseiosabtesting_128x128.png" />
4142
</ItemGroup>
@@ -54,11 +55,11 @@
5455
</ItemGroup>
5556

5657
<ItemGroup>
57-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
58+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
5859
</ItemGroup>
5960

6061
<ItemGroup>
61-
<ProjectReference Include="..\Core\Core.csproj" />
62+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
6263
</ItemGroup>
6364

6465
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/AdMob/AdMob.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
</ItemGroup>
5555

5656
<ItemGroup>
57-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
57+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
5858
</ItemGroup>
5959

6060
<ItemGroup>
61-
<ProjectReference Include="..\Core\Core.csproj" />
62-
<ProjectReference Include="..\InstanceID\InstanceID.csproj" />
63-
<ProjectReference Include="..\Analytics\Analytics.csproj" />
64-
<ProjectReference Include="..\..\Google\MobileAds\MobileAds.csproj" />
61+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
62+
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\Analytics\Analytics.csproj" PrivateAssets="None" />
64+
<ProjectReference Include="..\..\Google\MobileAds\MobileAds.csproj" PrivateAssets="None" />
6565
</ItemGroup>
6666

6767
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/Analytics/Analytics.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
<ItemGroup>
3838
<None Include="Analytics.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.Analytics.targets" />
39+
<None Include="Analytics.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.Analytics.targets" />
3940
<None Include="License.md" Pack="True" PackagePath="License.md" />
4041
<None Include="../../../icons/firebaseiosanalytics_128x128.png" Pack="True" PackagePath="firebaseiosanalytics_128x128.png" />
4142
</ItemGroup>
@@ -54,12 +55,12 @@
5455
</ItemGroup>
5556

5657
<ItemGroup>
57-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
58+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
5859
</ItemGroup>
5960

6061
<ItemGroup>
61-
<ProjectReference Include="..\Core\Core.csproj" />
62-
<ProjectReference Include="..\InstanceID\InstanceID.csproj" />
62+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6364
</ItemGroup>
6465

6566
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/Auth/Auth.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
</ItemGroup>
6767

6868
<ItemGroup>
69-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
69+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
7070
</ItemGroup>
7171

7272
<ItemGroup>
73-
<ProjectReference Include="..\Core\Core.csproj" />
73+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
7474
</ItemGroup>
7575

7676
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/CloudFirestore/CloudFirestore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@
8888
</ItemGroup>
8989

9090
<ItemGroup>
91-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
91+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
9292
</ItemGroup>
9393

9494
<ItemGroup>
95-
<ProjectReference Include="..\Core\Core.csproj" />
95+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
9696
</ItemGroup>
9797

9898
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/CloudMessaging/CloudMessaging.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@
6767
</ItemGroup>
6868

6969
<ItemGroup>
70-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
70+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
7171
</ItemGroup>
7272

7373
<ItemGroup>
74-
<ProjectReference Include="..\Core\Core.csproj" />
75-
<ProjectReference Include="..\InstanceID\InstanceID.csproj" />
74+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
75+
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
7676
</ItemGroup>
7777

7878
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/Core/Core.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
<ItemGroup>
3434
<Folder Include="Resources\" />
3535
</ItemGroup>
36-
37-
<ItemGroup>
38-
<None Include="Core.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.Core.targets" />
39-
</ItemGroup>
4036

4137
<ItemGroup>
4238
<None Include="..\..\..\externals\FirebaseCore.framework\FirebaseCore">
@@ -63,6 +59,8 @@
6359
<None Include="..\..\..\externals\GoogleAPIClientForREST.framework\GoogleAPIClientForREST">
6460
<Link>GoogleAPIClientForREST.framework</Link>
6561
</None>
62+
<None Include="Core.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.Core.targets" />
63+
<None Include="Core.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.Core.targets" />
6664
<None Include="External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
6765
<None Include="License.md" Pack="True" PackagePath="License.md" />
6866
<None Include="../../../icons/firebaseioscore_128x128.png" Pack="True" PackagePath="firebaseioscore_128x128.png" />
@@ -123,7 +121,7 @@
123121
</ItemGroup>
124122

125123
<ItemGroup>
126-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
124+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
127125
</ItemGroup>
128126

129127
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/CrashReporting/CrashReporting.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
<ItemGroup>
3838
<None Include="CrashReporting.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.CrashReporting.targets" />
39+
<None Include="CrashReporting.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.CrashReporting.targets" />
3940
<None Include="xamarin_upload_symbols.sh" Pack="True" PackagePath="content/xamarin_upload_symbols.sh" />
4041
<None Include="License.md" Pack="True" PackagePath="License.md" />
4142
<None Include="../../../icons/firebaseioscrashreporting_128x128.png" Pack="True" PackagePath="firebaseioscrashreporting_128x128.png" />
@@ -55,13 +56,13 @@
5556
</ItemGroup>
5657

5758
<ItemGroup>
58-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
59+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
5960
</ItemGroup>
6061

6162
<ItemGroup>
62-
<ProjectReference Include="..\Core\Core.csproj" />
63-
<ProjectReference Include="..\InstanceID\InstanceID.csproj" />
64-
<ProjectReference Include="..\Analytics\Analytics.csproj" />
63+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
64+
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
65+
<ProjectReference Include="..\Analytics\Analytics.csproj" PrivateAssets="None" />
6566
</ItemGroup>
6667

6768
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/Crashlytics/Crashlytics.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636

3737
<ItemGroup>
3838
<None Include="Crashlytics.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.Crashlytics.targets" />
39+
<None Include="Crashlytics.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.Crashlytics.targets" />
3940
<None Include="Crashlytics.props" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.Crashlytics.props" />
41+
<None Include="Crashlytics.props" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.Crashlytics.props" />
4042
<None Include="readme.txt" Pack="True" PackagePath="readme.txt" />
4143
<None Include="License.md" Pack="True" PackagePath="License.md" />
4244
<None Include="../../../icons/firebaseioscrashlytics_128x128.png" Pack="True" PackagePath="firebaseioscrashlytics_128x128.png" />
@@ -56,7 +58,7 @@
5658
</ItemGroup>
5759

5860
<ItemGroup>
59-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
61+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
6062
</ItemGroup>
6163

6264
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎source/Firebase/Database/Database.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
</ItemGroup>
6767

6868
<ItemGroup>
69-
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
69+
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="None" />
7070
</ItemGroup>
7171

7272
<ItemGroup>
73-
<ProjectReference Include="..\Core\Core.csproj" />
73+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
7474
</ItemGroup>
7575

7676
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

0 commit comments

Comments
 (0)