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

Commitbc65945

Browse files
committed
Merge branch 'master' of github.com:Microsoft/visualfsharp into warning-fs0104-fix
2 parents347b209 +70dee19 commitbc65945

File tree

31 files changed

+65
-64
lines changed

31 files changed

+65
-64
lines changed

‎fcs/build.fsx‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@ Target "Restore" (fun _ ->
7777
// We assume a paket restore has already been run
7878
runDotnet__SOURCE_DIRECTORY__"restore FSharp.Compiler.Service.sln -v n"
7979
for pin["../packages.config"]do
80-
ExecProcess(fun info->
81-
info.FileName<- FullName@"./../.nuget/NuGet.exe"
82-
info.WorkingDirectory<- FullName@"./.."
83-
info.Arguments<- sprintf"restore%s -PackagesDirectory\"%s\" -ConfigFile\"%s\""(FullName p)(FullName"./../packages")(FullName"./../NuGet.Config")) TimeSpan.MaxValue
84-
|> assertExitCodeZero
80+
let recexecuteProcess count=
81+
letresult= ExecProcess(fun info->
82+
info.FileName<- FullName@"./../.nuget/NuGet.exe"
83+
info.WorkingDirectory<- FullName@"./.."
84+
info.Arguments<- sprintf"restore%s -PackagesDirectory\"%s\" -ConfigFile\"%s\""(FullName p)(FullName"./../packages")(FullName"./../NuGet.Config")) TimeSpan.MaxValue
85+
if result<>0&& count>1then executeProcess(count-1)else result
86+
(executeProcess5)|> assertExitCodeZero
8587
)
8688

8789
Target"BuildVersion"(fun _->

‎mono/config.make‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,11 @@ install-sdk-lib:
212212
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\
213213
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/;\
214214
\
215-
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/;\
216-
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/;\
217-
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/;\
218-
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\
219-
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.NetSdk.Overrides.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/;\
215+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/;\
216+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/;\
217+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/;\
218+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\
219+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Overrides.NetSdk.targets$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/;\
220220
fi
221221
@iftest x-$(outsuffix) = x-net40;then\
222222
iftest -e$(outdir)$(NAME).dll;then \

‎src/fsharp/SimulatedMSBuildReferenceResolver.fs‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#if INTERACTIVE
44
#load"../utils/ResizeArray.fs""../absil/illib.fs""../fsharp/ReferenceResolver.fs"
55
#else
6-
moduleinternalMicrosoft.FSharp.Compiler.SimulatedMSBuildReferenceResolver
6+
moduleinternalMicrosoft.FSharp.Compiler.SimulatedMSBuildReferenceResolver
77
#endif
88

99
openSystem
@@ -15,21 +15,27 @@ open Microsoft.FSharp.Compiler.ReferenceResolver
1515
openMicrosoft.FSharp.Compiler.AbstractIL.Internal.Library
1616

1717
letinternalSimulatedMSBuildResolver=
18+
letsupportedFrameworks=[|
19+
"v4.7.2";
20+
"v4.7.1";
21+
"v4.7";
22+
"v4.6.2";
23+
"v4.6.1";
24+
"v4.6";
25+
"v4.5.1";
26+
"v4.5";
27+
"v4.0"
28+
|]
1829
{new Resolverwith
19-
memberx.HighestInstalledNetFrameworkVersion()=
30+
memberx.HighestInstalledNetFrameworkVersion()=
31+
2032
letroot= x.DotNetFrameworkReferenceAssembliesRootDirectory
21-
if Directory.Exists(Path.Combine(root,"v4.7.1"))then"v4.7.2"
22-
elif Directory.Exists(Path.Combine(root,"v4.7.1"))then"v4.7.1"
23-
elif Directory.Exists(Path.Combine(root,"v4.7"))then"v4.7"
24-
elif Directory.Exists(Path.Combine(root,"v4.6.2"))then"v4.6.2"
25-
elif Directory.Exists(Path.Combine(root,"v4.6.1"))then"v4.6.1"
26-
elif Directory.Exists(Path.Combine(root,"v4.6"))then"v4.6"
27-
elif Directory.Exists(Path.Combine(root,"v4.5.1"))then"v4.5.1"
28-
elif Directory.Exists(Path.Combine(root,"v4.5"))then"v4.5"
29-
elif Directory.Exists(Path.Combine(root,"v4.0"))then"v4.0"
30-
else"v4.5"
31-
32-
member__.DotNetFrameworkReferenceAssembliesRootDirectory=
33+
letfwOpt= supportedFrameworks|> Seq.tryFind(fun fw-> Directory.Exists(Path.Combine(root, fw)))
34+
match fwOptwith
35+
| Some fw-> fw
36+
| None->"v4.5"
37+
38+
member__.DotNetFrameworkReferenceAssembliesRootDirectory=
3339
#if!FX_RESHAPED_MSBUILD
3440
if System.Environment.OSVersion.Platform= System.PlatformID.Win32NTthen
3541
letPF=
@@ -41,7 +47,7 @@ let internal SimulatedMSBuildResolver =
4147
#endif
4248
""
4349

44-
member__.Resolve(resolutionEnvironment,references,targetFrameworkVersion,targetFrameworkDirectories,targetProcessorArchitecture,
50+
member__.Resolve(resolutionEnvironment,references,targetFrameworkVersion,targetFrameworkDirectories,targetProcessorArchitecture,
4551
fsharpCoreDir,explicitIncludeDirs,implicitIncludeDir,logMessage,logWarningOrError)=
4652

4753
#if!FX_NO_WIN_REGISTRY

‎tests/projects/Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ReferenceInclude="System.Core" />
4444
<ReferenceInclude="System.Numerics" />
4545
<ReferenceInclude="FSharp.Core">
46-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
46+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4747
</Reference>
4848
</ItemGroup>
4949
<ItemGroup>

‎tests/projects/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<ReferenceInclude="System.Core" />
4444
<ReferenceInclude="System.Numerics" />
4545
<ReferenceInclude="FSharp.Core">
46-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
46+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4747
</Reference>
4848
</ItemGroup>
4949
<ItemGroup>

‎tests/projects/Sample_VS2012_FSharp_Portable_Library/Sample_VS2012_FSharp_Portable_Library.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<ReferenceInclude="FSharp.Core">
3737
<Name>FSharp.Core</Name>
3838
<AssemblyName>FSharp.Core.dll</AssemblyName>
39-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
39+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4040
</Reference>
4141
</ItemGroup>
4242
<ItemGroup>

‎tests/projects/Sample_VS2012_FSharp_Portable_Library_upgraded_2013/Sample_VS2012_FSharp_Portable_Library_upgraded_2013.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<ReferenceInclude="FSharp.Core">
38-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
38+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
</ItemGroup>

‎tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net40/Sample_VS2013_FSharp_Portable_Library_Legacy_net40.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ReferenceInclude="FSharp.Core">
3838
<Name>FSharp.Core</Name>
3939
<AssemblyName>FSharp.Core.dll</AssemblyName>
40-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
40+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4141
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>

‎tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net45/Sample_VS2013_FSharp_Portable_Library_Legacy_net45.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ReferenceInclude="FSharp.Core">
3838
<Name>FSharp.Core</Name>
3939
<AssemblyName>FSharp.Core.dll</AssemblyName>
40-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
40+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4141
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>

‎tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net451/Sample_VS2013_FSharp_Portable_Library_Legacy_net451.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ReferenceInclude="FSharp.Core">
3838
<Name>FSharp.Core</Name>
3939
<AssemblyName>FSharp.Core.dll</AssemblyName>
40-
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
40+
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
4141
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>

0 commit comments

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