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

Commitceb7731

Browse files
Merge branch 'master' into nameof-operator
2 parents5b72f32 +490b9e1 commitceb7731

File tree

260 files changed

+13255
-3728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+13255
-3728
lines changed

‎.nuget/NuGet.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
<!-- We need to launch nuget.exe with the mono command if we're not on windows-->
3636
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
3737
<PackagesConfig>packages.config</PackagesConfig>
38+
<MonoPathCondition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
39+
<MonoPathCondition="'$(MonoPath)' == ''">mono</MonoPath>
3840
</PropertyGroup>
3941

4042
<PropertyGroup>
@@ -43,7 +45,7 @@
4345
<PackageSourcesCondition=" $(PackageSources) == ''">@(PackageSource)</PackageSources>
4446

4547
<NuGetCommandCondition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
46-
<NuGetCommandCondition=" '$(OS)' != 'Windows_NT'">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
48+
<NuGetCommandCondition=" '$(OS)' != 'Windows_NT'">$(MonoPath) --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
4749

4850
<PackageOutputDirCondition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
4951

‎.vscode/launch.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"version":"0.2.0",
3+
"configurations": [
4+
{
5+
"name":".NET Core Launch (console)",
6+
"type":"coreclr",
7+
"request":"launch",
8+
"preLaunchTask":"build",
9+
"program":"${workspaceRoot}/lkg/fsc/bin/Debug/netcoreapp1.0/fsc.dll",
10+
"args": [],
11+
"cwd":"${workspaceRoot}",
12+
"externalConsole":false,
13+
"stopAtEntry":false,
14+
"internalConsoleOptions":"openOnSessionStart"
15+
},
16+
{
17+
"name":".NET Core Attach",
18+
"type":"coreclr",
19+
"request":"attach",
20+
"processId":"${command.pickProcess}"
21+
}
22+
]
23+
}

‎.vscode/tasks.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version":"0.1.0",
3+
"command":"dotnet",
4+
"isShellCommand":true,
5+
"args": [],
6+
"tasks": [
7+
{
8+
"taskName":"build",
9+
"args": [
10+
"${workspaceRoot}/lkg/fsc/project.json"
11+
],
12+
"isBuildCommand":true,
13+
"problemMatcher":"$msCompile"
14+
}
15+
]
16+
}

‎before_install.sh‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ fi
2828

2929
# Check if SSL certificates have been imported into Mono's certificate store.
3030
# If certs haven't been installed, some/all of the Nuget packages will fail to restore.
31-
if [$('certmgr -list -c Trust | grep -c -F "X.509"')-le 1 ];then
31+
# Note, the result of the certmgr and grep commands returns the number of installed X.509 certificates.
32+
# We need to run the command twice -- on some systems (e.g. macOS) the certs are installed in the user store,
33+
# and on other systems (e.g., Ubuntu) they're installed to the machine store. certmgr only shows what's in
34+
# the selected store, which is why we need to check both.
35+
if ["$(certmgr -list -c Trust| grep -c -F"X.509")"-le 1 ]&& ["$(certmgr -list -c -m Trust| grep -c -F"X.509")"-le 1 ];then
3236
echo"No SSL certificates installed so unable to restore NuGet packages.">&2;
3337
echo"Run 'mozroots --sync --import' to install certificates to Mono's certificate store.">&2;
3438
exit 1
@@ -54,9 +58,9 @@ fi)
5458
fi)
5559

5660
#TODO: work out how to avoid the need for this
57-
chmod u+x packages/FSharp.Compiler.Tools.4.0.1.19/tools/fsi.exe
58-
chmod u+x packages/FsLexYacc.7.0.3/build/fslex.exe
59-
chmod u+x packages/FsLexYacc.7.0.3/build/fsyacc.exe
61+
chmod u+x packages/FSharp.Compiler.Tools.4.0.1.21/tools/fsi.exe
62+
chmod u+x packages/FsLexYacc.7.0.4/build/fslex.exe
63+
chmod u+x packages/FsLexYacc.7.0.4/build/fsyacc.exe
6064

6165
# The FSharp.Compiler.Tools package doesn't work correctly unless a proper install of F# has been done on the machine.
6266
# OSX can skip this because the OSX Mono installer includes F#.

‎build.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
482482
set_dotnetexe=%~dp0Tools\dotnetcli\dotnet.exe
483483
setNUGET_PACKAGES=%~dp0Packages
484484

485-
set_fsiexe="packages\FSharp.Compiler.Tools.4.0.1.19\tools\fsi.exe"
485+
set_fsiexe="packages\FSharp.Compiler.Tools.4.0.1.21\tools\fsi.exe"
486486
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
487487
%_ngenexe% install%_fsiexe% /nologo
488488

@@ -522,8 +522,8 @@ if '%BUILD_PROTO%' == '1' (
522522

523523
if '%BUILD_PROTO_WITH_CORECLR_LKG%'== '0' (
524524

525-
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.0.1.19\tools\fsc.exe /nologo
526-
%_ngenexe% install packages\FSharp.Compiler.Tools.4.0.1.19\tools\fsc.exe /nologo
525+
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.0.1.21\tools\fsc.exe /nologo
526+
%_ngenexe% install packages\FSharp.Compiler.Tools.4.0.1.21\tools\fsc.exe /nologo
527527

528528
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj
529529
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj

0 commit comments

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