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

Commit46a1e68

Browse files
authored
Update Dependencies (#3884)
* update* Upgrade System.Collection.Immutable to 1.4.0* more updates* re-fix vssdk* update .dll.config
1 parent676ab75 commit46a1e68

File tree

19 files changed

+45
-66
lines changed

19 files changed

+45
-66
lines changed

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-preview2-006502
1+
2.0.3-servicing-007056

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,16 +635,16 @@
635635
<ReferenceInclude="System.Numerics" />
636636
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
637637
<ReferenceInclude="Microsoft.DiaSymReader.PortablePdb">
638-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
638+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.PortablePdb.1.2.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
639639
</Reference>
640640
<ReferenceInclude="Microsoft.DiaSymReader">
641641
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
642642
</Reference>
643643
<ReferenceInclude="System.Reflection.Metadata">
644-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
644+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
645645
</Reference>
646646
<ReferenceInclude="System.Collections.Immutable">
647-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
647+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
648648
</Reference>
649649
<ReferenceInclude="System.ValueTuple">
650650
<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.3.1" />
17+
<dependencyid="System.Collections.Immutable"version="1.4.0" />
1818
<dependencyid="System.Reflection.Metadata"version="1.4.2" />
1919
</group>
2020
</dependencies>

‎packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
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.3.1" />
19-
<packageid="System.Reflection.Metadata"version="1.4.2" />
20-
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.1.0" />
18+
<packageid="System.Collections.Immutable"version="1.4.0" />
19+
<packageid="System.Reflection.Metadata"version="1.5.0" />
20+
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
2121
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
2222
<packageid="System.ValueTuple"version="4.3.1" />
2323
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
@@ -32,7 +32,7 @@
3232
<packageid="BenchmarkDotNet.Diagnostics.Windows"version="0.9.8"/>
3333
<packageid="Newtonsoft.Json"version="8.0.1"/>
3434
<packageid="Microsoft.FSharp.TupleSample"version="1.0.0-alpha-161121"/>
35-
<packageid="Microsoft.VSSDK.BuildTools"version="15.0.26201" />
35+
<packageid="Microsoft.VSSDK.BuildTools"version="15.5.72" />
3636

3737
<!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute-->
3838
<!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools-->

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,19 @@
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.3.1\lib\netstandard1.0\System.Collections.Immutable.dll" />
174+
<FileId="Compiler_Redist_System.Collections.Immutable.dll"Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.4.0\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.4.1-beta-24227-04\lib\netstandard1.1\System.Reflection.Metadata.dll" />
178+
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.5.0\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)))">
182-
<FileId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll" />
182+
<FileId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.PortablePdb.1.2.0\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll" />
183183
</Component>
184184

185185
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.dll, $(var.LocaleCode)))">
186-
<FileId="Compiler_Redist_Microsoft.DiaSymReader.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.1.0.8\lib\netstandard1.1\Microsoft.DiaSymReader.dll" />
186+
<FileId="Compiler_Redist_Microsoft.DiaSymReader.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.1.1.0\lib\netstandard1.1\Microsoft.DiaSymReader.dll" />
187187
</Component>
188188

189189
<ComponentId="Compiler_Redist_System.ValueTuple.dll"Guid="$(fsharp.guid(Compiler_Redist_System.ValueTuple.dll, $(var.LocaleCode)))">

‎setup/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="System.Collections.Immutable"version="1.3.1" />
4-
<packageid="System.Reflection.Metadata"version="1.4.1-beta-24227-04" />
5-
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.1.0" />
6-
<packageid="Microsoft.DiaSymReader"version="1.0.8" />
3+
<packageid="System.Collections.Immutable"version="1.4.0" />
4+
<packageid="System.Reflection.Metadata"version="1.5.0" />
5+
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
6+
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
77
<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />
88
<packageid="MicroBuild.Core"version="0.2.0" />
99
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />

‎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.3.1</SystemCollectionsImmutableVersion>
38+
<SystemCollectionsImmutableVersion>1.4.0</SystemCollectionsImmutableVersion>
3939
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>
4040

4141
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>

