From 443dbc1c8eabba5291f8e053c284550f59d0adf7 Mon Sep 17 00:00:00 2001 From: Trigve Siver Date: Sun, 19 Feb 2023 10:55:24 +0100 Subject: [PATCH 1/3] generator: Use CRLF for the generated code --- Unity/Assets/NativeScript/Editor/GenerateBindings.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Unity/Assets/NativeScript/Editor/GenerateBindings.cs b/Unity/Assets/NativeScript/Editor/GenerateBindings.cs index be815bc..5cc96fc 100644 --- a/Unity/Assets/NativeScript/Editor/GenerateBindings.cs +++ b/Unity/Assets/NativeScript/Editor/GenerateBindings.cs @@ -7123,7 +7123,7 @@ static void AppendBaseType( cppCtorInitTypes, indent + 1, builders.CppMacros, - " \\\n"); + " \\\r\n"); AppendIndent(indent + 1, builders.CppMacros); builders.CppMacros.Append(", "); AppendCppTypeFullName( @@ -7154,7 +7154,7 @@ static void AppendBaseType( cppCtorInitTypes, indent + 1, builders.CppMacros, - " \\\n"); + " \\\r\n"); AppendIndent(indent + 1, builders.CppMacros); builders.CppMacros.Append(", "); AppendCppTypeFullName( From 34877920d9a430de2ebd28f66a4f6af2c3398bd1 Mon Sep 17 00:00:00 2001 From: Trigve Siver Date: Sun, 19 Feb 2023 10:57:25 +0100 Subject: [PATCH 2/3] Add .gitattributes --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..03c6cf1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +*.cs diff=csharp text + +ProjectSettings/ProjectVersion.txt eol=lf + +*.meta merge=unityyamlmerge eol=lf +*.unity merge=unityyamlmerge eol=lf From e86f44acda8ff909b0463729a78617174af739c1 Mon Sep 17 00:00:00 2001 From: Trigve Siver Date: Sun, 19 Feb 2023 11:06:48 +0100 Subject: [PATCH 3/3] generator: Fix for Unity 2022.1 --- Unity/Assets/NativeScript/Editor/GenerateBindings.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Unity/Assets/NativeScript/Editor/GenerateBindings.cs b/Unity/Assets/NativeScript/Editor/GenerateBindings.cs index 5cc96fc..df150bb 100644 --- a/Unity/Assets/NativeScript/Editor/GenerateBindings.cs +++ b/Unity/Assets/NativeScript/Editor/GenerateBindings.cs @@ -715,7 +715,9 @@ static Assembly[] GetAssemblies(string[] assemblyNames) assemblies[30] = typeof(UnityEngine.Experimental.UIElements.Button).Assembly; // Unity UI elements module #endif assemblies[31] = typeof(Canvas).Assembly; // Unity UI module -#if UNITY_2020_1_OR_NEWER +#if UNITY_2022_1_OR_NEWER + assemblies[32] = typeof(UnityEngine.Networking.DownloadHandler).Assembly; // Unity network module +#elif UNITY_2020_1_OR_NEWER assemblies[32] = typeof(UnityEngine.Networking.Utility).Assembly; // Unity network module #else assemblies[32] = typeof(UnityEngine.Networking.NetworkTransport).Assembly; // Unity network module