Respond to PR feedback of marking them all currentTFM and cleaning up how we set the target

Author: marcpopMSFT

src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj

@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A}</ProjectGuid>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>

src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestB/NETCoreCppCliTestB.vcxproj

@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{C8D22D0F-0C2D-4B4A-BF28-14A2D001102B}</ProjectGuid>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>

src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestC/NETCoreCppCliTestC.vcxproj

@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{73B24404-97DE-467A-8251-6542819BCEB4}</ProjectGuid>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>

src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/CSConsoleApp/CSConsoleApp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>

src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj

@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectGuid>{CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A}</ProjectGuid>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProject.cs

@@ -66,9 +66,8 @@ public void It_builds_and_runs_with_package_reference()
                 .WithSource()
                 .WithProjectChanges((projectPath, project) => ConfigureProject(projectPath, project, "NewtonSoft.Json","13.0.1", targetFramework, new string[] { "_EnablePackageReferencesInVCProjects" , "IncludeWindowsSDKRefFrameworkReferences" }));
 
-            // build projects separately with BuildProjectReferences=false to simulate VS build behavior
             new BuildCommand(testAsset, "NETCoreCppCliTest")
-                .Execute("-p:Platform=x64", "-p:EnableManagedpackageReferenceSupport=true", "/bl")
+                .Execute("-p:Platform=x64", "-p:EnableManagedpackageReferenceSupport=true")
                 .Should()
                 .Pass();
 
@@ -214,34 +213,29 @@ private void RecordProperties(string projectPath, XDocument project, string[] pr
         {
             if (Path.GetExtension(projectPath) == ".vcxproj")
             {
-                List<XElement> propertiesElements = new List<XElement>();
+                string propertiesTextElements = "";
                 XNamespace ns = project.Root.Name.Namespace;
                 foreach (var propertyName in properties)
                 {
-                    propertiesElements.Add( new XElement(ns + "LinesToWrite", new XAttribute("Include", @$"{ propertyName }: $({ propertyName })")));
+                    propertiesTextElements += $"      <LinesToWrite Include='{propertyName}: $({propertyName})'/>" + Environment.NewLine;
                 }
 
-//                string target = $@"<Target Name='WritePropertyValues' BeforeTargets='AfterBuild'>
-//    <ItemGroup>
-//{propertiesElements}
-//    </ItemGroup>
-//    <WriteLinesToFile
-//      File='$(BaseIntermediateOutputPath)\$(Configuration)\$(TargetFramework)\PropertyValues.txt'
-//      Lines='@(LinesToWrite)'
-//      Overwrite='true'
-//      Encoding='Unicode'
-//      />
-//  </Target>";
-                XElement newNode = new XElement(ns + "Target",new XAttribute("Name","WriteProperty"), new XAttribute("BeforeTargets", "AfterBuild"),
-                    new XElement(ns + "ItemGroup",
-                        propertiesElements),
-                    new XElement(ns + "WriteLinesToFile",
-                        new XAttribute("File", @"$(BaseIntermediateOutputPath)\$(Configuration)\$(TargetFramework)\PropertyValues.txt"),
-                        new XAttribute("Lines", "@(LinesToWrite)"),
-                        new XAttribute("Overwrite","true"),
-                        new XAttribute("Encoding","Unicode")));
-
-
+                string target = $@"<Target Name='WritePropertyValues' BeforeTargets='AfterBuild'>
+                    <ItemGroup>
+                {propertiesTextElements}
+                    </ItemGroup>
+                    <WriteLinesToFile
+                      File='$(BaseIntermediateOutputPath)\$(Configuration)\$(TargetFramework)\PropertyValues.txt'
+                      Lines='@(LinesToWrite)'
+                      Overwrite='true'
+                      Encoding='Unicode'
+                      />
+                  </Target>";
+                XElement newNode = XElement.Parse(target);
+                foreach (var element in newNode.DescendantsAndSelf())
+                {
+                    element.Name = ns + element.Name.LocalName;
+                }
                 project.Root.AddFirst(newNode);
             }
         }