Skip to content

Commit 457b463

Browse files
teo-tsirpanisteo-tsirpanis
committed
Remove unnecessary .NET Standard 1.x packages.
And add a note that warns against adding them back.
1 parent 8119a02 commit 457b463

File tree

12 files changed

+5
-114
lines changed

12 files changed

+5
-114
lines changed

‎eng/Versions.props‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,34 +83,15 @@
8383
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
8484
</RestoreSources>
8585
<!-- System.* packages -->
86+
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
87+
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
8688
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
8789
<SystemCollectionsImmutableVersion>5.0.0</SystemCollectionsImmutableVersion>
88-
<SystemConsoleVersion>4.3.0</SystemConsoleVersion>
89-
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
90-
<SystemDesignVersion>4.0.0</SystemDesignVersion>
91-
<SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
92-
<SystemDiagnosticsTraceSourceVersion>4.3.0</SystemDiagnosticsTraceSourceVersion>
9390
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
94-
<SystemIoCompressionVersion>4.3.0</SystemIoCompressionVersion>
95-
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
96-
<SystemLinqQueryableVersion>4.3.0</SystemLinqQueryableVersion>
9791
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
9892
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
99-
<SystemNetSecurityVersion>4.3.1</SystemNetSecurityVersion>
100-
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
10193
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
102-
<SystemReflectionTypeExtensionsVersion>4.3.0</SystemReflectionTypeExtensionsVersion>
103-
<SystemRuntimeCachingVersion>1.5.0</SystemRuntimeCachingVersion>
104-
<SystemRuntimeVersion>4.3.0</SystemRuntimeVersion>
105-
<SystemRuntimeInteropServicesVersion>4.3.0</SystemRuntimeInteropServicesVersion>
106-
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
107-
<SystemSecurityClaimsVersion>4.3.0</SystemSecurityClaimsVersion>
108-
<SystemSecurityCryptographyAlgorithmsVersion>4.3.0</SystemSecurityCryptographyAlgorithmsVersion>
109-
<SystemSecurityPrincipalVersion>4.3.0</SystemSecurityPrincipalVersion>
110-
<SystemThreadingTasksParallelVersion>4.3.0</SystemThreadingTasksParallelVersion>
11194
<SystemThreadingTasksDataflow>4.11.1</SystemThreadingTasksDataflow>
112-
<SystemThreadingThreadVersion>4.3.0</SystemThreadingThreadVersion>
113-
<SystemThreadingThreadPoolVersion>4.3.0</SystemThreadingThreadPoolVersion>
11495
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
11596
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
11697
<!-- Versions for package groups -->

‎src/Compiler/FSharp.Compiler.Service.fsproj‎

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
33
<Project Sdk="Microsoft.NET.Sdk">
44

@@ -56,25 +56,9 @@
5656
<NuspecProperty Include="MicrosoftBuildUtilitiesCorePackageVersion=$(MicrosoftBuildUtilitiesCoreVersion)" />
5757
<NuspecProperty Include="SystemBuffersPackageVersion=$(SystemBuffersVersion)" />
5858
<NuspecProperty Include="SystemCollectionsImmutablePackageVersion=$(SystemCollectionsImmutableVersion)" />
59-
<NuspecProperty Include="SystemDiagnosticsProcessPackageVersion=$(SystemDiagnosticsProcessVersion)" />
60-
<NuspecProperty Include="SystemDiagnosticsTraceSourcePackageVersion=$(SystemDiagnosticsTraceSourceVersion)" />
61-
<NuspecProperty Include="SystemLinqExpressionsPackageVersion=$(SystemLinqExpressionsVersion)" />
62-
<NuspecProperty Include="SystemLinqQueryablePackageVersion=$(SystemLinqQueryableVersion)" />
6359
<NuspecProperty Include="SystemMemoryPackageVersion=$(SystemMemoryVersion)" />
64-
<NuspecProperty Include="SystemNetRequestsPackageVersion=$(SystemNetRequestsVersion)" />
65-
<NuspecProperty Include="SystemNetSecurityPackageVersion=$(SystemNetSecurityVersion)" />
6660
<NuspecProperty Include="SystemReflectionEmitPackageVersion=$(SystemReflectionEmitVersion)" />
6761
<NuspecProperty Include="SystemReflectionMetadataPackageVersion=$(SystemReflectionMetadataVersion)" />
68-
<NuspecProperty Include="SystemReflectionTypeExtensionsPackageVersion=$(SystemReflectionTypeExtensionsVersion)" />
69-
<NuspecProperty Include="SystemRuntimePackageVersion=$(SystemRuntimeVersion)" />
70-
<NuspecProperty Include="SystemRuntimeInteropServicesPackageVersion=$(SystemRuntimeInteropServicesVersion)" />
71-
<NuspecProperty Include="SystemRuntimeLoaderPackageVersion=$(SystemRuntimeLoaderVersion)" />
72-
<NuspecProperty Include="SystemSecurityClaimsPackageVersion=$(SystemSecurityClaimsVersion)" />
73-
<NuspecProperty Include="SystemSecurityCryptographyAlgorithmsPackageVersion=$(SystemSecurityCryptographyAlgorithmsVersion)" />
74-
<NuspecProperty Include="SystemSecurityPrincipalPackageVersion=$(SystemSecurityPrincipalVersion)" />
75-
<NuspecProperty Include="SystemThreadingTasksParallelPackageVersion=$(SystemThreadingTasksParallelVersion)" />
76-
<NuspecProperty Include="SystemThreadingThreadPackageVersion=$(SystemThreadingThreadVersion)" />
77-
<NuspecProperty Include="SystemThreadingThreadPoolPackageVersion=$(SystemThreadingThreadPoolVersion)" />
7862
<NuspecProperty Include="SystemRuntimeCompilerServicesUnsafePackageVersion=$(SystemRuntimeCompilerServicesUnsafeVersion)" />
7963
</ItemGroup>
8064

