Reenable a skipped cppcli test. (#31386)

Author: marcpopMSFT

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

@@ -17,6 +17,7 @@
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

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

@@ -31,7 +31,6 @@ public void It_builds_and_runs()
             var testAsset = _testAssetsManager
                 .CopyTestAsset("NetCoreCsharpAppReferenceCppCliLib")
                 .WithSource()
-                .WithProjectChanges((projectPath, project) => AddPackageReference(projectPath, project, "NewtonSoft.Json", "13.0.1"))
                 .WithProjectChanges((projectPath, project) => AddBuildProperty(projectPath, project, "EnableManagedpackageReferenceSupport", "true"));
 
             // build projects separately with BuildProjectReferences=false to simulate VS build behavior
@@ -69,7 +68,7 @@ public void It_builds_and_runs_with_package_reference()
             var testAsset = _testAssetsManager
                 .CopyTestAsset("NetCoreCsharpAppReferenceCppCliLib")
                 .WithSource()
-                .WithProjectChanges((projectPath, project) => ConfigureProject(projectPath, project, "NewtonSoft.Json", "13.0.1", targetFramework, new string[] { "_EnablePackageReferencesInVCProjects", "IncludeWindowsSDKRefFrameworkReferences" }));
+                .WithProjectChanges((projectPath, project) => ConfigureProject(projectPath, project, targetFramework, new string[] { "_EnablePackageReferencesInVCProjects", "IncludeWindowsSDKRefFrameworkReferences" }));
 
             new BuildCommand(testAsset, "NETCoreCppCliTest")
                 .Execute("-p:Platform=x64")
@@ -87,7 +86,6 @@ public void Given_no_restore_It_builds_cpp_project()
             var testAsset = _testAssetsManager
                 .CopyTestAsset("NetCoreCsharpAppReferenceCppCliLib")
                 .WithSource()
-                .WithProjectChanges((projectPath, project) => AddPackageReference(projectPath, project, "NewtonSoft.Json", "13.0.1"))
                 .WithProjectChanges((projectPath, project) => AddBuildProperty(projectPath, project, "EnableManagedpackageReferenceSupport", "True")); ;
 
             new BuildCommand(testAsset, "NETCoreCppCliTest")
@@ -101,8 +99,7 @@ public void Given_Wpf_framework_reference_It_builds_cpp_project()
         {
             var testAsset = _testAssetsManager
                 .CopyTestAsset("CppCliLibWithWpfFrameworkReference")
-                .WithSource()
-                .WithProjectChanges((projectPath, project) => AddPackageReference(projectPath, project, "NewtonSoft.Json", "13.0.1"));
+                .WithSource();
 
             new BuildCommand(testAsset)
                 .Execute("-p:Platform=x64")
@@ -199,25 +196,13 @@ private void ChangeTargetFramework(string projectPath, XDocument project, string
             }
         }
 
-        private void ConfigureProject(string projectPath, XDocument project, string package, string version, string targetFramework, string[] properties)
+        private void ConfigureProject(string projectPath, XDocument project, string targetFramework, string[] properties)
         {
             AddBuildProperty(projectPath, project, "EnableManagedpackageReferenceSupport","true");
             ChangeTargetFramework(projectPath, project, targetFramework);
-            AddPackageReference(projectPath, project, package, version);
             RecordProperties(projectPath, project, properties);
         }
 
-        private void AddPackageReference(string projectPath, XDocument project, string package, string version)
-        {
-            if (Path.GetExtension(projectPath) == ".vcxproj")
-            {
-                XNamespace ns = project.Root.Name.Namespace;
-                XElement itemGroup = project.Root.Descendants(ns + "ItemGroup").First();
-                itemGroup.Add(new XElement(ns + "PackageReference", new XAttribute("Include", package),
-                                                    new XAttribute("Version", version)));
-
-            }
-        }
         private void AddBuildProperty(string projectPath, XDocument project, string property, string value)
         {
             if (Path.GetExtension(projectPath) == ".vcxproj")

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishACppCliProject.cs

@@ -3,6 +3,7 @@
 
 using System.IO;
 using System.Linq;
+using System.Xml.Linq;
 using FluentAssertions;
 using Microsoft.NET.Build.Tasks;
 using Microsoft.NET.TestFramework;
@@ -20,22 +21,22 @@ public GivenThatWeWantToPublishACppCliProject(ITestOutputHelper log) : base(log)
         {
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]
+        [FullMSBuildOnlyFact]
         public void When_referenced_by_csharp_project_it_publishes_and_runs()
         {
             var testAsset = _testAssetsManager
                 .CopyTestAsset("NetCoreCsharpAppReferenceCppCliLib")
                 .WithSource();
 
             new PublishCommand(Log, Path.Combine(testAsset.TestRoot, "CSConsoleApp"))
-                .Execute(new string[] { "-p:Platform=x64" })
+                .Execute(new string[] { "-p:Platform=x64", "-p:EnableManagedpackageReferenceSupport=true" })
                 .Should()
                 .Pass();
 
             var exe = Path.Combine( //find the platform directory
                 new DirectoryInfo(Path.Combine(testAsset.TestRoot, "CSConsoleApp", "bin")).GetDirectories().Single().FullName,
                 "Debug",
-                "netcoreapp3.1",
+                ToolsetInfo.CurrentTargetFramework,
                 "publish",
                 "CSConsoleApp.exe");
 
@@ -48,15 +49,15 @@ public void When_referenced_by_csharp_project_it_publishes_and_runs()
                 .HaveStdOutContaining("Hello, World!");
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]
+        [FullMSBuildOnlyFact(Skip = "There is no publish error when using PackageReference support which is required for testing")]
         public void When_not_referenced_by_csharp_project_it_fails_to_publish()
         {
             var testAsset = _testAssetsManager
                 .CopyTestAsset("NetCoreCsharpAppReferenceCppCliLib")
                 .WithSource();
 
             new PublishCommand(Log, Path.Combine(testAsset.TestRoot, "NETCoreCppCliTest"))
-                .Execute(new string[] { "-p:Platform=x64" })
+                .Execute(new string[] { "-p:Platform=x64", "-p:EnableManagedpackageReferenceSupport=true"})
                 .Should()
                 .Fail()
                 .And.HaveStdOutContaining(Strings.NoSupportCppPublishDotnetCore);