From 7bc7a860b7508e3b69f36b0dc1a3a9e770dd8ca8 Mon Sep 17 00:00:00 2001 From: JasperCiti <48373360+JasperCiti@users.noreply.github.com> Date: Sun, 16 Feb 2020 12:15:23 +0200 Subject: [PATCH 1/2] Added Addressables. Prevent automatically generated addressable files to end up in Git. --- Unity.gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Unity.gitignore b/Unity.gitignore index 7d21efc9bd..bd9cb93db3 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -62,3 +62,8 @@ sysinfo.txt # Crashlytics generated file crashlytics-build.properties +# Addressables +/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* +/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/[Aa]sset[Gg]roups/[Ss]chemas/* +/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/[Aa]sset[Gg]roups[Tt]emplates/* +/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/[Ww]indows/* From 868f29d5558467b8c73ac79f7ba719f1f63a5b49 Mon Sep 17 00:00:00 2001 From: JasperCiti <48373360+JasperCiti@users.noreply.github.com> Date: Tue, 18 Feb 2020 05:55:53 +0200 Subject: [PATCH 2/2] Update .gitignore to exclude packed Addressables and Android auto-generated files. --- Unity.gitignore | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Unity.gitignore b/Unity.gitignore index bd9cb93db3..8150f045f6 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -62,8 +62,9 @@ sysinfo.txt # Crashlytics generated file crashlytics-build.properties -# Addressables +# Packed Addressables /[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* -/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/[Aa]sset[Gg]roups/[Ss]chemas/* -/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/[Aa]sset[Gg]roups[Tt]emplates/* -/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/[Ww]indows/* + +# Temporary auto-generated Android Assets +/[Aa]ssets/[Ss]treamingAssets/aa.meta +/[Aa]ssets/[Ss]treamingAssets/aa/*