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

Commitc1e4e4b

Browse files
authored
Merge pull requestdotnet#4996 from Microsoft/SRMSCI158
WIP - Update SCI, SRM to the latest RTM
2 parents07e2137 +f5f2f0a commitc1e4e4b

File tree

24 files changed

+34
-35
lines changed

24 files changed

+34
-35
lines changed

‎NuGet.Config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<addkey="myget.org dotnet-buildtools"value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
1616
<addkey="myget.org roslyn-tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1717
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
18-
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1918
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
2019
<addkey="myget.org symreader-converter"value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
2120
</packageSources>

‎build/targets/PackageVersions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RoslynPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\..\RoslynPackageVersion.txt').Trim())</RoslynPackageVersion>
77

88
<!-- System.* packages-->
9-
<SystemCollectionsImmutablePackageVersion>1.3.1</SystemCollectionsImmutablePackageVersion>
9+
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
1010

1111
<!-- Roslyn packages-->
1212
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,8 @@
636636
</ItemGroup>
637637
<ItemGroup>
638638
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
639-
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.1" />
640-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2" />
639+
<PackageReferenceInclude="System.Collections.Immutable"Version="1.5.0" />
640+
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
641641
</ItemGroup>
642642
<ItemGroupCondition="'$(TargetFramework)' == 'netstandard2.0'">
643643
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.1.0" />

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
1616
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
17-
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2" />
17+
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />
1818
</ItemGroup>
1919
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">
2020
<ReferenceInclude="System.Runtime" />

‎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="2.1.0-prerelease-02419-02" />
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" />
18+
<packageid="System.Collections.Immutable"version="1.5.0" />
19+
<packageid="System.Reflection.Metadata"version="1.6.0" />
2020
<packageid="System.ValueTuple"version="4.4.0" />
2121
<packageid="FSharp.Core"version="4.5.0"/>
2222
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />

‎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.3.1" />
4-
<packageid="System.Reflection.Metadata"version="1.4.2" />
3+
<packageid="System.Collections.Immutable"version="1.5.0" />
4+
<packageid="System.Reflection.Metadata"version="1.6.0" />
55
<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />
66
<packageid="MicroBuild.Core"version="0.2.0" />
77
<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
@@ -88,7 +88,7 @@
8888
<WarningsAsErrors />
8989

9090
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
91-
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
91+
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
9292
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.1.192</VSSDK_BUILDTOOLS_VERSION>
9393

9494
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,10 @@
675675
<ReferenceInclude="System.Numerics" />
676676
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
677677
<ReferenceInclude="System.Reflection.Metadata">
678-
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
678+
<HintPath>..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath>
679679
</Reference>
680680
<ReferenceInclude="System.Collections.Immutable">
681-
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
681+
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath>
682682
</Reference>
683683
<ReferenceInclude="System.ValueTuple">
684684
<HintPath>..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.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.3.1" />
19+
<dependencyid="System.Collections.Immutable"version="1.5.0" />
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.4.2" />
26+
<dependencyid="System.Reflection.Metadata"version="1.6.0" />
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" />

‎src/fsharp/FSharp.Compiler.Private/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"dependencies": {
33
"NETStandard.Library":"1.6.1",
4-
"System.Collections.Immutable":"1.3.1",
4+
"System.Collections.Immutable":"1.5.0",
55
"System.Diagnostics.Process":"4.3.0",
66
"System.Diagnostics.TraceSource":"4.3.0",
77
"System.Linq.Expressions":"4.3.0",
88
"System.Linq.Queryable":"4.3.0",
99
"System.Net.Requests":"4.3.0",
1010
"System.Reflection.Emit":"4.3.0",
11-
"System.Reflection.Metadata":"1.4.2",
11+
"System.Reflection.Metadata":"1.6.0",
1212
"System.Reflection.TypeExtensions":"4.3.0",
1313
"System.Runtime":"4.3.0",
1414
"System.Runtime.InteropServices":"4.3.0",

0 commit comments

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