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

Commit3685f84

Browse files
authored
Merge branch 'master' into fix-2453
2 parentsaa6364f +8aebb66 commit3685f84

File tree

178 files changed

+10288
-2325
lines changed

Some content is hidden

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

178 files changed

+10288
-2325
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

‎VisualFSharp.sln‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion =15.0.26020.0
4+
VisualStudioVersion =15.0.26206.0
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler","src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
@@ -122,11 +122,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextFile", "vsintegration\I
122122
EndProject
123123
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="XMLFile","vsintegration\ItemTemplates\XMLFile\XMLFile.csproj","{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6}"
124124
EndProject
125-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Solution Items","Solution Items","{A83A9A70-8C33-4253-BF6F-3AADB509F21C}"
126-
ProjectSection(SolutionItems) =preProject
127-
Performance1.psess=Performance1.psess
128-
EndProjectSection
129-
EndProject
130125
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Vsix","Vsix","{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}"
131126
EndProject
132127
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="VisualFSharpFull","vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj","{59ADCE46-9740-4079-834D-9A03A3494EBC}"

‎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

‎build.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ if [ $rc -ne 0 ]; then
1313
fi
1414

1515
# This is a very, very limited build script for Mono which bootstraps the compiler
16-
xbuild src/fsharp-proto-build.proj
17-
xbuild build-everything.proj /p:Configuration=release
16+
echo"xbuild src/fsharp-proto-build.proj /p:UseMonoPackaging=true"
17+
xbuild src/fsharp-proto-build.proj /p:UseMonoPackaging=true
18+
echo"xbuild build-everything.proj /p:Configuration=release /p:UseMonoPackaging=true"
19+
xbuild build-everything.proj /p:Configuration=release /p:UseMonoPackaging=true

‎packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- Packages for the Visual F# IDE Tools should go in vsintegration\packages.config-->
55

66
<!-- CodeGen-->
7-
<packageid="FsLexYacc"version="7.0.3"targetFramework="net46" />
7+
<packageid="FsLexYacc"version="7.0.4"targetFramework="net46" />
88

99
<!-- Build infrastructure-->
1010
<packageid="MicroBuild.Core"version="0.2.0" />
@@ -38,7 +38,7 @@
3838

3939
<!-- FSharp.Compiler.Tools is only used to get a working FSI.EXE to execute some scripts during the build-->
4040
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
41-
<packageid="FSharp.Compiler.Tools"version="4.0.1.19"/>
41+
<packageid="FSharp.Compiler.Tools"version="4.0.1.21"/>
4242

4343
<!-- FSharp.Data is used in some of the scripts ued for the coreclr build-->
4444
<packageid="FSharp.Data"version="2.2.5" />

‎src/FSharpSource.Settings.targets‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
<!-- Always qualify the IntermediateOutputPath by the TargetFramework if any exists-->
3737
<IntermediateOutputPath>obj\$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
3838
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetFramework)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
39+
3940
</PropertyGroup>
4041

41-
<PropertyGroupCondition="'$(OS)' != 'Unix'">
42-
<!-- Things we do only on Windows right now-->
42+
<PropertyGroupCondition="'$(MonoPackaging)' != 'true' AND '$(OS)' != 'Unix'">
4343
<UseMicroBuild>true</UseMicroBuild>
4444
<UseSourceLink>true</UseSourceLink>
4545
<UseGatherBinaries>true</UseGatherBinaries>
@@ -117,19 +117,22 @@
117117

