updated to 1.1.3 for all projects

Unity-Technologies · Jun 18, 2019 · 54b6956 · 54b6956
1 parent fd6f354
commit 54b6956
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 17 deletions.
diff --git a/Advanced/CustomAnalyzeRule/Packages/manifest.json b/Advanced/CustomAnalyzeRule/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.addressables": "1.1.0-preview",
+    "com.unity.addressables": "1.1.3-preview",
     "com.unity.ads": "2.3.1",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",
@@ -37,6 +37,5 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  },
-  "registry": "https://staging-packages.unity.com"
+  }
 }
diff --git a/Advanced/Sync Addressables/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Advanced/Sync Addressables/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -71,7 +71,7 @@ MonoBehaviour:
     m_AssemblyName: 
     m_ClassName: 
   m_ActivePlayerDataBuilderIndex: 3
-  m_ActivePlayModeDataBuilderIndex: 4
+  m_ActivePlayModeDataBuilderIndex: 2
   m_DataBuilders:
   - {fileID: 11400000, guid: 198a7e84d4d2ef64e8b9c60f96f15d3b, type: 2}
   - {fileID: 11400000, guid: 32dd92e48c14d2c49a48808efbb4b57a, type: 2}

diff --git a/...ced/Sync Addressables/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/...ced/Sync Addressables/Assets/AddressableAssetsData/Windows/addressables_content_state.bin
diff --git a/Advanced/Sync Addressables/Assets/SyncAddressables/Editor/SyncFastModeBuild.cs b/Advanced/Sync Addressables/Assets/SyncAddressables/Editor/SyncFastModeBuild.cs
@@ -46,7 +46,8 @@ protected override TResult BuildDataImplementation<TResult>(AddressablesDataBuil
             aaContext.runtimeData.ProfileEvents = context.ProfilerEventsEnabled;
             aaContext.runtimeData.CatalogLocations.Add(new ResourceLocationData(new[] { ResourceManagerRuntimeData.kCatalogAddress },
                 string.Format(pathFormat, "file://{UnityEngine.Application.dataPath}/../", "catalog"),
-                typeof(ContentCatalogProvider)));
+                typeof(ContentCatalogProvider),
+                typeof(ContentCatalogData)));
 
             var errorString = ProcessAllGroups(aaContext);
             if(!string.IsNullOrEmpty(errorString))
@@ -103,7 +104,7 @@ protected override string ProcessGroup(AddressableAssetGroup assetGroup, Address
 
         var typeName = typeof(SyncAssetDatabaseProvider).FullName;
         foreach (var a in allEntries)
-            aaContext.locations.Add(new ContentCatalogDataEntry(a.GetAssetLoadPath(true), typeName, a.CreateKeyList()));
+            a.CreateCatalogEntries(aaContext.locations, false, typeName, null, null);
 
         return errorString;
     }

diff --git a/Advanced/Sync Addressables/Packages/manifest.json b/Advanced/Sync Addressables/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.addressables": "0.8.4-preview",
+    "com.unity.addressables": "1.1.3-preview",
     "com.unity.ads": "2.3.1",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",

diff --git a/Advanced/Texture Variations/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Advanced/Texture Variations/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -89,7 +89,7 @@ MonoBehaviour:
     m_AssemblyName: 
     m_ClassName: 
   m_ActivePlayerDataBuilderIndex: 4
-  m_ActivePlayModeDataBuilderIndex: 2
+  m_ActivePlayModeDataBuilderIndex: 5
   m_DataBuilders:
   - {fileID: 11400000, guid: 780650a38de7f4942ae2ccc7422e118d, type: 2}
   - {fileID: 11400000, guid: 208117a7f78ec4d4894111e573eb5c7f, type: 2}

diff --git a/...ed/Texture Variations/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/...ed/Texture Variations/Assets/AddressableAssetsData/Windows/addressables_content_state.bin
diff --git a/Advanced/Texture Variations/Packages/manifest.json b/Advanced/Texture Variations/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.addressables": "0.8.4-preview",
+    "com.unity.addressables": "1.1.3-preview",
     "com.unity.ads": "2.3.1",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",

diff --git a/Basic/Basic AssetReference/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Basic/Basic AssetReference/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -36,7 +36,7 @@ MonoBehaviour:
       - m_Id: b503035f191f63348b0f03fe01eccff6
         m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
       - m_Id: ae4e4f8e82e20434882ff725d4519459
-        m_Value: Assets/StreamingAssets/com.unity.addressables/[BuildTarget]
+        m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
       - m_Id: 1eb742f6f5c8e8c48ac889ea1d5cb570
         m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
       - m_Id: e1b191ddb2f2cbb4c9686cbc9f1a7213
@@ -71,7 +71,7 @@ MonoBehaviour:
     m_AssemblyName: 
     m_ClassName: 
   m_ActivePlayerDataBuilderIndex: 2
-  m_ActivePlayModeDataBuilderIndex: 0
+  m_ActivePlayModeDataBuilderIndex: 3
   m_DataBuilders:
   - {fileID: 11400000, guid: d03cb99041348e5459b5eff24ac872cb, type: 2}
   - {fileID: 11400000, guid: 57838613cb4be3349b8411599f96a767, type: 2}

diff --git a/... AssetReference/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset b/... AssetReference/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
@@ -4,10 +4,17 @@
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ad8c280d42ee0ed41a27db23b43dd2bf, type: 3}
   m_Name: BuildScriptPackedPlayMode
   m_EditorClassIdentifier: 
+  instanceProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+  sceneProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider
diff --git a/.../Basic AssetReference/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/.../Basic AssetReference/Assets/AddressableAssetsData/Windows/addressables_content_state.bin
diff --git a/...ssetReference/Assets/StreamingAssets.meta → ...ndows/addressables_content_state.bin.meta b/...ssetReference/Assets/StreamingAssets.meta → ...ndows/addressables_content_state.bin.meta
diff --git a/Basic/Basic AssetReference/Packages/manifest.json b/Basic/Basic AssetReference/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.addressables": "0.8.4-preview",
+    "com.unity.addressables": "1.1.3-preview",
     "com.unity.ads": "2.3.1",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",

diff --git a/Basic/Scene Loading/Packages/manifest.json b/Basic/Scene Loading/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.addressables": "0.8.6-preview",
+    "com.unity.addressables": "1.1.3-preview",
     "com.unity.ads": "2.3.1",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",

diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ Why don't we put these sync methods in Addressables itself?  The best way to und
 
 
 #### *Advanced/Custom Analyze Rule*
-This sample shows how to create custom AnalyzeRules for use within the Analyze window.  Both rules follow the recommended pattern for adding themselves to the UI.
+This sample shows how to create custom AnalyzeRules for use within the Analyze window.  Both rules follow the recommended pattern for adding themselves to the UI.  There are no scenes to look at in this project, just analyze code.
 * Editor/AddressHasC
   * This is a non-fixable rule (meaning it will not fix itself).
   * When run, it checks that all addresses have a capital C in them.  Any that do not are flagged as errors.