|
13 | 13 |
|
14 | 14 | namespace Microsoft.Android.Build.Tasks
|
15 | 15 | {
|
| 16 | + [Flags] |
| 17 | + public enum RegisterTaskObjectKeyFlags { |
| 18 | + None = 0, |
| 19 | + IncludeProjectFile = 1 << 0, |
| 20 | + } |
| 21 | + |
16 | 22 | public static class MSBuildExtensions
|
17 | 23 | {
|
18 | 24 | public static void LogDebugMessage (this TaskLoggingHelper log, string message, params object[] messageArgs)
|
@@ -252,34 +258,80 @@ public static void SetDestinationSubPath (this ITaskItem assembly)
|
252 | 258 | /// <summary>
|
253 | 259 | /// IBuildEngine4.RegisterTaskObject, but adds the current assembly path into the key
|
254 | 260 | /// </summary>
|
| 261 | + [Obsolete ("Use RegisterTaskObjectAssemblyLocal (engine, key, value, allowEarlyCollection, lifetime, flags) instead.")] |
255 | 262 | public static void RegisterTaskObjectAssemblyLocal (this IBuildEngine4 engine, object key, object value, RegisteredTaskObjectLifetime lifetime, bool allowEarlyCollection = false) =>
|
256 |
| - engine.RegisterTaskObject ((AssemblyLocation, key), value, lifetime, allowEarlyCollection); |
| 263 | + RegisterTaskObjectAssemblyLocal (engine, key, value, lifetime, allowEarlyCollection: false, flags: RegisterTaskObjectKeyFlags.IncludeProjectFile); |
| 264 | + |
| 265 | + /// <summary> |
| 266 | + /// IBuildEngine4.RegisterTaskObject, but adds the current assembly path into the key |
| 267 | + /// </summary> |
| 268 | + public static void RegisterTaskObjectAssemblyLocal (this IBuildEngine4 engine, object key, object value, RegisteredTaskObjectLifetime lifetime, bool allowEarlyCollection = false, RegisterTaskObjectKeyFlags flags = RegisterTaskObjectKeyFlags.IncludeProjectFile) => |
| 269 | + engine.RegisterTaskObject (engine.GetKey (AssemblyLocation, key, flags), value, lifetime, allowEarlyCollection); |
257 | 270 |
|
258 | 271 | /// <summary>
|
259 | 272 | /// IBuildEngine4.GetRegisteredTaskObject, but adds the current assembly path into the key
|
260 | 273 | /// </summary>
|
| 274 | + [Obsolete ("Use GetRegisteredTaskObjectAssemblyLocal (engine, key, lifetime, flags) instead.")] |
261 | 275 | public static object GetRegisteredTaskObjectAssemblyLocal (this IBuildEngine4 engine, object key, RegisteredTaskObjectLifetime lifetime) =>
|
262 |
| - engine.GetRegisteredTaskObject ((AssemblyLocation, key), lifetime); |
| 276 | + GetRegisteredTaskObjectAssemblyLocal (engine, key, lifetime, flags: RegisterTaskObjectKeyFlags.IncludeProjectFile); |
| 277 | + |
| 278 | + /// <summary> |
| 279 | + /// IBuildEngine4.GetRegisteredTaskObject, but adds the current assembly path into the key |
| 280 | + /// </summary> |
| 281 | + public static object GetRegisteredTaskObjectAssemblyLocal (this IBuildEngine4 engine, object key, RegisteredTaskObjectLifetime lifetime, RegisterTaskObjectKeyFlags flags = RegisterTaskObjectKeyFlags.IncludeProjectFile) => |
| 282 | + engine.GetRegisteredTaskObject (engine.GetKey (AssemblyLocation, key, flags), lifetime); |
| 283 | + |
263 | 284 |
|
264 | 285 | /// <summary>
|
265 | 286 | /// Generic version of IBuildEngine4.GetRegisteredTaskObject, but adds the current assembly path into the key
|
266 | 287 | /// </summary>
|
| 288 | + [Obsolete ("Use GetRegisteredTaskObjectAssemblyLocal<T> (engine, key, lifetime, flags) instead.")] |
267 | 289 | public static T GetRegisteredTaskObjectAssemblyLocal<T> (this IBuildEngine4 engine, object key, RegisteredTaskObjectLifetime lifetime)
|
268 |
| - where T : class => |
269 |
| - engine.GetRegisteredTaskObject ((AssemblyLocation, key), lifetime) as T; |
| 290 | + where T : class => GetRegisteredTaskObjectAssemblyLocal<T> (engine, key, lifetime, flags: RegisterTaskObjectKeyFlags.IncludeProjectFile); |
270 | 291 |
|
| 292 | + /// <summary> |
| 293 | + /// Generic version of IBuildEngine4.GetRegisteredTaskObject, but adds the current assembly path into the key |
| 294 | + /// </summary> |
| 295 | + public static T GetRegisteredTaskObjectAssemblyLocal<T> (this IBuildEngine4 engine, object key, RegisteredTaskObjectLifetime lifetime, RegisterTaskObjectKeyFlags flags = RegisterTaskObjectKeyFlags.IncludeProjectFile) |
| 296 | + where T : class => |
| 297 | + engine.GetRegisteredTaskObject (engine.GetKey (AssemblyLocation, key, flags), lifetime) as T; |
271 | 298 |
|
272 | 299 | /// <summary>
|
273 | 300 | /// IBuildEngine4.UnregisterTaskObject, but adds the current assembly path into the key
|
274 | 301 | /// </summary>
|
| 302 | + [Obsolete ("Use UnregisterTaskObjectAssemblyLocal (engine, key, lifetime, flags) instead.")] |
275 | 303 | public static object UnregisterTaskObjectAssemblyLocal (this IBuildEngine4 engine, object key, RegisteredTaskObjectLifetime lifetime) =>
|
276 |
| - engine.UnregisterTaskObject ((AssemblyLocation, key), lifetime); |
| 304 | + UnregisterTaskObjectAssemblyLocal (engine, key, lifetime, flags: RegisterTaskObjectKeyFlags.IncludeProjectFile); |
| 305 | + |
| 306 | + /// <summary> |
| 307 | + /// IBuildEngine4.UnregisterTaskObject, but adds the current assembly path into the key |
| 308 | + /// </summary> |
| 309 | + public static object UnregisterTaskObjectAssemblyLocal (this IBuildEngine4 engine, object key, RegisteredTaskObjectLifetime lifetime, RegisterTaskObjectKeyFlags flags = RegisterTaskObjectKeyFlags.IncludeProjectFile) => |
| 310 | + engine.UnregisterTaskObject (engine.GetKey (AssemblyLocation, key, flags), lifetime); |
277 | 311 |
|
278 | 312 | /// <summary>
|
279 | 313 | /// Generic version of IBuildEngine4.UnregisterTaskObject, but adds the current assembly path into the key
|
280 | 314 | /// </summary>
|
| 315 | + [Obsolete ("Use UnregisterTaskObjectAssemblyLocal<T> (engine, key, lifetime, flags) instead.")] |
281 | 316 | public static T UnregisterTaskObjectAssemblyLocal<T> (this IBuildEngine4 engine, object key, RegisteredTaskObjectLifetime lifetime)
|
| 317 | + where T : class => UnregisterTaskObjectAssemblyLocal<T> (engine, key, lifetime, flags: RegisterTaskObjectKeyFlags.IncludeProjectFile); |
| 318 | + |
| 319 | + /// <summary> |
| 320 | + /// Generic version of IBuildEngine4.UnregisterTaskObject, but adds the current assembly path into the key |
| 321 | + /// </summary> |
| 322 | + public static T UnregisterTaskObjectAssemblyLocal<T> (this IBuildEngine4 engine, object key, RegisteredTaskObjectLifetime lifetime, RegisterTaskObjectKeyFlags flags = RegisterTaskObjectKeyFlags.IncludeProjectFile) |
282 | 323 | where T : class =>
|
283 |
| - engine.UnregisterTaskObject ((AssemblyLocation, key), lifetime) as T; |
| 324 | + engine.UnregisterTaskObject (engine.GetKey (AssemblyLocation, key, flags), lifetime) as T; |
| 325 | + |
| 326 | + /// <summary> |
| 327 | + /// Method to calculate the key for the RegisterTaskObject. This is based on the |
| 328 | + /// RegisterTaskObjectKeyFlags which are passed. |
| 329 | + /// </summary> |
| 330 | + static object GetKey (this IBuildEngine4 engine, string location, object key, RegisterTaskObjectKeyFlags flags) |
| 331 | + { |
| 332 | + return ((flags & RegisterTaskObjectKeyFlags.IncludeProjectFile) != 0) |
| 333 | + ? (location, key, engine.ProjectFileOfTaskNode) |
| 334 | + : (location, key, string.Empty); |
| 335 | + } |
284 | 336 | }
|
285 | 337 | }
|
0 commit comments