Merge pull request #28596 from dotnet/marcpopMSFT-disablewindowsdkforc++

Disable the windows SDK automated references for c++

Author: marcpopMSFT

src/Assets/TestProjects/CppCliLibWithWpfFrameworkReference/Project1.vcxproj

@@ -24,7 +24,7 @@
     <Keyword>NetCoreCProj</Keyword>
     <RootNamespace>Project1</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

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>net5.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>

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

@@ -11,9 +11,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
+    <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectGuid>{CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A}</ProjectGuid>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>NETCoreCppCliTest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
@@ -22,14 +22,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets

@@ -19,7 +19,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                              and '$(TargetPlatformIdentifier)' == 'Windows'
                              and '$(TargetPlatformVersion)' != ''
                              and $([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '10.0'))
-                             and ('$(Language)' != 'C++' or '$(_EnablePackageReferencesInVCProjects)' == 'true')
+                             and '$(Language)' != 'C++'
                              and '$(IncludeWindowsSDKRefFrameworkReferences)' == ''">
     <IncludeWindowsSDKRefFrameworkReferences>true</IncludeWindowsSDKRefFrameworkReferences>
   </PropertyGroup>

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

@@ -1,14 +1,19 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Xml.Linq;
 using FluentAssertions;
 using Microsoft.NET.Build.Tasks;
 using Microsoft.NET.TestFramework;
 using Microsoft.NET.TestFramework.Assertions;
 using Microsoft.NET.TestFramework.Commands;
+using Microsoft.NET.TestFramework.ProjectConstruction;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.NET.Build.Tests
@@ -19,7 +24,7 @@ public GivenThatWeWantToBuildACppCliProject(ITestOutputHelper log) : base(log)
         {
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]
+        [FullMSBuildOnlyFact]
         public void It_builds_and_runs()
         {
             var testAsset = _testAssetsManager
@@ -40,7 +45,7 @@ public void It_builds_and_runs()
             var exe = Path.Combine( //find the platform directory
                 new DirectoryInfo(Path.Combine(testAsset.TestRoot, "CSConsoleApp", "bin")).GetDirectories().Single().FullName,
                 "Debug",
-                "net5.0",
+                ToolsetInfo.CurrentTargetFramework,
                 "CSConsoleApp.exe");
 
             var runCommand = new RunExeCommand(Log, exe);
@@ -52,7 +57,26 @@ public void It_builds_and_runs()
                 .HaveStdOutContaining("Hello, World!");
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]
+        [FullMSBuildOnlyFact]
+        public void It_builds_and_runs_with_package_reference()
+        {
+            var targetFramework = ToolsetInfo.CurrentTargetFramework + "-windows";
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("NetCoreCsharpAppReferenceCppCliLib")
+                .WithSource()
+                .WithProjectChanges((projectPath, project) => ConfigureProject(projectPath, project, "NewtonSoft.Json","13.0.1", targetFramework, new string[] { "_EnablePackageReferencesInVCProjects" , "IncludeWindowsSDKRefFrameworkReferences" }));
+
+            new BuildCommand(testAsset, "NETCoreCppCliTest")
+                .Execute("-p:Platform=x64", "-p:EnableManagedpackageReferenceSupport=true")
+                .Should()
+                .Pass();
+
+            var cppnProjProperties = GetPropertyValues(testAsset.TestRoot, "NETCoreCppCliTest", targetFramework: targetFramework);
+            Assert.True(cppnProjProperties["_EnablePackageReferencesInVCProjects"] == "true");
+            Assert.True(cppnProjProperties["IncludeWindowsSDKRefFrameworkReferences"] == "");
+        }
+
+        [FullMSBuildOnlyFact]
         public void Given_no_restore_It_builds_cpp_project()
         {
             var testAsset = _testAssetsManager
@@ -65,7 +89,7 @@ public void Given_no_restore_It_builds_cpp_project()
                 .Pass();
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]
+        [FullMSBuildOnlyFact]
         public void Given_Wpf_framework_reference_It_builds_cpp_project()
         {
             var testAsset = _testAssetsManager
@@ -78,7 +102,7 @@ public void Given_Wpf_framework_reference_It_builds_cpp_project()
                 .Pass();
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
+        [FullMSBuildOnlyFact]
         public void It_fails_with_error_message_on_EnableComHosting()
         {
             var testAsset = _testAssetsManager
@@ -106,7 +130,7 @@ public void It_fails_with_error_message_on_EnableComHosting()
                 .HaveStdOutContaining(Strings.NoSupportCppEnableComHosting);
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
+        [FullMSBuildOnlyFact]
         public void It_fails_with_error_message_on_fullframework()
         {
             var testAsset = _testAssetsManager
@@ -123,7 +147,7 @@ public void It_fails_with_error_message_on_fullframework()
                 .HaveStdOutContaining(Strings.NETFrameworkWithoutUsingNETSdkDefaults);
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
+        [FullMSBuildOnlyFact]
         public void It_fails_with_error_message_on_tfm_lower_than_3_1()
         {
             var testAsset = _testAssetsManager
@@ -140,7 +164,7 @@ public void It_fails_with_error_message_on_tfm_lower_than_3_1()
                 .HaveStdOutContaining(Strings.CppRequiresTFMVersion31);
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
+        [FullMSBuildOnlyFact]
         public void When_run_with_selfcontained_It_fails_with_error_message()
         {
             var testAsset = _testAssetsManager
@@ -166,5 +190,74 @@ private void ChangeTargetFramework(string projectPath, XDocument project, string
                                             .Single().Value = targetFramework;
             }
         }
+
+        private void ConfigureProject(string projectPath, XDocument project, string package, string version, string targetFramework, string[] properties)
+        {
+            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 RecordProperties(string projectPath, XDocument project, string[] properties)
+        {
+            if (Path.GetExtension(projectPath) == ".vcxproj")
+            {
+                string propertiesTextElements = "";
+                XNamespace ns = project.Root.Name.Namespace;
+                foreach (var propertyName in properties)
+                {
+                    propertiesTextElements += $"      <LinesToWrite Include='{propertyName}: $({propertyName})'/>" + Environment.NewLine;
+                }
+
+                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);
+            }
+        }
+
+        public Dictionary<string, string> GetPropertyValues(string testRoot, string project, string configuration = "Debug", string targetFramework = null)
+        {
+            var propertyValues = new Dictionary<string, string>();
+
+            string intermediateOutputPath = Path.Combine(testRoot, project, "obj", configuration, targetFramework ?? "foo");
+
+            foreach (var line in File.ReadAllLines(Path.Combine(intermediateOutputPath, "PropertyValues.txt")))
+            {
+                int colonIndex = line.IndexOf(':');
+                if (colonIndex > 0)
+                {
+                    string propertyName = line.Substring(0, colonIndex);
+                    string propertyValue = line.Length == colonIndex + 1 ? "" : line.Substring(colonIndex + 2);
+                    propertyValues[propertyName] = propertyValue;
+                }
+            }
+
+            return propertyValues;
+        }
     }
 }

src/Tests/Microsoft.NET.Pack.Tests/GivenThatWeWantToPackACppCliProject.cs

@@ -18,7 +18,7 @@ public GivenThatWeWantToPackACppCliProject(ITestOutputHelper log) : base(log)
         {
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
+        [FullMSBuildOnlyFact]
         public void It_cannot_pack_the_cppcliproject()
         {
             var testAsset = _testAssetsManager