Revert IBuildEngine.ProjectFileOfTaskNode use. (#201)

Reverts: 47f95ab
Reverts: 76c076f
Context: dotnet/android#7685 (comment)
The problem is that we misunderstood
[`IBuildEngine.ProjectFileOfTaskNode`][0]: we *thought* (hoped?) that
it would return `$(MSBuildProjectFullPath)`, the path to the
`.csproj` being built.
In actuality it returns `$(MSBuildThisFileFullPath)` for the file
containing the Task invocation. Meaning if e.g.
`Xamarin.Android.Common.targets` contains the Task invocation, then
IBuildEngine.ProjectFileOfTaskNode` would be the path to
`Xamarin.Android.Common.targets`, *not* the path of the `.csproj`.
This in turn means it doesn't actually solve the problem we had.
We will instead need to audit all use of
`IBuildEngine4.RegisterTaskObject()` & related to ensure that the
keys provided *also* contain paths to project-specific files,
if necessary.
Revert 47f95ab and 76c076f, as the changes are not needed.
[0]: https://learn.microsoft.com/en-us/dotnet/api/microsoft.build.framework.ibuildengine.projectfileoftasknode?view=msbuild-17-netcore

Author: jonpryor

src/Microsoft.Android.Build.BaseTasks/MSBuildExtensions.cs

@@ -13,12 +13,6 @@
 
 namespaceMicrosoft.Android.Build.Tasks
 {
-[Flags]
-publicenumRegisterTaskObjectKeyFlags{
-None=0,
-IncludeProjectFile=1<<0,
-}
-
 publicstaticclassMSBuildExtensions
 {
 publicstaticvoidLogDebugMessage(thisTaskLoggingHelperlog,stringmessage,paramsobject[]messageArgs)
@@ -259,80 +253,33 @@ public static void SetDestinationSubPath (this ITaskItem assembly)
 /// IBuildEngine4.RegisterTaskObject, but adds the current assembly path into the key
 /// </summary>
 publicstaticvoidRegisterTaskObjectAssemblyLocal(thisIBuildEngine4engine,objectkey,objectvalue,RegisteredTaskObjectLifetimelifetime,boolallowEarlyCollection=false)=>
-RegisterTaskObjectAssemblyLocal(engine,key,value,lifetime,allowEarlyCollection:false,flags:RegisterTaskObjectKeyFlags.IncludeProjectFile);
-
-/// <summary>
-/// IBuildEngine4.RegisterTaskObject, but adds the current assembly path into the key
-/// </summary>
-publicstaticvoidRegisterTaskObjectAssemblyLocal(thisIBuildEngine4engine,objectkey,objectvalue,RegisteredTaskObjectLifetimelifetime,RegisterTaskObjectKeyFlagsflags)=>
-engine.RegisterTaskObject(engine.GetKey(AssemblyLocation,key,flags),value,lifetime,allowEarlyCollection:false);
-
-/// <summary>
-/// IBuildEngine4.RegisterTaskObject, but adds the current assembly path into the key
-/// </summary>
-publicstaticvoidRegisterTaskObjectAssemblyLocal(thisIBuildEngine4engine,objectkey,objectvalue,RegisteredTaskObjectLifetimelifetime,boolallowEarlyCollection,RegisterTaskObjectKeyFlagsflags)=>
-engine.RegisterTaskObject(engine.GetKey(AssemblyLocation,key,flags),value,lifetime,allowEarlyCollection);
+engine.RegisterTaskObject((AssemblyLocation,key),value,lifetime,allowEarlyCollection);
 
 /// <summary>
 /// IBuildEngine4.GetRegisteredTaskObject, but adds the current assembly path into the key
 /// </summary>
 publicstaticobjectGetRegisteredTaskObjectAssemblyLocal(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime)=>
-GetRegisteredTaskObjectAssemblyLocal(engine,key,lifetime,flags:RegisterTaskObjectKeyFlags.IncludeProjectFile);
-
-/// <summary>
-/// IBuildEngine4.GetRegisteredTaskObject, but adds the current assembly path into the key
-/// </summary>
-publicstaticobjectGetRegisteredTaskObjectAssemblyLocal(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime,RegisterTaskObjectKeyFlagsflags)=>
-engine.GetRegisteredTaskObject(engine.GetKey(AssemblyLocation,key,flags),lifetime);
-
+engine.GetRegisteredTaskObject((AssemblyLocation,key),lifetime);
 
 /// <summary>
 /// Generic version of IBuildEngine4.GetRegisteredTaskObject, but adds the current assembly path into the key
 /// </summary>
 publicstaticTGetRegisteredTaskObjectAssemblyLocal<T>(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime)
-whereT:class=>GetRegisteredTaskObjectAssemblyLocal<T>(engine,key,lifetime,flags:RegisterTaskObjectKeyFlags.IncludeProjectFile);
-
-/// <summary>
-/// Generic version of IBuildEngine4.GetRegisteredTaskObject, but adds the current assembly path into the key
-/// </summary>
-publicstaticTGetRegisteredTaskObjectAssemblyLocal<T>(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime,RegisterTaskObjectKeyFlagsflags)
 whereT:class=>
-engine.GetRegisteredTaskObject(engine.GetKey(AssemblyLocation,key,flags),lifetime)asT;
+engine.GetRegisteredTaskObject((AssemblyLocation,key),lifetime)asT;
 
-/// <summary>
-/// IBuildEngine4.UnregisterTaskObject, but adds the current assembly path into the key
-/// </summary>
-publicstaticobjectUnregisterTaskObjectAssemblyLocal(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime)=>
-UnregisterTaskObjectAssemblyLocal(engine,key,lifetime,flags:RegisterTaskObjectKeyFlags.IncludeProjectFile);
 
 /// <summary>
 /// IBuildEngine4.UnregisterTaskObject, but adds the current assembly path into the key
 /// </summary>
-publicstaticobjectUnregisterTaskObjectAssemblyLocal(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime,RegisterTaskObjectKeyFlagsflags)=>
-engine.UnregisterTaskObject(engine.GetKey(AssemblyLocation,key,flags),lifetime);
+publicstaticobjectUnregisterTaskObjectAssemblyLocal(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime)=>
+engine.UnregisterTaskObject((AssemblyLocation,key),lifetime);
 
 /// <summary>
 /// Generic version of IBuildEngine4.UnregisterTaskObject, but adds the current assembly path into the key
 /// </summary>
 publicstaticTUnregisterTaskObjectAssemblyLocal<T>(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime)
-whereT:class=>UnregisterTaskObjectAssemblyLocal<T>(engine,key,lifetime,flags:RegisterTaskObjectKeyFlags.IncludeProjectFile);
-
-/// <summary>
-/// Generic version of IBuildEngine4.UnregisterTaskObject, but adds the current assembly path into the key
-/// </summary>
-publicstaticTUnregisterTaskObjectAssemblyLocal<T>(thisIBuildEngine4engine,objectkey,RegisteredTaskObjectLifetimelifetime,RegisterTaskObjectKeyFlagsflags)
 whereT:class=>
-engine.UnregisterTaskObject(engine.GetKey(AssemblyLocation,key,flags),lifetime)asT;
-
-/// <summary>
-/// Method to calculate the key for the RegisterTaskObject. This is based on the
-/// RegisterTaskObjectKeyFlags which are passed.
-/// </summary>
-staticobjectGetKey(thisIBuildEngine4engine,stringlocation,objectkey,RegisterTaskObjectKeyFlagsflags)
-{
-return((flags&RegisterTaskObjectKeyFlags.IncludeProjectFile)!=0)
-?(location,key,engine.ProjectFileOfTaskNode)
-:(location,key,string.Empty);
-}
+engine.UnregisterTaskObject((AssemblyLocation,key),lifetime)asT;
 }
 }