diff --git a/Editor/BuildInfo.cs b/Editor/BuildInfo.cs index 4342f83..58690db 100644 --- a/Editor/BuildInfo.cs +++ b/Editor/BuildInfo.cs @@ -465,6 +465,27 @@ public string Configuration /// public virtual void OnPreProcessBuild(BuildReport report) { +#if UNITY_6000_0_OR_NEWER + var defaultIcons = PlayerSettings.GetIcons(UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(BuildTargetGroup.Unknown), IconKind.Any); +#else + var defaultIcons = PlayerSettings.GetIconsForTargetGroup(BuildTargetGroup.Unknown, IconKind.Any); +#endif + if (defaultIcons.Length == 0 || defaultIcons[0] == null) + { + Debug.LogWarning("No app icon set, setting a default..."); + var icon = AssetDatabase.LoadAssetAtPath("Packages/com.utilities.buildpipeline/Editor/Icons/UnityLogo.png"); + + if (icon == null) + { + throw new MissingReferenceException(nameof(icon)); + } +#if UNITY_6000_0_OR_NEWER + PlayerSettings.SetIcons(UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(BuildTargetGroup.Unknown), new[] { icon }, IconKind.Any); +#else + PlayerSettings.SetIconsForTargetGroup(BuildTargetGroup.Unknown, new[] { icon }); +#endif + AssetDatabase.SaveAssets(); + } } /// diff --git a/Editor/Icons.meta b/Editor/Icons.meta new file mode 100644 index 0000000..596ebe0 --- /dev/null +++ b/Editor/Icons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 359ade5c7cd3ef8498f40fdcbc664ca5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/Icons/UnityLogo.png b/Editor/Icons/UnityLogo.png new file mode 100644 index 0000000..ee178f3 Binary files /dev/null and b/Editor/Icons/UnityLogo.png differ diff --git a/Editor/Icons/UnityLogo.png.meta b/Editor/Icons/UnityLogo.png.meta new file mode 100644 index 0000000..fb8b643 --- /dev/null +++ b/Editor/Icons/UnityLogo.png.meta @@ -0,0 +1,152 @@ +fileFormatVersion: 2 +guid: 15cd37f5ffbadef4ea67ff67bf624e28 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/Platforms/AndroidBuildInfo.cs b/Editor/Platforms/AndroidBuildInfo.cs index 373e05b..8a5cbf5 100644 --- a/Editor/Platforms/AndroidBuildInfo.cs +++ b/Editor/Platforms/AndroidBuildInfo.cs @@ -94,6 +94,8 @@ public override void ParseCommandLineArgs() /// public override void OnPreProcessBuild(BuildReport report) { + base.OnPreProcessBuild(report); + if (EditorUserBuildSettings.activeBuildTarget != BuildTarget) { return; diff --git a/package.json b/package.json index 6228aae..8e56289 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Utilities.BuildPipeline", "description": "The Build Pipeline Utilities aims to give developers more tools and options when making builds with the command line or with continuous integration.", "keywords": [], - "version": "1.5.0", + "version": "1.5.1", "unity": "2019.4", "documentationUrl": "https://github.com/RageAgainstThePixel/com.utilities.buildpipeine#documentation", "changelogUrl": "https://github.com/RageAgainstThePixel/com.utilities.buildpipeine/releases",