This commit is contained in:
KevinRansom 2016-04-07 09:49:57 -07:00
Родитель b6d71c7eea
Коммит 5ef4acd14f
13 изменённых файлов: 293 добавлений и 1995 удалений

Просмотреть файл

@ -221,28 +221,33 @@ if '%RestorePackages%' == 'true' (
set DOTNET_HOME .\packages\dotnet
rem check to see if the dotnet cli tool exists
set _dotnetexe=".\packages\dotnet\bin\dotnet.exe"
set _dotnetexe=.\packages\dotnet\dotnet.exe
if not exist %_dotnetexe% (
echo Error: Could not find %_dotnetexe%.
rem do zipfile install nonsense
if not exist packages ( md packages )
if exist packages\dotnet ( rd packages /s /q )
powershell.exe -executionpolicy unrestricted -command .\scripts\install-dotnetcli.ps1 https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/Latest/dotnet-win-x64.latest.zip packages
powershell.exe -executionpolicy unrestricted -command .\scripts\install-dotnetcli.ps1 https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-dev-win-x64.latest.zip packages
@if ERRORLEVEL 1 echo Error: fetch dotnetcli failed && goto :failure
popd
)
pushd .\lkg & ..\%_dotnetexe% restore project.json &popd
pushd .\lkg & ..\%_dotnetexe% restore &popd
@if ERRORLEVEL 1 echo Error: dotnet restore failed && goto :failure
pushd .\lkg & ..\%_dotnetexe% publish project.json -f dnxcore50 -r win7-x64 -o ..\packages\lkg &popd
pushd .\lkg & ..\%_dotnetexe% publish project.json &popd
@if ERRORLEVEL 1 echo Error: dotnet publish failed && goto :failure
rem rename fsc and coreconsole to allow fsc.exe to to start compiler
pushd .\packages\lkg & ren fsc.exe fsc.dll & popd
copy .\packages\lkg\coreconsole.exe .\packages\lkg\fsc.exe
pushd .\lkg\bin\Debug\dnxcore50\win7-x64\publish
ren fsc.exe fsc.dll
copy corehost.exe fsc.exe
popd
rem rename fsi and coreconsole to allow fsi.exe to to start interative
pushd .\packages\lkg & ren fsi.exe fsi.dll & popd
copy .\packages\lkg\coreconsole.exe .\packages\lkg\fsi.exe
pushd .\lkg\bin\Debug\dnxcore50\win7-x64\publish
ren fsi.exe fsi.dll
copy corehost.exe fsi.exe
popd
:: Build Proto
if NOT EXIST Proto\net40\bin\fsc-proto.exe (set BUILD_PROTO=1)
@ -300,8 +305,8 @@ if '%TEST_COMPILERUNIT%' == '1' (
)
if '%TEST_NET40_COREUNIT%' == '1' (
%_msbuildexe% %msbuildflags% src/fsharp-library-unittests-build.proj /p:Configuration=%BUILD_CONFIG%
@if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
%_msbuildexe% %msbuildflags% src/fsharp-library-unittests-build.proj /p:Configuration=%BUILD_CONFIG%
@if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
)
if '%TEST_PORTABLE_COREUNIT%' == '1' (

Просмотреть файл

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160406",
},
"runtimes": {
"win7-x86": { },

Просмотреть файл

@ -56,10 +56,10 @@
"Microsoft.DotNet.CoreHost/0.0.1-beta-00001": {
"type": "package"
},
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160406",
"Microsoft.NETCore": "5.0.1-rc2-23911",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23911",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -67,12 +67,12 @@
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-23911"
}
},
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"Microsoft.DiaSymReader.PortablePdb": "1.0.0-rc-60301",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160406",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
"NETStandard.Library": "1.5.0-rc2-23911",
"System.Collections.Immutable": "1.2.0-rc2-23911",
@ -104,9 +104,15 @@
"lib/DNXCore50/FSharp.Compiler.dll": {},
"lib/DNXCore50/fsc.exe": {},
"lib/DNXCore50/fsi.exe": {}
},
"runtimeTargets": {
"runtimes/any/native/default.win32manifest": {
"assetType": "native",
"rid": "any"
}
}
},
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -126,6 +132,16 @@
},
"runtime": {
"lib/DNXCore50/FSharp.Core.dll": {}
},
"runtimeTargets": {
"runtimes/any/native/FSharp.Core.optdata": {
"assetType": "native",
"rid": "any"
},
"runtimes/any/native/FSharp.Core.sigdata": {
"assetType": "native",
"rid": "any"
}
}
},
"Microsoft.NETCore/5.0.1-rc2-23911": {
@ -376,10 +392,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
}
},
"System.Collections.NonGeneric/4.0.1-rc2-23911": {
@ -803,7 +819,7 @@
"System.Runtime.Extensions": "4.0.11-rc2-23911"
},
"compile": {
"ref/portable-net45+win8/System.Numerics.Vectors.dll": {}
"ref/netstandard1.1/System.Numerics.Vectors.dll": {}
},
"runtime": {
"lib/netstandard1.3/System.Numerics.Vectors.dll": {}
@ -906,10 +922,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
},
"runtime": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
}
},
"System.Reflection.Primitives/4.0.1-rc2-23911": {
@ -1177,10 +1193,10 @@
"System.Threading.Tasks": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/_._": {}
"lib/netstandard1.0/_._": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Extensions.dll": {}
"lib/netstandard1.0/System.Threading.Tasks.Extensions.dll": {}
}
},
"System.Threading.Tasks.Parallel/4.0.1-rc2-23911": {
@ -1343,10 +1359,10 @@
"runtime.osx.10.10-x64.Microsoft.DotNet.CoreHost": "0.0.1-beta-00001"
}
},
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160406",
"Microsoft.NETCore": "5.0.1-rc2-23911",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23911",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -1354,12 +1370,12 @@
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-23911"
}
},
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"Microsoft.DiaSymReader.PortablePdb": "1.0.0-rc-60301",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160406",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
"NETStandard.Library": "1.5.0-rc2-23911",
"System.Collections.Immutable": "1.2.0-rc2-23911",
@ -1396,7 +1412,7 @@
"runtimes/any/native/default.win32manifest": {}
}
},
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -1416,6 +1432,10 @@
},
"runtime": {
"lib/DNXCore50/FSharp.Core.dll": {}
},
"native": {
"runtimes/any/native/FSharp.Core.optdata": {},
"runtimes/any/native/FSharp.Core.sigdata": {}
}
},
"Microsoft.NETCore/5.0.1-rc2-23911": {
@ -2435,10 +2455,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
}
},
"System.Collections.NonGeneric/4.0.1-rc2-23911": {
@ -2540,10 +2560,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wpa81/System.Diagnostics.DiagnosticSource.dll": {}
"lib/netstandard1.1/System.Diagnostics.DiagnosticSource.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wpa81/System.Diagnostics.DiagnosticSource.dll": {}
"lib/netstandard1.1/System.Diagnostics.DiagnosticSource.dll": {}
}
},
"System.Diagnostics.Process/4.1.0-rc2-23911": {
@ -2916,7 +2936,7 @@
"System.Runtime.Extensions": "4.0.11-rc2-23911"
},
"compile": {
"ref/portable-net45+win8/System.Numerics.Vectors.dll": {}
"ref/netstandard1.1/System.Numerics.Vectors.dll": {}
},
"runtime": {
"lib/netstandard1.3/System.Numerics.Vectors.dll": {}
@ -3046,10 +3066,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
},
"runtime": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
}
},
"System.Reflection.Primitives/4.0.1-rc2-23911": {
@ -3378,10 +3398,10 @@
"System.Threading.Tasks": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/_._": {}
"lib/netstandard1.0/_._": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Extensions.dll": {}
"lib/netstandard1.0/System.Threading.Tasks.Extensions.dll": {}
}
},
"System.Threading.Tasks.Parallel/4.0.1-rc2-23911": {
@ -3545,10 +3565,10 @@
"runtime.ubuntu.14.04-x64.Microsoft.DotNet.CoreHost": "0.0.1-beta-00001"
}
},
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160406",
"Microsoft.NETCore": "5.0.1-rc2-23911",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23911",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -3556,12 +3576,12 @@
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-23911"
}
},
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"Microsoft.DiaSymReader.PortablePdb": "1.0.0-rc-60301",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160406",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
"NETStandard.Library": "1.5.0-rc2-23911",
"System.Collections.Immutable": "1.2.0-rc2-23911",
@ -3598,7 +3618,7 @@
"runtimes/any/native/default.win32manifest": {}
}
},
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -3618,6 +3638,10 @@
},
"runtime": {
"lib/DNXCore50/FSharp.Core.dll": {}
},
"native": {
"runtimes/any/native/FSharp.Core.optdata": {},
"runtimes/any/native/FSharp.Core.sigdata": {}
}
},
"Microsoft.NETCore/5.0.1-rc2-23911": {
@ -4640,10 +4664,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
}
},
"System.Collections.NonGeneric/4.0.1-rc2-23911": {
@ -4745,10 +4769,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wpa81/System.Diagnostics.DiagnosticSource.dll": {}
"lib/netstandard1.1/System.Diagnostics.DiagnosticSource.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wpa81/System.Diagnostics.DiagnosticSource.dll": {}
"lib/netstandard1.1/System.Diagnostics.DiagnosticSource.dll": {}
}
},
"System.Diagnostics.Process/4.1.0-rc2-23911": {
@ -5121,7 +5145,7 @@
"System.Runtime.Extensions": "4.0.11-rc2-23911"
},
"compile": {
"ref/portable-net45+win8/System.Numerics.Vectors.dll": {}
"ref/netstandard1.1/System.Numerics.Vectors.dll": {}
},
"runtime": {
"lib/netstandard1.3/System.Numerics.Vectors.dll": {}
@ -5251,10 +5275,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
},
"runtime": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
}
},
"System.Reflection.Primitives/4.0.1-rc2-23911": {
@ -5583,10 +5607,10 @@
"System.Threading.Tasks": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/_._": {}
"lib/netstandard1.0/_._": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Extensions.dll": {}
"lib/netstandard1.0/System.Threading.Tasks.Extensions.dll": {}
}
},
"System.Threading.Tasks.Parallel/4.0.1-rc2-23911": {
@ -5750,10 +5774,10 @@
"runtime.win7-x64.Microsoft.DotNet.CoreHost": "0.0.1-beta-00001"
}
},
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160406",
"Microsoft.NETCore": "5.0.1-rc2-23911",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23911",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -5761,12 +5785,12 @@
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-23911"
}
},
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"Microsoft.DiaSymReader.PortablePdb": "1.0.0-rc-60301",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160406",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
"NETStandard.Library": "1.5.0-rc2-23911",
"System.Collections.Immutable": "1.2.0-rc2-23911",
@ -5803,7 +5827,7 @@
"runtimes/any/native/default.win32manifest": {}
}
},
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -5823,6 +5847,10 @@
},
"runtime": {
"lib/DNXCore50/FSharp.Core.dll": {}
},
"native": {
"runtimes/any/native/FSharp.Core.optdata": {},
"runtimes/any/native/FSharp.Core.sigdata": {}
}
},
"Microsoft.NETCore/5.0.1-rc2-23911": {
@ -6910,10 +6938,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
}
},
"System.Collections.NonGeneric/4.0.1-rc2-23911": {
@ -7015,10 +7043,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wpa81/System.Diagnostics.DiagnosticSource.dll": {}
"lib/netstandard1.1/System.Diagnostics.DiagnosticSource.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wpa81/System.Diagnostics.DiagnosticSource.dll": {}
"lib/netstandard1.1/System.Diagnostics.DiagnosticSource.dll": {}
}
},
"System.Diagnostics.Process/4.1.0-rc2-23911": {
@ -7381,7 +7409,7 @@
"System.Runtime.Extensions": "4.0.11-rc2-23911"
},
"compile": {
"ref/portable-net45+win8/System.Numerics.Vectors.dll": {}
"ref/netstandard1.1/System.Numerics.Vectors.dll": {}
},
"runtime": {
"lib/netstandard1.3/System.Numerics.Vectors.dll": {}
@ -7511,10 +7539,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
},
"runtime": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
}
},
"System.Reflection.Primitives/4.0.1-rc2-23911": {
@ -7899,10 +7927,10 @@
"System.Threading.Tasks": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/_._": {}
"lib/netstandard1.0/_._": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Extensions.dll": {}
"lib/netstandard1.0/System.Threading.Tasks.Extensions.dll": {}
}
},
"System.Threading.Tasks.Parallel/4.0.1-rc2-23911": {
@ -8063,10 +8091,10 @@
"Microsoft.DotNet.CoreHost/0.0.1-beta-00001": {
"type": "package"
},
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Compiler.NetCore": "1.0.0-alpha-160406",
"Microsoft.NETCore": "5.0.1-rc2-23911",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23911",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -8074,12 +8102,12 @@
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-23911"
}
},
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"Microsoft.DiaSymReader.PortablePdb": "1.0.0-rc-60301",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160329",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160406",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
"NETStandard.Library": "1.5.0-rc2-23911",
"System.Collections.Immutable": "1.2.0-rc2-23911",
@ -8116,7 +8144,7 @@
"runtimes/any/native/default.win32manifest": {}
}
},
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160329": {
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160406": {
"type": "package",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
@ -8136,6 +8164,10 @@
},
"runtime": {
"lib/DNXCore50/FSharp.Core.dll": {}
},
"native": {
"runtimes/any/native/FSharp.Core.optdata": {},
"runtimes/any/native/FSharp.Core.sigdata": {}
}
},
"Microsoft.NETCore/5.0.1-rc2-23911": {
@ -9216,10 +9248,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {}
"lib/netstandard1.0/System.Collections.Immutable.dll": {}
}
},
"System.Collections.NonGeneric/4.0.1-rc2-23911": {
@ -9321,10 +9353,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wpa81/System.Diagnostics.DiagnosticSource.dll": {}
"lib/netstandard1.1/System.Diagnostics.DiagnosticSource.dll": {}
},
"runtime": {
"lib/portable-net45+win8+wpa81/System.Diagnostics.DiagnosticSource.dll": {}
"lib/netstandard1.1/System.Diagnostics.DiagnosticSource.dll": {}
}
},
"System.Diagnostics.Process/4.1.0-rc2-23911": {
@ -9687,7 +9719,7 @@
"System.Runtime.Extensions": "4.0.11-rc2-23911"
},
"compile": {
"ref/portable-net45+win8/System.Numerics.Vectors.dll": {}
"ref/netstandard1.1/System.Numerics.Vectors.dll": {}
},
"runtime": {
"lib/netstandard1.3/System.Numerics.Vectors.dll": {}
@ -9817,10 +9849,10 @@
"System.Threading": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
},
"runtime": {
"lib/portable-net45+win8/System.Reflection.Metadata.dll": {}
"lib/netstandard1.1/System.Reflection.Metadata.dll": {}
}
},
"System.Reflection.Primitives/4.0.1-rc2-23911": {
@ -10205,10 +10237,10 @@
"System.Threading.Tasks": "4.0.11-rc2-23911"
},
"compile": {
"lib/portable-net45+win8+wp8+wpa81/_._": {}
"lib/netstandard1.0/_._": {}
},
"runtime": {
"lib/portable-net45+win8+wp8+wpa81/System.Threading.Tasks.Extensions.dll": {}
"lib/netstandard1.0/System.Threading.Tasks.Extensions.dll": {}
}
},
"System.Threading.Tasks.Parallel/4.0.1-rc2-23911": {
@ -10404,19 +10436,19 @@
"runtime.json"
]
},
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160329": {
"sha512": "aQ6snPMiRHzbEIPTmAC7kwdSnFZXCOabun1ZJqw4rQBpoVgyqehHnBglyprLLv2Ju5ZIfCJy2iFkQe8dyMwdqQ==",
"Microsoft.FSharp.Compiler.Host.netcore/1.0.0-alpha-160406": {
"sha512": "7kXzo8Qj9x03bIQ+tloBU5K42LzaUuwFWwfUmvQFxhdAX7ujK+Lm/I7hYUbxJ5Uo4V5iTE7gBqaT/CXNc1+wPA==",
"type": "package",
"files": [
"Microsoft.FSharp.Compiler.Host.netcore.1.0.0-alpha-160329.nupkg.sha512",
"Microsoft.FSharp.Compiler.Host.netcore.1.0.0-alpha-160406.nupkg.sha512",
"Microsoft.FSharp.Compiler.Host.netcore.nuspec"
]
},
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160329": {
"sha512": "T2+mjZCZFGPA2g4qHgny/DJsFT1dY7jQB7LJ8yQD/zGk/X+vlVdD3w9QrAiiZoiotBJVSb9Nfpu5n9uh58XVzA==",
"Microsoft.FSharp.Compiler.NetCore/1.0.0-alpha-160406": {
"sha512": "7LzGoasoAonpjdDKpq3EnJd1WQKpbuF2dz+kFxnTqUnsFBfjCM6tAQJBkLNgCk1SkRSnRjJzXCYqQFvlf4AXMg==",
"type": "package",
"files": [
"Microsoft.FSharp.Compiler.NetCore.1.0.0-alpha-160329.nupkg.sha512",
"Microsoft.FSharp.Compiler.NetCore.1.0.0-alpha-160406.nupkg.sha512",
"Microsoft.FSharp.Compiler.NetCore.nuspec",
"lib/DNXCore50/FSharp.Compiler.Interactive.Settings.dll",
"lib/DNXCore50/FSharp.Compiler.dll",
@ -10425,17 +10457,19 @@
"runtimes/any/native/default.win32manifest"
]
},
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160329": {
"sha512": "YzG6f5QqumI7b3QhMVlERG326Ek1UgyfDZT8fpa4ewfotJmd2dLhOsMpXDgDbvrTUpO2bz4ZznZY5LR6pt0H8A==",
"Microsoft.FSharp.Core.netcore/1.0.0-alpha-160406": {
"sha512": "KMzfpctIF9xV5/8KgmnC0D9108FAtdJR3wuLrQhArqQNw+dH9Cw1Y4cnZgy3HoSUMj+TsWICmqKR4p1FnaItxA==",
"type": "package",
"files": [
"Microsoft.FSharp.Core.netcore.1.0.0-alpha-160329.nupkg.sha512",
"Microsoft.FSharp.Core.netcore.1.0.0-alpha-160406.nupkg.sha512",
"Microsoft.FSharp.Core.netcore.nuspec",
"content/any/DNXCore50/FSharp.Core.optdata",
"content/any/DNXCore50/FSharp.Core.sigdata",
"lib/DNXCore50/FSharp.Core.dll",
"lib/DNXCore50/FSharp.Core.optdata",
"lib/DNXCore50/FSharp.Core.sigdata"
"lib/DNXCore50/FSharp.Core.sigdata",
"runtimes/any/native/FSharp.Core.optdata",
"runtimes/any/native/FSharp.Core.sigdata"
]
},
"Microsoft.NETCore/5.0.1-rc2-23911": {
@ -15983,8 +16017,10 @@
},
"projectFileDependencyGroups": {
"": [
"Microsoft.FSharp.Compiler.Host.netcore >= 1.0.0-alpha-160329"
"Microsoft.FSharp.Compiler.Host.netcore >= 1.0.0-alpha-160406"
],
"DNXCore,Version=v5.0": []
}
},
"tools": {},
"projectFileToolGroups": {}
}

