Skip to content

update System.Collections.Immutable to 1.3.1 #3630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

update System.Collections.Immutable to 1.3.1 #3630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@

<ItemGroup>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework">
Expand Down
2 changes: 1 addition & 1 deletion fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion fcs/nuget/FSharp.Compiler.Service.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<summary>F# compiler services for creating IDE tools, language extensions and for F# embedding.</summary>
<dependencies>
<group targetFramework="net45">
<dependency id="System.Collections.Immutable" version="1.2.0" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
<dependency id="System.Reflection.Metadata" version="1.4.2" />
</group>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<package id="MicroBuild.Core.Sentinel" version="1.0.0" />

<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll -->
<package id="System.Collections.Immutable" version="1.2.0" />
<package id="System.Collections.Immutable" version="1.3.1" />
<package id="System.Reflection.Metadata" version="1.4.2" />
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
<package id="Microsoft.DiaSymReader" version="1.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
</Component>

<Component Id="Compiler_Redist_System.Collections.Immutable.dll" Guid="$(fsharp.guid(Compiler_Redist_System.Collections.Immutable.dll, $(var.LocaleCode)))">
<File Id="Compiler_Redist_System.Collections.Immutable.dll" Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.2.0\lib\netstandard1.0\System.Collections.Immutable.dll" />
<File Id="Compiler_Redist_System.Collections.Immutable.dll" Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.3.1\lib\netstandard1.0\System.Collections.Immutable.dll" />
</Component>

<Component Id="Compiler_Redist_System.Reflection.Metadata.dll" Guid="$(fsharp.guid(Compiler_Redist_System.Reflection.Metadata.dll, $(var.LocaleCode)))">
Expand Down
2 changes: 1 addition & 1 deletion setup/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Collections.Immutable" version="1.2.0" />
<package id="System.Collections.Immutable" version="1.3.1" />
<package id="System.Reflection.Metadata" version="1.4.1-beta-24227-04" />
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
<package id="Microsoft.DiaSymReader" version="1.0.8" />
Expand Down
1 change: 1 addition & 0 deletions src/FSharpSource.Settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<RoslynVersion>2.3.0-beta2-61719-01</RoslynVersion>
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>

<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
Expand Down
23 changes: 1 addition & 22 deletions src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.BuildFromSource.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,30 +607,9 @@
</ItemGroup>
<Import Project = "$(MSBuildThisFileDirectory)../../FSharpSource.BuildFromSource.targets" />

<!--
"System.Collections.Immutable":"1.2.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.TypeExtensions": "4.3.0",
"System.Runtime": "4.3.0",
"System.Runtime.InteropServices": "4.3.0",
"System.Runtime.Loader": "4.3.0",
"System.Security.Cryptography.Algorithms": "4.3.0",
"System.Threading.Tasks.Parallel": "4.3.0",
"System.Threading.Thread": "4.3.0",
"System.Threading.ThreadPool": "4.3.0",
"Microsoft.DiaSymReader.PortablePdb": "1.1.0",
"Microsoft.DiaSymReader": "1.1.0",
"System.ValueTuple": "4.3.1"
-->
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.BuildFromSource.fsproj" />
<PackageReference Include="System.Collections.Immutable" Version="1.2.0"></PackageReference>
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)"></PackageReference>
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0"></PackageReference>
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0"></PackageReference>
<PackageReference Include="System.Linq.Expressions" Version="4.3.0"></PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>..\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.netcore.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependencies>
<group>
<dependency id="NETStandard.Library" version="1.6.0" />
<dependency id="System.Collections.Immutable" version="1.2.0" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
<dependency id="System.Diagnostics.Process" version="4.1.0" />
<dependency id="System.Diagnostics.TraceSource" version="4.0.0" />
<dependency id="System.Linq.Expressions" version="4.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.Private/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"NETStandard.Library": "1.6.1",
"System.Collections.Immutable":"1.2.0",
"System.Collections.Immutable":"1.3.1",
"System.Diagnostics.Process": "4.3.0",
"System.Diagnostics.TraceSource": "4.3.0",
"System.Linq.Expressions": "4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<group targetFramework=".NETStandard1.6">
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1" />
<dependency id="NETStandard.Library" version="1.6.0" />
<dependency id="System.Collections.Immutable" version="1.2.0" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
<dependency id="System.Console" version="4.0.0" />
<dependency id="System.Diagnostics.Process" version="4.1.0" />
<dependency id="System.Diagnostics.TraceSource" version="4.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<group targetFramework=".NETStandard1.6">
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1" />
<dependency id="NETStandard.Library" version="1.6.0" />
<dependency id="System.Collections.Immutable" version="1.2.0" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
<dependency id="System.Console" version="4.0.0" />
<dependency id="System.Diagnostics.Process" version="4.1.0" />
<dependency id="System.Diagnostics.TraceSource" version="4.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/Fsc-proto/Fsc-proto.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
Expand Down
6 changes: 2 additions & 4 deletions vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>$(FSharpSourcesRoot)\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<!-- Microsoft.CodeAnalysis.Features requires 1.2.1 but the rest of F# uses 1.2.0 -->
<!-- If we don't get the version right here the wrong version is copied during the build -->
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
Expand Down
6 changes: 2 additions & 4 deletions vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>$(FSharpSourcesRoot)\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<!-- Microsoft.CodeAnalysis.Features requires 1.2.1 but the rest of F# uses 1.2.0 -->
<!-- If we don't get the version right here the wrong version is copied during the build -->
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@
<Private>True</Private>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.ComponentModelHost.15.0.26201-alpha\lib\net46\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
<Private>True</Private>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
6 changes: 2 additions & 4 deletions vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,8 @@
<Reference Include="Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
</Reference>
<!-- Microsoft.CodeAnalysis.Features requires 1.2.1 but the rest of F# uses 1.2.0 -->
<!-- If we don't get the version right here the wrong version is copied during the build -->
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj">
<Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
Expand Down
3 changes: 1 addition & 2 deletions vsintegration/tests/unittests/VisualFSharp.Unittests.dll.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@
<assemblyIdentity name="Microsoft.VisualStudio.Platform.VSEditor.Interop" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="14.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
</dependentAssembly>
<!-- Microsoft.CodeAnalysis.Features requires 1.2.1 but the rest of F# uses 1.2.0 -->
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="1.0.0.0-1.2.1.0" newVersion="1.2.0.0" />
<bindingRedirect oldVersion="1.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
<Private>True</Private>
</Reference>
<Reference Include="System.Collections.Immutable">
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
Expand Down