Skip to content

Commit 0794281

Browse files
authored
Eliminate ValueTuple build stuff (#11383)
1 parent 2d31116 commit 0794281

File tree

12 files changed

+3
-30
lines changed

12 files changed

+3
-30
lines changed

eng/Versions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
<SystemThreadingTasksDataflow>4.11.1</SystemThreadingTasksDataflow>
104104
<SystemThreadingThreadVersion>4.3.0</SystemThreadingThreadVersion>
105105
<SystemThreadingThreadPoolVersion>4.3.0</SystemThreadingThreadPoolVersion>
106-
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
107106
<!-- Roslyn packages -->
108107
<RoslynVersion>3.8.0-5.20570.14</RoslynVersion>
109108
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>

src/fsharp/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</PropertyGroup>
1313

1414
<PropertyGroup>
15-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
1615
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1716
<UseStandardResourceNames>false</UseStandardResourceNames>
1817
<PackageOutputPath>$(ArtifactsPackagesDir)\$(Configuration)</PackageOutputPath>

src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.ProjectFile.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ $(POUND_R)
139139
140140
<!-- Disable automagic FSharp.Core resolution when not using with FSharp scripts -->
141141
<DisableImplicitFSharpCoreReference Condition="'$(SCRIPTEXTENSION)' != '.fsx'">true</DisableImplicitFSharpCoreReference>
142-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
143142
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
144143
145144
<!-- Temporary fix some sdks, shipped internally with broken parameterization -->

tests/benchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fsproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
<OutputType>Exe</OutputType>
99
<TargetFramework>net472</TargetFramework>
1010
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
11-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
12-
<DefaultValueTuplePackageVersion>$(SystemValueTupleVersion)</DefaultValueTuplePackageVersion>
1311
</PropertyGroup>
1412

1513
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

vsintegration/Directory.Build.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
44

5-
<PropertyGroup>
6-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
7-
</PropertyGroup>
8-
95
<ItemGroup Condition="'$(NoMsbuild)' != 'true'">
106
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
117
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
@@ -17,7 +13,6 @@
1713
<ItemGroup>
1814
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
1915
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
20-
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
2116
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
2217
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
2318
</ItemGroup>

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<NoWarn>$(NoWarn);75</NoWarn>
88
<NoWarn>$(NoWarn);44</NoWarn><!-- warning about Roslyn API only for F# and TypeScript -->
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
10-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
11-
<DefaultValueTuplePackageVersion>$(SystemValueTupleVersion)</DefaultValueTuplePackageVersion>
1210
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1311
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1412
</PropertyGroup>
@@ -178,9 +176,8 @@
178176
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
179177
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
180178
<PackageReference Include="System.Design" Version="$(SystemDesignVersion)" />
181-
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
182179
<PackageReference Include="VSSDK.VSLangProj" Version="$(VSSDKVSLangProjVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
183-
<PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
180+
<PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
184181
</ItemGroup>
185182

186183
<ItemGroup>

vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<PackageReference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" Version="$(MicrosoftVisualStudioShellImmutable110Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
5959
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="$(MicrosoftVisualStudioShellInterop100Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6060
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="$(MicrosoftVisualStudioShellInterop110Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
61-
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
6261
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6362
<PackageReference Include="VSSDK.VSHelp" Version="$(VSSDKVSHelpVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6463
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />

vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<NoWarn>$(NoWarn);75</NoWarn>
88
<NoWarn>$(NoWarn);44</NoWarn><!-- warning about Roslyn API only for F# and TypeScript -->
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
10-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
11-
<DefaultValueTuplePackageVersion>$(SystemValueTupleVersion)</DefaultValueTuplePackageVersion>
1210
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1311
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1412
</PropertyGroup>
@@ -78,10 +76,9 @@
7876
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="$(MicrosoftVisualStudioShellInterop100Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
7977
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="$(MicrosoftVisualStudioShellInterop110Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
8078
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
81-
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
8279
<PackageReference Include="VSSDK.VSHelp" Version="$(VSSDKVSHelpVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
8380
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
84-
<PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
81+
<PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
8582
</ItemGroup>
8683

8784
<ItemGroup>

vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<AssemblyName>FSharp.ProjectSystem.FSharp</AssemblyName>
88
<NoWarn>$(NoWarn);52;62;75</NoWarn>
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
10-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
11-
<DefaultValueTuplePackageVersion>$(SystemValueTupleVersion)</DefaultValueTuplePackageVersion>
1210
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1311
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1412
</PropertyGroup>

vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<OutputType>Library</OutputType>
77
<NoWarn>$(NoWarn);47;75</NoWarn>
88
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
9-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
10-
<DefaultValueTuplePackageVersion>$(SystemValueTupleVersion)</DefaultValueTuplePackageVersion>
119
<OtherFlags>$(OtherFlags) --subsystemversion:6.00</OtherFlags>
1210
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1311
</PropertyGroup>
@@ -71,7 +69,6 @@
7169
<PackageReference Include="Microsoft.VisualStudio.Shell.Design" Version="$(MicrosoftVisualStudioShellDesignVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
7270
<PackageReference Include="Microsoft.VisualStudio.TextManager.Interop.10.0" Version="$(MicrosoftVisualStudioTextManagerInterop100Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
7371
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
74-
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
7572
<PackageReference Include="VSSDK.DebuggerVisualizers" Version="$(VSSDKDebuggerVisualizersVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
7673
<PackageReference Include="VSSDK.VSHelp" Version="$(VSSDKVSHelpVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
7774
<PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8Version)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />

0 commit comments

Comments
 (0)