Skip to content

Commit 23fc09a

Browse files
author
SotoiGhost
committed
Fixed NuGet data and ProjectReferences in some components
1 parent 2005068 commit 23fc09a

File tree

20 files changed

+44
-42
lines changed

20 files changed

+44
-42
lines changed

Diff for: ‎source/Firebase/Analytics/Analytics.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
<ItemGroup>
6262
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
63-
<ProjectReference Include="..\Installations\Installations.csproj" />
63+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
6464
</ItemGroup>
6565

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

Diff for: ‎source/Firebase/CloudMessaging/CloudMessaging.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
<ItemGroup>
7575
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
76-
<ProjectReference Include="..\Installations\Installations.csproj" />
76+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
7777
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
7878
</ItemGroup>
7979

Diff for: ‎source/Firebase/CrashReporting/CrashReporting.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161

6262
<ItemGroup>
6363
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
64+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
6465
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6566
<ProjectReference Include="..\Analytics\Analytics.csproj" PrivateAssets="None" />
6667
</ItemGroup>

Diff for: ‎source/Firebase/Crashlytics/Crashlytics.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
<ItemGroup>
7878
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
79-
<ProjectReference Include="..\Installations\Installations.csproj" />
79+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
8080
</ItemGroup>
8181

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

Diff for: ‎source/Firebase/Installations/Installations.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Owners>Microsoft</Owners>
2121
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
2222
<PackageIcon>firebaseiosinstallations_128x128.png</PackageIcon>
23-
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=865551</PackageProjectUrl>
23+
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2125908</PackageProjectUrl>
2424
<PackageLicenseFile>License.md</PackageLicenseFile>
2525
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2626
<PackageVersion>1.1.1</PackageVersion>

Diff for: ‎source/Firebase/InstanceID/InstanceID.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989

9090
<ItemGroup>
9191
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
92-
<ProjectReference Include="..\Installations\Installations.csproj" />
92+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
9393
</ItemGroup>
9494

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

Diff for: ‎source/Firebase/Invites/Invites.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
<ItemGroup>
6262
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
6364
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6465
<ProjectReference Include="..\Analytics\Analytics.csproj" PrivateAssets="None" />
6566
<ProjectReference Include="..\DynamicLinks\DynamicLinks.csproj" PrivateAssets="None" />

Diff for: ‎source/Firebase/MLKit.Common/MLKit.Common.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272

7373
<ItemGroup>
7474
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
75-
<ProjectReference Include="..\Installations\Installations.csproj" />
76-
<ProjectReference Include="..\InstanceID\InstanceID.csproj" />
75+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
76+
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
7777
</ItemGroup>
7878

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

Diff for: ‎source/Firebase/MLKit.ModelInterpreter/MLKit.ModelInterpreter.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
<ItemGroup>
6363
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
64-
<ProjectReference Include="..\Installations\Installations.csproj" />
64+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
6565
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6666
<ProjectReference Include="..\MLKit.Common\MLKit.Common.csproj" PrivateAssets="None" />
6767
</ItemGroup>

Diff for: ‎source/Firebase/MLKit.NaturalLanguage/MLKit.NaturalLanguage.csproj

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
2+
<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
33
<PropertyGroup>
44
<TargetFrameworks>Xamarin.iOS10</TargetFrameworks>
55
<IsBindingProject>true</IsBindingProject>
@@ -19,9 +19,9 @@
1919
<Authors>Microsoft</Authors>
2020
<Owners>Microsoft</Owners>
2121
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
22-
<PackageIconUrl>https://raw.githubusercontent.com/xamarin/GoogleApisForiOSComponents/master/icons/firebaseiosmlkitnaturallanguage_128x128.png</PackageIconUrl>
22+
<PackageIcon>firebaseiosmlkitnaturallanguage_128x128.png</PackageIcon>
2323
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2109487</PackageProjectUrl>
24-
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2109658</PackageLicenseUrl>
24+
<PackageLicenseFile>License.md</PackageLicenseFile>
2525
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2626
<PackageVersion>0.17.0</PackageVersion>
2727
</PropertyGroup>
@@ -36,6 +36,10 @@
3636

