diff --git a/NuGet.Config b/NuGet.Config index 372e8b1c311..c89208eb6da 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -15,7 +15,6 @@ - diff --git a/build/targets/PackageVersions.props b/build/targets/PackageVersions.props index b56251e7232..f4bcf0d7bab 100644 --- a/build/targets/PackageVersions.props +++ b/build/targets/PackageVersions.props @@ -6,7 +6,7 @@ $([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\..\RoslynPackageVersion.txt').Trim()) - 1.3.1 + 1.5.0 $(RoslynPackageVersion) diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 5e1db94e1a3..1705a3c3bd5 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -636,8 +636,8 @@ - - + + diff --git a/fcs/samples/EditorService/EditorService.fsproj b/fcs/samples/EditorService/EditorService.fsproj index 7066f79c8f5..05847e67f90 100644 --- a/fcs/samples/EditorService/EditorService.fsproj +++ b/fcs/samples/EditorService/EditorService.fsproj @@ -14,7 +14,7 @@ - + diff --git a/packages.config b/packages.config index caf79970a4a..c09a626345c 100644 --- a/packages.config +++ b/packages.config @@ -15,8 +15,8 @@ - - + + diff --git a/setup/packages.config b/setup/packages.config index f62527d8caf..930e870e4bf 100644 --- a/setup/packages.config +++ b/setup/packages.config @@ -1,7 +1,7 @@ - - + + diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets index 3fb2ba1bc6e..b4b4f9f9406 100644 --- a/src/FSharpSource.Settings.targets +++ b/src/FSharpSource.Settings.targets @@ -88,7 +88,7 @@ 15.0.26201 - 1.3.1 + 1.5.0 Microsoft.VSSDK.BuildTools.15.1.192 15.3.23 diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index 989a9970ee8..fdda3ce7c8b 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -675,10 +675,10 @@ - ..\..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll + ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard1.1\System.Reflection.Metadata.dll - ..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + ..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\netstandard1.0\System.Collections.Immutable.dll ..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.netcore.nuspec b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.netcore.nuspec index 5f1ffaf1317..dc8c6aa2975 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.netcore.nuspec +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.netcore.nuspec @@ -16,14 +16,14 @@ - + - + diff --git a/src/fsharp/FSharp.Compiler.Private/project.json b/src/fsharp/FSharp.Compiler.Private/project.json index 5a427509053..46a8b02f9b2 100644 --- a/src/fsharp/FSharp.Compiler.Private/project.json +++ b/src/fsharp/FSharp.Compiler.Private/project.json @@ -1,14 +1,14 @@ { "dependencies": { "NETStandard.Library": "1.6.1", - "System.Collections.Immutable":"1.3.1", + "System.Collections.Immutable": "1.5.0", "System.Diagnostics.Process": "4.3.0", "System.Diagnostics.TraceSource": "4.3.0", "System.Linq.Expressions": "4.3.0", "System.Linq.Queryable": "4.3.0", "System.Net.Requests": "4.3.0", "System.Reflection.Emit": "4.3.0", - "System.Reflection.Metadata": "1.4.2", + "System.Reflection.Metadata": "1.6.0", "System.Reflection.TypeExtensions": "4.3.0", "System.Runtime": "4.3.0", "System.Runtime.InteropServices": "4.3.0", diff --git a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec index e26b6dd36ef..7e887dd6d6e 100644 --- a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec +++ b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec b/src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec index e512806ebca..2f5c7e4aab2 100644 --- a/src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec +++ b/src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec @@ -16,7 +16,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj index 4577e7535ba..b4f86c8943c 100644 --- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj +++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj @@ -461,10 +461,10 @@ - $(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll + $(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard1.1\System.Reflection.Metadata.dll - $(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + $(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\netstandard1.0\System.Collections.Immutable.dll $(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll diff --git a/src/fsharp/Fsc-proto/app.config b/src/fsharp/Fsc-proto/app.config index 46b5e39962b..be4549ea2d2 100644 --- a/src/fsharp/Fsc-proto/app.config +++ b/src/fsharp/Fsc-proto/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/fsharp/Fsc/app.config b/src/fsharp/Fsc/app.config index f8b3fb396b7..80d85763659 100644 --- a/src/fsharp/Fsc/app.config +++ b/src/fsharp/Fsc/app.config @@ -10,7 +10,7 @@ - + diff --git a/src/fsharp/Fsc/project.json b/src/fsharp/Fsc/project.json index 9c96ba5a003..09458a531ee 100644 --- a/src/fsharp/Fsc/project.json +++ b/src/fsharp/Fsc/project.json @@ -3,7 +3,7 @@ "Microsoft.NETCore.Platforms": "1.1.0", "NETStandard.Library": "1.6.1", "System.Linq.Expressions": "4.3.0", - "System.Reflection.Metadata": "1.4.2", + "System.Reflection.Metadata": "1.6.0", "System.Runtime.Loader": "4.3.0" }, "runtimes": { diff --git a/src/fsharp/fsi/app.config b/src/fsharp/fsi/app.config index df4baf6b49b..e6feb514fab 100644 --- a/src/fsharp/fsi/app.config +++ b/src/fsharp/fsi/app.config @@ -9,7 +9,7 @@ - + diff --git a/src/fsharp/fsi/project.json b/src/fsharp/fsi/project.json index 8c336a3e67a..8fdb41c7a8e 100644 --- a/src/fsharp/fsi/project.json +++ b/src/fsharp/fsi/project.json @@ -8,7 +8,7 @@ "System.Reflection.TypeExtensions": "4.3.0", "System.Runtime.Loader": "4.3.0", "System.Threading.Thread": "4.3.0", - "System.Reflection.Metadata": "1.4.2" + "System.Reflection.Metadata": "1.6.0" }, "runtimes": { "win7-x86": { }, diff --git a/src/fsharp/fsiAnyCpu/app.config b/src/fsharp/fsiAnyCpu/app.config index 231a002c172..a7514bd602e 100644 --- a/src/fsharp/fsiAnyCpu/app.config +++ b/src/fsharp/fsiAnyCpu/app.config @@ -10,7 +10,7 @@ - + diff --git a/tests/fsharp/FSharp.Tests.FSharpSuite.fsproj b/tests/fsharp/FSharp.Tests.FSharpSuite.fsproj index 20052813a69..066de62f40d 100644 --- a/tests/fsharp/FSharp.Tests.FSharpSuite.fsproj +++ b/tests/fsharp/FSharp.Tests.FSharpSuite.fsproj @@ -46,11 +46,11 @@ - $(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + $(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\netstandard1.0\System.Collections.Immutable.dll True - $(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll + $(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard1.1\System.Reflection.Metadata.dll True diff --git a/tests/fsharp/app.config b/tests/fsharp/app.config index bd1c9c33df5..b64cfc5852a 100644 --- a/tests/fsharp/app.config +++ b/tests/fsharp/app.config @@ -4,7 +4,7 @@ - + diff --git a/tests/fsharp/packages.config b/tests/fsharp/packages.config index 1d5c24f97f0..cf755012d51 100644 --- a/tests/fsharp/packages.config +++ b/tests/fsharp/packages.config @@ -6,6 +6,6 @@ - - + + \ No newline at end of file diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config b/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config index 885af92830a..ab88e62ffc5 100644 --- a/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config +++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/App.config @@ -13,7 +13,7 @@ - + diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.dll.config b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.dll.config index 9215b5d9654..fbdc6fa374f 100644 --- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.dll.config +++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.dll.config @@ -41,7 +41,7 @@ - +