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 diff --git a/Unity/Assets/NativeScript/Editor/GenerateBindings.cs b/Unity/Assets/NativeScript/Editor/GenerateBindings.cs index be815bc..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 @@ -7123,7 +7125,7 @@ static void AppendBaseType( cppCtorInitTypes, indent + 1, builders.CppMacros, - " \\\n"); + " \\\r\n"); AppendIndent(indent + 1, builders.CppMacros); builders.CppMacros.Append(", "); AppendCppTypeFullName( @@ -7154,7 +7156,7 @@ static void AppendBaseType( cppCtorInitTypes, indent + 1, builders.CppMacros, - " \\\n"); + " \\\r\n"); AppendIndent(indent + 1, builders.CppMacros); builders.CppMacros.Append(", "); AppendCppTypeFullName(