PR feedback

dotnet · Jun 17, 2020 · 3822afc · 3822afc
1 parent 9dc0f6b
commit 3822afc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
@@ -153,6 +153,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup  Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))">
     <_EnableDefaultWindowsPlatform Condition="'$(_EnableDefaultWindowsPlatform)' == ''" >false</_EnableDefaultWindowsPlatform>
+    <UseOSWinMdReferences>false</UseOSWinMdReferences>
   </PropertyGroup>
 
   <PropertyGroup  Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' And '$(NETStandardMaximumVersion)' == ''">

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs
@@ -394,7 +394,7 @@ public void It_implicitly_defines_compilation_constants_for_the_target_framework
             definedConstants.Should().BeEquivalentTo(new[] { "DEBUG", "TRACE" }.Concat(expectedDefines).ToArray());
         }
 
-        [RequiresMSBuildVersionTheory("16.7.1")]
+        [RequiresMSBuildVersionTheory("16.7")]
         [InlineData("net5.0", new[] { "NETCOREAPP3_1", "NET5_0" })]
         [InlineData("net6.0", new[] { "NETCOREAPP3_1", "NET5_0", "NET6_0" })]
         public void It_implicitly_defines_compilation_constants_for_the_target_framework_with_backwards_compatibility(string targetFramework, string[] expectedDefines)
@@ -502,7 +502,7 @@ public void It_fails_gracefully_if_targetframework_should_be_targetframeworks(bo
                 $"The TargetFramework value '{targetFramework}' is not valid. To multi-target, use the 'TargetFrameworks' property instead");
         }
 
-        [RequiresMSBuildVersionTheory("16.7.1")]
+        [RequiresMSBuildVersionTheory("16.7")]
         [InlineData("net5.0", false)]
         [InlineData("netcoreapp3.1", true)]
         public void It_defines_target_platform_defaults_correctly(string targetFramework, bool defaultsDefined)

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs
@@ -194,7 +194,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
             definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD1_5=-1" }));
         }
 
-        [RequiresMSBuildVersionTheory("16.7.1")]
+        [RequiresMSBuildVersionTheory("16.7")]
         [InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD=-1", "NETSTANDARD1_0=-1", "_MyType=\"Empty\"" }, false)]
         [InlineData("netstandard1.3", new[] { "NETSTANDARD=-1", "NETSTANDARD1_3=-1", "_MyType=\"Empty\"" }, false)]
         [InlineData("netstandard1.6", new[] { "NETSTANDARD=-1", "NETSTANDARD1_6=-1", "_MyType=\"Empty\"" }, false)]