3737
<ItemGroup>
3838
<None Include="MLKit.NaturalLanguage.targets" Pack="True" PackagePath="build/Xamarin.Firebase.iOS.MLKit.NaturalLanguage.targets" />
39+
<None Include="MLKit.NaturalLanguage.targets" Pack="True" PackagePath="buildTransitive/Xamarin.Firebase.iOS.MLKit.NaturalLanguage.targets" />
40+
<None Include="External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
41+
<None Include="License.md" Pack="True" PackagePath="License.md" />
42+
<None Include="../../../icons/firebaseiosmlkitnaturallanguage_128x128.png" Pack="True" PackagePath="firebaseiosmlkitnaturallanguage_128x128.png" />
3943
</ItemGroup>
4044

4145
<ItemGroup>
@@ -52,17 +56,16 @@
5256
</ItemGroup>
5357

5458
<ItemGroup>
55-
<PackageReference Include="Xamarin.Build.Download" Version="0.10.0" />
56-
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
59+
<PackageReference Include="Xamarin.Build.Download" Version="0.10.0" PrivateAssets="None" />
5760
</ItemGroup>
5861

5962
<ItemGroup>
60-
<ProjectReference Include="..\Core\Core.csproj" />
61-
<ProjectReference Include="..\Installations\Installations.csproj" />
62-
<ProjectReference Include="..\InstanceID\InstanceID.csproj" />
63-
<ProjectReference Include="..\ABTesting\ABTesting.csproj" />
64-
<ProjectReference Include="..\RemoteConfig\RemoteConfig.csproj" />
65-
<ProjectReference Include="..\MLKit.Common\MLKit.Common.csproj" />
63+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
64+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
65+
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
66+
<ProjectReference Include="..\ABTesting\ABTesting.csproj" PrivateAssets="None" />
67+
<ProjectReference Include="..\RemoteConfig\RemoteConfig.csproj" PrivateAssets="None" />
68+
<ProjectReference Include="..\MLKit.Common\MLKit.Common.csproj" PrivateAssets="None" />
6669
</ItemGroup>
6770

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

Diff for: ‎source/Firebase/MLKit.Vision/MLKit.Vision.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
</ItemGroup>
5858

5959
<ItemGroup>
60-
<ProjectReference Include="..\Core\Core.csproj" />
61-
<ProjectReference Include="..\Installations\Installations.csproj" />
62-
<ProjectReference Include="..\InstanceID\InstanceID.csproj" />
63-
<ProjectReference Include="..\MLKit.Common\MLKit.Common.csproj" />
60+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
61+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
62+
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\MLKit.Common\MLKit.Common.csproj" PrivateAssets="None" />
6464
</ItemGroup>
6565

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

Diff for: ‎source/Firebase/MLKit/MLKit.csproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@
6767
</ItemGroup>
6868

6969
<ItemGroup>
70-
<ProjectReference Include="..\Core\Core.csproj" />
71-
<ProjectReference Include="..\Installations\Installations.csproj" />
72-
<ProjectReference Include="..\InstanceID\InstanceID.csproj" />
73-
<ProjectReference Include="..\ABTesting\ABTesting.csproj" />
74-
<ProjectReference Include="..\RemoteConfig\RemoteConfig.csproj" />
75-
<ProjectReference Include="..\MLKit.Common\MLKit.Common.csproj" />
76-
<ProjectReference Include="..\MLKit.ModelInterpreter\MLKit.ModelInterpreter.csproj" />
77-
<ProjectReference Include="..\MLKit.NaturalLanguage\MLKit.NaturalLanguage.csproj" />
78-
<ProjectReference Include="..\MLKit.Vision\MLKit.Vision.csproj" />
70+
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
71+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
72+
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
73+
<ProjectReference Include="..\ABTesting\ABTesting.csproj" PrivateAssets="None" />
74+
<ProjectReference Include="..\RemoteConfig\RemoteConfig.csproj" PrivateAssets="None" />
75+
<ProjectReference Include="..\MLKit.Common\MLKit.Common.csproj" PrivateAssets="None" />
76+
<ProjectReference Include="..\MLKit.ModelInterpreter\MLKit.ModelInterpreter.csproj" PrivateAssets="None" />
77+
<ProjectReference Include="..\MLKit.NaturalLanguage\MLKit.NaturalLanguage.csproj" PrivateAssets="None" />
78+
<ProjectReference Include="..\MLKit.Vision\MLKit.Vision.csproj" PrivateAssets="None" />
7979
</ItemGroup>
8080

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

