From 4e7b3de70a7b11223e99af47a049d9d2b961347b Mon Sep 17 00:00:00 2001 From: Andrei Borodin Date: Tue, 19 Nov 2019 20:51:10 -0800 Subject: [PATCH 1/6] Checking in a C# project file that as part of Integrated dependencies will build it's source externally. --- .../Assets/CustomUnityBuild/.gitignore | 4 + .../.src/ExternalMonoBehaviour.cs | 12 + .../CustomUnityBuild/CustomUnityBuild.csproj | 85 +++++ .../CustomUnityBuild.csproj.meta | 12 + .../Assets/CustomUnityBuild/NuGet.config | 7 + .../Assets/CustomUnityBuild/NuGet.config.meta | 32 ++ .../Assets/CustomUnityBuild/TestScene.unity | 308 ++++++++++++++++++ .../CustomUnityBuild/TestScene.unity.meta | 7 + 8 files changed, 467 insertions(+) create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/.gitignore create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/.src/ExternalMonoBehaviour.cs create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj.meta create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/NuGet.config create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/NuGet.config.meta create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/TestScene.unity create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/TestScene.unity.meta diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/.gitignore b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/.gitignore new file mode 100644 index 0000000..15ecc70 --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/.gitignore @@ -0,0 +1,4 @@ +Plugins/ +.obj/ +Plugins.meta +!*.csproj \ No newline at end of file diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/.src/ExternalMonoBehaviour.cs b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/.src/ExternalMonoBehaviour.cs new file mode 100644 index 0000000..fd1e438 --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/.src/ExternalMonoBehaviour.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ExternalMonoBehaviour : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + Debug.Log(typeof(ExternalMonoBehaviour).BaseType.FullName); + } +} diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj new file mode 100644 index 0000000..d31322b --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj @@ -0,0 +1,85 @@ + + + + + + netstandard2.0 + + + + $(UnityCurrentTargetFramework) + + + + $(UnityCurrentPlatform) + + + + InEditor + bb41a40a-fd6b-47da-0865-83ab52977bdc + False + 7.3 + False + false + false + + + + + .obj + Plugins + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + + {CandidateAssemblyFiles};{HintPathFromItem};{RawFileName}; + + + + + + + + + $(DefaultItemExcludes)obj;bin;*.asmdef;*.asmdef.meta;*.csmap; + + false + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj.meta b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj.meta new file mode 100644 index 0000000..9d5f425 --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 69089c25af66ec949836106124044360 +ScriptedImporter: + fileIDToRecycleName: + 11400000: CustomUnityBuild + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 0e4dca1acba66fd478b3854f09a32ec7, type: 3} + buildEngine: 0 + profiles: [] diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/NuGet.config b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/NuGet.config new file mode 100644 index 0000000..ce1bf2c --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/NuGet.config.meta b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/NuGet.config.meta new file mode 100644 index 0000000..bf5f6d4 --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/NuGet.config.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: cc1cbb5c014810e418e1ed9dc9f46571 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/TestScene.unity b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/TestScene.unity new file mode 100644 index 0000000..c45f8ab --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/TestScene.unity @@ -0,0 +1,308 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641252, b: 0.5748167, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &32453599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32453601} + - component: {fileID: 32453600} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &32453600 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32453599} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &32453601 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32453599} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &345216303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 345216306} + - component: {fileID: 345216305} + - component: {fileID: 345216304} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &345216304 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345216303} + m_Enabled: 1 +--- !u!20 &345216305 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345216303} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &345216306 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345216303} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1538864951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1538864953} + - component: {fileID: 1538864952} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1538864952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538864951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1265714924, guid: a18e47869ec87918f08efda65fd1b2c9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1538864953 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538864951} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/TestScene.unity.meta b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/TestScene.unity.meta new file mode 100644 index 0000000..1ed13b1 --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/TestScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c2bf9a6e83a3a074aa501cbb76aa6581 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 7bd483d3c6da04a8dd8322e000ad53bec7fa32d1 Mon Sep 17 00:00:00 2001 From: Andrei Borodin Date: Tue, 19 Nov 2019 21:10:58 -0800 Subject: [PATCH 2/6] Had to add second project to build player DLL --- .../Assets/CustomUnityBuild.meta | 8 ++ .../CustomUnityBuild.Player.csproj | 100 +++++++++++++++ .../CustomUnityBuild.Player.csproj.meta | 12 ++ .../CustomUnityBuild/CustomUnityBuild.csproj | 11 +- .../Player/net46/CustomUnityBuild.dll.meta | 115 ++++++++++++++++++ 5 files changed, 243 insertions(+), 3 deletions(-) create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild.meta create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.Player.csproj create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.Player.csproj.meta create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/Plugins/Player/net46/CustomUnityBuild.dll.meta diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild.meta b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild.meta new file mode 100644 index 0000000..827fed3 --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e41dbd3ff17bad94c8cfce4105dddded +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.Player.csproj b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.Player.csproj new file mode 100644 index 0000000..5ae433b --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.Player.csproj @@ -0,0 +1,100 @@ + + + + + + netstandard2.0 + + + + $(UnityCurrentTargetFramework) + + + + $(UnityCurrentPlatform) + + + + + Player + {E8060EE6-F0CB-459B-A4B2-634E87DFDD9C} + False + 7.3 + False + false + false + + CustomUnityBuild + CustomUnityBuild + + + + + + + + .obj + Plugins/Editor + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + + {CandidateAssemblyFiles};{HintPathFromItem};{RawFileName}; + + + + + + + + + + $(DefaultItemExcludes)obj;bin;*.asmdef;*.asmdef.meta;*.csmap; + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.Player.csproj.meta b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.Player.csproj.meta new file mode 100644 index 0000000..78e4f04 --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.Player.csproj.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 6ea8535805e42ec4cbddffd7688a620c +ScriptedImporter: + fileIDToRecycleName: + 11400000: CustomUnityBuild.Player + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 0e4dca1acba66fd478b3854f09a32ec7, type: 3} + buildEngine: 0 + profiles: [] diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj index d31322b..d207d51 100644 --- a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/CustomUnityBuild.csproj @@ -1,5 +1,5 @@  - + @@ -15,7 +15,9 @@ + InEditor + Editor bb41a40a-fd6b-47da-0865-83ab52977bdc False 7.3 @@ -25,9 +27,9 @@ - + .obj - Plugins + Plugins/Player @@ -48,6 +50,7 @@ {CandidateAssemblyFiles};{HintPathFromItem};{RawFileName}; + @@ -60,6 +63,8 @@ + + diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/Plugins/Player/net46/CustomUnityBuild.dll.meta b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/Plugins/Player/net46/CustomUnityBuild.dll.meta new file mode 100644 index 0000000..6241378 --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/Plugins/Player/net46/CustomUnityBuild.dll.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: 983328ecb84a10544a251499303d55df +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 1 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude OSXUniversal: 0 + Exclude Win: 0 + Exclude Win64: 0 + Exclude WindowsStoreApps: 0 + Exclude iOS: 0 + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: {} + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 1 + settings: + CPU: AnyCPU + DontProcess: false + PlaceholderPath: + SDK: AnySDK + ScriptingBackend: AnyScriptingBackend + - first: + iPhone: iOS + second: + enabled: 1 + settings: + AddToEmbeddedBinaries: false + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: From ed6578a5991e636ac50a928bf6a3df17ed1028e3 Mon Sep 17 00:00:00 2001 From: Andrei Borodin Date: Tue, 19 Nov 2019 21:12:10 -0800 Subject: [PATCH 3/6] Adding Editor dll meta --- .../Editor/net46/CustomUnityBuild.dll.meta | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/Plugins/Editor/net46/CustomUnityBuild.dll.meta diff --git a/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/Plugins/Editor/net46/CustomUnityBuild.dll.meta b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/Plugins/Editor/net46/CustomUnityBuild.dll.meta new file mode 100644 index 0000000..d9d8d6c --- /dev/null +++ b/Samples/IntegratedDependencies.Unity/Assets/CustomUnityBuild/Plugins/Editor/net46/CustomUnityBuild.dll.meta @@ -0,0 +1,38 @@ +fileFormatVersion: 2 +guid: a18e47869ec87918f08efda65fd1b2c9 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + '': Any + second: + enabled: 0 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: From d601f0341d4ef2e20c36906963e7a7967a475740 Mon Sep 17 00:00:00 2001 From: Andrei Borodin Date: Wed, 20 Nov 2019 13:38:34 -0800 Subject: [PATCH 4/6] Updating Readme, plus version range (#60) * Updating MSBuildForUnity NuGet package reference that is either generated or embedded int he simple sample. The new version range allows any 0.8.0- prerelease, or a 0.8.0 package as max. * Git is case sensitive on link, fixing it --- README.md | 4 ++-- .../Assets/NewtonsoftDependency/NewtonsoftDependency.csproj | 2 +- .../DependenciesProjectTemplate.g.props.template | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f52ecae..c0e6c79 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ MSBuildForUnity solves the problem of establishing clear dependency relationship The samples included in this repository best convey the simplicity and value of this component: -- [Simple NuGet Dependency Sample](Samples/SimpleNuGetDependency.Unity/Readme.md) - Showcases the simplest and most minimal usage of this component to pull in a dependency. -- [Integrated Dependencies Sample](Samples/IntegratedDependencies.Unity/Readme.md) - Showcases the power of this component by relying on project generation. +- [Simple NuGet Dependency Sample](Samples/SimpleNuGetDependency.Unity/README.md) - Showcases the simplest and most minimal usage of this component to pull in a dependency. +- [Integrated Dependencies Sample](Samples/IntegratedDependencies.Unity/README.md) - Showcases the power of this component by relying on project generation. ## Contributing diff --git a/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj b/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj index 31b2884..2c6eb05 100644 --- a/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj +++ b/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template index 3e18de6..57b9b24 100644 --- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template +++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template @@ -20,7 +20,7 @@ - + all runtime; build; native; contentfiles; analyzers From 03bca86f1e9e19032ea2036f371d6b84bf17b355 Mon Sep 17 00:00:00 2001 From: Andrei Borodin Date: Wed, 20 Nov 2019 16:39:28 -0800 Subject: [PATCH 5/6] Fixing overwrite bug (#62) --- .../Scripts/Exporters/TemplatedProjectExporter.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/TemplatedProjectExporter.cs b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/TemplatedProjectExporter.cs index fd0a267..e6ba4a5 100644 --- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/TemplatedProjectExporter.cs +++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/TemplatedProjectExporter.cs @@ -133,12 +133,9 @@ public void ExportProject(UnityProjectInfo unityProjectInfo, CSProjectInfo proje generatedProjectFileTemplate.Write(projectPath, generatedProjectFileTemplate.Root.CreateReplacementSet()); File.SetAttributes(projectPath, FileAttributes.ReadOnly); } - else + else if (!File.Exists(projectPath)) { - if (File.Exists(projectPath)) - { - projectFileTemplate.Write(projectPath, projectFileTemplate.Root.CreateReplacementSet()); - } + projectFileTemplate.Write(projectPath, projectFileTemplate.Root.CreateReplacementSet()); } } From 3c1a263ac35657466a4416df4c18223a7ba5da00 Mon Sep 17 00:00:00 2001 From: Andrei Borodin Date: Wed, 20 Nov 2019 16:56:07 -0800 Subject: [PATCH 6/6] Increment NPM Version only on Master (#63) --- AzurePipelines/Publish.UPM.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AzurePipelines/Publish.UPM.yml b/AzurePipelines/Publish.UPM.yml index 16392ea..4f757ea 100644 --- a/AzurePipelines/Publish.UPM.yml +++ b/AzurePipelines/Publish.UPM.yml @@ -15,6 +15,8 @@ pool: steps: - task: Npm@1 +# Only update the version on master branch + condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') inputs: command: 'custom' customCommand: --no-git-tag-version version prerelease --preid=$(Build.BuildNumber)