Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit383e2f6

Browse files
authored
update to System.Collections.Immutable 1.3.1 (#3641)
* update to System.Collections.Immutable 1.3.1* fixes
1 parentd08a5ff commit383e2f6

File tree

31 files changed

+60
-46
lines changed

31 files changed

+60
-46
lines changed

‎fcs/FSharp.Compiler.Service.Tests/App.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
88
<bindingRedirectoldVersion="2.0.0.0-4.4.0.0"newVersion="4.4.1.0" />
99
</dependentAssembly>
10+
<dependentAssembly>
11+
<assemblyIdentityname="System.Collections.Immutable"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
12+
<bindingRedirectoldVersion="1.0.0.0-1.2.0.0"newVersion="1.2.1.0" />
13+
</dependentAssembly>
1014
</assemblyBinding>
1115
</runtime>
1216
<startup>

‎fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100

101101
<ItemGroup>
102102
<ReferenceInclude="System.Collections.Immutable">
103-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
103+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
104104
<Private>True</Private>
105105
</Reference>
106106
<ReferenceInclude="nunit.framework">

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@
626626
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
627627
</Reference>
628628
<ReferenceInclude="System.Collections.Immutable">
629-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
629+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
630630
</Reference>
631631
<ReferenceInclude="System.ValueTuple">
632632
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎fcs/docsrc/content/corelib.fsx‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,25 @@ an FSharp.Core.optdata and FSharp.Core.sigdata, see below for guidance.
1919
Binding redirects for your application
2020
--------------------------------------
2121
22-
The FSharp.Compiler.Service.dll component depends on FSharp.Core 4.3.0.0. Normally your application will target
22+
The FSharp.Compiler.Service.dll component depends on FSharp.Core 4.4.0.0. Normally your application will target
2323
a later version of FSharp.Core, and you will need a [binding redirect](http://msdn.microsoft.com/en-us/library/7wd6ex19(v=vs.110).aspx) to ensure
24-
that FSharp.Core4.3.0.0 forwards to which the final version of FSharp.Core.dll your application uses.
24+
thatother versions ofFSharp.Coreforward to the final version of FSharp.Core.dll your application uses.
2525
Binding redirect files are normally generated automatically by build tools. If not, you can use one like this
2626
(if your tool is called ``HostedCompiler.exe``, the binding redirect file is called ``HostedCompiler.exe.config``)
2727
28+
Some other dependencies may also need to be reconciled and forwarded.
29+
2830
<?xml version="1.0" encoding="utf-8" ?>
2931
<configuration>
3032
<runtime>
3133
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3234
<dependentAssembly>
3335
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
34-
<bindingRedirect oldVersion="2.0.0.0-4.3.0.0" newVersion="4.3.1.0"/>
36+
<bindingRedirect oldVersion="2.0.0.0-4.4.0.0" newVersion="4.4.1.0"/>
37+
</dependentAssembly>
38+
<dependentAssembly>
39+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
40+
<bindingRedirect oldVersion="1.0.0.0-1.2.0.0" newVersion="1.2.1.0" />
3541
</dependentAssembly>
3642
</assemblyBinding>
3743
</runtime>

‎fcs/docsrc/content/ja/corelib.fsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ FSharp.Compiler.Service.dll コンポーネントは FSharp.Core 4.3.0.0 に依
2626
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
2727
<bindingRedirect oldVersion="2.0.0.0-4.3.0.0" newVersion="4.3.1.0"/>
2828
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31+
<bindingRedirect oldVersion="1.0.0.0-1.2.0.0" newVersion="1.2.1.0" />
32+
</dependentAssembly>
2933
</assemblyBinding>
3034
</runtime>
3135
</configuration>

‎fcs/nuget/FSharp.Compiler.Service.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<summary>F# compiler services for creating IDE tools, language extensions and for F# embedding.</summary>
2020
<dependencies>
2121
<grouptargetFramework="net45">
22-
<dependencyid="System.Collections.Immutable"version="1.2.0" />
22+
<dependencyid="System.Collections.Immutable"version="1.3.1" />
2323
<dependencyid="System.Reflection.Metadata"version="1.4.2" />
2424
</group>
2525
</dependencies>

‎fcs/samples/EditorService/App.config‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,7 @@
77
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
99
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral" />
10-
<bindingRedirectoldVersion="2.0.0.0"newVersion="4.3.1.0" />
11-
<bindingRedirectoldVersion="2.3.0.0"newVersion="4.3.1.0" />
12-
<bindingRedirectoldVersion="2.3.5.0"newVersion="4.3.1.0" />
13-
<bindingRedirectoldVersion="4.0.0.0"newVersion="4.3.1.0" />
14-
<bindingRedirectoldVersion="4.3.0.0"newVersion="4.3.1.0" />
15-
<bindingRedirectoldVersion="3.3.1.0"newVersion="4.3.1.0" />
16-
<bindingRedirectoldVersion="2.3.5.1"newVersion="4.3.1.0" />
17-
<bindingRedirectoldVersion="3.78.3.1"newVersion="4.3.1.0" />
18-
<bindingRedirectoldVersion="3.259.3.1"newVersion="4.3.1.0" />
10+
<bindingRedirectoldVersion="2.0.0.0-4.4.0.0"newVersion="4.4.1.0" />
1911
</dependentAssembly>
2012
</assemblyBinding>
2113
</runtime>

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<AssemblyName>EditorService</AssemblyName>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<Name>EditorService</Name>
15-
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
1615
<TargetFrameworkProfile />
1716
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1817
</PropertyGroup>

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />
1313

1414
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
15-
<packageid="System.Collections.Immutable"version="1.2.0" />
15+
<packageid="System.Collections.Immutable"version="1.3.1" />
1616
<packageid="System.Reflection.Metadata"version="1.4.2" />
1717
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.1.0" />
1818
<packageid="Microsoft.DiaSymReader"version="1.1.0" />

‎setup/FSharp.SDK/component-groups/Compiler_Redist.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
</Component>
172172

173173
<ComponentId="Compiler_Redist_System.Collections.Immutable.dll"Guid="$(fsharp.guid(Compiler_Redist_System.Collections.Immutable.dll, $(var.LocaleCode)))">
174-
<FileId="Compiler_Redist_System.Collections.Immutable.dll"Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.2.0\lib\netstandard1.0\System.Collections.Immutable.dll" />
174+
<FileId="Compiler_Redist_System.Collections.Immutable.dll"Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.3.1\lib\netstandard1.0\System.Collections.Immutable.dll" />
175175
</Component>
176176

177177
<ComponentId="Compiler_Redist_System.Reflection.Metadata.dll"Guid="$(fsharp.guid(Compiler_Redist_System.Reflection.Metadata.dll, $(var.LocaleCode)))">

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp