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

Commit8e6a868

Browse files
committed
fix build
1 parent50704d0 commit8e6a868

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ build:
4646
cp -p packages/FSharp.Core.3.0.2/lib/net40/*$(Configuration)/fsharp30/net40/bin
4747
cp -p packages/FSharp.Core.3.1.2.5/lib/net40/*$(Configuration)/fsharp31/net40/bin
4848
cp -p packages/FSharp.Core.4.0.0.1/lib/net40/*$(Configuration)/fsharp40/net40/bin
49-
cp -p packages/FSharp.Core.4.1.17/lib/net40/*$(Configuration)/fsharp41/net40/bin
49+
cp -p packages/FSharp.Core.4.1.18/lib/net40/*$(Configuration)/fsharp41/net40/bin
5050
mkdir -p$(Configuration)/portable7/bin
51-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45/*$(Configuration)/portable7/bin
51+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+netcore45/*$(Configuration)/portable7/bin
5252
mkdir -p$(Configuration)/portable47/bin
53-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+sl5+netcore45/*$(Configuration)/portable47/bin
53+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+sl5+netcore45/*$(Configuration)/portable47/bin
5454
mkdir -p$(Configuration)/portable78/bin
55-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wp8/*$(Configuration)/portable78/bin
55+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+netcore45+wp8/*$(Configuration)/portable78/bin
5656
mkdir -p$(Configuration)/portable259/bin
57-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wpa81+wp8/*$(Configuration)/portable259/bin
57+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+netcore45+wpa81+wp8/*$(Configuration)/portable259/bin
5858
mkdir -p$(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
59-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/*$(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
59+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/*$(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
6060
mkdir -p$(Configuration)/xamarinmacmobile/bin
61-
cp -p packages/FSharp.Core.4.1.17/lib/xamarinmac20/*$(Configuration)/xamarinmacmobile/bin
61+
cp -p packages/FSharp.Core.4.1.18/lib/xamarinmac20/*$(Configuration)/xamarinmacmobile/bin
6262

6363

6464

‎build.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ set TEST_NET40_COREUNIT_SUITE=1
6565
%_msbuildexe% src\fsharp-proto-build.proj /p:Configuration=Proto
6666
@if ERRORLEVEL1echo Error:"%_msbuildexe% src\fsharp-proto-build.proj" failed&&goto :failure
6767

68-
%_ngenexe% install Proto\net40\bin\fsc-proto.exe
68+
%_ngenexe% install Proto\net40\bin\fsc.exe
6969

7070
%_msbuildexe%%msbuildflags% build-everything.proj /p:TargetDotnetProfile=net40 /p:Configuration=Release
7171
@if ERRORLEVEL1echo Error:"%_msbuildexe%%msbuildflags% src\fsharp-library-build.proj /p:TargetDotnetProfile=net40 /p:Configuration=Release" failed&&goto :failure

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<packageid="Microsoft.Portable.FSharp.Core"version="10.1.0"/>
4242

4343
<!-- FSharp.Core is used to get back versions of FSharp.Core-->
44-
<packageid="FSharp.Core"version="4.1.17"/>
44+
<packageid="FSharp.Core"version="4.1.18"/>
4545

4646
<!-- FSharp.Core is used to get back versions of FSharp.Core-->
4747
<packageid="FSharp.Core"version="4.0.0.1"/>

‎src/fsharp/CompileOps.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,10 +1795,10 @@ type private TypeInThisAssembly = class end
17951795
// or the System.ValueTuple.dll that sits alongside the compiler. (Note we always ship one with the compiler)
17961796
letGetDefaultSystemValueTupleReference()=
17971797
try
1798-
letasm= typeof<System.ValueTuple<int, int>>.Assembly
1799-
if asm.FullName.StartsWith"System.ValueTuple"then
1800-
Some asm.Location
1801-
else
1798+
//let asm = typeof<System.ValueTuple<int, int>>.Assembly
1799+
//if asm.FullName.StartsWith "System.ValueTuple" then
1800+
// Some asm.Location
1801+
//else
18021802
letlocation= Path.GetDirectoryName(typeof<TypeInThisAssembly>.Assembly.Location)
18031803
letvalueTuplePath= Path.Combine(location,"System.ValueTuple.dll")
18041804
if File.Exists(valueTuplePath)then

‎src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@
7575
<ReferenceInclude="Microsoft.Build.Tasks.Core, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7676
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll</HintPath>
7777
</Reference>
78-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
79-
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
80-
<Name>FSharp.Core</Name>
81-
</ProjectReference>
8278
</ItemGroup>
8379
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' == 'true'">
8480
<ReferenceInclude="Microsoft.Build.Framework, Version=$(MonoPackagingMSBuildVersionFull), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -94,5 +90,11 @@
9490
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Build.Tasks.Core.14.3.0\lib\net45\Microsoft.Build.Tasks.Core.dll</HintPath>
9591
</Reference>
9692
</ItemGroup>
93+
<ItemGroup>
94+
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
95+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
96+
<Name>FSharp.Core</Name>
97+
</ProjectReference>
98+
</ItemGroup>
9799
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
98100
</Project>

‎src/fsharp/TypeChecker.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15223,7 +15223,7 @@ module EstablishTypeDefinitionCores =
1522315223
else ty)
1522415224

1522515225
// Allow super type to be a function type but convert back to FSharpFunc<A,B> to make sure it has metadata
15226-
let super = super |> Option.map (helpEnsureTypeHasMetadata cenv.g)
15226+
let super = super |> Option.map (convertToTypeWithMetadataIfPossible cenv.g)
1522715227

1522815228
// Publish the super type
1522915229
tycon.TypeContents.tcaug_super <- super

0 commit comments

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