hack get 2018 build running

5 年前 · 3f8cedfd
--- a/UnitySDK/Assets/ML-Agents/Editor/Tests/MLAgentsEditModeTest.cs
+++ b/UnitySDK/Assets/ML-Agents/Editor/Tests/MLAgentsEditModeTest.cs
            return null;
        }

-        public CompressionType GetCompressionType()
+        public Sensor.CompressionType GetCompressionType()
-            return CompressionType.None;
+            return Sensor.CompressionType.None;
        }

        public string GetName()
--- a/UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs
+++ b/UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs
 using System;
 using UnityEditor;
 using UnityEngine;
+using UnityEditor.Build.Reporting;

 namespace MLAgents
 {
        {
            string[] scenes = { "Assets/ML-Agents/Examples/3DBall/Scenes/3DBall.unity" };
-            var error = BuildPipeline.BuildPlayer(scenes, "testPlayer", BuildTarget.StandaloneOSX, BuildOptions.None);
-            if (string.IsNullOrEmpty(error))
+            var report = BuildPipeline.BuildPlayer(scenes, "testPlayer", BuildTarget.StandaloneOSX, BuildOptions.None);
+
+            //if (string.IsNullOrEmpty(error))
+            if(report.summary.result == BuildResult.Succeeded)
-                Console.Error.WriteLine(error);
+                //Console.Error.WriteLine(error);
-                
+
-        
+
    }
 }
--- a/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/LogoCube.png.meta
+++ b/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/LogoCube.png.meta
 fileFormatVersion: 2
 guid: be5d24d9d9e024be784fbcb911cb18e8
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
-  serializedVersion: 4
+  serializedVersion: 10
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
    serializedVersion: 2
    filterMode: 1
    aniso: -1
-    mipBias: -1
+    mipBias: -100
    wrapU: 1
    wrapV: 1
    wrapW: -1
  spriteTessellationDetail: -1
  textureType: 8
  textureShape: 1
+  singleChannelComponent: 0
-  - buildTarget: DefaultTexturePlatform
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 1
    textureFormat: -1
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-  - buildTarget: Standalone
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Standalone
    maxTextureSize: 2048
    resizeAlgorithm: 1
    textureFormat: -1
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-  - buildTarget: iPhone
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: iPhone
    maxTextureSize: 2048
    resizeAlgorithm: 1
    textureFormat: -1
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-  - buildTarget: Android
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Android
    maxTextureSize: 2048
    resizeAlgorithm: 1
    textureFormat: -1
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/UnityLogo.png.meta
+++ b/UnitySDK/Assets/ML-Agents/Examples/SharedAssets/Materials/Textures/UnityLogo.png.meta
 fileFormatVersion: 2
 guid: 2e85738fe64714cffbf72f0f11de6307
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
-  serializedVersion: 4
+  serializedVersion: 10
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
    serializedVersion: 2
    filterMode: -1
    aniso: -1
-    mipBias: -1
+    mipBias: -100
    wrapU: 1
    wrapV: 1
    wrapW: -1
  spriteTessellationDetail: -1
  textureType: 8
  textureShape: 1
+  singleChannelComponent: 0
-  - buildTarget: DefaultTexturePlatform
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-  - buildTarget: Standalone
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Standalone
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-  - buildTarget: iPhone
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: iPhone
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-  - buildTarget: Android
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Android
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/UnitySDK/Assets/ML-Agents/Plugins/Barracuda.Core/Barracuda/Plugins/iOS/iOSBLAS.mm.meta
+++ b/UnitySDK/Assets/ML-Agents/Plugins/Barracuda.Core/Barracuda/Plugins/iOS/iOSBLAS.mm.meta
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
+  defineConstraints: []
+  isExplicitlyReferenced: 0
+  validateReferences: 1
  platformData:
  - first:
      '': Any
    second:
      enabled: 0
      settings:
-        CPU: x86_64
+        CPU: AnyCPU
  - first:
      Standalone: OSXUniversal
    second:
--- a/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/Grpc.Core.dll.meta
+++ b/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/Grpc.Core.dll.meta
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
+  defineConstraints: []
+  isExplicitlyReferenced: 0
+  validateReferences: 1
  platformData:
  - first:
      '': Any
    second:
      enabled: 1
      settings:
-        CPU: x86_64
+        CPU: AnyCPU
  - first:
      Standalone: LinuxUniversal
    second:
--- a/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/runtimes/linux/native/libgrpc_csharp_ext.x64.so.meta
+++ b/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/runtimes/linux/native/libgrpc_csharp_ext.x64.so.meta
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
+  defineConstraints: []
+  isExplicitlyReferenced: 0
+  validateReferences: 1
  platformData:
  - first:
      '': Any
    second:
      enabled: 1
      settings:
