diff --git a/benchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fsproj b/benchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fsproj index 513ff0d4ec2..2fb509e4c14 100644 --- a/benchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fsproj +++ b/benchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fsproj @@ -9,7 +9,7 @@ net472 true true - $(SystemValueTuplePackageVersion) + $(SystemValueTupleVersion) diff --git a/eng/Versions.props b/eng/Versions.props index e8a90e3946c..b7706f695e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,114 +74,114 @@ https://vside.myget.org/F/devcore/api/v3/index.json; - $([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\RoslynPackageVersion.txt').Trim()) + $([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\RoslynPackageVersion.txt').Trim()) - 1.5.0 - 4.3.0 - 4.0.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.5.2 - 4.3.0 - 4.3.0 - 4.3.0 - 1.6.0 - 4.3.0 - 1.5.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.3.0 - 4.4.0 + 1.5.0 + 4.3.0 + 4.0.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.5.2 + 4.3.0 + 4.3.0 + 4.3.0 + 1.6.0 + 4.3.0 + 1.5.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.4.0 - $(RoslynPackageVersion) - $(RoslynPackageVersion) - $(RoslynPackageVersion) - $(RoslynPackageVersion) - $(RoslynPackageVersion) + $(RoslynVersion) + $(RoslynVersion) + $(RoslynVersion) + $(RoslynVersion) + $(RoslynVersion) 16.0.461 - $(MicrosoftBuildOverallPackagesVersion) - $(MicrosoftBuildOverallPackagesVersion) - $(MicrosoftBuildOverallPackagesVersion) - $(MicrosoftBuildOverallPackagesVersion) + $(MicrosoftBuildOverallPackagesVersion) + $(MicrosoftBuildOverallPackagesVersion) + $(MicrosoftBuildOverallPackagesVersion) + $(MicrosoftBuildOverallPackagesVersion) - 8.0.1 - 14.0.25420 - 16.0.467 - 16.0.467 - 1.1.4322 - 16.0.467 - 16.0.28727 - 16.0.28729 - 16.0.467 - 16.0.467 - 16.0.467 - 8.0.50728 - 7.10.6071 - 16.0.28729 - 8.0.50728 + 8.0.1 + 14.0.25420 + 16.0.467 + 16.0.467 + 1.1.4322 + 16.0.467 + 16.0.28727 + 16.0.28729 + 16.0.467 + 16.0.467 + 16.0.467 + 8.0.50728 + 7.10.6071 + 16.0.28729 + 8.0.50728 16.0.201-pre-g7d366164d0 2.3.6152103 - 14.3.25407 - 16.0.28729 - 16.0.28729 - 16.0.28729 - 10.0.30319 - 11.0.50727 - 15.0.25123-Dev15Preview - 7.10.6072 - 8.0.50728 - 9.0.30730 - 10.0.30320 - 11.0.61031 - 12.0.30111 - 16.0.467 - 7.10.6071 - 8.0.50728 - 10.0.30320 - 12.0.30112 - 16.0.467 - 16.0.467 - 16.0.102 - 16.0.28729 - 15.3.58 - 9.0.30729 + 14.3.25407 + 16.0.28729 + 16.0.28729 + 16.0.28729 + 10.0.30319 + 11.0.50727 + 15.0.25123-Dev15Preview + 7.10.6072 + 8.0.50728 + 9.0.30730 + 10.0.30320 + 11.0.61031 + 12.0.30111 + 16.0.467 + 7.10.6071 + 8.0.50728 + 10.0.30320 + 12.0.30112 + 16.0.467 + 16.0.467 + 16.0.102 + 16.0.28729 + 15.3.58 + 9.0.30729 16.0.2264 - 12.0.4 - 7.0.4 - 8.0.4 - 11.0.4 - 7.0.4 + 12.0.4 + 7.0.4 + 8.0.4 + 11.0.4 + 7.0.4 - 0.2.0 - 1.0.0 - 1.0.147 + 0.2.0 + 1.0.0 + 1.0.147 - 3.0.0-alpha4 + 3.0.0-alpha4 4.3.0.0 - 1.0.30 - 8.0.0-alpha - 2.7.0 - 2.0.3 - 15.8.0 - 1.0.0 - 4.3.0 - 9.0.1 - 3.11.0 - 3.11.2 - 3.11.0 - 2.1.36 - 1.0.0-beta2-dev3 - 5.22.2.1 + 1.0.30 + 8.0.0-alpha + 2.7.0 + 2.0.3 + 15.8.0 + 1.0.0 + 4.3.0 + 9.0.1 + 3.11.0 + 3.11.2 + 3.11.0 + 2.1.36 + 1.0.0-beta2-dev3 + 5.22.2.1 diff --git a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj index a702f827717..cc9d75a2887 100644 --- a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj +++ b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj index 8ddb082c56a..9cec3fb3140 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -35,11 +35,11 @@ - - - - - + + + + + diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index a7bafddfded..4b92a354abe 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -43,14 +43,14 @@ - - - - - - - - + + + + + + + + diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 4bf59eb4aa6..e28338a5d44 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj index cc43c8810f8..7c6ea79b387 100644 --- a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj +++ b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj @@ -20,15 +20,15 @@ - + - - - - - + + + + + diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj b/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj index 9724cf930c3..24a2132e9c2 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj +++ b/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj @@ -90,7 +90,7 @@ - + diff --git a/tests/fsharp/FSharpSuite.Tests.fsproj b/tests/fsharp/FSharpSuite.Tests.fsproj index 44645a569b1..56240b466b4 100644 --- a/tests/fsharp/FSharpSuite.Tests.fsproj +++ b/tests/fsharp/FSharpSuite.Tests.fsproj @@ -51,12 +51,12 @@ - - - - - - + + + + + + diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets index af547ce3c0c..bc5c6d7195c 100644 --- a/vsintegration/Directory.Build.targets +++ b/vsintegration/Directory.Build.targets @@ -7,17 +7,17 @@ - - - - - + + + + + - - - + + + diff --git a/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj b/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj index a61ba873ce9..1b2f4b81dde 100644 --- a/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj +++ b/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj @@ -5,7 +5,7 @@ Exe true true - $(SystemValueTuplePackageVersion) + $(SystemValueTupleVersion) true diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj index dc670ae39f3..cfe668403ca 100644 --- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj +++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj @@ -23,7 +23,7 @@ License.txt true - + PreserveNewest FSharp.Data.TypeProviders.dll true @@ -259,8 +259,8 @@ - - + + diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 5f78b109805..575f038d015 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -8,7 +8,7 @@ $(NoWarn);44 true true - $(SystemValueTuplePackageVersion) + $(SystemValueTupleVersion) $(OtherFlags) --warnon:1182 --subsystemversion:6.00 false @@ -131,36 +131,36 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj index 58115e56eb0..9396c8c41b7 100644 --- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj +++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj @@ -46,22 +46,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj index 77dfb2dcc15..cf72f552163 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj +++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj @@ -8,7 +8,7 @@ $(NoWarn);44 true true - $(SystemValueTuplePackageVersion) + $(SystemValueTupleVersion) $(OtherFlags) --warnon:1182 --subsystemversion:6.00 false @@ -59,28 +59,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectBase.files b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectBase.files index 09bea264a03..4343af2f328 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectBase.files +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectBase.files @@ -16,22 +16,22 @@ global - $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Framework.$(MicrosoftBuildFrameworkPackageVersion)\lib\net46\Microsoft.Build.Framework.dll + $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Framework.$(MicrosoftBuildFrameworkVersion)\lib\net46\Microsoft.Build.Framework.dll - $(FSharpSourcesRoot)\..\packages\Microsoft.Build.$(MicrosoftBuildPackageVersion)\lib\net46\Microsoft.Build.dll + $(FSharpSourcesRoot)\..\packages\Microsoft.Build.$(MicrosoftBuildVersion)\lib\net46\Microsoft.Build.dll - $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Utilities.Core.$(MicrosoftBuildUtilitiesCorePackageVersion)\lib\net46\Microsoft.Build.Utilities.Core.dll + $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Utilities.Core.$(MicrosoftBuildUtilitiesCoreVersion)\lib\net46\Microsoft.Build.Utilities.Core.dll - $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Tasks.Core.$(MicrosoftBuildTasksCorePackageVersion)\lib\net46\Microsoft.Build.Tasks.Core.dll + $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Tasks.Core.$(MicrosoftBuildTasksCoreVersion)\lib\net46\Microsoft.Build.Tasks.Core.dll - $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Tasks.Core.$(MicrosoftBuildTasksCorePackageVersion)\lib\net46\Microsoft.Build.Tasks.Core.dll + $(FSharpSourcesRoot)\..\packages\Microsoft.Build.Tasks.Core.$(MicrosoftBuildTasksCoreVersion)\lib\net46\Microsoft.Build.Tasks.Core.dll - $(FSharpSourcesRoot)\..\packages\System.IO.Compression.$(SystemIoCompressionPackageVersion)\lib\net46\System.IO.Compression.dll + $(FSharpSourcesRoot)\..\packages\System.IO.Compression.$(SystemIoCompressionVersion)\lib\net46\System.IO.Compression.dll diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj index 9e3ebadbb0b..1604a94f3bd 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj @@ -44,23 +44,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj index 6c2b6091402..a161faab968 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj @@ -8,7 +8,7 @@ $(NoWarn);52;62;75 true true - $(SystemValueTuplePackageVersion) + $(SystemValueTupleVersion) $(OtherFlags) --warnon:1182 --subsystemversion:6.00 false @@ -104,24 +104,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj index 62f44ba24d6..e192cccbf90 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj @@ -42,21 +42,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj b/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj index f6deaa32daf..28e4f314f5a 100644 --- a/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj +++ b/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj @@ -7,7 +7,7 @@ $(NoWarn);47;75 true true - $(SystemValueTuplePackageVersion) + $(SystemValueTupleVersion) $(OtherFlags) --subsystemversion:6.00 false @@ -57,23 +57,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/vsintegration/tests/GetTypesVS.UnitTests/GetTypesVS.UnitTests.fsproj b/vsintegration/tests/GetTypesVS.UnitTests/GetTypesVS.UnitTests.fsproj index 546c29c18cc..d44b41fab37 100644 --- a/vsintegration/tests/GetTypesVS.UnitTests/GetTypesVS.UnitTests.fsproj +++ b/vsintegration/tests/GetTypesVS.UnitTests/GetTypesVS.UnitTests.fsproj @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj index ee8cd6a9d30..f7eea70d974 100644 --- a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj +++ b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj @@ -7,7 +7,7 @@ $(NoWarn);45;47;52;58;75 true true - $(SystemValueTuplePackageVersion) + $(SystemValueTupleVersion) true false @@ -49,23 +49,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj index c317a7a2e72..e67623fd9fc 100644 --- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj +++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj @@ -10,7 +10,7 @@ NO_PROJECTCRACKER;$(DefineConstants) true true - $(SystemValueTuplePackageVersion) + $(SystemValueTupleVersion) true true false @@ -221,39 +221,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +