Skip to content

Commit eeef150

Browse files
KevinRansomKevinRansom
committed
Update to rtm coreclr libraries
1 parent 3cd1705 commit eeef150

File tree

15 files changed

+2493
-940
lines changed

15 files changed

+2493
-940
lines changed

‎packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<package id="NUnit.Console" version="3.0.0" targetFramework="net45" />
88
<package id="NUnitLite" version="3.0.0" targetFramework="net45" />
99
<package id="NUnit3TestAdapter" version="3.0.8-ctp-8" targetFramework="net45" />
10-
<package id="System.Collections.Immutable" version="1.2.0-rc3-23805" />
11-
<package id="System.Reflection.Metadata" version="1.3.0-beta-23816" />
12-
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.0.0-rc-60301" />
13-
<package id="Microsoft.DiaSymReader" version="1.0.7" />
10+
<package id="System.Collections.Immutable" version="1.2.0" />
11+
<package id="System.Reflection.Metadata" version="1.4.1-beta-24227-04" />
12+
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
13+
<package id="Microsoft.DiaSymReader" version="1.0.8" />
1414
<package id="FsSrGen" version="2.0.0" targetFramework="net46" />
1515
<package id="MicroBuild.Core" version="0.2.0" />
1616
<package id="WiX.Toolset.2015" version="3.10.0.1503" />

‎src/absil/ilwritepdb.fs‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ open System.IO
99
open System.Reflection
1010
open System.Reflection.Metadata
1111
open System.Reflection.Metadata.Ecma335
12-
open System.Reflection.Metadata.Ecma335.Blobs
1312
open System.Reflection.PortableExecutable
1413
open Internal.Utilities
1514
open Microsoft.FSharp.Compiler.AbstractIL.IL
@@ -222,10 +221,10 @@ let writePortablePdbInfo (fixupSPs:bool) showTimes fpdb (info:PdbData) =
222221
writer.WriteByte(byte(separator))
223222

224223
for part in name.Split( [| separator |] ) do
225-
let partIndex = MetadataTokens.GetHeapOffset(BlobHandle.op_Implicit(metadata.GetBlobUtf8(part)))
224+
let partIndex = MetadataTokens.GetHeapOffset(BlobHandle.op_Implicit(metadata.GetOrAddBlobUTF8(part)))
226225
writer.WriteCompressedInteger(int(partIndex))
227226

228-
metadata.GetBlob(writer);
227+
metadata.GetOrAddBlob(writer);
229228

230229
let corSymLanguageTypeFSharp = System.Guid(0xAB4F38C9u, 0xB6E6us, 0x43baus, 0xBEuy, 0x3Buy, 0x58uy, 0x08uy, 0x0Buy, 0x2Cuy, 0xCCuy, 0xE3uy)
231230
let documentIndex =
@@ -236,14 +235,14 @@ let writePortablePdbInfo (fixupSPs:bool) showTimes fpdb (info:PdbData) =
236235
match checkSum doc.File with
237236
| Some (hashAlg, checkSum) ->
238237
serializeDocumentName doc.File,
239-
metadata.GetGuid(hashAlg),
240-
metadata.GetBlob(checkSum.ToImmutableArray()),
241-
metadata.GetGuid(corSymLanguageTypeFSharp)
238+
metadata.GetOrAddGuid(hashAlg),
239+
metadata.GetOrAddBlob(checkSum.ToImmutableArray()),
240+
metadata.GetOrAddGuid(corSymLanguageTypeFSharp)
242241
| None ->
243242
serializeDocumentName doc.File,
244-
metadata.GetGuid(System.Guid.Empty),
245-
metadata.GetBlob(ImmutableArray<byte>.Empty),
246-
metadata.GetGuid(corSymLanguageTypeFSharp)
243+
metadata.GetOrAddGuid(System.Guid.Empty),
244+
metadata.GetOrAddBlob(ImmutableArray<byte>.Empty),
245+
metadata.GetOrAddGuid(corSymLanguageTypeFSharp)
247246
|> metadata.AddDocument
248247
index.Add(doc.File, handle)
249248
index
@@ -332,7 +331,7 @@ let writePortablePdbInfo (fixupSPs:bool) showTimes fpdb (info:PdbData) =
332331
previousNonHiddenStartLine <- sps.[i].Line
333332
previousNonHiddenStartColumn <- sps.[i].Column
334333

335-
getDocumentHandle singleDocumentIndex, metadata.GetBlob(builder)
334+
getDocumentHandle singleDocumentIndex, metadata.GetOrAddBlob(builder)
336335

337336
// Write the scopes
338337
let mutable lastLocalVariableHandle = Unchecked.defaultof<LocalVariableHandle>
@@ -347,7 +346,7 @@ let writePortablePdbInfo (fixupSPs:bool) showTimes fpdb (info:PdbData) =
347346
scope.StartOffset,
348347
scope.EndOffset - scope.StartOffset) |>ignore
349348
for localVariable in scope.Locals do
350-
lastLocalVariableHandle <- metadata.AddLocalVariable(LocalVariableAttributes.None, localVariable.Index, metadata.GetString(localVariable.Name))
349+
lastLocalVariableHandle <- metadata.AddLocalVariable(LocalVariableAttributes.None, localVariable.Index, metadata.GetOrAddString(localVariable.Name))
351350
scope.Children |> Array.iter (writePdbScope false)
352351

353352
writePdbScope true minfo.RootScope
@@ -358,10 +357,9 @@ let writePortablePdbInfo (fixupSPs:bool) showTimes fpdb (info:PdbData) =
358357
| None -> MetadataTokens.MethodDefinitionHandle(0)
359358
| Some x -> MetadataTokens.MethodDefinitionHandle(x)
360359

