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

Commit72a14e1

Browse files
authored
Fixes --- Current master does not work on 15.4 (#3903)
* Add binding redirect to latest System.Collections.Immutable for anything with the F# ProjectSystem installed.* Revert "Add binding redirect to latest System.Collections.Immutable for anything with the F# ProjectSystem installed."This reverts commit 99de19a8d30742fb12cfb592ff7b86f868b2aa81.* Reverse the timeflow and don'[t update quite so far into the future* Add trailing quote* typo
1 parentc66a799 commit72a14e1

File tree

15 files changed

+24
-24
lines changed

15 files changed

+24
-24
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@
653653
</Compile>
654654
</ItemGroup>
655655
<ItemGroup>
656-
<PackageReferenceInclude="System.Collections.Immutable"Version="1.4.0" />
656+
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.1" />
657657
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.1.0" />
658658
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="4.0.0" />
659659
<PackageReferenceInclude="System.Reflection.Emit"Version="4.3.0" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,10 +640,10 @@
640640
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
641641
</Reference>
642642
<ReferenceInclude="System.Reflection.Metadata">
643-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
643+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
644644
</Reference>
645645
<ReferenceInclude="System.Collections.Immutable">
646-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
646+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
647647
</Reference>
648648
<ReferenceInclude="System.ValueTuple">
649649
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<summary>F# compiler services for creating IDE tools, language extensions and for F# embedding.</summary>
1515
<dependencies>
1616
<grouptargetFramework="net45">
17-
<dependencyid="System.Collections.Immutable"version="1.4.0" />
17+
<dependencyid="System.Collections.Immutable"version="1.3.1" />
1818
<dependencyid="System.Reflection.Metadata"version="1.4.2" />
1919
</group>
2020
</dependencies>

‎packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<packageid="Microsoft.DotNet.Build.Tasks.Feed"version="1.0.0-prerelease-02121-01" />
1616

1717
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
18-
<packageid="System.Collections.Immutable"version="1.4.0" />
19-
<packageid="System.Reflection.Metadata"version="1.5.0" />
18+
<packageid="System.Collections.Immutable"version="1.3.1" />
19+
<packageid="System.Reflection.Metadata"version="1.4.2" />
2020
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
2121
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
2222
<packageid="System.ValueTuple"version="4.3.1" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@
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.4.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)))">
178-
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.5.0\lib\netstandard1.1\System.Reflection.Metadata.dll" />
178+
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.4.2\lib\netstandard1.1\System.Reflection.Metadata.dll" />
179179
</Component>
180180

181181
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll, $(var.LocaleCode)))">

‎setup/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="System.Collections.Immutable"version="1.4.0" />
4-
<packageid="System.Reflection.Metadata"version="1.5.0" />
3+
<packageid="System.Collections.Immutable"version="1.3.1" />
4+
<packageid="System.Reflection.Metadata"version="1.4.2" />
55
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
66
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
77
<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<RoslynVersion>2.3.0-beta2-61719-01</RoslynVersion>
3636
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
3737
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
38-
<SystemCollectionsImmutableVersion>1.4.0</SystemCollectionsImmutableVersion>
38+
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
3939
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>
4040

4141
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>

‎src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,14 +631,14 @@
631631

632632
<ItemGroup>
633633
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
634-
<PackageReferenceInclude="System.Collections.Immutable"Version="1.4.0"></PackageReference>
634+
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.1"></PackageReference>
635635
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.3.0"></PackageReference>
636636
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="4.3.0"></PackageReference>
637637
<PackageReferenceInclude="System.Linq.Expressions"Version="4.3.0"></PackageReference>
638638
<PackageReferenceInclude="System.Linq.Queryable"Version="4.3.0"></PackageReference>
639639
<PackageReferenceInclude="System.Net.Requests"Version="4.3.0"></PackageReference>
640640
<PackageReferenceInclude="System.Reflection.Emit"Version="4.3.0"></PackageReference>
641-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.5.0"></PackageReference>
641+
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2"></PackageReference>
642642
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="4.3.0"></PackageReference>
643643
<PackageReferenceInclude="System.Runtime"Version="4.3.0"></PackageReference>
644644
<PackageReferenceInclude="System.Runtime.InteropServices"Version="4.3.0"></PackageReference>

‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@
694694
<HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
695695
</Reference>
696696
<ReferenceInclude="System.Reflection.Metadata">
697-
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
697+
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
698698
</Reference>
699699
<ReferenceInclude="System.Collections.Immutable">
700700
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>

‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.netcore.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
<dependencies>
1717
<group>
1818
<dependencyid="NETStandard.Library"version="1.6.0" />
19-
<dependencyid="System.Collections.Immutable"version="1.4.0" />
19+
<dependencyid="System.Collections.Immutable"version="1.3.1" />
2020
<dependencyid="System.Diagnostics.Process"version="4.1.0" />
2121
<dependencyid="System.Diagnostics.TraceSource"version="4.0.0" />
2222
<dependencyid="System.Linq.Expressions"version="4.1.0" />
2323
<dependencyid="System.Linq.Queryable"version="4.0.1" />
2424
<dependencyid="System.Net.Requests"version="4.0.11" />
2525
<dependencyid="System.Reflection.Emit"version="4.0.1" />
26-
<dependencyid="System.Reflection.Metadata"version="1.5.0" />
26+
<dependencyid="System.Reflection.Metadata"version="1.4.2" />
2727
<dependencyid="System.Reflection.TypeExtensions"version="4.1.0" />
2828
<dependencyid="System.Runtime.InteropServices"version="4.1.0" />
2929
<dependencyid="System.Runtime.Loader"version="4.0.0" />

0 commit comments

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