@@ -432,8 +416,8 @@
432416
<Compile Include="Service\ItemKey.fsi" />
433417
<Compile Include="Service\ItemKey.fs" />
434418
<Compile Include="Service\SemanticClassificationKey.fsi" />
435-
<Compile Include="Service\SemanticClassificationKey.fs" />
436-
<Compile Include="Service\FSharpSource.fsi" />
419+
<Compile Include="Service\SemanticClassificationKey.fs" />
420+
<Compile Include="Service\FSharpSource.fsi" />
437421
<Compile Include="Service\FSharpSource.fs" />
438422
<Compile Include="Service\IncrementalBuild.fsi" />
439423
<Compile Include="Service\IncrementalBuild.fs" />
@@ -501,25 +485,9 @@
501485
</ItemGroup>
502486

503487
<ItemGroup>
504-
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
505488
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
506-
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
507-
<PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourceVersion)" />
508-
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
509-
<PackageReference Include="System.Linq.Queryable" Version="$(SystemLinqExpressionsVersion)" />
510-
<PackageReference Include="System.Net.Requests" Version="$(SystemNetRequestsVersion)" />
511-
<PackageReference Include="System.Net.Security" Version="$(SystemNetSecurityVersion)" />
512489
<PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
513490
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
514-
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
515-
<PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
516-
<PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" />
517-
<PackageReference Include="System.Security.Claims" Version="$(SystemSecurityClaimsVersion)" />
518-
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" />
519-
<PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
520-
<PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
521-
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
522-
<PackageReference Include="System.Threading.ThreadPool" Version="$(SystemThreadingThreadPoolVersion)" />
523491
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
524492
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
525493
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />

