Skip to content

Commit bdd9fd7

Browse files
authored
Update min Unity version and remove dotnet 3 support (#485)
* Remove dotnet 3 support * Update testapp readmes * Add missing newline
1 parent c3b46b4 commit bdd9fd7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+31
-1592
lines changed

analytics/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ mono_add_library(firebase_analytics_cs
4343
${firebase_analytics_src}
4444
${firebase_analytics_swig_gen_src}
4545
REFERENCES
46-
unity_compat_cs
47-
unity_tasks_cs
4846
${FIREBASE_PLATFORM_REF}
4947
DEPENDS
5048
firebase_analytics_swig

analytics/testapp/readme.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,7 @@ with the
5151
- Import the `Firebase Analytics` plugin.
5252
- Select the **Assets > Import Package > Custom Package** menu item.
5353
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
54-
downloaded previously, import `FirebaseAnalytics.unitypackage` from the
55-
directory that matches the version of Unity you use:
56-
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
57-
import the `dotnet3/FirebaseAnalytics.unitypackage` package .
58-
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
59-
your project is configured to use .NET 4.x, import the
60-
`dotnet4/FirebaseAnalytics.unitypackage` package.
54+
downloaded previously, import `FirebaseAnalytics.unitypackage`.
6155
- When the **Import Unity Package** window appears, click the **Import**
6256
button.
6357
- Add the `GoogleService-Info.plist` file to the project.
@@ -143,13 +137,7 @@ with the
143137
- Import the `Firebase Analytics` plugin.
144138
- Select the **Assets > Import Package > Custom Package** menu item.
145139
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
146-
downloaded previously, import `FirebaseAnalytics.unitypackage` from the
147-
directory that matches the version of Unity you use:
148-
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
149-
import the `dotnet3/FirebaseAnalytics.unitypackage` package .
150-
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
151-
your project is configured to use .NET 4.x, import the
152-
`dotnet4/FirebaseAnalytics.unitypackage` package.
140+
downloaded previously, import `FirebaseAnalytics.unitypackage`.
153141
- When the **Import Unity Package** window appears, click the **Import**
154142
button.
155143
- Add the `google-services.json` file to the project.

app/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ mono_add_library(firebase_app_cs
9595
${firebase_app_swig_gen_src}
9696
${version_info_file}
9797
REFERENCES
98-
unity_compat_cs
99-
unity_tasks_cs
10098
${firebase_platform_task_lib}
10199
firebase_platform_cs
102100
firebase_taskextension_cs

app/platform/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ mono_add_library(firebase_platform_cs
6464
${firebase_platform_src}
6565
REFERENCES
6666
google_minijson_cs
67-
unity_compat_cs
68-
unity_tasks_cs
6967
${firebase_platform_task_lib}
7068
)
7169

app/task_extension/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ mono_add_library(firebase_taskextension_cs
2424
SOURCES
2525
${firebase_taskextension_src}
2626
REFERENCES
27-
unity_compat_cs
28-
unity_tasks_cs
2927
${firebase_platform_task_lib}
3028
firebase_platform_cs
3129
XBUILD_EXE

auth/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ mono_add_library(firebase_auth_cs
5757
${firebase_auth_src}
5858
${firebase_auth_swig_gen_src}
5959
REFERENCES
60-
unity_compat_cs
61-
unity_tasks_cs
6260
${FIREBASE_PLATFORM_REF}
6361
DEPENDS
6462
firebase_auth_swig

auth/testapp/readme.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,7 @@ with the
5757
- Import the `Firebase Auth` plugin.
5858
- Select the **Assets > Import Package > Custom Package** menu item.
5959
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
60-
downloaded previously, import `FirebaseAuth.unitypackage` from the
61-
directory that matches the version of Unity you use:
62-
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
63-
import the `dotnet3/FirebaseAuth.unitypackage` package .
64-
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
65-
your project is configured to use .NET 4.x, import the
66-
`dotnet4/FirebaseAuth.unitypackage` package.
60+
downloaded previously, import `FirebaseAuth.unitypackage`.
6761
- When the **Import Unity Package** window appears, click the **Import**
6862
button.
6963
- Add the `GoogleService-Info.plist` file to the project.
@@ -157,13 +151,7 @@ with the
157151
- Import the `Firebase Auth` plugin.
158152
- Select the **Assets > Import Package > Custom Package** menu item.
159153
- From the [Firebase Unity SDK](https://firebase.google.com/download/unity)
160-
downloaded previously, import `FirebaseAuth.unitypackage` from the
161-
directory that matches the version of Unity you use:
162-
- Unity 5.x and earlier use the .NET 3.x framework, so you need to
163-
import the `dotnet3/FirebaseAuth.unitypackage` package .
164-
- Unity 2017.x and newer allow the use of the .NET 4.x framework. If
165-
your project is configured to use .NET 4.x, import the
166-
`dotnet4/FirebaseAuth.unitypackage` package.
154+
downloaded previously, import `FirebaseAuth.unitypackage`.
167155
- When the **Import Unity Package** window appears, click the **Import**
168156
button.
169157
- Add the `google-services.json` file to the project.

cmake/external/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
2525
include(firebase_cpp_sdk)
2626
include(google_unity_jar_resolver)
2727
include(minijson)
28-
include(parse)

cmake/external/parse.cmake

Lines changed: 0 additions & 34 deletions
This file was deleted.

cmake/unity_mono.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ endmacro()
199199
# sys_references: System CSharp libraries this depends on
200200
# dep_targets: Targets this target depends on and need to be linked/built first
201201
# guid: MSBuild project guid (for use with solution files)
202-
# framework_version: .net framework version, defaults to 3.5
202+
# framework_version: .net framework version, defaults to 4.5
203203
# defines: Extra defines to add to the project file
204204
# assembly_name: Name of the output assembly. Defaults to module
205205
# xbuild: Path to xbuild executable. Defaults to XBUILD_EXE global var
@@ -250,7 +250,7 @@ macro(mono_add_internal name output_type)
250250
endif()
251251

252252
if ("${UNITY_MONO_FRAMEWORK_VERSION}" STREQUAL "")
253-
set(UNITY_MONO_FRAMEWORK_VERSION "3.5")
253+
set(UNITY_MONO_FRAMEWORK_VERSION "4.5")
254254
endif()
255255

256256
if ("${UNITY_MONO_ASSEMBLY_NAME}" STREQUAL "")

0 commit comments

Comments
 (0)