361-
let pdbContentId = ContentId(info.ModuleID, BitConverter.GetBytes(info.Timestamp))
362-
let serializer = StandaloneDebugMetadataSerializer(metadata, externalRowCounts, entryPoint, false)
360+
let serializer = PortablePdbBuilder(metadata, externalRowCounts, entryPoint, null )
363361
let blobBuilder = new BlobBuilder()
364-
serializer.SerializeMetadata(blobBuilder, (fun builder -> pdbContentId)) |> ignore
362+
serializer.Serialize(blobBuilder) |> ignore
365363

366364
reportTime showTimes "PDB: Created"
367365
use portablePdbStream = new FileStream(fpdb, FileMode.Create, FileAccess.ReadWrite)

‎src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,10 @@
473473
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
474474
<Reference Include="Microsoft.Build.Engine, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
475475
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
476-
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.0.0-rc-60301\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
477-
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.7\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
478-
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.3.0-beta-23816\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
479-
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
476+
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
477+
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
478+
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
479+
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
480480
</ItemGroup>
481481
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
482482
<Import Project="$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\FSharp.PowerPack.targets" />

‎src/fsharp/FSharp.Compiler.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency id="System.Linq.Queryable" version="4.0.1" />
2626
<dependency id="System.Net.Requests" version="4.0.11" />
2727
<dependency id="System.Reflection.Emit" version="4.0.1" />
28-
<dependency id="System.Reflection.Metadata" version="1.3.0" />
28+
<dependency id="System.Reflection.Metadata" version="1.4.1-beta-24227-04" />
2929
<dependency id="System.Runtime.InteropServices" version="4.1.0" />
3030
<dependency id="System.Runtime.InteropServices.PInvoke" version="4.0.0-rc2-24027" />
3131
<dependency id="System.Runtime.Loader" version="4.0.0" />

‎src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
3030
<LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci</LciCommentFile>
3131
<HasLceComments>false</HasLceComments>
32-
<InProject>false</InProject>
32+
<InProject>false</InProject>
3333
</FilesToLocalize>
3434
</ItemGroup>
3535
<ItemGroup>
@@ -523,10 +523,10 @@
523523
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
524524
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
525525
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
526-
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.0.0-rc-60301\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
527-
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.7\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
528-
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.3.0-beta-23816\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
529-
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
526+
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
527+
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
528+
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
529+
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
530530
</ItemGroup>
531531
<ItemGroup>
532532
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">

‎src/fsharp/FSharp.Compiler/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"System.Linq.Queryable": "4.0.1",
1010
"System.Net.Requests": "4.0.11",
1111
"System.Reflection.Emit": "4.0.1",
12-
"System.Reflection.Metadata": "1.3.0",
12+
"System.Reflection.Metadata": "1.4.1-beta-24227-04",
1313
"System.Reflection.TypeExtensions": "4.1.0",
1414
"System.Runtime.InteropServices": "4.1.0",
1515
"System.Runtime.InteropServices.PInvoke": "4.0.0-rc2-24027",

‎src/fsharp/FSharp.Core.Unittests/project.json‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
4-
"NETStandard.Library": "1.5.0-rc2-24027",
5-
"System.Linq.Expressions": "4.0.11-rc2-24027",
6-
"System.Linq.Queryable": "4.0.1-rc2-24027",
7-
"System.Reflection.Emit": "4.0.1-rc2-24027",
8-
"System.Runtime.Loader": "4.0.0-rc2-24027",
9-
"System.Net.Requests": "4.0.11-rc2-24027",
3+
"Microsoft.NETCore.Platforms": "1.0.1",
4+
"NETStandard.Library": "1.6.0",
5+
"System.Linq.Expressions": "4.1.0",
6+
"System.Linq.Queryable": "4.0.1",
7+
"System.Net.Requests": "4.0.11",
8+
"System.Reflection.Emit": "4.0.1",
9+
"System.Runtime.Loader": "4.0.0",
10+
"System.Text.RegularExpressions": "4.1.0",
1011
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
11-
"System.Threading.Thread": "4.0.0-rc2-24027",
12-
"System.Threading.ThreadPool": "4.0.10-rc2-24027",
12+
"System.Threading.Thread": "4.0.0",
13+
"System.Threading.ThreadPool": "4.0.10",
1314
},
1415
"runtimes": {
1516
"win7-x86": { },
1617
"win7-x64": { },
17-
"osx.10.10-x64": { },
18+
"osx.10.11-x64": { },
1819
"ubuntu.14.04-x64": { }
1920
},
2021
"frameworks": {
21-
"netstandard1.5": { }
22+
"netstandard1.6": { }
2223
}
2324
}

‎src/fsharp/FSharp.Core/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"Microsoft.NETCore.Platforms": "1.0.1",
4-
"Microsoft.NETCore.Runtime": "1.0.2",
4+
"Microsoft.NETCore.Runtime": "1.0.2-rc4-24201-00",
55
"System.Collections": "4.0.11",
66
"System.Console": "4.0.0",
77
"System.Diagnostics.Debug": "4.0.11",

‎src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,10 @@
582582
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
583583
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
584584
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
585-
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.0.0-rc-60301\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
586-
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.7\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
587-
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.3.0-beta-23816\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
588-
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
585+
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
586+
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
587+
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
588+
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
589589
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
590590
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
591591
<Name>FSharp.Core</Name>

‎src/fsharp/Fsc/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"Microsoft.NETCore.Platforms": "1.0.1",
44
"NETStandard.Library": "1.6.0",
55
"System.Linq.Expressions": "4.1.0",
6-
"System.Reflection.Metadata": "1.3.0"
6+
"System.Reflection.Metadata": "1.4.1-beta-24227-04"
77
},
88
"runtimes": {
99
"win7-x86": { },

0 commit comments

Comments
 (0)