Skip to content

Commit

Permalink
Update to rtm coreclr libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
@KevinRansom
KevinRansom committed Jun 28, 2016
1 parent 3cd1705 commit eeef150
Show file tree
Hide file tree
Showing 15 changed files with 2,493 additions and 940 deletions.
8 changes: 4 additions & 4 deletions packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<package id="NUnit.Console" version="3.0.0" targetFramework="net45" />
<package id="NUnitLite" version="3.0.0" targetFramework="net45" />
<package id="NUnit3TestAdapter" version="3.0.8-ctp-8" targetFramework="net45" />
<package id="System.Collections.Immutable" version="1.2.0-rc3-23805" />
<package id="System.Reflection.Metadata" version="1.3.0-beta-23816" />
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.0.0-rc-60301" />
<package id="Microsoft.DiaSymReader" version="1.0.7" />
<package id="System.Collections.Immutable" version="1.2.0" />
<package id="System.Reflection.Metadata" version="1.4.1-beta-24227-04" />
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
<package id="Microsoft.DiaSymReader" version="1.0.8" />
<package id="FsSrGen" version="2.0.0" targetFramework="net46" />
<package id="MicroBuild.Core" version="0.2.0" />
<package id="WiX.Toolset.2015" version="3.10.0.1503" />
Expand Down
26 changes: 12 additions & 14 deletions src/absil/ilwritepdb.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ open System.IO
open System.Reflection
open System.Reflection.Metadata
open System.Reflection.Metadata.Ecma335
open System.Reflection.Metadata.Ecma335.Blobs
open System.Reflection.PortableExecutable
open Internal.Utilities
open Microsoft.FSharp.Compiler.AbstractIL.IL
Expand Down Expand Up @@ -222,10 +221,10 @@ let writePortablePdbInfo (fixupSPs:bool) showTimes fpdb (info:PdbData) =
writer.WriteByte(byte(separator))

for part in name.Split( [| separator |] ) do
let partIndex = MetadataTokens.GetHeapOffset(BlobHandle.op_Implicit(metadata.GetBlobUtf8(part)))
let partIndex = MetadataTokens.GetHeapOffset(BlobHandle.op_Implicit(metadata.GetOrAddBlobUTF8(part)))
writer.WriteCompressedInteger(int(partIndex))

metadata.GetBlob(writer);
metadata.GetOrAddBlob(writer);

let corSymLanguageTypeFSharp = System.Guid(0xAB4F38C9u, 0xB6E6us, 0x43baus, 0xBEuy, 0x3Buy, 0x58uy, 0x08uy, 0x0Buy, 0x2Cuy, 0xCCuy, 0xE3uy)
let documentIndex =
Expand All @@ -236,14 +235,14 @@ let writePortablePdbInfo (fixupSPs:bool) showTimes fpdb (info:PdbData) =
match checkSum doc.File with
| Some (hashAlg, checkSum) ->
serializeDocumentName doc.File,
metadata.GetGuid(hashAlg),
metadata.GetBlob(checkSum.ToImmutableArray()),
metadata.GetGuid(corSymLanguageTypeFSharp)
metadata.GetOrAddGuid(hashAlg),
metadata.GetOrAddBlob(checkSum.ToImmutableArray()),
metadata.GetOrAddGuid(corSymLanguageTypeFSharp)
| None ->
serializeDocumentName doc.File,
metadata.GetGuid(System.Guid.Empty),
metadata.GetBlob(ImmutableArray<byte>.Empty),
metadata.GetGuid(corSymLanguageTypeFSharp)
metadata.GetOrAddGuid(System.Guid.Empty),
metadata.GetOrAddBlob(ImmutableArray<byte>.Empty),
metadata.GetOrAddGuid(corSymLanguageTypeFSharp)
|> metadata.AddDocument
index.Add(doc.File, handle)
index
Expand Down Expand Up @@ -332,7 +331,7 @@ let writePortablePdbInfo (fixupSPs:bool) showTimes fpdb (info:PdbData) =
previousNonHiddenStartLine <- sps.[i].Line
previousNonHiddenStartColumn <- sps.[i].Column

getDocumentHandle singleDocumentIndex, metadata.GetBlob(builder)
getDocumentHandle singleDocumentIndex, metadata.GetOrAddBlob(builder)

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

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

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

