Skip to content

Commit 32546ac

Browse files
a-mauricea-maurice
committed
Integrate Latest @ 221706454
Changes to all ... - Updated plugin import instructions for .NET 3.x vs. 4.x projects. Changes to functions/testapp ... - Added missing Unity asset metadata to Functions sample. - Add UseFunctionsEmulator to C++ and C# SDKs. CL: 221706454
1 parent fe63718 commit 32546ac

File tree

12 files changed

+202
-89
lines changed

12 files changed

+202
-89
lines changed

Diff for: ‎analytics/testapp/readme.md

+22-10
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,17 @@ with the
4747
- Navigate to `Assets/Firebase/Sample/Analytics` in the `Project` window.
4848
- Double click on `MainScene` file to open.
4949
- Import the `Firebase Analytics` plugin.
50-
- Select the `Assets > Import Package > Custom Package` menu item.
51-
- Import `FirebaseAnalytics.unitypackage` from the
52-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
53-
downloaded previously.
54-
- Click the `Import` when the `Import Unity Package` window appears.
50+
- Select the **Assets > Import Package > Custom Package** menu item.
51+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
52+
downloaded previously, import `FirebaseAnalytics.unitypackage` from the
53+
directory that matches the version of Unity you use:
54+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
55+
import the `dotnet3/FirebaseAnalytics.unitypackage` package .
56+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
57+
your project is configured to use .NET 4.x, import the
58+
`dotnet4/FirebaseAnalytics.unitypackage` package.
59+
- When the **Import Unity Package** window appears, click the **Import**
60+
button.
5561
- Add the `GoogleService-Info.plist` file to the project.
5662
- Navigate to the `Assets/Firebase/Sample/Analytics` folder in the `Project`
5763
window.
@@ -120,11 +126,17 @@ with the
120126
- Navigate to `Assets/Firebase/Sample/Analytics` in the `Project` window.
121127
- Double click on `MainScene` file to open.
122128
- Import the `Firebase Analytics` plugin.
123-
- Select the `Assets > Import Package > Custom Package` menu item.
124-
- Import `FirebaseAnalytics.unitypackage` from the
125-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
126-
downloaded previously.
127-
- Click the `Import` when the `Import Unity Package` window appears.
129+
- Select the **Assets > Import Package > Custom Package** menu item.
130+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
131+
downloaded previously, import `FirebaseAnalytics.unitypackage` from the
132+
directory that matches the version of Unity you use:
133+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
134+
import the `dotnet3/FirebaseAnalytics.unitypackage` package .
135+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
136+
your project is configured to use .NET 4.x, import the
137+
`dotnet4/FirebaseAnalytics.unitypackage` package.
138+
- When the **Import Unity Package** window appears, click the **Import**
139+
button.
128140
- Add the `google-services.json` file to the project.
129141
- Navigate to the `Assets/Firebase/Sample/Analytics` folder in the `Project`
130142
window.

Diff for: ‎auth/testapp/readme.md

+22-10
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,17 @@ with the
5353
- Navigate to `Assets/Firebase/Sample/Auth` in the `Project` window.
5454
- Double click on `MainScene` file to open.
5555
- Import the `Firebase Auth` plugin.
56-
- Select the `Assets > Import Package > Custom Package` menu item.
57-
- Import `FirebaseAuth.unitypackage` from the
58-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
59-
downloaded previously.
60-
- Click the `Import` when the `Import Unity Package` window appears.
56+
- Select the **Assets > Import Package > Custom Package** menu item.
57+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
58+
downloaded previously, import `FirebaseAuth.unitypackage` from the
59+
directory that matches the version of Unity you use:
60+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
61+
import the `dotnet3/FirebaseAuth.unitypackage` package .
62+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
63+
your project is configured to use .NET 4.x, import the
64+
`dotnet4/FirebaseAuth.unitypackage` package.
65+
- When the **Import Unity Package** window appears, click the **Import**
66+
button.
6167
- Add the `GoogleService-Info.plist` file to the project.
6268
- Navigate to the `Assets/Firebase/Sample/Auth` folder in the `Project`
6369
window.
@@ -136,11 +142,17 @@ with the
136142
- Navigate to `Assets/Firebase/Sample/Auth` in the `Project` window.
137143
- Double click on `MainScene` file to open.
138144
- Import the `Firebase Auth` plugin.
139-
- Select the `Assets > Import Package > Custom Package` menu item.
140-
- Import `FirebaseAuth.unitypackage` from the
141-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
142-
downloaded previously.
143-
- Click the `Import` when the `Import Unity Package` window appears.
145+
- Select the **Assets > Import Package > Custom Package** menu item.
146+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
147+
downloaded previously, import `FirebaseAuth.unitypackage` from the
148+
directory that matches the version of Unity you use:
149+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
150+
import the `dotnet3/FirebaseAuth.unitypackage` package .
151+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
152+
your project is configured to use .NET 4.x, import the
153+
`dotnet4/FirebaseAuth.unitypackage` package.
154+
- When the **Import Unity Package** window appears, click the **Import**
155+
button.
144156
- Add the `google-services.json` file to the project.
145157
- Navigate to the `Assets/Firebase/Sample/Auth` folder in the `Project`
146158
window.