118118
<PropertyGroup>
119119
<!-- Compiler tool locations.-->
120-
<FsSrGenToolPath>$(FSharpSourcesRoot)\..\packages\fssrgen.3.1.0\lib\net46</FsSrGenToolPath>
121-
<FsLexToolPath>$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.3\build</FsLexToolPath>
122-
<FsYaccToolPath>$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.3\build</FsYaccToolPath>
120+
<FsLexToolPath>$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.4\build</FsLexToolPath>
121+
<FsYaccToolPath>$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.4\build</FsYaccToolPath>
123122
<FsiToolExe>fsi.exe</FsiToolExe>
124123
<FsLexToolExe>fslex.exe</FsLexToolExe>
125124
<FsYaccToolExe>fsyacc.exe</FsYaccToolExe>
126125
<RoslynVersion>2.0.0-rc3-61324-01</RoslynVersion>
127126
<RoslynVSBinariesVersion>14.0</RoslynVSBinariesVersion>
128127
<RoslynVSPackagesVersion>14.3.25407</RoslynVSPackagesVersion>
128+
129+
<!-- The version of MSBuild assumed byt the F# compiler in the Mono packaging of F#-->
130+
<MonoPackagingMSBuildVersionSuffix>v12.0"</MonoPackagingMSBuildVersionSuffix>
131+
<MonoPackagingMSBuildVersionFull>12.0.0.0</MonoPackagingMSBuildVersionFull>
129132

130133
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build-->
131134
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
132-
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.0.1.19\tools</FsiToolPath>
135+
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.0.1.21\tools</FsiToolPath>
133136
</PropertyGroup>
134137

135138
<ImportProject="../Tools/Build.Common.props"Condition="'$(TargetFramework)'=='coreclr'"/>

‎src/FSharpSource.targets‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<FSCoreVersionCondition="'$(TargetFramework)' == 'portable47'">3.47.41.0</FSCoreVersion>
99
<FSCoreVersionCondition="'$(TargetFramework)' == 'portable78'">3.78.41.0</FSCoreVersion>
1010
<FSCoreVersionCondition="'$(TargetFramework)' == 'portable259'">3.259.41.0</FSCoreVersion>
11+
1112
</PropertyGroup>
1213
<Choose>
1314
<WhenCondition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Release'">
@@ -18,6 +19,16 @@
1819
<Choose>
1920
<WhenCondition="'$(ProjectLanguage)' == 'FSharp'">
2021
<Choose>
22+
<!-- In the open source "Mono" build we always sign the binaries with the public test.snk, apart from FSharp.Core-->
23+
<WhenCondition="('$(MonoPackaging)' == 'true') AND ('$(AssemblyName)'!='FSharp.Core') AND ('$(AssemblyName)'!='FSharp.Core.Unittests')" >
24+
<PropertyGroup>
25+
<OtherFlags>$(OtherFlags) --keyfile:"$(FSharpSourcesRoot)\fsharp\test.snk"</OtherFlags>
26+
<DefineConstants>STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY;$(DefineConstants)</DefineConstants>
27+
<StrongNames>true</StrongNames>
28+
<MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>
29+
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
30+
</PropertyGroup>
31+
</When>
2132
<WhenCondition="'$(AssemblyName)' == 'FSharp.Core' or '$(AssemblyName)' == 'FSharp.Build' or '$(AssemblyName)' == 'FSharp.Compiler' or '$(AssemblyName)' == 'FSharp.Compiler.Interactive.Settings' or '$(AssemblyName)' == 'FSharp.Compiler.Server.Shared' or '$(AssemblyName)' == 'fsc' or '$(AssemblyName)' == 'fsi' or '$(AssemblyName)' == 'fsiAnyCpu' or '$(AssemblyName)' == 'FSharp.Compiler.Unittests' or '$(AssemblyName)' == 'HostedCompilerServer'" >
2233
<PropertyGroupCondition="'$(AssemblyName)' == 'FSharp.Core' and ('$(TargetFramework)' == 'portable47' or '$(TargetFramework)' == 'portable7' or '$(TargetFramework)' == 'portable78' or '$(TargetFramework)' == 'portable259' or '$(TargetFramework)' == 'coreclr')">
2334
<IsPortableProfile>true</IsPortableProfile>
@@ -88,10 +99,19 @@
8899
</Otherwise>
89100
</Choose>
90101

102+
<PropertyGroupCondition="'$(UseMicroBuild)' != 'true'">
103+
<OtherFlags >$(OtherFlags) --version:"$(MicroBuildAssemblyVersion)"</OtherFlags>
104+
</PropertyGroup>
105+
91106
<PropertyGroupCondition="'$(StrongNames)' != 'true'">
92107
<DefineConstants>NO_STRONG_NAMES;$(DefineConstants)</DefineConstants>
93108
</PropertyGroup>
94109