Просмотреть файл

@ -734,7 +734,7 @@
<When Condition="'$(BuildWith)' == 'LKG'">
<PropertyGroup>
<FSharpTargetsPath>..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
<FscToolPath>$(FSharpSourcesRoot)\..\packages\lkg</FscToolPath>
<FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\dnxcore50\win7-x64\publish</FscToolPath>
<FSCoreLKGPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\FSharp.Core.dll</FSCoreLKGPath>
</PropertyGroup>
</When>

Просмотреть файл

@ -3605,7 +3605,10 @@ let writeBinaryAndReportMappings (outfile, ilg, pdbfile: string option, signer:
{ modul with Manifest = match modul.Manifest with None -> None | Some m -> Some {m with PublicKey = pubkey} }
let os =
try
try
// Ensure the output directory exists otherwise it will fail
let dir = Path.GetDirectoryName(outfile)
if not (Directory.Exists(dir)) then Directory.CreateDirectory(dir) |>ignore
new BinaryWriter(FileSystem.FileStreamCreateShim(outfile))
with e ->
failwith ("Could not open file for writing (binary mode): " + outfile)

Просмотреть файл

@ -35,5 +35,7 @@
<file src="FSharp.Core.optdata" target="lib/DNXCore50" />
<file src="FSharp.Core.sigdata" target="content/any/DNXCore50" />
<file src="FSharp.Core.optdata" target="content/any/DNXCore50" />
<file src="FSharp.Core.sigdata" target="runtimes/any/native/" />
<file src="FSharp.Core.optdata" target="runtimes/any/native/" />
</files>
</package>

Просмотреть файл

@ -1,7 +1,12 @@
REM == %1 --> assembly
REM == %2 --> NetFx20|NetFx40 (default is NetFx20) - case insensitive
REM == %3 --> directory
ildasm /TEXT /LINENUM /NOBAR "%~nx1" >"%~n1.il"
if not '%3' == '' ( set dll=%3\%~nx1)
if '%3' == '' ( set dll=%~nx1)
ildasm /TEXT /LINENUM /NOBAR %dll% >"%~n1.il"
IF NOT ERRORLEVEL 0 exit 1
IF /I "%2"=="NetFx40" goto :NetFx4

Просмотреть файл

@ -1,5 +1,5 @@
// Microsoft (R) .NET Framework IL Disassembler. Version 4.0.30319.17376
// Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0
// Copyright (c) Microsoft Corporation. All rights reserved.
@ -13,36 +13,38 @@
.assembly extern FSharp.Core
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
.ver 4:3:0:0
.ver 4:4:1:9055
}
.assembly ToplevelModule
.assembly TopLevelModule
{
.custom instance void [FSharp.Core]Microsoft.FSharp.Core.FSharpInterfaceDataVersionAttribute::.ctor(int32,
int32,
int32) = ( 01 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00 )
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 00 01 00 00 00 00 )
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.ToplevelModule
.mresource public FSharpSignatureData.TopLevelModule
{
// Offset: 0x00000000 Length: 0x00001169
// Offset: 0x00000000 Length: 0x0000114B
// WARNING: managed resource file FSharpSignatureData.TopLevelModule created
}
.mresource public FSharpOptimizationData.ToplevelModule
.mresource public FSharpOptimizationData.TopLevelModule
{
// Offset: 0x00001170 Length: 0x000003FD
// Offset: 0x00001150 Length: 0x000003FD
// WARNING: managed resource file FSharpOptimizationData.TopLevelModule created
}
.module ToplevelModule.dll
// MVID: {4F20E24D-FD14-B25B-A745-03834DE2204F}
.module TopLevelModule.dll
// MVID: {570620A2-37F5-C118-A745-0383A2200657}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x000000AAFA640000
// Image base: 0x00AE0000
// =============== CLASS MEMBERS DECLARATION ===================
@ -219,7 +221,7 @@
// Code size 14 (0xe)
.maxstack 8
.language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
.line 6,6 : 14,18
.line 6,6 : 14,18 'c:\\KevinRansom\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SerializableAttribute\\ToplevelModule.fs'
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -241,7 +243,7 @@
[3] class [mscorlib]System.Collections.IComparer V_3,
[4] int32 V_4,
[5] int32 V_5)
.line 6,6 : 14,18
.line 6,6 : 14,18 ''
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any ABC/Expr
@ -255,7 +257,7 @@
IL_0010: br.s IL_004e
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0012: ldarg.1
IL_0013: unbox.any ABC/Expr
IL_0018: ldnull
@ -266,10 +268,10 @@
IL_001f: br.s IL_004c
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0021: ldarg.0
IL_0022: pop
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0023: ldarg.0
IL_0024: stloc.1
IL_0025: ldloc.0
@ -290,21 +292,21 @@
IL_0041: br.s IL_0045
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0043: ldc.i4.m1
IL_0044: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0045: ldloc.s V_4
IL_0047: ldloc.s V_5
IL_0049: cgt
IL_004b: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004c: ldc.i4.1
IL_004d: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004e: ldarg.1
IL_004f: unbox.any ABC/Expr
IL_0054: ldnull
@ -315,11 +317,11 @@
IL_005b: br.s IL_005f
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005d: ldc.i4.m1
IL_005e: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005f: ldc.i4.0
IL_0060: ret
} // end of method Expr::CompareTo
@ -379,7 +381,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 6,6 : 14,18
.line 6,6 : 14,18 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -645,7 +647,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 7,7 : 19,24
.line 7,7 : 19,24 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -815,7 +817,7 @@
{
// Code size 17 (0x11)
.maxstack 8
.line 8,8 : 16,17
.line 8,8 : 16,17 ''
IL_0000: ldarg.0
IL_0001: callvirt instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
@ -824,7 +826,7 @@
IL_0009: ldarg.0
IL_000a: ldarg.1
IL_000b: stfld string ABC/A::x
.line 8,8 : 14,15
.line 8,8 : 14,15 ''
IL_0010: ret
} // end of method A::.ctor
@ -833,7 +835,7 @@
{
// Code size 8 (0x8)
.maxstack 8
.line 8,8 : 42,43
.line 8,8 : 42,43 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld string ABC/A::x
@ -1017,7 +1019,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 14 (0xe)
.maxstack 8
.line 16,16 : 18,22
.line 16,16 : 18,22 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -1039,7 +1041,7 @@
[3] class [mscorlib]System.Collections.IComparer V_3,
[4] int32 V_4,
[5] int32 V_5)
.line 16,16 : 18,22
.line 16,16 : 18,22 ''
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any ABC/ABC/Expr
@ -1053,7 +1055,7 @@
IL_0010: br.s IL_004e
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0012: ldarg.1
IL_0013: unbox.any ABC/ABC/Expr
IL_0018: ldnull
@ -1064,10 +1066,10 @@
IL_001f: br.s IL_004c
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0021: ldarg.0
IL_0022: pop
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0023: ldarg.0
IL_0024: stloc.1
IL_0025: ldloc.0
@ -1088,21 +1090,21 @@
IL_0041: br.s IL_0045
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0043: ldc.i4.m1
IL_0044: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0045: ldloc.s V_4
IL_0047: ldloc.s V_5
IL_0049: cgt
IL_004b: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004c: ldc.i4.1
IL_004d: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004e: ldarg.1
IL_004f: unbox.any ABC/ABC/Expr
IL_0054: ldnull
@ -1113,11 +1115,11 @@
IL_005b: br.s IL_005f
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005d: ldc.i4.m1
IL_005e: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005f: ldc.i4.0
IL_0060: ret
} // end of method Expr::CompareTo
@ -1177,7 +1179,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 16,16 : 18,22
.line 16,16 : 18,22 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -1443,7 +1445,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 17,17 : 23,28
.line 17,17 : 23,28 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -1613,7 +1615,7 @@
{
// Code size 17 (0x11)
.maxstack 8
.line 18,18 : 20,21
.line 18,18 : 20,21 ''
IL_0000: ldarg.0
IL_0001: callvirt instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
@ -1622,7 +1624,7 @@
IL_0009: ldarg.0
IL_000a: ldarg.1
IL_000b: stfld string ABC/ABC/A::x
.line 18,18 : 18,19
.line 18,18 : 18,19 ''
IL_0010: ret
} // end of method A::.ctor
@ -1631,7 +1633,7 @@
{
// Code size 8 (0x8)
.maxstack 8
.line 18,18 : 46,47
.line 18,18 : 46,47 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld string ABC/ABC/A::x
@ -1650,7 +1652,7 @@
.custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationArgumentCountsAttribute::.ctor(int32[]) = ( 01 00 02 00 00 00 01 00 00 00 01 00 00 00 00 00 )
// Code size 5 (0x5)
.maxstack 8
.line 21,21 : 27,32
.line 21,21 : 27,32 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -1682,7 +1684,7 @@
.custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationArgumentCountsAttribute::.ctor(int32[]) = ( 01 00 02 00 00 00 01 00 00 00 01 00 00 00 00 00 )
// Code size 5 (0x5)
.maxstack 8
.line 11,11 : 23,28
.line 11,11 : 23,28 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -1708,7 +1710,7 @@
} // end of property ABC::greeting
} // end of class ABC
.class private abstract auto ansi sealed '<StartupCode$ToplevelModule>'.$ABC
.class private abstract auto ansi sealed '<StartupCode$TopLevelModule>'.$ABC
extends [mscorlib]System.Object
{
.field static assembly int32 init@
@ -1722,17 +1724,17 @@
.maxstack 3
.locals init ([0] string greeting,
[1] string V_1)
.line 12,12 : 9,31
.line 12,12 : 9,31 ''
IL_0000: nop
IL_0001: call string ABC::get_greeting()
IL_0006: stloc.0
.line 22,22 : 13,35
.line 22,22 : 13,35 ''
IL_0007: call string ABC/ABC::get_greeting()
IL_000c: stloc.1
IL_000d: ret
} // end of method $ABC::.cctor
} // end of class '<StartupCode$ToplevelModule>'.$ABC
} // end of class '<StartupCode$TopLevelModule>'.$ABC
// =============================================================

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,5 +1,5 @@
// Microsoft (R) .NET Framework IL Disassembler. Version 4.0.30319.17376
// Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0
// Copyright (c) Microsoft Corporation. All rights reserved.
@ -13,7 +13,7 @@
.assembly extern FSharp.Core
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
.ver 4:3:0:0
.ver 4:4:1:9055
}
.assembly ToplevelNamespace
{
@ -22,27 +22,29 @@
int32) = ( 01 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00 )
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 00 01 00 00 00 00 )
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.ToplevelNamespace
{
// Offset: 0x00000000 Length: 0x00001875
// Offset: 0x00000000 Length: 0x00001856
// WARNING: managed resource file FSharpSignatureData.ToplevelNamespace created
}
.mresource public FSharpOptimizationData.ToplevelNamespace
{
// Offset: 0x00001880 Length: 0x0000055C
// Offset: 0x00001860 Length: 0x0000055C
// WARNING: managed resource file FSharpOptimizationData.ToplevelNamespace created
}
.module ToplevelNamespace.dll
// MVID: {4F20E250-218B-729A-A745-038350E2204F}
// MVID: {570620A3-218B-729A-A745-0383A3200657}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x000000A3A1760000
// Image base: 0x00FD0000
// =============== CLASS MEMBERS DECLARATION ===================
@ -213,8 +215,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 14 (0xe)
.maxstack 8
.language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
.line 7,7 : 10,14
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -230,13 +230,12 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 97 (0x61)
.maxstack 4
.locals init ([0] class XYZ.Expr V_0,
[1] class XYZ.Expr V_1,
[2] class XYZ.Expr V_2,
[3] class [mscorlib]System.Collections.IComparer V_3,
[4] int32 V_4,
[5] int32 V_5)
.line 7,7 : 10,14
.locals init (class XYZ.Expr V_0,
class XYZ.Expr V_1,
class XYZ.Expr V_2,
class [mscorlib]System.Collections.IComparer V_3,
int32 V_4,
int32 V_5)
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any XYZ.Expr
@ -250,7 +249,6 @@
IL_0010: br.s IL_004e
.line 100001,100001 : 0,0
IL_0012: ldarg.1
IL_0013: unbox.any XYZ.Expr
IL_0018: ldnull
@ -261,10 +259,8 @@
IL_001f: br.s IL_004c
.line 100001,100001 : 0,0
IL_0021: ldarg.0
IL_0022: pop
.line 100001,100001 : 0,0
IL_0023: ldarg.0
IL_0024: stloc.1
IL_0025: ldloc.0
@ -285,21 +281,17 @@
IL_0041: br.s IL_0045
.line 100001,100001 : 0,0
IL_0043: ldc.i4.m1
IL_0044: ret
.line 100001,100001 : 0,0
IL_0045: ldloc.s V_4
IL_0047: ldloc.s V_5
IL_0049: cgt
IL_004b: ret
.line 100001,100001 : 0,0
IL_004c: ldc.i4.1
IL_004d: ret
.line 100001,100001 : 0,0
IL_004e: ldarg.1
IL_004f: unbox.any XYZ.Expr
IL_0054: ldnull
@ -310,11 +302,9 @@
IL_005b: br.s IL_005f
.line 100001,100001 : 0,0
IL_005d: ldc.i4.m1
IL_005e: ret
.line 100001,100001 : 0,0
IL_005f: ldc.i4.0
IL_0060: ret
} // end of method Expr::CompareTo
@ -374,7 +364,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 7,7 : 10,14
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -640,7 +629,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 8,8 : 15,20
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -810,7 +798,6 @@
{
// Code size 17 (0x11)
.maxstack 8
.line 9,9 : 12,13
IL_0000: ldarg.0
IL_0001: callvirt instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
@ -819,7 +806,6 @@
IL_0009: ldarg.0
IL_000a: ldarg.1
IL_000b: stfld string XYZ.A::x
.line 9,9 : 10,11
IL_0010: ret
} // end of method A::.ctor
@ -828,7 +814,6 @@
{
// Code size 8 (0x8)
.maxstack 8
.line 9,9 : 38,39
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld string XYZ.A::x
@ -1012,7 +997,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 14 (0xe)
.maxstack 8
.line 13,13 : 14,18
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -1028,13 +1012,12 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 97 (0x61)
.maxstack 4
.locals init ([0] class XYZ.ABC/Expr V_0,
[1] class XYZ.ABC/Expr V_1,
[2] class XYZ.ABC/Expr V_2,
[3] class [mscorlib]System.Collections.IComparer V_3,
[4] int32 V_4,
[5] int32 V_5)
.line 13,13 : 14,18
.locals init (class XYZ.ABC/Expr V_0,
class XYZ.ABC/Expr V_1,
class XYZ.ABC/Expr V_2,
class [mscorlib]System.Collections.IComparer V_3,
int32 V_4,
int32 V_5)
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any XYZ.ABC/Expr
@ -1048,7 +1031,6 @@
IL_0010: br.s IL_004e
.line 100001,100001 : 0,0
IL_0012: ldarg.1
IL_0013: unbox.any XYZ.ABC/Expr
IL_0018: ldnull
@ -1059,10 +1041,8 @@
IL_001f: br.s IL_004c
.line 100001,100001 : 0,0
IL_0021: ldarg.0
IL_0022: pop
.line 100001,100001 : 0,0
IL_0023: ldarg.0
IL_0024: stloc.1
IL_0025: ldloc.0
@ -1083,21 +1063,17 @@
IL_0041: br.s IL_0045
.line 100001,100001 : 0,0
IL_0043: ldc.i4.m1
IL_0044: ret
.line 100001,100001 : 0,0
IL_0045: ldloc.s V_4
IL_0047: ldloc.s V_5
IL_0049: cgt
IL_004b: ret
.line 100001,100001 : 0,0
IL_004c: ldc.i4.1
IL_004d: ret
.line 100001,100001 : 0,0
IL_004e: ldarg.1
IL_004f: unbox.any XYZ.ABC/Expr
IL_0054: ldnull
@ -1108,11 +1084,9 @@
IL_005b: br.s IL_005f
.line 100001,100001 : 0,0
IL_005d: ldc.i4.m1
IL_005e: ret
.line 100001,100001 : 0,0
IL_005f: ldc.i4.0
IL_0060: ret
} // end of method Expr::CompareTo
@ -1172,7 +1146,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 13,13 : 14,18
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -1438,7 +1411,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 14,14 : 19,24
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -1608,7 +1580,6 @@
{
// Code size 17 (0x11)
.maxstack 8
.line 15,15 : 16,17
IL_0000: ldarg.0
IL_0001: callvirt instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
@ -1617,7 +1588,6 @@
IL_0009: ldarg.0
IL_000a: ldarg.1
IL_000b: stfld string XYZ.ABC/A::x
.line 15,15 : 14,15
IL_0010: ret
} // end of method A::.ctor
@ -1626,7 +1596,6 @@
{
// Code size 8 (0x8)
.maxstack 8
.line 15,15 : 42,43
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld string XYZ.ABC/A::x
@ -1810,7 +1779,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 14 (0xe)
.maxstack 8
.line 23,23 : 18,22
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -1826,13 +1794,12 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 97 (0x61)
.maxstack 4
.locals init ([0] class XYZ.ABC/ABC/Expr V_0,
[1] class XYZ.ABC/ABC/Expr V_1,
[2] class XYZ.ABC/ABC/Expr V_2,
[3] class [mscorlib]System.Collections.IComparer V_3,
[4] int32 V_4,
[5] int32 V_5)
.line 23,23 : 18,22
.locals init (class XYZ.ABC/ABC/Expr V_0,
class XYZ.ABC/ABC/Expr V_1,
class XYZ.ABC/ABC/Expr V_2,
class [mscorlib]System.Collections.IComparer V_3,
int32 V_4,
int32 V_5)
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any XYZ.ABC/ABC/Expr
@ -1846,7 +1813,6 @@
IL_0010: br.s IL_004e
.line 100001,100001 : 0,0
IL_0012: ldarg.1
IL_0013: unbox.any XYZ.ABC/ABC/Expr
IL_0018: ldnull
@ -1857,10 +1823,8 @@
IL_001f: br.s IL_004c
.line 100001,100001 : 0,0
IL_0021: ldarg.0
IL_0022: pop
.line 100001,100001 : 0,0
IL_0023: ldarg.0
IL_0024: stloc.1
IL_0025: ldloc.0
@ -1881,21 +1845,17 @@
IL_0041: br.s IL_0045
.line 100001,100001 : 0,0
IL_0043: ldc.i4.m1
IL_0044: ret
.line 100001,100001 : 0,0
IL_0045: ldloc.s V_4
IL_0047: ldloc.s V_5
IL_0049: cgt
IL_004b: ret
.line 100001,100001 : 0,0
IL_004c: ldc.i4.1
IL_004d: ret
.line 100001,100001 : 0,0
IL_004e: ldarg.1
IL_004f: unbox.any XYZ.ABC/ABC/Expr
IL_0054: ldnull
@ -1906,11 +1866,9 @@
IL_005b: br.s IL_005f
.line 100001,100001 : 0,0
IL_005d: ldc.i4.m1
IL_005e: ret
.line 100001,100001 : 0,0
IL_005f: ldc.i4.0
IL_0060: ret
} // end of method Expr::CompareTo
@ -1970,7 +1928,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 23,23 : 18,22
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -2236,7 +2193,6 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 24,24 : 23,28
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -2406,7 +2362,6 @@
{
// Code size 17 (0x11)
.maxstack 8
.line 25,25 : 20,21
IL_0000: ldarg.0
IL_0001: callvirt instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
@ -2415,7 +2370,6 @@
IL_0009: ldarg.0
IL_000a: ldarg.1
IL_000b: stfld string XYZ.ABC/ABC/A::x
.line 25,25 : 18,19
IL_0010: ret
} // end of method A::.ctor
@ -2424,7 +2378,6 @@
{
// Code size 8 (0x8)
.maxstack 8
.line 25,25 : 46,47
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld string XYZ.ABC/ABC/A::x
@ -2443,7 +2396,6 @@
.custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationArgumentCountsAttribute::.ctor(int32[]) = ( 01 00 02 00 00 00 01 00 00 00 01 00 00 00 00 00 )
// Code size 5 (0x5)
.maxstack 8
.line 28,28 : 27,32
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -2475,7 +2427,6 @@
.custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationArgumentCountsAttribute::.ctor(int32[]) = ( 01 00 02 00 00 00 01 00 00 00 01 00 00 00 00 00 )
// Code size 5 (0x5)
.maxstack 8
.line 18,18 : 23,28
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -2513,13 +2464,11 @@
{
// Code size 14 (0xe)
.maxstack 3
.locals init ([0] string greeting,
[1] string V_1)
.line 19,19 : 9,31
.locals init (string V_0,
string V_1)
IL_0000: nop
IL_0001: call string XYZ.ABC::get_greeting()
IL_0006: stloc.0
.line 29,29 : 13,35
IL_0007: call string XYZ.ABC/ABC::get_greeting()
IL_000c: stloc.1
IL_000d: ret

Просмотреть файл

@ -1,5 +1,5 @@
// Microsoft (R) .NET Framework IL Disassembler. Version 4.0.30319.17376
// Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0
// Copyright (c) Microsoft Corporation. All rights reserved.
@ -13,7 +13,7 @@
.assembly extern FSharp.Core
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
.ver 2:3:5:0
.ver 4:4:1:9055
}
.assembly ToplevelNamespaceP
{
@ -22,27 +22,27 @@
int32) = ( 01 00 02 00 00 00 00 00 00 00 00 00 00 00 00 00 )
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 )
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 00 01 00 00 00 00 )
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.ToplevelNamespaceP
{
// Offset: 0x00000000 Length: 0x00001877
// Offset: 0x00000000 Length: 0x00001858
}
.mresource public FSharpOptimizationData.ToplevelNamespaceP
{
// Offset: 0x00001880 Length: 0x0000055D
// Offset: 0x00001860 Length: 0x0000055D
}
.module ToplevelNamespaceP.dll
// MVID: {4F20E257-88D9-D7FD-A745-038357E2204F}
// MVID: {57061C46-88D9-D7FD-A745-0383461C0657}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x0000005FF48E0000
// Image base: 0x00960000
// =============== CLASS MEMBERS DECLARATION ===================
@ -214,7 +214,7 @@
// Code size 14 (0xe)
.maxstack 8
.language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
.line 7,7 : 10,14
.line 7,7 : 10,14 'c:\\KevinRansom\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SerializableAttribute\\ToplevelNamespace.fs'
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -236,7 +236,7 @@
[3] class [mscorlib]System.Collections.IComparer V_3,
[4] int32 V_4,
[5] int32 V_5)
.line 7,7 : 10,14
.line 7,7 : 10,14 ''
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any XYZ.Expr
@ -250,7 +250,7 @@
IL_0010: br.s IL_004e
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0012: ldarg.1
IL_0013: unbox.any XYZ.Expr
IL_0018: ldnull
@ -261,10 +261,10 @@
IL_001f: br.s IL_004c
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0021: ldarg.0
IL_0022: pop
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0023: ldarg.0
IL_0024: stloc.1
IL_0025: ldloc.0
@ -285,21 +285,21 @@
IL_0041: br.s IL_0045
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0043: ldc.i4.m1
IL_0044: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0045: ldloc.s V_4
IL_0047: ldloc.s V_5
IL_0049: cgt
IL_004b: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004c: ldc.i4.1
IL_004d: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004e: ldarg.1
IL_004f: unbox.any XYZ.Expr
IL_0054: ldnull
@ -310,11 +310,11 @@
IL_005b: br.s IL_005f
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005d: ldc.i4.m1
IL_005e: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005f: ldc.i4.0
IL_0060: ret
} // end of method Expr::CompareTo
@ -374,7 +374,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 7,7 : 10,14
.line 7,7 : 10,14 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -626,7 +626,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 8,8 : 15,20
.line 8,8 : 15,20 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -796,7 +796,7 @@
{
// Code size 17 (0x11)
.maxstack 8
.line 9,9 : 12,13
.line 9,9 : 12,13 ''
IL_0000: ldarg.0
IL_0001: callvirt instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
@ -805,7 +805,7 @@
IL_0009: ldarg.0
IL_000a: ldarg.1
IL_000b: stfld string XYZ.A::x
.line 9,9 : 10,11
.line 9,9 : 10,11 ''
IL_0010: ret
} // end of method A::.ctor
@ -814,7 +814,7 @@
{
// Code size 8 (0x8)
.maxstack 8
.line 9,9 : 38,39
.line 9,9 : 38,39 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld string XYZ.A::x
@ -998,7 +998,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 14 (0xe)
.maxstack 8
.line 13,13 : 14,18
.line 13,13 : 14,18 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -1020,7 +1020,7 @@
[3] class [mscorlib]System.Collections.IComparer V_3,
[4] int32 V_4,
[5] int32 V_5)
.line 13,13 : 14,18
.line 13,13 : 14,18 ''
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any XYZ.ABC/Expr
@ -1034,7 +1034,7 @@
IL_0010: br.s IL_004e
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0012: ldarg.1
IL_0013: unbox.any XYZ.ABC/Expr
IL_0018: ldnull
@ -1045,10 +1045,10 @@
IL_001f: br.s IL_004c
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0021: ldarg.0
IL_0022: pop
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0023: ldarg.0
IL_0024: stloc.1
IL_0025: ldloc.0
@ -1069,21 +1069,21 @@
IL_0041: br.s IL_0045
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0043: ldc.i4.m1
IL_0044: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0045: ldloc.s V_4
IL_0047: ldloc.s V_5
IL_0049: cgt
IL_004b: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004c: ldc.i4.1
IL_004d: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004e: ldarg.1
IL_004f: unbox.any XYZ.ABC/Expr
IL_0054: ldnull
@ -1094,11 +1094,11 @@
IL_005b: br.s IL_005f
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005d: ldc.i4.m1
IL_005e: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005f: ldc.i4.0
IL_0060: ret
} // end of method Expr::CompareTo
@ -1158,7 +1158,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 13,13 : 14,18
.line 13,13 : 14,18 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -1410,7 +1410,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 14,14 : 19,24
.line 14,14 : 19,24 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -1580,7 +1580,7 @@
{
// Code size 17 (0x11)
.maxstack 8
.line 15,15 : 16,17
.line 15,15 : 16,17 ''
IL_0000: ldarg.0
IL_0001: callvirt instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
@ -1589,7 +1589,7 @@
IL_0009: ldarg.0
IL_000a: ldarg.1
IL_000b: stfld string XYZ.ABC/A::x
.line 15,15 : 14,15
.line 15,15 : 14,15 ''
IL_0010: ret
} // end of method A::.ctor
@ -1598,7 +1598,7 @@
{
// Code size 8 (0x8)
.maxstack 8
.line 15,15 : 42,43
.line 15,15 : 42,43 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld string XYZ.ABC/A::x
@ -1782,7 +1782,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 14 (0xe)
.maxstack 8
.line 23,23 : 18,22
.line 23,23 : 18,22 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -1804,7 +1804,7 @@
[3] class [mscorlib]System.Collections.IComparer V_3,
[4] int32 V_4,
[5] int32 V_5)
.line 23,23 : 18,22
.line 23,23 : 18,22 ''
IL_0000: nop
IL_0001: ldarg.1
IL_0002: unbox.any XYZ.ABC/ABC/Expr
@ -1818,7 +1818,7 @@
IL_0010: br.s IL_004e
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0012: ldarg.1
IL_0013: unbox.any XYZ.ABC/ABC/Expr
IL_0018: ldnull
@ -1829,10 +1829,10 @@
IL_001f: br.s IL_004c
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0021: ldarg.0
IL_0022: pop
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0023: ldarg.0
IL_0024: stloc.1
IL_0025: ldloc.0
@ -1853,21 +1853,21 @@
IL_0041: br.s IL_0045
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0043: ldc.i4.m1
IL_0044: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_0045: ldloc.s V_4
IL_0047: ldloc.s V_5
IL_0049: cgt
IL_004b: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004c: ldc.i4.1
IL_004d: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_004e: ldarg.1
IL_004f: unbox.any XYZ.ABC/ABC/Expr
IL_0054: ldnull
@ -1878,11 +1878,11 @@
IL_005b: br.s IL_005f
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005d: ldc.i4.m1
IL_005e: ret
.line 100001,100001 : 0,0
.line 100001,100001 : 0,0 ''
IL_005f: ldc.i4.0
IL_0060: ret
} // end of method Expr::CompareTo
@ -1942,7 +1942,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 23,23 : 18,22
.line 23,23 : 18,22 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -2194,7 +2194,7 @@
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
// Code size 13 (0xd)
.maxstack 8
.line 24,24 : 23,28
.line 24,24 : 23,28 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: call class [mscorlib]System.Collections.IEqualityComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericEqualityComparer()
@ -2364,7 +2364,7 @@
{
// Code size 17 (0x11)
.maxstack 8
.line 25,25 : 20,21
.line 25,25 : 20,21 ''
IL_0000: ldarg.0
IL_0001: callvirt instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
@ -2373,7 +2373,7 @@
IL_0009: ldarg.0
IL_000a: ldarg.1
IL_000b: stfld string XYZ.ABC/ABC/A::x
.line 25,25 : 18,19
.line 25,25 : 18,19 ''
IL_0010: ret
} // end of method A::.ctor
@ -2382,7 +2382,7 @@
{
// Code size 8 (0x8)
.maxstack 8
.line 25,25 : 46,47
.line 25,25 : 46,47 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld string XYZ.ABC/ABC/A::x
@ -2401,7 +2401,7 @@
.custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationArgumentCountsAttribute::.ctor(int32[]) = ( 01 00 02 00 00 00 01 00 00 00 01 00 00 00 00 00 )
// Code size 5 (0x5)
.maxstack 8
.line 28,28 : 27,32
.line 28,28 : 27,32 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -2433,7 +2433,7 @@
.custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationArgumentCountsAttribute::.ctor(int32[]) = ( 01 00 02 00 00 00 01 00 00 00 01 00 00 00 00 00 )
// Code size 5 (0x5)
.maxstack 8
.line 18,18 : 23,28
.line 18,18 : 23,28 ''
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldarg.1
@ -2473,11 +2473,11 @@
.maxstack 3
.locals init ([0] string greeting,
[1] string V_1)
.line 19,19 : 9,31
.line 19,19 : 9,31 ''
IL_0000: nop
IL_0001: call string XYZ.ABC::get_greeting()
IL_0006: stloc.0
.line 29,29 : 13,35
.line 29,29 : 13,35 ''
IL_0007: call string XYZ.ABC/ABC::get_greeting()
IL_000c: stloc.1
IL_000d: ret

Просмотреть файл

@ -1,7 +1,7 @@
SOURCE=ToplevelModule.fs SCFLAGS="-a -g --test:EmitFeeFeeAs100001 --optimize-" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelModule.dll" # ToplevelModule.fs - Desktop
SOURCE=ToplevelNamespace.fs SCFLAGS="-a -g --test:EmitFeeFeeAs100001 --optimize-" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelNamespace.dll" # ToplevelNamespace.fs - Desktop
SOURCE=ToplevelModule.fs SCFLAGS="-a -g --out:desktop\\TopLevelModule.dll --test:EmitFeeFeeAs100001 --optimize-" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelModule.dll NetFx20 desktop" # ToplevelModule.fs - Desktop
SOURCE=ToplevelNamespace.fs SCFLAGS="-a -g --out:desktop\\ToplevelNamespace.dll --test:EmitFeeFeeAs100001 --optimize-" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelNamespace.dll NetFx20 desktop" # ToplevelNamespace.fs - Desktop
x,ReqUltimate SOURCE=ToplevelModule.fs SCFLAGS="-o:ToplevelModuleP.dll -a -g --test:EmitFeeFeeAs100001 --optimize- --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelModuleP.dll" # ToplevelModule.fs - Portable
y,ReqUltimate SOURCE=ToplevelNamespace.fs SCFLAGS="-o:ToplevelNamespaceP.dll -a -g --test:EmitFeeFeeAs100001 --optimize- --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelNamespaceP.dll" # ToplevelNamespace.fs - Portable
x,ReqUltimate SOURCE=ToplevelModule.fs SCFLAGS="--out:portable\\ToplevelModuleP.dll -a -g --test:EmitFeeFeeAs100001 --optimize- --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelModuleP.dll NetFx20 portable" # ToplevelModule.fs - Portable
y,ReqUltimate SOURCE=ToplevelNamespace.fs SCFLAGS="--out:portable\\ToplevelNamespaceP.dll -a -g --test:EmitFeeFeeAs100001 --optimize- --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelNamespaceP.dll NetFx20 portable" # ToplevelNamespace.fs - Portable

Просмотреть файл

@ -32,6 +32,9 @@
# Redmond suite (RunAll.pl) known failures
fail001 CodeGen\EmittedIL\SerializableAttribute # (ToplevelNamespace.fs - Desktop)
fail002 CodeGen\EmittedIL\SerializableAttribute # (ToplevelModule.fs - Portable)
fail003 CodeGen\EmittedIL\SerializableAttribute # (ToplevelNamespace.fs - Portable)
OS32BIT Conformance\DeclarationElements\P-invokeDeclarations (CallingConventions01.fs - x64) -- This test is not meant to run on a 32bit OS
MT402020 Conformance\Expressions\ApplicationExpressions\ObjectConstruction (E_ObjectConstruction01.fs) -- DevDiv:90622
MT402040 Conformance\Expressions\ApplicationExpressions\ObjectConstruction (E_ObjectConstruction01.fs) -- DevDiv:90622