Fix yellow triangle of horror (#4990)

* Fix yellow triangle of horror

* typo

Author: KevinRansom

src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props

@@ -32,8 +32,6 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
   <PropertyGroup>
     <EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)' == '' ">false</EnableDefaultCompileItems>                                <!--- Do not glob F# source files -->
     <EnableDefaultNoneItems Condition=" '$(EnableDefaultNoneItems)' == '' ">false</EnableDefaultNoneItems>
-    <DefaultValueTuplePackageVersion>4.3.1</DefaultValueTuplePackageVersion>
-    <DefaultFSharpPackageVersion>4.3.4</DefaultFSharpPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -67,14 +65,35 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <FscToolExe Condition="'$(OS)' == 'Unix' and '$(FscToolExe)' == ''">RunFsc.sh</FscToolExe>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="$(DefaultValueTuplePackageVersion)" >
-      <DefaultInclude>true</DefaultInclude>
-    </PackageReference>
+  <ItemGroup Condition="'$(DisableImplicitSystemValueTupleReference)' != 'true'
+                        and ('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == '.NETCoreApp')
+                        and !('$(_TargetFrameworkVersionWithoutV)' >= '2.0' )">
+    <PackageReference Include="System.ValueTuple" Version="$(ValueTupleImplicitPackageVersion)" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <DefaultValueTuplePackageVersion>4.3.1</DefaultValueTuplePackageVersion>
+    <DefaultFSharpCorePackageVersion>4.3.4</DefaultFSharpCorePackageVersion>
+    <ValueTupleImplicitPackageVersion>$(DefaultValueTuplePackageVersion)</ValueTupleImplicitPackageVersion>
+    <FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePackageVersion)</FSharpCoreImplicitPackageVersion>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(DisableImplicitSystemValueTupleReference)' != 'true'
+                        and ('$(TargetFrameworkIdentifier)' == '.NETFramework'
+                             and ('$(_TargetFrameworkVersionWithoutV)' == ''
+                                  or '$(_TargetFrameworkVersionWithoutV)' == '4.0' or
+                                     '$(_TargetFrameworkVersionWithoutV)' == '4.5' or
+                                     '$(_TargetFrameworkVersionWithoutV)' == '4.5.1' or
+                                     '$(_TargetFrameworkVersionWithoutV)' == '4.5.2' or
+                                     '$(_TargetFrameworkVersionWithoutV)' == '4.6' or
+                                     '$(_TargetFrameworkVersionWithoutV)' == '4.6.1' or
+                                     '$(_TargetFrameworkVersionWithoutV)' == '4.6.2' or
+                                     '$(_TargetFrameworkVersionWithoutV)' == '4.7')) ">
+    <PackageReference Include="System.ValueTuple" Version="$(ValueTupleImplicitPackageVersion)" />
+  </ItemGroup>
 
-    <PackageReference Include="FSharp.Core" Version="$(DefaultFSharpPackageVersion)">
-      <DefaultInclude>true</DefaultInclude>
-    </PackageReference>
+  <ItemGroup Condition="'$(DisableImplicitFSharpCoreReference)' != 'true'">
+    <PackageReference Include="FSharp.Core" Version="$(FSharpCoreImplicitPackageVersion)" />
   </ItemGroup>
 
 </Project>

src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets

@@ -35,11 +35,6 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <_ExplicitReference Include="$(FrameworkPathOverride)\mscorlib.dll" Condition=" '$(NoStdLib)' != 'true' " />
   </ItemGroup>
 
-  <PropertyGroup>
-    <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion)</_TargetFrameworkVersionWithoutV>
-    <_TargetFrameworkVersionWithoutV Condition="$(TargetFrameworkVersion.StartsWith('v'))">$(TargetFrameworkVersion.Substring(1))</_TargetFrameworkVersionWithoutV>
-  </PropertyGroup>
-
   <PropertyGroup>
     <TargetProfile Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' " >mscorlib</TargetProfile>
     <TargetProfile Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' " >netcore</TargetProfile>
@@ -53,60 +48,10 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <PackProjectInputFile>$(MSBuildProjectFullPath)</PackProjectInputFile>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <_FrameworkNeedsValueTupleReference Condition=" ('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == '.NETCoreApp') and !('$(_TargetFrameworkVersionWithoutV)' >= '2.0') ">true</_FrameworkNeedsValueTupleReference>
-    <_FrameworkNeedsValueTupleReference Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' and 
-                                                    ('$(_TargetFrameworkVersionWithoutV)' == '' or
-                                                     '$(_TargetFrameworkVersionWithoutV)' == '4.0' or 
-                                                     '$(_TargetFrameworkVersionWithoutV)' == '4.5' or 
-                                                     '$(_TargetFrameworkVersionWithoutV)' == '4.6' or
-                                                     '$(_TargetFrameworkVersionWithoutV)' == '4.6.1' or
-                                                     '$(_TargetFrameworkVersionWithoutV)' == '4.6.2' or
-                                                     '$(_TargetFrameworkVersionWithoutV)' == '4.7') ">true</_FrameworkNeedsValueTupleReference>
-  </PropertyGroup>
-
   <PropertyGroup>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackageFSharpDesignTimeTools</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