Diff for: ‎database/testapp/readme.md

+13-11
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,21 @@ inside the Unity Editor.
2525
- Navigate to the sample directory `testapp` in the file dialog and click
2626
`Open`.
2727
- Open the scene `MainScene`.
28-
- Navigate to `Assets/TestApp/MainScene` in the `Project` window.
28+
- Navigate to `Assets/Firebase/Sample/Database` in the `Project`
29+
window.
2930
- Double click on `MainScene` file to open.
30-
- Import the `Firebase Auth` plugin.
31-
- Select the `Assets > Import Package > Custom Package` menu item.
32-
- Import `FirebaseAuth.unitypackage` from the
33-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
34-
downloaded previously.
35-
- Click the `Import` when the `Import Unity Package` window appears.
3631
- Import the `Firebase Database` plugin.
37-
- Select the `Assets > Import Package > Custom Package` menu item.
38-
- Import `FirebaseDatabase.unitypackage` from the
39-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
40-
downloaded previously.
32+
- Select the **Assets > Import Package > Custom Package** menu item.
33+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
34+
downloaded previously, import `FirebaseDatabase.unitypackage` from the
35+
directory that matches the version of Unity you use:
36+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
37+
import the `dotnet3/FirebaseDatabase.unitypackage` package .
38+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
39+
your project is configured to use .NET 4.x, import the
40+
`dotnet4/FirebaseDatabase.unitypackage` package.
41+
- When the **Import Unity Package** window appears, click the **Import**
42+
button.
4143
- Click the `Import` when the `Import Unity Package` window appears.
4244
- Turn off secure access. [Configure your rules for public access.](https://firebase.google.com/docs/database/security/quickstart#sample-rules)
4345
- Change the line `SetEditorDatabaseUrl("https://replace-with-your-project.firebaseio.com/");`

Diff for: ‎dynamic_links/testapp/readme.md

+22-10
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,17 @@ using the
4848
- Navigate to `Assets/Firebase/Sample/Functions` in the `Project` window.
4949
- Double click on `MainScene` file to open.
5050
- Import the `Firebase Dynamic Links` plugin.
51-
- Select the `Assets > Import Package > Custom Package` menu item.
52-
- Import `FirebaseDynamicLinks.unitypackage` from the
53-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
54-
downloaded previously.
55-
- Click the `Import` when the `Import Unity Package` window appears.
51+
- Select the **Assets > Import Package > Custom Package** menu item.
52+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
53+
downloaded previously, import `FirebaseDynamicLinks.unitypackage` from the
54+
directory that matches the version of Unity you use:
55+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
56+
import the `dotnet3/FirebaseDynamicLinks.unitypackage` package .
57+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
58+
your project is configured to use .NET 4.x, import the
59+
`dotnet4/FirebaseDynamicLinks.unitypackage` package.
60+
- When the **Import Unity Package** window appears, click the **Import**
61+
button.
5662
- Add the `GoogleService-Info.plist` file to the project.
5763
- Navigate to the `Assets/Firebase/Sample/Functions` folder in the `Project`
5864
window.
@@ -136,11 +142,17 @@ using the
136142
- Navigate to `Assets/Firebase/Sample/Functions` in the `Project` window.
137143
- Double click on `MainScene` file to open.
138144
- Import the `Firebase Dynamic Links` plugin.
139-
- Select the `Assets > Import Package > Custom Package` menu item.
140-
- Import `FirebaseDynamicLinks.unitypackage` from the
141-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
142-
downloaded previously.
143-
- Click the `Import` when the `Import Unity Package` window appears.
145+
- Select the **Assets > Import Package > Custom Package** menu item.
146+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
147+
downloaded previously, import `FirebaseDynamicLinks.unitypackage` from the
148+
directory that matches the version of Unity you use:
149+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
150+
import the `dotnet3/FirebaseDynamicLinks.unitypackage` package .
151+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
152+
your project is configured to use .NET 4.x, import the
153+
`dotnet4/FirebaseDynamicLinks.unitypackage` package.
154+
- When the **Import Unity Package** window appears, click the **Import**
155+
button.
144156
- Add the `google-services.json` file to the project.
145157
- Navigate to the `Assets/Firebase/Sample/Functions` folder in the `Project`
146158
window.

Diff for: ‎functions/testapp/Assets/Firebase/Sample/Functions/.functions/functionsindex.js.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎functions/testapp/Assets/Firebase/Sample/Functions/.functions/functionspackage-lock.json.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎functions/testapp/Assets/Firebase/Sample/Functions/.functions/functionspackage.json.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎functions/testapp/readme.md

+22-10
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,29 @@ inside the Unity Editor.
5050
- Navigate to `Assets/Firebase/Sample/Functions` in the `Project` window.
5151
- Double click on `MainScene` file to open.
5252
- Import the `Firebase Auth` plugin.
53-
- Select the `Assets > Import Package > Custom Package` menu item.
54-
- Import `FirebaseAuth.unitypackage` from the
55-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
56-
downloaded previously.
57-
- Click the `Import` when the `Import Unity Package` window appears.
53+
- Select the **Assets > Import Package > Custom Package** menu item.
54+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
55+
downloaded previously, import `FirebaseAuth.unitypackage` from the
56+
directory that matches the version of Unity you use:
57+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
58+
import the `dotnet3/FirebaseAuth.unitypackage` package .
59+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
60+
your project is configured to use .NET 4.x, import the
61+
`dotnet4/FirebaseAuth.unitypackage` package.
62+
- When the **Import Unity Package** window appears, click the **Import**
63+
button.
5864
- Import the `Firebase Functions` plugin.
59-
- Select the `Assets > Import Package > Custom Package` menu item.
60-
- Import `FirebaseFunctions.unitypackage` from the
61-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
62-
downloaded previously.
63-
- Click the `Import` when the `Import Unity Package` window appears.
65+
- Select the **Assets > Import Package > Custom Package** menu item.
66+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
67+
downloaded previously, import `FirebaseFunctions.unitypackage` from the
68+
directory that matches the version of Unity you use:
69+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
70+
import the `dotnet3/FirebaseFunctions.unitypackage` package .
71+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
72+
your project is configured to use .NET 4.x, import the
73+
`dotnet4/FirebaseFunctions.unitypackage` package.
74+
- When the **Import Unity Package** window appears, click the **Import**
75+
button.
6476

6577
Once you have done this, you can run the Unity Editor and test the application.
6678

Diff for: ‎invites/testapp/readme.md

+24-12
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,18 @@ using the
4949
- Open the scene `MainScene`.
5050
- Navigate to `Assets/Firebase/Sample/Invites` in the `Project` window.
5151
- Double click on `MainScene` file to open.
52-
- Import the `Firebase Invites and Dynamic Links` plugin.
53-
- Select the `Assets > Import Package > Custom Package` menu item.
54-
- Import `FirebaseInvites.unitypackage` from the
55-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
56-
downloaded previously.
57-
- Click the `Import` when the `Import Unity Package` window appears.
52+
- Import the `Firebase Invites` plugin.
53+
- Select the **Assets > Import Package > Custom Package** menu item.
54+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
55+
downloaded previously, import `FirebaseInvites.unitypackage` from the
56+
directory that matches the version of Unity you use:
57+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
58+
import the `dotnet3/FirebaseInvites.unitypackage` package .
59+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
60+
your project is configured to use .NET 4.x, import the
61+
`dotnet4/FirebaseInvites.unitypackage` package.
62+
- When the **Import Unity Package** window appears, click the **Import**
63+
button.
5864
- Add the `GoogleService-Info.plist` file to the project.
5965
- Navigate to the `Assets/Firebase/Sample/Invites` folder in the `Project`
6066
window.
@@ -133,12 +139,18 @@ using the
133139
- Open the scene `MainScene`.
134140
- Navigate to `Assets/Firebase/Sample/Invites` in the `Project` window.
135141
- Double click on `MainScene` file to open.
136-
- Import the `Firebase Invites and Dynamic Links` plugin.
137-
- Select the `Assets > Import Package > Custom Package` menu item.
138-
- Import `FirebaseInvites.unitypackage` from the
139-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
140-
downloaded previously.
141-
- Click the `Import` when the `Import Unity Package` window appears.
142+
- Import the `Firebase Invites` plugin.
143+
- Select the **Assets > Import Package > Custom Package** menu item.
144+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
145+
downloaded previously, import `FirebaseInvites.unitypackage` from the
146+
directory that matches the version of Unity you use:
147+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
148+
import the `dotnet3/FirebaseInvites.unitypackage` package .
149+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
150+
your project is configured to use .NET 4.x, import the
151+
`dotnet4/FirebaseInvites.unitypackage` package.
152+
- When the **Import Unity Package** window appears, click the **Import**
153+
button.
142154
- Add the `google-services.json` file to the project.
143155
- Navigate to the `Assets/Firebase/Sample/Invites` folder in the `Project`
144156
window.

Diff for: ‎messaging/testapp/readme.md

+20-12
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,16 @@ using the
5656
- Open the scene `MainScene`.
5757
- Navigate to `Assets/Firebase/Sample/Messaging` in the `Project` window.
5858
- Double click on `MainScene` file to open.
59-
- Import the `Firebase Messaging` plugin.
60-
- Select the `Assets > Import Package > Custom Package` menu item.
61-
- Import `FirebaseMessaging.unitypackage` from the
62-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
63-
downloaded previously.
64-
- Click the `Import` when the `Import Unity Package` window appears.
59+
- Import the `Firebase Cloud Messaging` plugin.
60+
- Select the **Assets > Import Package > Custom Package** menu item.
61+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
62+
downloaded previously, import `FirebaseMessaging.unitypackage` from the
63+
directory that matches the version of Unity you use:
64+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
65+
import the `dotnet3/FirebaseMessaging.unitypackage` package .
66+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
67+
your project is configured to use .NET 4.x, import the
68+
`dotnet4/FirebaseMessaging.unitypackage` package.
6569
- Add the `GoogleService-Info.plist` file to the project.
6670
- Navigate to the `Assets/Firebase/Sample/Messaging` folder in the `Project`
6771
window.
@@ -145,12 +149,16 @@ using the
145149
- Open the scene `MainScene`.
146150
- Navigate to `Assets/Firebase/Sample/Messaging` in the `Project` window.
147151
- Double click on `MainScene` file to open.
148-
- Import the `Firebase Messaging` plugin.
149-
- Select the `Assets > Import Package > Custom Package` menu item.
150-
- Import `FirebaseMessaging.unitypackage` from the
151-
[Firebase Unity SDK](https://firebase.google.com/download/unity),
152-
downloaded previously.
153-
- Click the `Import` when the `Import Unity Package` window appears.
152+
- Import the `Firebase Cloud Messaging` plugin.
153+
- Select the **Assets > Import Package > Custom Package** menu item.
154+
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
155+
downloaded previously, import `FirebaseMessaging.unitypackage` from the
156+
directory that matches the version of Unity you use:
157+
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
158+
import the `dotnet3/FirebaseMessaging.unitypackage` package .
159+
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
160+
your project is configured to use .NET 4.x, import the
161+
`dotnet4/FirebaseMessaging.unitypackage` package.
154162
- Add the `google-services.json` file to the project.
155163
- Navigate to the `Assets/Firebase/Sample/Messaging` folder in the `Project`
156164
window.

0 commit comments

Comments
 (0)