-        CPU: x86_64
+        CPU: AnyCPU
  - first:
      Standalone: LinuxUniversal
    second:
--- a/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/runtimes/osx/native/libgrpc_csharp_ext.x64.bundle.meta
+++ b/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/runtimes/osx/native/libgrpc_csharp_ext.x64.bundle.meta
 fileFormatVersion: 2
 guid: 7eeb863bd08ba4388829c23da03a714f
 PluginImporter:
+  externalObjects: {}
+  defineConstraints: []
+  isExplicitlyReferenced: 0
+  validateReferences: 1
-    data:
-      first:
-        '': Any
-      second:
-        enabled: 0
-        settings:
-          Exclude Android: 1
-          Exclude Editor: 0
-          Exclude Linux: 1
-          Exclude Linux64: 1
-          Exclude LinuxUniversal: 1
-          Exclude OSXIntel: 0
-          Exclude OSXIntel64: 0
-          Exclude OSXUniversal: 0
-          Exclude Win: 1
-          Exclude Win64: 1
-          Exclude iOS: 1
-    data:
-      first:
-        '': OSXIntel
-      second:
-        enabled: 1
-        settings: {}
-    data:
-      first:
-        '': OSXIntel64
-      second:
-        enabled: 1
-        settings: {}
-    data:
-      first:
-        Android: Android
-      second:
-        enabled: 0
-        settings:
-          CPU: ARMv7
-    data:
-      first:
-        Any: 
-      second:
-        enabled: 0
-        settings: {}
-    data:
-      first:
-        Editor: Editor
-      second:
-        enabled: 1
-        settings:
-          CPU: x86_64
-          DefaultValueInitialized: true
-          OS: OSX
-    data:
-      first:
-        Facebook: Win
-      second:
-        enabled: 0
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Facebook: Win64
-      second:
-        enabled: 0
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: Linux
-      second:
-        enabled: 0
-        settings:
-          CPU: x86
-    data:
-      first:
-        Standalone: Linux64
-      second:
-        enabled: 0
-        settings:
-          CPU: x86_64
-    data:
-      first:
-        Standalone: LinuxUniversal
-      second:
-        enabled: 0
-        settings:
-          CPU: None
-    data:
-      first:
-        Standalone: OSXIntel
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: OSXIntel64
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: OSXUniversal
-      second:
-        enabled: 1
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: Win
-      second:
-        enabled: 0
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        Standalone: Win64
-      second:
-        enabled: 0
-        settings:
-          CPU: AnyCPU
-    data:
-      first:
-        iPhone: iOS
-      second:
-        enabled: 0
-        settings:
-          AddToEmbeddedBinaries: false
-          CompileFlags: 
-          FrameworkDependencies: 
+  - first:
+      '': Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux: 1
+        Exclude Linux64: 1
+        Exclude LinuxUniversal: 1
+        Exclude OSXIntel: 0
+        Exclude OSXIntel64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 1
+        Exclude Win64: 1
+        Exclude iOS: 1
+  - first:
+      '': OSXIntel
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      '': OSXIntel64
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+        DefaultValueInitialized: true
+        OS: OSX
+  - first:
+      Facebook: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Facebook: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Linux
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: LinuxUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXIntel
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXIntel64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
+        CompileFlags: 
+        FrameworkDependencies: 
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/runtimes/win/native/grpc_csharp_ext.x64.dll.meta
+++ b/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/runtimes/win/native/grpc_csharp_ext.x64.dll.meta
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
+  defineConstraints: []
+  isExplicitlyReferenced: 0
+  validateReferences: 1
  platformData:
  - first:
      '': Any
    second:
      enabled: 1
      settings:
-        CPU: x86_64
+        CPU: AnyCPU
  - first:
      Standalone: LinuxUniversal
    second:
--- a/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/runtimes/win/native/grpc_csharp_ext.x86.dll.meta
+++ b/UnitySDK/Assets/ML-Agents/Plugins/ProtoBuffer/runtimes/win/native/grpc_csharp_ext.x86.dll.meta
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
+  defineConstraints: []
+  isExplicitlyReferenced: 0
+  validateReferences: 1
  platformData:
  - first:
      '': Any
    second:
      enabled: 1
      settings:
-        CPU: x86_64
+        CPU: AnyCPU
  - first:
      Standalone: LinuxUniversal
    second:
--- a/UnitySDK/ProjectSettings/ProjectVersion.txt
+++ b/UnitySDK/ProjectSettings/ProjectVersion.txt
-m_EditorVersion: 2017.4.32f1
+m_EditorVersion: 2019.2.6f1
+m_EditorVersionWithRevision: 2019.2.6f1 (fe82a0e88406)