Diff for: ‎source/Firebase/PerformanceMonitoring/PerformanceMonitoring.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
<ItemGroup>
6262
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
63-
<ProjectReference Include="..\Installations\Installations.csproj" />
63+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
6464
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6565
<ProjectReference Include="..\ABTesting\ABTesting.csproj" PrivateAssets="None" />
6666
<ProjectReference Include="..\RemoteConfig\RemoteConfig.csproj" PrivateAssets="None" />

Diff for: ‎source/Firebase/RemoteConfig/RemoteConfig.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

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

Diff for: ‎source/Google/Core/Core.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
<ItemGroup>
6262
<ProjectReference Include="..\..\Firebase\Core\Core.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\..\Firebase\Installations\Installations.csproj" PrivateAssets="None" />
6364
<ProjectReference Include="..\..\Firebase\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6465
<ProjectReference Include="..\..\Firebase\Analytics\Analytics.csproj" PrivateAssets="None" />
6566
</ItemGroup>

Diff for: ‎source/Google/GoogleCloudMessaging/GoogleCloudMessaging.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
<ItemGroup>
6262
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\Installations\Installations.csproj" PrivateAssets="None" />
6364
<ProjectReference Include="..\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6465
</ItemGroup>
6566

Diff for: ‎source/Google/InstanceID/InstanceID.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
<ItemGroup>
6262
<ProjectReference Include="..\..\Firebase\Core\Core.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\..\Firebase\Installations\Installations.csproj" PrivateAssets="None" />
6364
<ProjectReference Include="..\..\Firebase\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6465
<ProjectReference Include="..\..\Firebase\Analytics\Analytics.csproj" PrivateAssets="None" />
6566
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />

Diff for: ‎source/Google/PlayGames/PlayGames.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
<ItemGroup>
6262
<ProjectReference Include="..\..\Firebase\Core\Core.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\..\Firebase\Installations\Installations.csproj" PrivateAssets="None" />
6364
<ProjectReference Include="..\..\Firebase\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6465
<ProjectReference Include="..\..\Firebase\Analytics\Analytics.csproj" PrivateAssets="None" />
6566
<ProjectReference Include="..\Core\Core.csproj" PrivateAssets="None" />

Diff for: ‎source/Google/SignIn/SignIn.csproj

-8
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,4 @@
8989
</ItemGroup>
9090

9191
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
92-
93-
<!-- We are embedding a framework using NativeReference tag but, on Windows with .NET Core project,
94-
this tags means another thing. On windows, if a NativeReference exists it creates a file named
95-
Native.$(AssemblyName).manifest which on macOS is not being generated. This is just to satisfy
96-
the MSBuild packing process as it's looking for it. It seems not to be packed in the end. -->
97-
<Target Name="_TouchNativeManifestWorkaround" BeforeTargets="GenerateNuspec" Condition="!Exists('$(OutputPath)$(TargetFrameworks)\Native.$(AssemblyName).manifest')">
98-
<Touch Files="$(OutputPath)$(TargetFrameworks)\Native.$(AssemblyName).manifest" AlwaysCreate="True" />
99-
</Target>
10092
</Project>

Diff for: ‎source/Google/TagManager/TagManager.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
<ItemGroup>
6262
<ProjectReference Include="..\..\Firebase\Core\Core.csproj" PrivateAssets="None" />
63+
<ProjectReference Include="..\..\Firebase\Installations\Installations.csproj" PrivateAssets="None" />
6364
<ProjectReference Include="..\..\Firebase\InstanceID\InstanceID.csproj" PrivateAssets="None" />
6465
<ProjectReference Include="..\..\Firebase\Analytics\Analytics.csproj" PrivateAssets="None" />
6566
<ProjectReference Include="..\Analytics\Analytics.csproj" PrivateAssets="None" />

0 commit comments

Comments
 (0)