‎src/FSharpSource.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
<PropertyGroup >
157157
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin</OutputPath>
158158
<!-- When using coreclr to bootstrap to proto. We acquire the FSharp.Core LKG, targets LKG, the FSharp.Build LKG from the .NET Framework compiler tools LKG package.-->
159-
<FSharpNetCoreLkgPath>$(FSharpSourcesRoot)\..\Tools\dotnet20\sdk\2.0.0-preview2-006502\FSharp</FSharpNetCoreLkgPath>
159+
<FSharpNetCoreLkgPath>$(FSharpSourcesRoot)\..\Tools\dotnet20\sdk\2.0.3-servicing-007056\FSharp</FSharpNetCoreLkgPath>
160160
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
161161

162162
<!-- When using coreclr to bootstrap, the compiler binary comes from the coreclr LKG, invoked using corehost.exe-->

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

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -627,37 +627,16 @@
627627
</ItemGroup>
628628
<Import Project ="..\BuildFromSource.targets" />
629629

630-
<!--
631-
"System.Collections.Immutable":"1.3.1",
632-
"System.Diagnostics.Process": "4.3.0",
633-
"System.Diagnostics.TraceSource": "4.3.0",
634-
"System.Linq.Expressions": "4.3.0",
635-
"System.Linq.Queryable": "4.3.0",
636-
"System.Net.Requests": "4.3.0",
637-
"System.Reflection.Emit": "4.3.0",
638-
"System.Reflection.Metadata": "1.4.2",
639-
"System.Reflection.TypeExtensions": "4.3.0",
640-
"System.Runtime": "4.3.0",
641-
"System.Runtime.InteropServices": "4.3.0",
642-
"System.Runtime.Loader": "4.3.0",
643-
"System.Security.Cryptography.Algorithms": "4.3.0",
644-
"System.Threading.Tasks.Parallel": "4.3.0",
645-
"System.Threading.Thread": "4.3.0",
646-
"System.Threading.ThreadPool": "4.3.0",
647-
"Microsoft.DiaSymReader.PortablePdb": "1.1.0",
648-
"Microsoft.DiaSymReader": "1.1.0",
649-
"System.ValueTuple": "4.3.1"
650-
-->
651630
<ItemGroup>
652631
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
653-
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.1"></PackageReference>
632+
<PackageReferenceInclude="System.Collections.Immutable"Version="1.4.0"></PackageReference>
654633
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.3.0"></PackageReference>
655634
<PackageReferenceInclude="System.Diagnostics.TraceSource"Version="4.3.0"></PackageReference>
656635
<PackageReferenceInclude="System.Linq.Expressions"Version="4.3.0"></PackageReference>
657636
<PackageReferenceInclude="System.Linq.Queryable"Version="4.3.0"></PackageReference>
658637
<PackageReferenceInclude="System.Net.Requests"Version="4.3.0"></PackageReference>
659638
<PackageReferenceInclude="System.Reflection.Emit"Version="4.3.0"></PackageReference>
660-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2"></PackageReference>
639+
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.5.0"></PackageReference>
661640
<PackageReferenceInclude="System.Reflection.TypeExtensions"Version="4.3.0"></PackageReference>
662641
<PackageReferenceInclude="System.Runtime"Version="4.3.0"></PackageReference>
663642
<PackageReferenceInclude="System.Runtime.InteropServices"Version="4.3.0"></PackageReference>
@@ -666,7 +645,7 @@
666645
<PackageReferenceInclude="System.Threading.Tasks.Parallel"Version="4.3.0"></PackageReference>
667646
<PackageReferenceInclude="System.Threading.Thread"Version="4.3.0"></PackageReference>
668647
<PackageReferenceInclude="System.Threading.ThreadPool"Version="4.3.0"></PackageReference>
669-
<PackageReferenceInclude="Microsoft.DiaSymReader.PortablePdb"Version="1.1.0"></PackageReference>
648+
<PackageReferenceInclude="Microsoft.DiaSymReader.PortablePdb"Version="1.2.0"></PackageReference>
670649
<PackageReferenceInclude="Microsoft.DiaSymReader"Version="1.1.0"></PackageReference>
671650
<PackageReferenceInclude="System.ValueTuple"Version="4.3.1"></PackageReference>
672651
</ItemGroup>

0 commit comments

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