Update Calls to GetMrtPackagingOutput to follow the Project Reference protocol. (#1535)

* Update Calls to GetMrtPackagingOutput to follow the Project Reference protocol.

* Update MrtCore.PriGen.targets

* Update MrtCore.PriGen.targets

* Update MrtCore.PriGen.targets

Author: jlaanstra

dev/MRTCore/packaging/MrtCore.PriGen.targets

@@ -1196,31 +1196,33 @@
     </PropertyGroup>
 
     <MSBuild
-      Projects="@(ProjectReferenceWithConfiguration)"
+      Projects="@(_MSBuildProjectReferenceExistent)"
       Targets="GetMrtPackagingOutputs"
       BuildInParallel="$(BuildInParallel)"
-      Properties="%(ProjectReferenceWithConfiguration.SetConfiguration); %(ProjectReferenceWithConfiguration.SetPlatform)"
-      Condition="'@(ProjectReferenceWithConfiguration)' != ''
-                 and '%(ProjectReferenceWithConfiguration.BuildReference)' == 'true'
-                 and '%(ProjectReferenceWithConfiguration.ReferenceOutputAssembly)' == 'true'"
+      Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration); %(_MSBuildProjectReferenceExistent.SetPlatform); %(_MSBuildProjectReferenceExistent.SetTargetFramework)"
+      Condition="'@(_MSBuildProjectReferenceExistent)' != ''
+                 and '%(_MSBuildProjectReferenceExistent.BuildReference)' == 'true'
+                 and '%(_MSBuildProjectReferenceExistent.ReferenceOutputAssembly)' == 'true'"
       SkipNonexistentTargets="true"
-      ContinueOnError="$(_ContinueOnError)">
+      ContinueOnError="$(_ContinueOnError)"
+      RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences)">
       <Output TaskParameter="TargetOutputs" ItemName="_PackagingOutputsFromOtherMrtCoreProjects"/>
     </MSBuild>
 
     <!-- The referenced project may not be using MRTCore. In that case, GetMrtPackagingOutputs won't be defined. However, if the
          project is of type UWP, it'll have GetPackagingOutputs defined. So, try calling GetPackagingOutputs. If it does not exist,
          we simply no-op - see the SkipNonexistentTargets parameter below. -->
     <MSBuild
-      Projects="@(ProjectReferenceWithConfiguration)"
+      Projects="@(_MSBuildProjectReferenceExistent)"
       Targets="GetPackagingOutputs"
       BuildInParallel="$(BuildInParallel)"
-      Properties="%(ProjectReferenceWithConfiguration.SetConfiguration); %(ProjectReferenceWithConfiguration.SetPlatform)"
-      Condition="'@(ProjectReferenceWithConfiguration)' != ''
-                 and '%(ProjectReferenceWithConfiguration.BuildReference)' == 'true'
-                 and '%(ProjectReferenceWithConfiguration.ReferenceOutputAssembly)' == 'true'"
+      Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration); %(_MSBuildProjectReferenceExistent.SetPlatform); %(_MSBuildProjectReferenceExistent.SetTargetFramework)"
+      Condition="'@(_MSBuildProjectReferenceExistent)' != ''
+                 and '%(_MSBuildProjectReferenceExistent.BuildReference)' == 'true'
+                 and '%(_MSBuildProjectReferenceExistent.ReferenceOutputAssembly)' == 'true'"
       SkipNonexistentTargets="true"
-      ContinueOnError="$(_ContinueOnError)">
+      ContinueOnError="$(_ContinueOnError)"
+      RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences)">
       <Output TaskParameter="TargetOutputs" ItemName="_PackagingOutputsFromOtherUwpProjects"/>
     </MSBuild>
 
@@ -1306,8 +1308,9 @@
       Projects="@(OptionalProjectBuildReferences)"
       Targets="GetOptionalProjectOutputs"
       BuildInParallel="$(BuildInParallel)"
-      Properties="%(OptionalProjectBuildReferences.SetConfiguration); %(OptionalProjectBuildReferences.SetPlatform)"
-      ContinueOnError="$(_ContinueOnError)">
+      Properties="%(OptionalProjectBuildReferences.SetConfiguration); %(OptionalProjectBuildReferences.SetPlatform); %(OptionalProjectBuildReferences.SetTargetFramework)"
+      ContinueOnError="$(_ContinueOnError)"      
+      RemoveProperties="%(OptionalProjectBuildReferences.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences)">
       <Output TaskParameter="TargetOutputs" ItemName="_OptionalProjectOutputsFromOtherProjects"/>
     </MSBuild>