‎src/Compiler/FSharp.Compiler.Service.nuspec‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,9 @@
1111
<dependency id="Microsoft.Build.Utilities.Core" version="$MicrosoftBuildUtilitiesCorePackageVersion$" exclude="Build,Analyzers" />
1212
<dependency id="System.Buffers" version="$SystemBuffersPackageVersion$" exclude="Build,Analyzers" />
1313
<dependency id="System.Collections.Immutable" version="$SystemCollectionsImmutablePackageVersion$" exclude="Build,Analyzers" />
14-
<dependency id="System.Diagnostics.Process" version="$SystemDiagnosticsProcessPackageVersion$" exclude="Build,Analyzers" />
15-
<dependency id="System.Diagnostics.TraceSource" version="$SystemDiagnosticsTraceSourcePackageVersion$" exclude="Build,Analyzers" />
16-
<dependency id="System.Linq.Expressions" version="$SystemLinqExpressionsPackageVersion$" exclude="Build,Analyzers" />
17-
<dependency id="System.Linq.Queryable" version="$SystemLinqQueryablePackageVersion$" exclude="Build,Analyzers" />
1814
<dependency id="System.Memory" version="$SystemMemoryPackageVersion$" exclude="Build,Analyzers" />
19-
<dependency id="System.Net.Requests" version="$SystemNetRequestsPackageVersion$" exclude="Build,Analyzers" />
20-
<dependency id="System.Net.Security" version="$SystemNetSecurityPackageVersion$" exclude="Build,Analyzers" />
2115
<dependency id="System.Reflection.Emit" version="$SystemReflectionEmitPackageVersion$" exclude="Build,Analyzers" />
2216
<dependency id="System.Reflection.Metadata" version="$SystemReflectionMetadataPackageVersion$" exclude="Build,Analyzers" />
23-
<dependency id="System.Reflection.TypeExtensions" version="$SystemReflectionTypeExtensionsPackageVersion$" exclude="Build,Analyzers" />
24-
<dependency id="System.Runtime" version="$SystemRuntimePackageVersion$" exclude="Build,Analyzers" />
25-
<dependency id="System.Runtime.InteropServices" version="$SystemRuntimeInteropServicesPackageVersion$" exclude="Build,Analyzers" />
26-
<dependency id="System.Runtime.Loader" version="$SystemRuntimeLoaderPackageVersion$" exclude="Build,Analyzers" />
27-
<dependency id="System.Security.Claims" version="$SystemSecurityClaimsPackageVersion$" exclude="Build,Analyzers" />
28-
<dependency id="System.Security.Cryptography.Algorithms" version="$SystemSecurityCryptographyAlgorithmsPackageVersion$" exclude="Build,Analyzers" />
29-
<dependency id="System.Security.Principal" version="$SystemSecurityPrincipalPackageVersion$" exclude="Build,Analyzers" />
30-
<dependency id="System.Threading.Tasks.Parallel" version="$SystemThreadingTasksParallelPackageVersion$" exclude="Build,Analyzers" />
31-
<dependency id="System.Threading.Thread" version="$SystemThreadingThreadPackageVersion$" exclude="Build,Analyzers" />
32-
<dependency id="System.Threading.ThreadPool" version="$SystemThreadingThreadPoolPackageVersion$" exclude="Build,Analyzers" />
3317
<dependency id="System.Runtime.CompilerServices.Unsafe" version="$SystemRuntimeCompilerServicesUnsafePackageVersion$" exclude="Build,Analyzers" />
3418
</group>
3519
</dependencies>

‎src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,4 @@
3232
<ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
3333
</ItemGroup>
3434

35-
<ItemGroup>
36-
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
37-
</ItemGroup>
38-
3935
</Project>

‎src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,10 @@
4848
</ItemGroup>
4949

5050
<ItemGroup>
51-
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
5251
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
53-
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
54-
<PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourceVersion)" />
55-
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
56-
<PackageReference Include="System.Linq.Queryable" Version="$(SystemLinqExpressionsVersion)" />
57-
<PackageReference Include="System.Net.Requests" Version="$(SystemNetRequestsVersion)" />
58-
<PackageReference Include="System.Net.Security" Version="$(SystemNetSecurityVersion)" />
5952
<PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
6053
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
61-
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
62-
<PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
63-
<PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" />
6454
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
65-
<PackageReference Include="System.Security.Claims" Version="$(SystemSecurityClaimsVersion)" />
66-
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" />
67-
<PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
68-
<PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
69-
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
70-
<PackageReference Include="System.Threading.ThreadPool" Version="$(SystemThreadingThreadPoolVersion)" />
7155
</ItemGroup>
7256

7357
</Project>

‎src/fsc/fsc.targets‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,9 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" />
47-
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
4846
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
4947
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
5048
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
51-
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
52-
<PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
5349
</ItemGroup>
5450

5551
</Project>

‎src/fsi/fsi.targets‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,4 @@
5757
<Reference Include="WindowsBase" />
5858
</ItemGroup>
5959

60-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
61-
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
62-
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
63-
<PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
64-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
65-
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
66-
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
67-
<PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
68-
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
69-
</ItemGroup>
70-
7160
</Project>

‎tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6060
</PackageReference>
6161
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
62-
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
6362
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonVersion)" />
6463
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
6564
<PackageReference Include="Microsoft.CodeAnalysis.Test.Resources.Proprietary" Version="$(MicrosoftCodeAnalysisTestResourcesProprietaryVersion)" />

‎tests/fsharp/FSharpSuite.Tests.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
120120
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
121121
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
122-
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
123122
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonVersion)" />
124123
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
125124
<PackageReference Include="Microsoft.CodeAnalysis.Test.Resources.Proprietary" Version="$(MicrosoftCodeAnalysisTestResourcesProprietaryVersion)" />

‎vsintegration/Directory.Build.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<PackageReference Include="Microsoft.VisualStudio.TextManager.Interop" Version="$(MicrosoftVisualStudioTextManagerInteropVersion)" PrivateAssets="compile" ExcludeAssets="compile" />
1313
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
1414
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
15-
<PackageReference Include="System.IO.Compression" Version="$(SystemIoCompressionVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
1615
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
1716
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />
1817
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;analyzers;native" />

0 commit comments

Comments
 (0)