Skip to content

Commit 41ef61c

Browse files
dsymedsyme
dsyme
authored and
dsyme
committed
integrate visualfsharp master
2 parents ff80de4 + e0933b4 commit 41ef61c

21 files changed

+163
-183
lines changed

‎fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@
652652
</Compile>
653653
</ItemGroup>
654654
<ItemGroup>
655-
<PackageReference Include="System.Collections.Immutable" Version="1.3.0" />
655+
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
656656
<PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
657657
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
658658
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,16 +635,16 @@
635635
<Reference Include="System.Numerics" />
636636
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
637637
<Reference Include="Microsoft.DiaSymReader.PortablePdb">
638-
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
638+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.PortablePdb.1.2.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath>
639639
</Reference>
640640
<Reference Include="Microsoft.DiaSymReader">
641641
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.DiaSymReader.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath>
642642
</Reference>
643643
<Reference Include="System.Reflection.Metadata">
644-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
644+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.1.5.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
645645
</Reference>
646646
<Reference Include="System.Collections.Immutable">
647-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
647+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
648648
</Reference>
649649
<Reference Include="System.ValueTuple">
650650
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎fcs/nuget/FSharp.Compiler.Service.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<summary>F# compiler services for creating IDE tools, language extensions and for F# embedding.</summary>
1515
<dependencies>
1616
<group targetFramework="net45">
17-
<dependency id="System.Collections.Immutable" version="1.3.1" />
17+
<dependency id="System.Collections.Immutable" version="1.4.0" />
1818
<dependency id="System.Reflection.Metadata" version="1.4.2" />
1919
</group>
2020
</dependencies>

‎packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<package id="FsLexYacc" version="7.0.6" targetFramework="net46" />
99

1010
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll -->
11-
<package id="System.Collections.Immutable" version="1.3.1" />
12-
<package id="System.Reflection.Metadata" version="1.4.2" />
13-
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
11+
<package id="System.Collections.Immutable" version="1.4.0" />
12+
<package id="System.Reflection.Metadata" version="1.5.0" />
13+
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.2.0" />
1414
<package id="Microsoft.DiaSymReader" version="1.1.0" />
1515
<package id="System.ValueTuple" version="4.3.1" />
1616
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<RoslynVersion>2.3.0-beta2-61719-01</RoslynVersion>
3636
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
3737
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
38-
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
38+
<SystemCollectionsImmutableVersion>1.4.0</SystemCollectionsImmutableVersion>
3939
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.0.26201</VSSDK_BUILDTOOLS_VERSION>
4040

4141
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>

‎src/FSharpSource.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
<PropertyGroup >
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. -->
159-
<FSharpNetCoreLkgPath>$(FSharpSourcesRoot)\..\Tools\dotnet20\sdk\2.0.0-preview2-006502\FSharp</FSharpNetCoreLkgPath>
159+
<FSharpNetCoreLkgPath>$(FSharpSourcesRoot)\..\Tools\dotnet20\sdk\2.0.3-servicing-007056\FSharp</FSharpNetCoreLkgPath>
160160
<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 -->

‎src/absil/il.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3656,7 +3656,7 @@ let computeILRefs modul =
36563656
{ AssemblyReferences = Seq.fold (fun acc x -> x::acc) [] s.refsA
36573657
ModuleReferences = Seq.fold (fun acc x -> x::acc) [] s.refsM }
36583658

3659-
let tspan = System.TimeSpan(System.DateTime.Now.Ticks - System.DateTime(2000,1,1).Ticks)
3659+
let tspan = System.TimeSpan(System.DateTime.UtcNow.Ticks - System.DateTime(2000,1,1).Ticks)
36603660

36613661
let parseILVersion (vstr : string) =
36623662
// matches "v1.2.3.4" or "1.2.3.4". Note, if numbers are missing, returns -1 (not 0).
@@ -3667,7 +3667,7 @@ let parseILVersion (vstr : string) =
36673667
// account for wildcards
36683668
if versionComponents.Length > 2 then
36693669
let defaultBuild = (uint16)tspan.Days % System.UInt16.MaxValue - 1us
3670-
let defaultRevision = (uint16)(System.DateTime.Now.TimeOfDay.TotalSeconds / 2.0) % System.UInt16.MaxValue - 1us
3670+
let defaultRevision = (uint16)(System.DateTime.UtcNow.TimeOfDay.TotalSeconds / 2.0) % System.UInt16.MaxValue - 1us
36713671
if versionComponents.[2] = "*" then
36723672
if versionComponents.Length > 3 then
36733673
failwith "Invalid version format"

‎src/absil/illib.fs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,13 +1257,16 @@ module Shim =
12571257
abstract FileStreamReadShim: fileName:string -> System.IO.Stream
12581258
abstract FileStreamCreateShim: fileName:string -> System.IO.Stream
12591259
abstract FileStreamWriteExistingShim: fileName:string -> System.IO.Stream
1260+
12601261
/// Take in a filename with an absolute path, and return the same filename
12611262
/// but canonicalized with respect to extra path separators (e.g. C:\\\\foo.txt)
12621263
/// and '..' portions
12631264
abstract GetFullPathShim: fileName:string -> string
12641265
abstract IsPathRootedShim: path:string -> bool
12651266
abstract IsInvalidPathShim: filename:string -> bool
12661267
abstract GetTempPathShim : unit -> string
1268+
1269+
/// Utc time of the last modification
12671270
abstract GetLastWriteTimeShim: fileName:string -> System.DateTime
12681271
abstract SafeExists: fileName:string -> bool
12691272
abstract FileDelete: fileName:string -> unit
@@ -1303,7 +1306,7 @@ module Shim =
13031306

13041307
member __.GetTempPathShim() = System.IO.Path.GetTempPath()
13051308

1306-
member __.GetLastWriteTimeShim (fileName:string) = File.GetLastWriteTime fileName
1309+
member __.GetLastWriteTimeShim (fileName:string) = File.GetLastWriteTimeUtc fileName
13071310
member __.SafeExists (fileName:string) = System.IO.File.Exists fileName
13081311
member __.FileDelete (fileName:string) = System.IO.File.Delete fileName
13091312

‎src/absil/ilread.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3984,7 +3984,7 @@ let OpenILModuleReaderAfterReadingAllBytes infile opts =
39843984
opts.pdbPath.IsSome), true
39853985
with e ->
39863986
System.Diagnostics.Debug.Assert(false, sprintf "Failed to compute key in OpenILModuleReaderAfterReadingAllBytes cache for '%s'. Falling back to uncached." infile)
3987-
("", System.DateTime.Now, ILScopeRef.Local, false), false
3987+
("", System.DateTime.UtcNow, ILScopeRef.Local, false), false
39883988

39893989
let cacheResult =
39903990
if not succeeded then None // Fall back to uncached.

‎src/fsharp/CompileOps.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2460,7 +2460,7 @@ type TcConfigBuilder =
24602460
isInvalidationSupported = false
24612461
sqmSessionGuid = None
24622462
sqmNumOfSourceFiles = 0
2463-
sqmSessionStartedTime = System.DateTime.Now.Ticks
2463+
sqmSessionStartedTime = System.DateTime.UtcNow.Ticks
24642464
emitDebugInfoInQuotations = false
24652465
exename = None
24662466
copyFSharpCore = false

0 commit comments

Comments
 (0)