reportTime showTimes "PDB: Created"
use portablePdbStream = new FileStream(fpdb, FileMode.Create, FileAccess.ReadWrite)
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,10 @@
<Reference Include="Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Engine, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<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>
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.7\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
<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>
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
<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>
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
<Import Project="$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\FSharp.PowerPack.targets" />
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency id="System.Linq.Queryable" version="4.0.1" />
<dependency id="System.Net.Requests" version="4.0.11" />
<dependency id="System.Reflection.Emit" version="4.0.1" />
<dependency id="System.Reflection.Metadata" version="1.3.0" />
<dependency id="System.Reflection.Metadata" version="1.4.1-beta-24227-04" />
<dependency id="System.Runtime.InteropServices" version="4.1.0" />
<dependency id="System.Runtime.InteropServices.PInvoke" version="4.0.0-rc2-24027" />
<dependency id="System.Runtime.Loader" version="4.0.0" />
Expand Down
10 changes: 5 additions & 5 deletions src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl</TranslationFile>
<LciCommentFile>$(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci</LciCommentFile>
<HasLceComments>false</HasLceComments>
<InProject>false</InProject>
<InProject>false</InProject>
</FilesToLocalize>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -523,10 +523,10 @@
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<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>
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.7\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
<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>
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
<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>
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"System.Linq.Queryable": "4.0.1",
"System.Net.Requests": "4.0.11",
"System.Reflection.Emit": "4.0.1",
"System.Reflection.Metadata": "1.3.0",
"System.Reflection.Metadata": "1.4.1-beta-24227-04",
"System.Reflection.TypeExtensions": "4.1.0",
"System.Runtime.InteropServices": "4.1.0",
"System.Runtime.InteropServices.PInvoke": "4.0.0-rc2-24027",
Expand Down
23 changes: 12 additions & 11 deletions src/fsharp/FSharp.Core.Unittests/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Linq.Queryable": "4.0.1-rc2-24027",
"System.Reflection.Emit": "4.0.1-rc2-24027",
"System.Runtime.Loader": "4.0.0-rc2-24027",
"System.Net.Requests": "4.0.11-rc2-24027",
"Microsoft.NETCore.Platforms": "1.0.1",
"NETStandard.Library": "1.6.0",
"System.Linq.Expressions": "4.1.0",
"System.Linq.Queryable": "4.0.1",
"System.Net.Requests": "4.0.11",
"System.Reflection.Emit": "4.0.1",
"System.Runtime.Loader": "4.0.0",
"System.Text.RegularExpressions": "4.1.0",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027",
"System.Threading.ThreadPool": "4.0.10-rc2-24027",
"System.Threading.Thread": "4.0.0",
"System.Threading.ThreadPool": "4.0.10",
},
"runtimes": {
"win7-x86": { },
"win7-x64": { },
"osx.10.10-x64": { },
"osx.10.11-x64": { },
"ubuntu.14.04-x64": { }
},
"frameworks": {
"netstandard1.5": { }
"netstandard1.6": { }
}
}
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.NETCore.Runtime": "1.0.2",
"Microsoft.NETCore.Runtime": "1.0.2-rc4-24201-00",
"System.Collections": "4.0.11",
"System.Console": "4.0.0",
"System.Diagnostics.Debug": "4.0.11",
Expand Down
8 changes: 4 additions & 4 deletions src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,10 +582,10 @@
<Reference Include="Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Utilities.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Tasks.$(MSBuildVersionSuffix), Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<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>
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.7\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
<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>
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0-rc3-23805\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
<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>
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81</HintPath></Reference>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/Fsc/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Microsoft.NETCore.Platforms": "1.0.1",
"NETStandard.Library": "1.6.0",
"System.Linq.Expressions": "4.1.0",
"System.Reflection.Metadata": "1.3.0"
"System.Reflection.Metadata": "1.4.1-beta-24227-04"
},
"runtimes": {
"win7-x86": { },
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/fsi/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"System.Reflection.TypeExtensions": "4.1.0",
"System.Runtime.Loader": "4.0.0",
"System.Threading.Thread": "4.0.0",
"System.Reflection.Metadata": "1.3.0"
"System.Reflection.Metadata": "1.4.1-beta-24227-04"
},
"runtimes": {
"win7-x86": { },
Expand Down
Loading

0 comments on commit eeef150

Please sign in to comment.