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

Commitec3396b

Browse files
authored
Merge pull requestfsharp#791 from dsyme/f6
upgrade FSC tools and fix resource test
2 parents43b3b01 +ecf0b55 commitec3396b

File tree

23 files changed

+26
-46
lines changed

23 files changed

+26
-46
lines changed

‎CHANGELOG-fsharp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
4.1.24
1212
* Build using Mono 5.0 and msbuild
1313

14-
4.1.23
14+
4.1.27
1515
* Fix nuget package for FSharp.Compiler.Tools System.ValueTuple.dll
1616

1717
4.1.21

‎build.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if not exist %_ngenexe% echo Note: Could not find ngen.exe.
1818
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
1919
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
2020

21-
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe
21+
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe
2222

2323
setBUILD_NET40=1
2424
setTEST_NET40_COREUNIT_SUITE=1

‎mono/prepare-mono.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ fi)
5454
fi)
5555

5656
#TODO: work out how to avoid the need for this
57-
echo"chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe"
57+
echo"chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe"
5858
echo"chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe"
5959
echo"chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe"
60-
chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe
60+
chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe
6161
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
6262
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
6363

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<!-- FSharp.Compiler.Tools is only used to get a working FSI.EXE to execute some scripts during the build-->
3232
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
33-
<packageid="FSharp.Compiler.Tools"version="4.1.23"/>
33+
<packageid="FSharp.Compiler.Tools"version="4.1.27"/>
3434

3535
<!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
3636
<packageid="Microsoft.Portable.FSharp.Core"version="4.1.20"/>

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144

145145
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build-->
146146
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
147-
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools</FsiToolPath>
147+
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>
148148
</PropertyGroup>
149149

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

‎src/FSharpSource.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin</OutputPath>
158158
<!-- 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.-->
159159
<FSharpNetCoreLkgPath>$(FSharpSourcesRoot)\..\Tools\dotnet20\sdk\2.0.0-preview2-006502\FSharp</FSharpNetCoreLkgPath>
160-
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
160+
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
161161

162162
<!-- When using coreclr to bootstrap, the compiler binary comes from the coreclr LKG, invoked using corehost.exe-->
163163
<FscToolPath>$(FSharpSourcesRoot)\..\Tools\dotnet20</FscToolPath>
@@ -170,7 +170,7 @@
170170
<!-- Use .NET Framework to bootstrap to proto-->
171171
<PropertyGroup >
172172
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin</OutputPath>
173-
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
173+
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
174174
</PropertyGroup>
175175
</When>
176176
<WhenCondition="'$(BuildWith)' == '' AND '$(TargetDotnetProfile)'=='coreclr'">

‎tests/fsharp/core/attributes/test.fsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,13 +1333,15 @@ module BugWithOverloadedAttributes =
13331333
[<FooAttribute(value=42)>]
13341334
typeBar=classend
13351335

1336+
#if!TESTS_AS_APP&&!FX_PORTABLE_OR_NETSTANDARD
13361337
moduleBug719b=
13371338

13381339
openTestLibModule.Bug719
13391340

13401341
typeBar=
13411342
interface IFoowith
13421343
member__.Test(?value:int)= value.ToString()
1344+
#endif
13431345

13441346
(*-------------------------------------------------------------------------
13451347
!* Test passed?

‎tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource_using_bootstrap/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.fsproj‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
<ProductVersion>10.0.0</ProductVersion>
1515
<UsePartialTypes>False</UsePartialTypes>
1616
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
17-
<LkgPath>$(MSBuildProjectDirectory)\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.23\tools</LkgPath>
18-
<LkgPath>$(MSBuildProjectDirectory)\..\..\..\..\packages\FSharp.Compiler.Tools\tools</LkgPath>
19-
<LkgPath>$(MSBuildProjectDirectory)\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.5\tools</LkgPath>
17+
<LkgPath>$(MSBuildProjectDirectory)\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.27\tools</LkgPath>
2018
</PropertyGroup>
2119
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
2220
<DebugSymbols>True</DebugSymbols>
@@ -48,20 +46,6 @@
4846
<ImportProject="$(LkgPath)\Microsoft.FSharp.Targets" />
4947
<ItemGroup>
5048
<CompileInclude="Program.fs" />
51-
<FsSrGenInclude="FSComp.txt" />
52-
<FsSrGenInclude="..\FSCompLinkedInSuperDir.txt">
53-
<Link>FSCompLinkedInSuperDir.txt</Link>
54-
</FsSrGen>
55-
<FsSrGenInclude="FSCompLinkedInSameDir.txt">
56-
<Link>FSCompLinkedInSameDir.txt</Link>
57-
</FsSrGen>
58-
<FsSrGenInclude="SubDir\FSCompLinkedInSubDir.txt">
59-
<Link>FSCompLinkedInSubDir.txt</Link>
60-
</FsSrGen>
61-
<NoneInclude="App.config" />
62-
<EmbeddedResourceInclude="ExplicitCompiledResource.resources" />
63-
<EmbeddedResourceInclude="ResxResource.resx" />
64-
<EmbeddedResourceInclude="ResxResourceWithLogicalName.resx">
6549
<EmbeddedTextInclude="FSComp.txt" />
6650
<EmbeddedTextInclude="..\FSCompLinkedInSuperDir.txt">
6751
<Link>FSCompLinkedInSuperDir.txt</Link>
@@ -90,8 +74,6 @@
9074
</Content>
9175
<EmbeddedResourceInclude="SubDir\ExplicitCompiledResourceInSubDir.resources" />
9276
<EmbeddedResourceInclude="SubDir\NonResxResourceInSubDir.txt" />
93-
<EmbeddedResourceInclude="SubDir\ResxResourceInSubDir.resx" />
94-
<EmbeddedResourceInclude="SubDir\ResxResourceWithLogicalNameInSubDir.resx">
9577
<EmbeddedResourceInclude="SubDir\ResxResourceInSubDir.resx">
9678
<GenerateSource>true</GenerateSource>
9779
</EmbeddedResource>
@@ -112,9 +94,5 @@
11294
<ReferenceInclude="System.Core" />
11395
<ReferenceInclude="System.Numerics" />
11496
</ItemGroup>
115-
<PropertyGroup>
116-
<FsSrGenToolPath>$(MSBuildProjectDirectory)\tools</FsSrGenToolPath>
117-
</PropertyGroup>
118-
<ImportProject="tools\FSharp.SRGen.targets" />
11997

12098
</Project>

‎tests/service/data/DifferingOutputDir/Dir1/Test1.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<CompileInclude="Test1File2.fs" />
4949
<CompileInclude="Test1File1.fs" />
5050
</ItemGroup>
51-
<ImportProject="..\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
51+
<ImportProject="..\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
5252
<Choose>
5353
<WhenCondition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5')">
5454
<ItemGroup>

‎tests/service/data/DifferingOutputDir/Dir2/Test2.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<Name>Test1</Name>
5555
</ProjectReference>
5656
</ItemGroup>
57-
<ImportProject="..\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
57+
<ImportProject="..\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
5858
<Choose>
5959
<WhenCondition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5')">
6060
<ItemGroup>

0 commit comments

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