110+
111+
<PropertyGroupCondition="'$(MonoPackaging)' != 'true'">
112+
<DefineConstants>MSBUILD_AT_LEAST_14;$(DefineConstants)</DefineConstants>
113+
</PropertyGroup>
114+
95115
<PropertyGroup>
96116
<!-- Disable uwa toolchain nuget package resolve logic.-->
97117
<NuGetTargetsCondition="'$(NuGetTargets)' == ''">false</NuGetTargets>
@@ -108,6 +128,7 @@
108128
</PropertyGroup>
109129

110130
<PropertyGroupCondition="'$(TargetFramework)'=='net40'">
131+
<DefineConstantsCondition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
111132
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
112133
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
113134
<DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
@@ -263,6 +284,7 @@
263284
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
264285
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
265286
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
287+
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_BINDINGFLAGS</DefineConstants>
266288
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
267289
<DefineConstants>$(DefineConstants);FX_NO_TYPECODE</DefineConstants>
268290
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
@@ -297,6 +319,7 @@
297319
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
298320
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
299321
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
322+
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_BINDINGFLAGS</DefineConstants>
300323
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
301324
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
302325
<DefineConstants>$(DefineConstants);FX_NO_TYPECODE</DefineConstants>
@@ -333,6 +356,7 @@
333356
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
334357
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
335358
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
359+
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_BINDINGFLAGS</DefineConstants>
336360
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
337361
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
338362
<DefineConstants>$(DefineConstants);FX_NO_TYPECODE</DefineConstants>
@@ -348,9 +372,9 @@
348372
<PropertyGroup >
349373
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin</OutputPath>
350374
<!-- When using coreclr to bootstrap to proto. We acquire the FSharp.Core LKG, targets LKG, the FSharp.Build LKG from the .NET Framework compiler tools LKG package.-->
351-
<FSharpCoreLkgPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.0.1.19\tools</FSharpCoreLkgPath>
375+
<FSharpCoreLkgPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.0.1.21\tools</FSharpCoreLkgPath>
352376
<FSharpNetCoreLkgPath>$(FSharpSourcesRoot)\..\Tools\lkg</FSharpNetCoreLkgPath>
353-
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.0.1.19\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
377+
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.0.1.21\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
354378
<!-- When using coreclr to bootstrap, the compiler binary comes from the coreclr LKG, invoked using corehost.exe-->
355379
<FscToolPath>$(FSharpSourcesRoot)\..\Tools\dotnetcli</FscToolPath>
356380
<FscToolExeCondition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
@@ -362,8 +386,8 @@
362386
<!-- Use .NET Framework to bootstrap to proto-->
363387
<PropertyGroup >
364388
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin</OutputPath>
365-
<FSharpCoreLkgPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.0.1.19\tools</FSharpCoreLkgPath>
366-
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.0.1.19\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
389+
<FSharpCoreLkgPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.0.1.21\tools</FSharpCoreLkgPath>
390+
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.0.1.21\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
367391
</PropertyGroup>
368392
</When>
369393
<WhenCondition="'$(BuildWith)' == '' AND ('$(TargetFramework)'=='portable47' OR '$(TargetFramework)'=='portable7' OR '$(TargetFramework)'=='portable78' OR '$(TargetFramework)'=='portable259' OR '$(TargetFramework)'=='coreclr')">
@@ -393,7 +417,6 @@
393417
<MessageText="FSharpTargetsPath = $(FSharpTargetsPath)" />
394418
<MessageText="FSharpSourcesRoot = $(FSharpSourcesRoot)" />
395419
<MessageText="FscToolPath = $(FscToolPath)" />
396-
<MessageText="FsSrGenToolPath = $(FsSrGenToolPath)" />
397420
<MessageText="FsiToolPath = $(FsiToolPath)" />
398421
<MessageText="FsLexToolPath = $(FsLexToolPath)" />
399422
<MessageText="FsYaccToolPath = $(FsYaccToolPath)" />
@@ -402,7 +425,6 @@
402425
<ErrorText="Expect $(FSharpSourcesRoot)\..\Tools\lkg\fsc.exe to exist when BUILD_PROTO_WITH_CORECLR_LKG==1"Condition="'$(BUILD_PROTO_WITH_CORECLR_LKG)' == 1 AND !Exists('$(FSharpSourcesRoot)\..\Tools\lkg\fsc.exe')" />
403426
<ErrorText="Expect $(FscToolPath)\$(FscToolExe) to exist"Condition="!Exists('$(FscToolPath)\$(FscToolExe)')" />
404427
<ErrorText="Expect $(DotnetFscCompilerPath) to exist if non-empty"Condition="'$(DotnetFscCompilerPath)' != '' AND !Exists('$(DotnetFscCompilerPath)')" />
405-
<ErrorText="Expect $(FsSrGenToolPath)\fssrgen.exe to exist"Condition="!Exists('$(FsSrGenToolPath)\fssrgen.exe')" />
406428
<ErrorText="Expect $(FsiToolPath)\$(FsiToolExe) to exist"Condition="!Exists('$(FsiToolPath)\$(FsiToolExe)')" />
407429
<ErrorText="Expect $(FsLexToolPath)\$(FsLexToolExe) to exist"Condition="!Exists('$(FsLexToolPath)\$(FsLexToolExe)')" />
408430
<ErrorText="Expect $(FsYaccToolPath)\$(FsYaccToolExe) to exist"Condition="!Exists('$(FsYaccToolPath)\$(FsYaccToolExe)')" />
@@ -451,7 +473,8 @@
451473
Name="CopyAndSubstituteTextFiles"
452474
Inputs="@(CopyAndSubstituteText)"
453475
Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')" >
454-
<ExecCommand="&quot;$(FsiToolPath)\$(FsiToolExe)&quot; --exec&quot;$(MSBuildThisFileDirectory)scripts/subst.fsx&quot; --in:&quot;%(CopyAndSubstituteText.FullPath)&quot; --out:&quot;$(OutDir)%(CopyAndSubstituteText.TargetFilename)&quot; --pattern1:&quot;%(CopyAndSubstituteText.Pattern1)&quot; --replacement1:&quot;%(CopyAndSubstituteText.Replacement1)&quot; --pattern2:&quot;%(CopyAndSubstituteText.Pattern2)&quot; --replacement2:&quot;%(CopyAndSubstituteText.Replacement2)&quot;" />
476+
<ExecCommand="&quot;$([System.IO.Path]::GetFullPath('$(FsiToolPath)\$(FsiToolExe)'))&quot; --exec&quot;$(MSBuildThisFileDirectory)scripts/subst.fsx&quot; --in:&quot;%(CopyAndSubstituteText.FullPath)&quot; --out:&quot;$(OutDir)%(CopyAndSubstituteText.TargetFilename)&quot; --pattern1:&quot;%(CopyAndSubstituteText.Pattern1)&quot; --replacement1:&quot;%(CopyAndSubstituteText.Replacement1)&quot; --pattern2:&quot;%(CopyAndSubstituteText.Pattern2)&quot; --replacement2:&quot;%(CopyAndSubstituteText.Replacement2)&quot;"Condition="'$(OS)' != 'Unix'" />
477+
<ExecCommand="mono $([System.IO.Path]::GetFullPath('$(FsiToolPath)\$(FsiToolExe)')) --exec&quot;$(MSBuildThisFileDirectory)scripts/subst.fsx&quot; --in:&quot;%(CopyAndSubstituteText.FullPath)&quot; --out:&quot;$(OutDir)%(CopyAndSubstituteText.TargetFilename)&quot; --pattern1:&quot;%(CopyAndSubstituteText.Pattern1)&quot; --replacement1:&quot;%(CopyAndSubstituteText.Replacement1)&quot; --pattern2:&quot;%(CopyAndSubstituteText.Pattern2)&quot; --replacement2:&quot;%(CopyAndSubstituteText.Replacement2)&quot;"Condition="'$(OS)' == 'Unix'" />
455478
<!-- Make sure it will get cleaned-->
456479
<CreateItemInclude="$(OutDir)%(CopyAndSubstituteText.TargetFilename)">
457480
<OutputTaskParameter="Include"ItemName="FileWrites"/>

0 commit comments

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