-  <Target Name="FSharpCorePackageReferences" BeforeTargets="CollectPackageReferences;">
-    <ItemGroup>
-      <FSharpCorePackages Include="@(PackageReference)" Condition=" '%(Identity)' == 'FSharp.Core' " />
-      <PackageReference Update="FSharp.Core" Version="$(FSharpCoreImplicitPackageVersion)" 
-                        Condition=" ('%(PackageReference.Identity)' == 'FSharp.Core') 
-                                and ('%(PackageReference.Version)' == '$(DefaultFSharpPackageVersion)') 
-                                and ('%(PackageReference.DefaultInclude)' == 'true') 
-                                and ('$(DisableImplicitFSharpCoreReference)' != 'true') 
-                                and ('$(FSharpCoreImplicitPackageVersion)' != '') 
-                                and (@(FSharpCorePackages->Count()) == 1) " />
-      <PackageReference Remove="FSharp.Core" 
-                       Condition=" (('$(DisableImplicitFSharpCoreReference)' == 'true') or (@(FSharpCorePackages->Count()) &gt; 1))
-                                and ('%(PackageReference.Identity)' == 'FSharp.Core') 
-                                and ('%(PackageReference.Version)' == '$(DefaultFSharpPackageVersion)') 
-                                and ('%(PackageReference.DefaultInclude)' == 'true') " />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="ValueTuplePackageReferences" BeforeTargets="CollectPackageReferences;">
-    <Message Text="PackageReferences: ValueTuplePackageReferences start : @(PackageReference)" />
-    <ItemGroup>
-      <ValueTuplePackages Include="@(PackageReference)" Condition=" '%(Identity)' == 'System.ValueTuple' " />
-      <PackageReference Update="System.ValueTuple" Version="$(ValueTupleImplicitPackageVersion)"
-                        Condition=" ('%(PackageReference.Identity)' == 'System.ValueTuple')
-                                and ('%(PackageReference.Version)' == '$(DefaultValueTuplePackageVersion)') 
-                                and ('%(PackageReference.DefaultInclude)' == 'true') 
-                                and ('$(ValueTupleImplicitPackageVersion)' != '') 
-                                and ('$(DisableImplicitSystemValueTupleReference)' != 'true') 
-                                and ('$(_FrameworkNeedsValueTupleReference)' == 'true') 
-                                and (@(ValueTuplePackages->Count()) == 1) " />
-      <PackageReference Remove="System.ValueTuple" 
-                        Condition=" ( ('$(DisableImplicitSystemValueTupleReference)' == 'true') or ('$(_FrameworkNeedsValueTupleReference)' != 'true') or (@(ValueTuplePackages->Count()) &gt; 1) ) 
-                                and ('%(PackageReference.Identity)' == 'System.ValueTuple') 
-                                and ('%(PackageReference.Version)' == '$(DefaultValueTuplePackageVersion)') 
-                                and ('%(PackageReference.DefaultInclude)' == 'true') " />
-    </ItemGroup>
-  </Target>
-
   <Target Name="PackageFSharpDesignTimeTools" DependsOnTargets="_GetFrameworkAssemblyReferences">
     <PropertyGroup>
       <FSharpDesignTimeProtocol Condition = " '$(FSharpDesignTimeProtocol)' == '' ">fsharp41</FSharpDesignTimeProtocol>

tests/fsharp/SDKTests/tests/DefaultImplicitReferenceTest.proj

@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <ExpectsFSharpCore>true</ExpectsFSharpCore>
-    <ExpectedFSharpCorePackageVersion>$(DefaultFSharpPackageVersion)</ExpectedFSharpCorePackageVersion>
+    <ExpectedFSharpCorePackageVersion>$(DefaultFSharpCorePackageVersion)</ExpectedFSharpCorePackageVersion>
 
     <ExpectsValueTuple>true</ExpectsValueTuple>
     <ExpectedValueTuplePackageVersion>$(DefaultValueTuplePackageVersion)</ExpectedValueTuplePackageVersion>

tests/fsharp/SDKTests/tests/Test.props

@@ -1,7 +1,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
+
     <TargetFramework Condition="'$(TargetFramework)' == ''">net46</TargetFramework>
+    <_TargetFrameworkVersionWithoutV Condition="'$(_TargetFrameworkVersionWithoutV)' == ''">4.6</_TargetFrameworkVersionWithoutV>
+    <TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">.NETFramework</TargetFrameworkIdentifier>
+
     <Configuration Condition="'$(Configuration)' == ''">release</Configuration>
     <BinariesDirectory>$(MSBuildThisFileDirectory)..\..\..\..\$(Configuration)\net40\bin</BinariesDirectory>
 

tests/fsharp/SDKTests/tests/Test.targets

@@ -2,7 +2,7 @@
 
   <Import Project="$(BinariesDirectory)\Microsoft.FSharp.NetSdk.targets" />
 
-  <Target Name="Test" DependsOnTargets="FSharpCorePackageReferences;ValueTuplePackageReferences">
+  <Target Name="Test">
 
     <Message Importance="High" Text="Testing : $(MSBuildProjectName)" />
     <ItemGroup>