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

Commitaf95593

Browse files
authored
Merge pull request #5035 from Microsoft/merges/master-to-dev15.8
Merge master to dev15.8
2 parents6a9a072 +ee938a7 commitaf95593

File tree

18 files changed

+84
-35
lines changed

18 files changed

+84
-35
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
</Compile>
2727
</ItemGroup>
2828
<ItemGroup>
29+
<ReferenceInclude="System.Runtime" />
30+
<ReferenceInclude="System.IO" />
2931
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
3032
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3133
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<ContentInclude="..\..\release\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config"PackagePath="utilities\net45" />
2929
</ItemGroup>
3030
<ItemGroup>
31+
<ReferenceInclude="System.Runtime" />
32+
<ReferenceInclude="System.IO" />
3133
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
3234
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3335
</ItemGroup>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<NoneInclude="App.config" />
2222
<NoneInclude="FSharp.Compiler.Service.ProjectCracker.targets" />
2323
<NoneInclude="paket.references" />
24+
<ReferenceInclude="System.Runtime" />
25+
<ReferenceInclude="System.IO" />
2426
<ReferenceInclude="FSharp.Core">
2527
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
2628
<Private>false</Private>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
</ItemGroup>
7878
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">
7979
<ReferenceInclude="mscorlib" />
80+
<ReferenceInclude="System.Runtime" />
81+
<ReferenceInclude="System.IO" />
8082
<ReferenceInclude="System" />
8183
<ReferenceInclude="System.Numerics" />
8284
<ReferenceInclude="System.Windows.Forms" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,8 @@
647647
<PackageReferenceInclude="System.Security.Cryptography.Algorithms"Version="4.3.0" />
648648
</ItemGroup>
649649
<ItemGroupCondition="'$(TargetFramework)' == 'net45'">
650-
<ReferenceInclude="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
651-
<ReferenceInclude="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
650+
<ReferenceInclude="System.Runtime" />
651+
<ReferenceInclude="System.IO" />
652652
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
653653
<ReferenceInclude="System.ValueTuple">
654654
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎fcs/build.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let isMono = false
2424
// Utilities
2525
// --------------------------------------------------------------------------------------
2626

27-
letdotnetExePath= DotNetCli.InstallDotNetSDK"2.1.100"
27+
letdotnetExePath= DotNetCli.InstallDotNetSDK"2.1.201"
2828

2929
letrunDotnet workingDir args=
3030
letresult=

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1616
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2" />
1717
</ItemGroup>
18+
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">
19+
<ReferenceInclude="System.Runtime" />
20+
<ReferenceInclude="System.IO" />
21+
</ItemGroup>
1822
</Project>

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@
1616
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
1717
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1818
</ItemGroup>
19+
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">
20+
<ReferenceInclude="System.Runtime" />
21+
<ReferenceInclude="System.IO" />
22+
</ItemGroup>
1923
</Project>

‎fcs/samples/FsiExe/FsiExe.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,8 @@
1818
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
1919
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
2020
</ItemGroup>
21+
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">
22+
<ReferenceInclude="System.Runtime" />
23+
<ReferenceInclude="System.IO" />
24+
</ItemGroup>
2125
</Project>

‎fcs/samples/InteractiveService/InteractiveService.fsproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@
1414
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
1515
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1616
</ItemGroup>
17+
<ItemGroupCondition="'$(TargetFramework)' == 'net46'">
18+
<ReferenceInclude="System.Runtime" />
19+
<ReferenceInclude="System.IO" />
20+
</ItemGroup>
1721
</Project>

0 commit comments

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