diff --git a/.github/skills/fsharp-diagnostics/server/Directory.Build.props b/.github/skills/fsharp-diagnostics/server/Directory.Build.props index 5a08e96c89f..48e48f88427 100644 --- a/.github/skills/fsharp-diagnostics/server/Directory.Build.props +++ b/.github/skills/fsharp-diagnostics/server/Directory.Build.props @@ -3,6 +3,8 @@ Also blocks Directory.Build.targets import. --> false + + false $(MSBuildThisFileDirectory)../../../../.tools/fsharp-diag/bin/ $(MSBuildThisFileDirectory)../../../../.tools/fsharp-diag/obj/ diff --git a/Directory.Build.targets b/Directory.Build.targets index 4e5dab341de..a0ac2867bd2 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,6 +3,13 @@ + + + $(NoWarn);NU1507 + + - - - - - - - - + + + + + + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000000..80c569422a8 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,10 @@ + + + + true + true + + + + + diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj index 78d24349889..8023580df5a 100644 --- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj +++ b/buildtools/AssemblyCheck/AssemblyCheck.fsproj @@ -23,7 +23,7 @@ - + diff --git a/buildtools/checkpackages/Directory.Build.props b/buildtools/checkpackages/Directory.Build.props index a9a651c4a65..1aa11050403 100644 --- a/buildtools/checkpackages/Directory.Build.props +++ b/buildtools/checkpackages/Directory.Build.props @@ -3,6 +3,8 @@ + + false true $(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid()) $(CachePath)\obj\ diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj index 3b8aafb532b..08f77151636 100644 --- a/buildtools/fslex/fslex.fsproj +++ b/buildtools/fslex/fslex.fsproj @@ -38,7 +38,7 @@ - + diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj index ba57de811c9..42ea6e1bf36 100644 --- a/buildtools/fsyacc/fsyacc.fsproj +++ b/buildtools/fsyacc/fsyacc.fsproj @@ -38,7 +38,7 @@ - + diff --git a/docs/fcs-samples/Directory.Build.props b/docs/fcs-samples/Directory.Build.props new file mode 100644 index 00000000000..21aa3b5274e --- /dev/null +++ b/docs/fcs-samples/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + false + + diff --git a/eng/Packages.props b/eng/Packages.props new file mode 100644 index 00000000000..2d1e15740ba --- /dev/null +++ b/eng/Packages.props @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 8f756067e4d..a133437fa93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,6 @@ 1 - $(FSMajorVersion).$(FSMinorVersion) $(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion) $(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion) $(FSMajorVersion).$(FSMinorVersion).0.0 @@ -89,7 +88,26 @@ 4.6.1 4.6.3 6.1.2 - + + + $(SystemSecurityCryptographyXmlVersion) + $(SystemCollectionsImmutableVersion) + $(SystemReflectionMetadataVersion) + + + + + 10.0.9 + $(SystemRuntimeCentralFloorVersion) + $(SystemRuntimeCentralFloorVersion) + $(SystemRuntimeCentralFloorVersion) @@ -97,92 +115,30 @@ 4.7.0 - 1.6.0 - - 18.0.404-preview - 18.0.2188-preview.1 - 18.0.1237-pre - 18.0.2077-preview.1 - 18.7.19 - - - 2.0.28 - - $(MicrosoftVisualStudioShellPackagesVersion) - $(VisualStudioShellProjectsPackages) - - 18.9.438 - 18.9.438 - 18.9.438 - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(VisualStudioShellProjectsPackages) - $(MicrosoftVisualStudioShellPackagesVersion) - 10.0.30319 - 11.0.50727 - 15.0.25123-Dev15Preview - - - $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) - - 18.9.123 - $(VisualStudioEditorPackagesVersion) - 17.14.0 + + + 18.9.123 0.1.800-beta - $(MicrosoftVisualStudioExtensibilityTestingVersion) - - - $(MicrosoftVisualStudioThreadingPackagesVersion) - - 18.7.1 - 18.9.453 - 4.10.128 - 2.26.5 - - - 1.0.52 + + 17.14.2120 - - $(VisualStudioProjectSystemPackagesVersion) - 2.3.6152103 + + 4.3.0-1.22220.8 + 5.0.0-preview.7.20364.11 + 5.0.0-preview.7.20364.11 - - 17.14.2120 - 17.0.0 - - - 0.2.0 - 1.0.0 - 1.1.87 - 0.13.10 - 2.16.6 - 4.3.0-1.22220.8 - - 5.0.0-preview.7.20364.11 - 5.0.0-preview.7.20364.11 17.14.1 2.0.2 - 13.0.4 3.2.2 - 3.2.2 8.0.0 - diff --git a/setup/Swix/Directory.Build.props b/setup/Swix/Directory.Build.props index 0a9e6f4ecc5..3e43aa310f4 100644 --- a/setup/Swix/Directory.Build.props +++ b/setup/Swix/Directory.Build.props @@ -1,6 +1,8 @@ + + false true Microsoft.FSharp neutral diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj index 5510af6b3f6..a7b3737a77b 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj @@ -621,17 +621,17 @@ - + - - - - - - - + + + + + + + diff --git a/src/FSharp.Build/FSharp.Build.fsproj b/src/FSharp.Build/FSharp.Build.fsproj index d7f814ce261..90912e95fe2 100644 --- a/src/FSharp.Build/FSharp.Build.fsproj +++ b/src/FSharp.Build/FSharp.Build.fsproj @@ -82,16 +82,13 @@ - + - - - - - - + + + diff --git a/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index a8ecf73e065..0302ae845f5 100644 --- a/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -45,7 +45,7 @@ - + diff --git a/src/FSharp.Compiler.LanguageServer/FSharp.Compiler.LanguageServer.fsproj b/src/FSharp.Compiler.LanguageServer/FSharp.Compiler.LanguageServer.fsproj index e1b1f0b35f9..ffa91fc3cac 100644 --- a/src/FSharp.Compiler.LanguageServer/FSharp.Compiler.LanguageServer.fsproj +++ b/src/FSharp.Compiler.LanguageServer/FSharp.Compiler.LanguageServer.fsproj @@ -8,10 +8,12 @@ - - - - + + + + + + @@ -28,7 +30,7 @@ - + diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj index 500f3b32208..a24d5b0e5d9 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj @@ -51,13 +51,7 @@ - - - - - - - + diff --git a/src/FSharp.VisualStudio.Extension/FSharp.VisualStudio.Extension.csproj b/src/FSharp.VisualStudio.Extension/FSharp.VisualStudio.Extension.csproj index 862decf5606..f2f8ab61ede 100644 --- a/src/FSharp.VisualStudio.Extension/FSharp.VisualStudio.Extension.csproj +++ b/src/FSharp.VisualStudio.Extension/FSharp.VisualStudio.Extension.csproj @@ -12,11 +12,12 @@ - - - - - + + + + + + + diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj index 36d7036a22c..f685e300651 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj @@ -12,7 +12,7 @@ - + diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index c85dc1e66ab..f54cb4b32a9 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -43,7 +43,7 @@ - + @@ -53,14 +53,9 @@ - - - - - - - - + + + diff --git a/src/fsi/fsi.targets b/src/fsi/fsi.targets index cba9355e99f..b38960f7f0e 100644 --- a/src/fsi/fsi.targets +++ b/src/fsi/fsi.targets @@ -48,7 +48,7 @@ - + @@ -65,9 +65,9 @@ - - - + + + \ No newline at end of file diff --git a/tests/AheadOfTime/Directory.Build.props b/tests/AheadOfTime/Directory.Build.props index 6b0a85482a8..7c6ff208af6 100644 --- a/tests/AheadOfTime/Directory.Build.props +++ b/tests/AheadOfTime/Directory.Build.props @@ -4,6 +4,8 @@ + + false $(MSBuildThisFileDirectory)/../../artifacts/bin/fsc/Release/$(FSharpNetCoreProductTargetFramework) diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index ccc7e44ffa3..8eeb2b54e20 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -5,22 +5,34 @@ true portable + + <_IsTestRunnerProject Condition="$(MSBuildProjectName.EndsWith('.Tests')) OR $(MSBuildProjectName.EndsWith('.ComponentTests')) OR $(MSBuildProjectName.EndsWith('.UnitTests'))">true - - - + + + - + - + - + + + + + + + + + + - + true @@ -33,9 +45,8 @@ - + OutputType isn't available at props evaluation time, so this applies to all net472 test-runner projects. --> + x64 diff --git a/tests/EndToEndBuildTests/Directory.Build.props b/tests/EndToEndBuildTests/Directory.Build.props index f97db4e1684..d39ae0c5faf 100644 --- a/tests/EndToEndBuildTests/Directory.Build.props +++ b/tests/EndToEndBuildTests/Directory.Build.props @@ -1,11 +1,12 @@ + + false net40 LatestMajor 3.2.2 - 3.2.2 2.0.2 8.0.0 17.14.1 diff --git a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj index 2018b41cb92..0b489b6cc7c 100644 --- a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj +++ b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj @@ -25,13 +25,13 @@ - + - - - + + + diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj index 5070905529f..1b1e51e4f6f 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj @@ -547,7 +547,7 @@ - + diff --git a/tests/FSharp.Compiler.LanguageServer.Tests/FSharp.Compiler.LanguageServer.Tests.fsproj b/tests/FSharp.Compiler.LanguageServer.Tests/FSharp.Compiler.LanguageServer.Tests.fsproj index 181cc03f4d3..90993cf5b32 100644 --- a/tests/FSharp.Compiler.LanguageServer.Tests/FSharp.Compiler.LanguageServer.Tests.fsproj +++ b/tests/FSharp.Compiler.LanguageServer.Tests/FSharp.Compiler.LanguageServer.Tests.fsproj @@ -25,7 +25,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj index 6193e4f73a4..0c2a3014b6c 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -93,9 +93,6 @@ - - - TargetFramework=netstandard2.0 diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj b/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj index d4ff59d3cbd..1694e8eb4ca 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj +++ b/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj @@ -98,6 +98,6 @@ - + diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj index a4f64a0f893..194e2d8f19f 100644 --- a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj +++ b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj @@ -54,7 +54,7 @@ - + @@ -65,19 +65,19 @@ - + runtime; native all - + runtime; native all - + runtime; native all - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -94,24 +94,24 @@ - - + + $(NoWarn);NU1510;44 - - - - - - + + + + + + - - - + + + diff --git a/tests/benchmarks/Directory.Build.props b/tests/benchmarks/Directory.Build.props index ba9f0b7a4fa..e6b735ad57b 100644 --- a/tests/benchmarks/Directory.Build.props +++ b/tests/benchmarks/Directory.Build.props @@ -2,6 +2,8 @@ + + false true $(FSharpNetCoreProductTargetFramework) diff --git a/tests/fsharp/SDKTests/Directory.Build.props b/tests/fsharp/SDKTests/Directory.Build.props index b8ed27bf510..e0f9795a355 100644 --- a/tests/fsharp/SDKTests/Directory.Build.props +++ b/tests/fsharp/SDKTests/Directory.Build.props @@ -1,6 +1,8 @@ + + false false diff --git a/tests/projects/CompilerCompat/Directory.Build.props b/tests/projects/CompilerCompat/Directory.Build.props new file mode 100644 index 00000000000..d02e351a949 --- /dev/null +++ b/tests/projects/CompilerCompat/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + false + + diff --git a/tests/service/data/TestTP/TestTP.fsproj b/tests/service/data/TestTP/TestTP.fsproj index 4bf7e293c3a..3c421bdbe21 100644 --- a/tests/service/data/TestTP/TestTP.fsproj +++ b/tests/service/data/TestTP/TestTP.fsproj @@ -18,7 +18,7 @@ - + diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets index 16099d6637c..381557267a2 100644 --- a/vsintegration/Directory.Build.targets +++ b/vsintegration/Directory.Build.targets @@ -3,22 +3,22 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets index 674c3487ac7..db4b3097d66 100644 --- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets +++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharp.Core.targets @@ -260,8 +260,8 @@ - - + + diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 68206f698bd..9c5013e0520 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -177,12 +177,12 @@ - - - - - - + + + + + + diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj index fbf420a0741..3a71ba25a3c 100644 --- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj +++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj @@ -46,9 +46,9 @@ - - - + + + diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj index 848ba3fcf67..ead290f6ec0 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj +++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj @@ -56,14 +56,14 @@ - - - - - - - - + + + + + + + + diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/FSharp.ProjectSystem.Base.csproj b/vsintegration/src/FSharp.ProjectSystem.Base/FSharp.ProjectSystem.Base.csproj index be6eb82d080..379bfd8b328 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/FSharp.ProjectSystem.Base.csproj +++ b/vsintegration/src/FSharp.ProjectSystem.Base/FSharp.ProjectSystem.Base.csproj @@ -39,12 +39,11 @@ - - - - - - + + + + + diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj index da59e918292..97811017810 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/FSharp.ProjectSystem.FSharp.fsproj @@ -104,12 +104,12 @@ - - - - - - + + + + + + diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.ProjectSystem.PropertyPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.ProjectSystem.PropertyPages.vbproj index e964555f55f..4b2657c9977 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.ProjectSystem.PropertyPages.vbproj +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.ProjectSystem.PropertyPages.vbproj @@ -46,9 +46,9 @@ - - - + + + diff --git a/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj b/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj index 95878c043b9..5827d12b71a 100644 --- a/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj +++ b/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj @@ -57,9 +57,8 @@ - - - + + diff --git a/vsintegration/tests/Directory.Build.targets b/vsintegration/tests/Directory.Build.targets index 2bbbb8d4d4c..1b4f33eed3a 100644 --- a/vsintegration/tests/Directory.Build.targets +++ b/vsintegration/tests/Directory.Build.targets @@ -5,6 +5,6 @@ - + diff --git a/vsintegration/tests/FSharp.Editor.IntegrationTests/FSharp.Editor.IntegrationTests.csproj b/vsintegration/tests/FSharp.Editor.IntegrationTests/FSharp.Editor.IntegrationTests.csproj index 374c8164a5b..b68a4d941dc 100644 --- a/vsintegration/tests/FSharp.Editor.IntegrationTests/FSharp.Editor.IntegrationTests.csproj +++ b/vsintegration/tests/FSharp.Editor.IntegrationTests/FSharp.Editor.IntegrationTests.csproj @@ -27,12 +27,12 @@ - - - - - - + + + + + + diff --git a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj index 0d05a915760..af5090a2b3f 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj +++ b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj @@ -92,12 +92,12 @@ - - + + - - - + + + @@ -106,11 +106,11 @@ - - - - - + + + + + diff --git a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj index 83d89379565..1dd626fc421 100644 --- a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj +++ b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj @@ -53,14 +53,14 @@ - - - - - - - - + + + + + + + + diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj index cf8cc25e837..0eef235185e 100644 --- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj +++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj @@ -117,19 +117,19 @@ - - + + - - - - - - - - - - + + + + + + + + + +