Skip to content

F
fsharp

dotNET Platform / fsharp
大约 1 年 前同步成功

通知 0
Star 1
Fork 0
F
fsharp

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 03714a0d 编写于 作者: D dotnet-maestro[bot] 提交者： GitHub
浏览文件
操作

[main] Update dependencies from dotnet/arcade (#13771) 

* Update dependencies from https://github.com/dotnet/arcade build 20220823.2

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22423.2

* Update global.json

* Update Version.Details.xml

* Update dependencies from https://github.com/dotnet/arcade build 20220824.3

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22424.3

* Update global.json

* Update Version.Details.xml

* Update dependencies from https://github.com/dotnet/arcade build 20220825.1

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22425.1

* Update dependencies from https://github.com/dotnet/arcade build 20220826.1

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22426.1

* Update dependencies from https://github.com/dotnet/arcade build 20220826.8

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22426.8

* Update Version.Details.xml

* Update global.json

* Try fix Microsoft.CodeAnalysis

* Update dependencies from https://github.com/dotnet/arcade build 20220826.8

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22426.8

* Update dependencies from https://github.com/dotnet/arcade build 20220830.3

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 8.0.0-beta.22430.3

* Update dependencies from https://github.com/dotnet/arcade build 20220831.1

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 8.0.0-beta.22431.1

* Update global.json

* Update Version.Details.xml

* Update dependencies from https://github.com/dotnet/arcade build 20220902.1

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 8.0.0-beta.22452.1

* fix?

* Update dependencies from https://github.com/dotnet/arcade build 20220905.1

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 8.0.0-beta.22455.1

* Update dependencies from https://github.com/dotnet/arcade build 20220906.4

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 8.0.0-beta.22456.4

* wip

* wip

* Update dependencies from https://github.com/dotnet/arcade build 20220906.4

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 8.0.0-beta.22456.4

* wip

* wip

* Update dependencies from https://github.com/dotnet/arcade build 20220912.4

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 8.0.0-beta.22462.4

* Update dependencies from https://github.com/dotnet/arcade build 20220913.5

Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 8.0.0-beta.22463.5

* Update to rc1

* Updates to peverify?

* Perl
Co-authored-by: Ndotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: NVlad Zarytovskii <vzaritovsky@hotmail.com>
Co-authored-by: NKevin Ransom (msft) <codecutter@hotmail.com>
上级 da72a987
隐藏空白更改
内联 并排
Showing with 233 addition and 671 deletion
FSharp.sln
浏览文件 @ 03714a0d
......@@ -44,10 +44,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks",
tests\benchmarks\README.md = tests\benchmarks\README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroPerfCSharp", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\CS\MicroPerfCSharp.csproj", "{348DCC13-DD3E-4214-B040-5A74E8C6B782}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MicroPerf", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\MicroPerf.fsproj", "{9735B522-37F7-478C-A0C6-6C60BCC53390}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskPerfCSharp", "tests\benchmarks\CompiledCodeBenchmarks\TaskPerf\TaskPerfCSharp\TaskPerfCSharp.csproj", "{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TaskPerf", "tests\benchmarks\CompiledCodeBenchmarks\TaskPerf\TaskPerf\TaskPerf.fsproj", "{51B569A8-17C5-4EBD-8AAC-240E0B3AD8C4}"
......@@ -90,8 +86,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fcs", "fcs", "{B86EBFF1-E03
docs\fcs\untypedtree.fsx = docs\fcs\untypedtree.fsx
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PEVerify", "tests\PEVerify\PEVerify.csproj", "{358821CB-4D63-4157-9EFF-65C06EBD4E36}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsc", "src\fsc\fscProject\fsc.fsproj", "{10D15DBB-EFF0-428C-BA83-41600A93EEC4}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fscAnyCpu", "src\fsc\fscAnyCpuProject\fscAnyCpu.fsproj", "{B9EFC4FB-E702-45C8-A885-A05A25C5BCAA}"
......@@ -290,30 +284,6 @@ Global
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|Any CPU.Build.0 = Release|Any CPU
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|x86.ActiveCfg = Release|Any CPU
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|x86.Build.0 = Release|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Debug|Any CPU.Build.0 = Debug|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Debug|x86.ActiveCfg = Debug|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Debug|x86.Build.0 = Debug|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Proto|Any CPU.Build.0 = Debug|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Proto|x86.ActiveCfg = Debug|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Proto|x86.Build.0 = Debug|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Release|Any CPU.ActiveCfg = Release|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Release|Any CPU.Build.0 = Release|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Release|x86.ActiveCfg = Release|Any CPU
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Release|x86.Build.0 = Release|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Debug|x86.ActiveCfg = Debug|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Debug|x86.Build.0 = Debug|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Proto|Any CPU.Build.0 = Debug|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Proto|x86.ActiveCfg = Debug|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Proto|x86.Build.0 = Debug|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Release|Any CPU.Build.0 = Release|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Release|x86.ActiveCfg = Release|Any CPU
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Release|x86.Build.0 = Release|Any CPU
{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB}.Debug|x86.ActiveCfg = Debug|Any CPU
......@@ -362,18 +332,6 @@ Global
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|Any CPU.Build.0 = Release|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|x86.ActiveCfg = Release|Any CPU
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|x86.Build.0 = Release|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Debug|x86.ActiveCfg = Debug|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Debug|x86.Build.0 = Debug|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Proto|Any CPU.Build.0 = Debug|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Proto|x86.ActiveCfg = Debug|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Proto|x86.Build.0 = Debug|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Release|Any CPU.Build.0 = Release|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Release|x86.ActiveCfg = Release|Any CPU
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Release|x86.Build.0 = Release|Any CPU
{10D15DBB-EFF0-428C-BA83-41600A93EEC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10D15DBB-EFF0-428C-BA83-41600A93EEC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10D15DBB-EFF0-428C-BA83-41600A93EEC4}.Debug|x86.ActiveCfg = Debug|Any CPU
......@@ -489,8 +447,6 @@ Global
{FAC5A3BF-C0D6-437A-868A-E962AA00B418} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{DDFD06DC-D7F2-417F-9177-107764EEBCD8} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{348DCC13-DD3E-4214-B040-5A74E8C6B782} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
{9735B522-37F7-478C-A0C6-6C60BCC53390} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
{51B569A8-17C5-4EBD-8AAC-240E0B3AD8C4} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
{452EED3C-AA87-471F-B9AC-0F4479C5820C} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
......
Microsoft.FSharp.Compiler.sln
浏览文件 @ 03714a0d
......@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.32113.165
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.csproj", "{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.fsproj", "{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
VisualFSharp.sln
浏览文件 @ 03714a0d
......@@ -170,16 +170,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks",
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{564E7DC5-11CB-4FCF-ABDD-23AD93AF3A61}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroPerfCSharp", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\CS\MicroPerfCSharp.csproj", "{208E36EE-665C-42D2-B767-C6DB03C4FEB2}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MicroPerf", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\MicroPerf.fsproj", "{EE08E954-AE91-4EFA-8595-10931D29E628}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicroPerf", "MicroPerf", "{47112E07-9FF1-43E7-8021-F2A21D6A19A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "shims", "vsintegration\shims\shims.csproj", "{B1E30F2C-894F-47A9-9C8A-3324831E7D26}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PEVerify", "tests\PEVerify\PEVerify.csproj", "{035CF639-9704-44C0-96AA-BCB132AA881A}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fscAnyCpu", "src\fsc\fscAnyCpuProject\fscAnyCpu.fsproj", "{597D9896-4B90-4E9E-9C99-445C2CB9FF60}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fscArm64", "src\fsc\fscArm64Project\fscArm64.fsproj", "{0973C362-585C-4838-9459-D7E45C6B784B}"
......@@ -931,30 +923,6 @@ Global
{564E7DC5-11CB-4FCF-ABDD-23AD93AF3A61}.Release|Any CPU.Build.0 = Release|Any CPU
{564E7DC5-11CB-4FCF-ABDD-23AD93AF3A61}.Release|x86.ActiveCfg = Release|Any CPU
{564E7DC5-11CB-4FCF-ABDD-23AD93AF3A61}.Release|x86.Build.0 = Release|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Debug|x86.ActiveCfg = Debug|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Debug|x86.Build.0 = Debug|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Proto|Any CPU.Build.0 = Debug|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Proto|x86.ActiveCfg = Debug|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Proto|x86.Build.0 = Debug|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Release|Any CPU.Build.0 = Release|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Release|x86.ActiveCfg = Release|Any CPU
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Release|x86.Build.0 = Release|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Debug|x86.ActiveCfg = Debug|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Debug|x86.Build.0 = Debug|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Proto|Any CPU.Build.0 = Debug|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Proto|x86.ActiveCfg = Debug|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Proto|x86.Build.0 = Debug|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Release|Any CPU.Build.0 = Release|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Release|x86.ActiveCfg = Release|Any CPU
{EE08E954-AE91-4EFA-8595-10931D29E628}.Release|x86.Build.0 = Release|Any CPU
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Debug|x86.ActiveCfg = Debug|Any CPU
......@@ -967,18 +935,6 @@ Global
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Release|Any CPU.Build.0 = Release|Any CPU
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Release|x86.ActiveCfg = Release|Any CPU
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Release|x86.Build.0 = Release|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Debug|x86.ActiveCfg = Debug|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Debug|x86.Build.0 = Debug|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Proto|Any CPU.Build.0 = Debug|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Proto|x86.ActiveCfg = Debug|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Proto|x86.Build.0 = Debug|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Release|Any CPU.Build.0 = Release|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Release|x86.ActiveCfg = Release|Any CPU
{035CF639-9704-44C0-96AA-BCB132AA881A}.Release|x86.Build.0 = Release|Any CPU
{597D9896-4B90-4E9E-9C99-445C2CB9FF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{597D9896-4B90-4E9E-9C99-445C2CB9FF60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{597D9896-4B90-4E9E-9C99-445C2CB9FF60}.Debug|x86.ActiveCfg = Debug|Any CPU
......@@ -1133,11 +1089,7 @@ Global
{B5A9BBD9-2F45-4722-A6CA-BAE3C64CD4E2} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{A422D673-8E3B-4924-821B-DD3174173426} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{208E36EE-665C-42D2-B767-C6DB03C4FEB2} = {47112E07-9FF1-43E7-8021-F2A21D6A19A0}
{EE08E954-AE91-4EFA-8595-10931D29E628} = {47112E07-9FF1-43E7-8021-F2A21D6A19A0}
{47112E07-9FF1-43E7-8021-F2A21D6A19A0} = {DFB6ADD7-3149-43D9-AFA0-FC4A818B472B}
{B1E30F2C-894F-47A9-9C8A-3324831E7D26} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
{035CF639-9704-44C0-96AA-BCB132AA881A} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{597D9896-4B90-4E9E-9C99-445C2CB9FF60} = {B8DDA694-7939-42E3-95E5-265C2217C142}
{0973C362-585C-4838-9459-D7E45C6B784B} = {B8DDA694-7939-42E3-95E5-265C2217C142}
{E54456F4-D51A-4334-B225-92EBBED92B40} = {B8DDA694-7939-42E3-95E5-265C2217C142}
......
eng/Version.Details.xml
浏览文件 @ 03714a0d
......@@ -8,10 +8,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22419.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22463.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
<Sha>c670c5bf5cff7c5c2ca086fd41cc1ace90761576</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22463.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c670c5bf5cff7c5c2ca086fd41cc1ace90761576</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @ 03714a0d
......@@ -129,6 +129,7 @@
<MicrosoftCodeAnalysisCSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
<MicrosoftCodeAnalysisCompilersVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCompilersVersion>
<!-- Visual Studio Shell packages -->
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
......
eng/common/cross/arm/sources.list.focal 0 → 100644
浏览文件 @ 03714a0d
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
eng/common/cross/arm/sources.list.jammy 0 → 100644
浏览文件 @ 03714a0d
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
eng/common/cross/arm64/sources.list.focal 0 → 100644
浏览文件 @ 03714a0d
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
eng/common/cross/arm64/sources.list.jammy 0 → 100644
浏览文件 @ 03714a0d
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
eng/common/cross/build-rootfs.sh
浏览文件 @ 03714a0d
......@@ -186,32 +186,27 @@ while :; do
__UbuntuArch=i386
__UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
;;
lldb3.6)
__LLDB_Package="lldb-3.6-dev"
;;
lldb3.8)
__LLDB_Package="lldb-3.8-dev"
;;
lldb3.9)
__LLDB_Package="liblldb-3.9-dev"
;;
lldb4.0)
__LLDB_Package="liblldb-4.0-dev"
;;
lldb5.0)
__LLDB_Package="liblldb-5.0-dev"
;;
lldb6.0)
__LLDB_Package="liblldb-6.0-dev"
lldb*)
version="${lowerI/lldb/}"
parts=(${version//./ })
# for versions > 6.0, lldb has dropped the minor version
if [[ "${parts[0]}" -gt 6 ]]; then
version="${parts[0]}"
fi
__LLDB_Package="liblldb-${version}-dev"
;;
no-lldb)
unset __LLDB_Package
;;
llvm*)
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
version="${lowerI/llvm/}"
parts=(${version//./ })
__LLVM_MajorVersion="${parts[0]}"
__LLVM_MinorVersion="${parts[1]}"
# for versions > 6.0, llvm has dropped the minor version
if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then
__LLVM_MinorVersion=0;
fi
......@@ -231,6 +226,16 @@ while :; do
__CodeName=bionic
fi
;;
focal) # Ubuntu 20.04
if [[ "$__CodeName" != "jessie" ]]; then
__CodeName=focal
fi
;;
jammy) # Ubuntu 22.04
if [[ "$__CodeName" != "jessie" ]]; then
__CodeName=jammy
fi
;;
jessie) # Debian 8
__CodeName=jessie
__UbuntuRepo="http://ftp.debian.org/debian/"
......
eng/common/cross/x86/sources.list.focal 0 → 100644
浏览文件 @ 03714a0d
deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe
deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe
deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
deb-src http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
eng/common/cross/x86/sources.list.jammy 0 → 100644
浏览文件 @ 03714a0d
deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe
deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe
deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted
deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted
deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
eng/common/generate-locproject.ps1
浏览文件 @ 03714a0d
......@@ -62,7 +62,7 @@ $locJson = @{
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
if ($_.FullName.Contains($exclusion))
{
$continue = $false
}
......@@ -91,6 +91,7 @@ $locJson = @{
)
},
@{
LanguageSet = $LanguageSet
CloneLanguageSet = "WiX_CloneLanguages"
LssFiles = @( "wxl_loc.lss" )
LocItems = @(
......@@ -98,7 +99,7 @@ $locJson = @{
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
if ($_.FullName.Contains($exclusion))
{
$continue = $false
}
......@@ -110,7 +111,6 @@ $locJson = @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = $outputPath
Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
}
}
}
......
eng/common/sdl/NuGet.config
浏览文件 @ 03714a0d
......@@ -7,6 +7,11 @@
<clear />
<add key="guardian" value="https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="guardian">
<package pattern="microsoft.guardian.cli" />
</packageSource>
</packageSourceMapping>
<disabledPackageSources>
<clear />
</disabledPackageSources>
......
eng/common/sdl/sdl.ps1
浏览文件 @ 03714a0d
function Install-Gdn {
param(
[Parameter(Mandatory=$true)]
[string]$Path,
# If omitted, install the latest version of Guardian, otherwise install that specific version.
......
eng/common/templates/job/execute-sdl.yml
浏览文件 @ 03714a0d
......@@ -59,7 +59,9 @@ jobs:
- checkout: self
clean: true
- template: /eng/common/templates/post-build/setup-maestro-vars.yml
# If the template caller didn't provide an AzDO parameter, set them all up as Maestro vars.
- ${{ if not(and(parameters.AzDOProjectName, parameters.AzDOPipelineId, parameters.AzDOBuildId)) }}:
- template: /eng/common/templates/post-build/setup-maestro-vars.yml
- ${{ if ne(parameters.downloadArtifacts, 'false')}}:
- ${{ if ne(parameters.artifactNames, '') }}:
......
eng/common/templates/job/source-index-stage1.yml
浏览文件 @ 03714a0d
......@@ -29,7 +29,7 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Public
demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
demands: ImageOverride -equals windows.vs2019.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals windows.vs2019.amd64
......
eng/common/templates/steps/execute-sdl.yml
浏览文件 @ 03714a0d
......@@ -17,14 +17,16 @@ steps:
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
- pwsh: |
. $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1
Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl
. .\sdl.ps1
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }}
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
displayName: Install Guardian (Overridden)
- ${{ if eq(parameters.overrideGuardianVersion, '') }}:
- pwsh: |
. $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1
Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl
. .\sdl.ps1
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
displayName: Install Guardian
......
global.json
浏览文件 @ 03714a0d
{
"sdk": {
"version": "7.0.100-preview.6.22352.1",
"version": "7.0.100-rc.1.22431.12",
"allowPrerelease": true,
"rollForward": "latestMajor"
"rollForward": "latestPatch"
},
"tools": {
"dotnet": "7.0.100-preview.6.22352.1",
"dotnet": "7.0.100-rc.1.22431.12",
"vs": {
"version": "17.0",
"version": "17.2",
"components": [
"Microsoft.VisualStudio.Component.FSharp"
]
},
"xcopy-msbuild": "17.1.0"
"xcopy-msbuild": "17.2.1"
},
"native-tools": {
"perl": "5.32.1.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22411.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22411.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22463.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22463.5"
}
}
src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj → src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
浏览文件 @ 03714a0d
......@@ -56,6 +56,10 @@
</DependentProjects>
</ItemGroup>
<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>
<Target Name="PackDependentProjectsCore">
<MSBuild Projects="@(DependentProjects)" Targets="Pack" Properties="Restore=true;Pack=true;BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN)" />
</Target>
......
src/Microsoft.FSharp.Compiler/Program.cs 已删除 100644 → 0
浏览文件 @ da72a987
// See https://aka.ms/new-console-template for more information
return 0;
\ No newline at end of file
src/Microsoft.FSharp.Compiler/Program.fs 0 → 100644
浏览文件 @ 03714a0d
[<EntryPoint>]
let main _ = 0
\ No newline at end of file
tests/FSharp.Compiler.ComponentTests/Conformance/DeclarationElements/Events/Basic/Basic.fs
浏览文件 @ 03714a0d
......@@ -86,7 +86,7 @@ module Basic =
|> verifyCompileAndRun
|> shouldSucceed
#if !NETCOREAPP && !NETSTANDARD
#if false && !NETCOREAPP && !NETSTANDARD
// SOURCE=SanityCheck02.fs PEVER=/MD # SanityCheck02.fs - /MD
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"SanityCheck02.fs"|])>]
let ``SanityCheck02_fs_peverify`` compilation =
......
tests/FSharp.Compiler.ComponentTests/EmittedIL/Structure/Structure.fs
浏览文件 @ 03714a0d
......@@ -161,7 +161,7 @@ module Structure =
compilation
|> verifyExecution
#if !NETCOREAPP && !NETSTANDARD
#if false && !NETCOREAPP && !NETSTANDARD
// SOURCE=NativePtr01.fs PEVER=/Exp_Fail SCFLAGS="-r:CodeGenHelper.dll" # NativePtr01.fs
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"NativePtr01.fs"|])>]
let ``NativePtr01_fs`` compilation =
......
tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
浏览文件 @ 03714a0d
......@@ -38,7 +38,6 @@
Make sure they are getting built with the Utilities. -->
<ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Core\FSharp.Core.fsproj" />
<ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Build\FSharp.Build.fsproj" />
<ProjectReference Include="$(FSharpSourcesRoot)\..\tests\PEVerify\PEVerify.csproj" />
</ItemGroup>
<ItemGroup>
......
tests/FSharp.Test.Utilities/TestFramework.fs
浏览文件 @ 03714a0d
......@@ -303,11 +303,11 @@ let config configurationName envVars =
#if NET472
let fscArchitecture = "net472"
let fsiArchitecture = "net472"
let peverifyArchitecture = "net472"
//let peverifyArchitecture = "net472"
#else
let fscArchitecture = dotnetArchitecture
let fsiArchitecture = dotnetArchitecture
let peverifyArchitecture = dotnetArchitecture
//let peverifyArchitecture = dotnetArchitecture
#endif
let repoRoot = SCRIPT_ROOT ++ ".." ++ ".."
let artifactsPath = repoRoot ++ "artifacts"
......@@ -329,8 +329,8 @@ let config configurationName envVars =
let ILDASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILDAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILDASM_EXE)
let ILASM_EXE = if operatingSystem = "win" then "ilasm.exe" else "ilasm"
let ILASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILASM_EXE)
let PEVERIFY_EXE = if operatingSystem = "win" then "PEVerify.exe" elif operatingSystem = "osx" then "PEVerify.dll" else "PEVerify"
let PEVERIFY = requireArtifact ("PEVerify" ++ configurationName ++ peverifyArchitecture ++ PEVERIFY_EXE)
//let PEVERIFY_EXE = if operatingSystem = "win" then "PEVerify.exe" elif operatingSystem = "osx" then "PEVerify.dll" else "PEVerify"
let PEVERIFY = "dummy" //requireArtifact ("PEVerify" ++ configurationName ++ peverifyArchitecture ++ PEVERIFY_EXE)
// let FSI_FOR_SCRIPTS = artifactsBinPath ++ "fsi" ++ configurationName ++ fsiArchitecture ++ "fsi.exe"
let FSharpBuild = requireArtifact ("FSharp.Build" ++ configurationName ++ fsharpBuildArchitecture ++ "FSharp.Build.dll")
let FSharpCompilerInteractiveSettings = requireArtifact ("FSharp.Compiler.Interactive.Settings" ++ configurationName ++ fsharpCompilerInteractiveSettingsArchitecture ++ "FSharp.Compiler.Interactive.Settings.dll")
......@@ -618,8 +618,8 @@ let csc cfg arg = Printf.ksprintf (Commands.csc (exec cfg) cfg.CSC) arg
let vbc cfg arg = Printf.ksprintf (Commands.vbc (exec cfg) cfg.VBC) arg
let ildasm cfg arg = Printf.ksprintf (Commands.ildasm (exec cfg) cfg.ILDASM) arg
let ilasm cfg arg = Printf.ksprintf (Commands.ilasm (exec cfg) cfg.ILASM) arg
let peverify cfg = Commands.peverify (exec cfg) cfg.PEVERIFY "/nologo"
let peverifyWithArgs cfg args = Commands.peverify (exec cfg) cfg.PEVERIFY args
let peverify _cfg _test = printfn "PEVerify is disabled, need to migrate to ILVerify instead, see https://github.com/dotnet/fsharp/issues/13854" //Commands.peverify (exec cfg) cfg.PEVERIFY "/nologo"
let peverifyWithArgs _cfg _args _test = printfn "PEVerify is disabled, need to migrate to ILVerify instead, see https://github.com/dotnet/fsharp/issues/13854" //Commands.peverify (exec cfg) cfg.PEVERIFY args
let fsi cfg = Printf.ksprintf (Commands.fsi (exec cfg) cfg.FSI)
#if !NETCOREAPP
let fsiAnyCpu cfg = Printf.ksprintf (Commands.fsi (exec cfg) cfg.FSIANYCPU)
......
tests/PEVerify/CLRHelpers.cs 已删除 100644 → 0
浏览文件 @ da72a987
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
// ported from https://github.com/dotnet/roslyn/blob/aaee215045c03c4f4b38a66b56d35261ee7f0ddc/src/Test/Utilities/Portable/Platform/Desktop/CLRHelpers.cs
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using PEVerify;
using Roslyn.Test.Utilities.Desktop.ComTypes;
namespace Roslyn.Test.Utilities.Desktop
{
public static class CLRHelpers
{
private static readonly Guid s_clsIdClrRuntimeHost = new Guid("90F1A06E-7712-4762-86B5-7A5EBA6BDB02");
private static readonly Guid s_clsIdCorMetaDataDispenser = new Guid("E5CB7A31-7512-11d2-89CE-0080C792E5D8");
public static event ResolveEventHandler ReflectionOnlyAssemblyResolve;
static CLRHelpers()
{
// Work around CLR bug:
// PE Verifier adds a handler to ReflectionOnlyAssemblyResolve event in AppDomain.EnableResolveAssembliesForIntrospection
// (called from ValidateWorker in Validator.cpp) in which it directly calls Assembly.ReflectionOnlyLoad.
// If that happens before we get a chance to resolve the assembly the resolution fails.
//
// The handlers are invoked in the order they were added until one of them returns non-null assembly.
// Therefore once we call Validate we can't add any more handlers -- they would all follow the CLR one, which fails.
//
// As A workaround we add a single forwarding handler before any calls to Validate and then subscribe all of our true handlers
// to this event.
AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += ReflectionOnlyAssemblyResolveHandler;
}
private static Assembly ReflectionOnlyAssemblyResolveHandler(object sender, ResolveEventArgs args)
{
var handler = ReflectionOnlyAssemblyResolve;
if (handler != null)
{
return handler(sender, args);
}
return null;
}
public static object GetRuntimeInterfaceAsObject(Guid clsid, Guid riid)
{
// This API isn't available on Mono hence we must use reflection to access it.
Debug.Assert(!MonoHelpers.IsRunningOnMono());
var getRuntimeInterfaceAsObject = typeof(RuntimeEnvironment).GetMethod("GetRuntimeInterfaceAsObject", BindingFlags.Public | BindingFlags.Static);
return getRuntimeInterfaceAsObject.Invoke(null, new object[] { clsid, riid });
}
/// <summary>
/// Verifies the specified image. Subscribe to <see cref="ReflectionOnlyAssemblyResolve"/> to provide a loader for dependent assemblies.
/// </summary>
public static string[] PeVerify(byte[] peImage, bool metadataOnly)
{
// fileName must be null, otherwise AssemblyResolve events won't fire
return PeVerify(peImage, AppDomain.CurrentDomain.Id, assemblyPath: null, metadataOnly: metadataOnly);
}
/// <summary>
/// Verifies the specified file. All dependencies must be on disk next to the file.
/// </summary>
public static string[] PeVerify(string filePath, bool metadataOnly)
{
return PeVerify(File.ReadAllBytes(filePath), AppDomain.CurrentDomain.Id, filePath, metadataOnly: metadataOnly);
}
private static readonly object s_guard = new object();
private static string[] PeVerify(byte[] peImage, int domainId, string assemblyPath, bool metadataOnly)
{
if (MonoHelpers.IsRunningOnMono())
{
// PEverify is currently unsupported on Mono hence return an empty
// set of messages
return new string[0];
}
lock (s_guard)
{
GCHandle pinned = GCHandle.Alloc(peImage, GCHandleType.Pinned);
try
{
IntPtr buffer = pinned.AddrOfPinnedObject();
ICLRValidator validator = (ICLRValidator)GetRuntimeInterfaceAsObject(s_clsIdClrRuntimeHost, typeof(ICLRRuntimeHost).GUID);
ValidationErrorHandler errorHandler = new ValidationErrorHandler(validator);
IMetaDataDispenser dispenser = (IMetaDataDispenser)GetRuntimeInterfaceAsObject(s_clsIdCorMetaDataDispenser, typeof(IMetaDataDispenser).GUID);
// the buffer needs to be pinned during validation
Guid riid = typeof(IMetaDataImport).GUID;
object metaDataImport = null;
if (assemblyPath != null)
{
dispenser.OpenScope(assemblyPath, CorOpenFlags.ofRead, ref riid, out metaDataImport);
}
else
{
dispenser.OpenScopeOnMemory(buffer, (uint)peImage.Length, CorOpenFlags.ofRead, ref riid, out metaDataImport);
}
IMetaDataValidate metaDataValidate = (IMetaDataValidate)metaDataImport;
metaDataValidate.ValidatorInit(CorValidatorModuleType.ValidatorModuleTypePE, errorHandler);
metaDataValidate.ValidateMetaData();
if (!metadataOnly)
{
validator.Validate(errorHandler, (uint)domainId, ValidatorFlags.VALIDATOR_EXTRA_VERBOSE,
ulMaxError: 10, token: 0, fileName: assemblyPath, pe: buffer, ulSize: (uint)peImage.Length);
}
return errorHandler.GetOutput();
}
finally
{
pinned.Free();
}
}
}
private class ValidationErrorHandler : IVEHandler
{
private readonly ICLRValidator _validator;
private readonly List<string> _output;
private const int MessageLength = 256;
public ValidationErrorHandler(ICLRValidator validator)
{
_validator = validator;
_output = new List<string>();
}
public void SetReporterFtn(long lFnPtr)
{
throw new NotImplementedException();
}
public void VEHandler(int VECode, tag_VerError Context, Array psa)
{
StringBuilder sb = new StringBuilder(MessageLength);
string message = null;
if (Context.Flags == (uint)ValidatorFlags.VALIDATOR_CHECK_PEFORMAT_ONLY)
{
GetErrorResourceString(VECode, sb);
string formatString = ReplaceFormatItems(sb.ToString(), "%08x", ":x8");
formatString = ReplaceFormatItems(formatString, "%d", "");
if (psa == null)
{
psa = new object[0];
}
message = string.Format(formatString, (object[])psa);
}
else
{
_validator.FormatEventInfo(VECode, Context, sb, (uint)MessageLength - 1, psa);
message = sb.ToString();
}
// retail version of peverify.exe filters out CLS warnings...
if (!message.Contains("[CLS]"))
{
_output.Add(message);
}
}
public string[] GetOutput()
{
return _output.ToArray();
}
private static readonly string s_resourceFilePath = Path.Combine(RuntimeEnvironment.GetRuntimeDirectory(), "mscorrc.dll");
private const uint LOAD_LIBRARY_AS_DATAFILE = 0x00000002;
private static readonly IntPtr s_hMod = LoadLibraryEx(s_resourceFilePath, IntPtr.Zero, LOAD_LIBRARY_AS_DATAFILE);
private static void GetErrorResourceString(int code, StringBuilder message)
{
LoadString(s_hMod, (uint)(code & 0x0000FFFF), message, MessageLength - 1);
}
[DllImport("kernel32.dll", SetLastError = true)]
private static extern IntPtr LoadLibraryEx(string lpFileName, IntPtr hFile, uint dwFlags);
[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
private static extern int LoadString(IntPtr hInstance, uint uID, StringBuilder lpBuffer, int nBufferMax);
private static string ReplaceFormatItems(string input, string oldFormat, string newFormat)
{
// not foolproof/efficient, but easy to write/understand...
var parts = input.Replace(oldFormat, "|").Split('|');
var formatString = new StringBuilder();
for (int i = 0; i < parts.Length; i++)
{
formatString.Append(parts[i]);
if (i < (parts.Length - 1))
{
formatString.Append('{');
formatString.Append(i);
formatString.Append(newFormat);
formatString.Append('}');
}
}
return formatString.ToString();
}
}
}
namespace ComTypes
{
[ComImport, CoClass(typeof(object)), Guid("90F1A06C-7712-4762-86B5-7A5EBA6BDB02"), TypeIdentifier]
public interface CLRRuntimeHost : ICLRRuntimeHost
{
}
[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("90F1A06C-7712-4762-86B5-7A5EBA6BDB02"), TypeIdentifier]
public interface ICLRRuntimeHost
{
}
[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("63DF8730-DC81-4062-84A2-1FF943F59FDD"), TypeIdentifier]
public interface ICLRValidator
{
void Validate(
[In, MarshalAs(UnmanagedType.Interface)] IVEHandler veh,
[In] uint ulAppDomainId,
[In] ValidatorFlags ulFlags,
[In] uint ulMaxError,
[In] uint token,
[In, MarshalAs(UnmanagedType.LPWStr)] string fileName,
[In] IntPtr pe,
[In] uint ulSize);
void FormatEventInfo(
[In, MarshalAs(UnmanagedType.Error)] int hVECode,
[In] tag_VerError Context,
[In, Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder msg,
[In] uint ulMaxLength,
[In, MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array psa);
}
[ComImport, Guid("856CA1B2-7DAB-11D3-ACEC-00C04F86C309"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), TypeIdentifier]
public interface IVEHandler
{
void VEHandler([In, MarshalAs(UnmanagedType.Error)] int VECode, [In] tag_VerError Context, [In, MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array psa);
void SetReporterFtn([In] long lFnPtr);
}
[ComImport, Guid("809C652E-7396-11D2-9771-00A0C9B4D50C"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), TypeIdentifier]
public interface IMetaDataDispenser
{
void DefineScope(
[In] ref Guid rclsid,
[In] uint dwCreateFlags,
[In] ref Guid riid,
[Out, MarshalAs(UnmanagedType.IUnknown)] out object ppIUnk);
void OpenScope(
[In, MarshalAs(UnmanagedType.LPWStr)] string szScope,
[In] CorOpenFlags dwOpenFlags,
[In] ref Guid riid,
[Out, MarshalAs(UnmanagedType.IUnknown)] out object ppIUnk);
void OpenScopeOnMemory(
[In] IntPtr pData,
[In] uint cbData,
[In] CorOpenFlags dwOpenFlags,
[In] ref Guid riid,
[Out, MarshalAs(UnmanagedType.IUnknown)] out object ppIUnk);
}
[ComImport, Guid("7DAC8207-D3AE-4c75-9B67-92801A497D44"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), TypeIdentifier]
public interface IMetaDataImport
{
}
[ComImport, Guid("4709C9C6-81FF-11D3-9FC7-00C04F79A0A3"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), TypeIdentifier]
public interface IMetaDataValidate
{
void ValidatorInit([In] CorValidatorModuleType dwModuleType, [In, MarshalAs(UnmanagedType.IUnknown)] object pUnk);
void ValidateMetaData();
}
[StructLayout(LayoutKind.Sequential, Pack = 4), TypeIdentifier("5477469e-83b1-11d2-8b49-00a0c9b7c9c4", "mscoree.tag_VerError")]
public struct tag_VerError
{
public uint Flags;
public uint opcode;
public uint uOffset;
public uint Token;
public uint item1_flags;
public IntPtr item1_data;
public uint item2_flags;
public IntPtr item2_data;
}
public enum ValidatorFlags : uint
{
VALIDATOR_EXTRA_VERBOSE = 0x00000001,
VALIDATOR_SHOW_SOURCE_LINES = 0x00000002,
VALIDATOR_CHECK_ILONLY = 0x00000004,
VALIDATOR_CHECK_PEFORMAT_ONLY = 0x00000008,
VALIDATOR_NOCHECK_PEFORMAT = 0x00000010
};
public enum CorValidatorModuleType : uint
{
ValidatorModuleTypeInvalid = 0x00000000,
ValidatorModuleTypeMin = 0x00000001,
ValidatorModuleTypePE = 0x00000001,
ValidatorModuleTypeObj = 0x00000002,
ValidatorModuleTypeEnc = 0x00000003,
ValidatorModuleTypeIncr = 0x00000004,
ValidatorModuleTypeMax = 0x00000004
};
public enum CorOpenFlags : uint
{
ofRead = 0x00000000,
ofWrite = 0x00000001,
ofReadWriteMask = 0x00000001,
ofCopyMemory = 0x00000002,
ofCacheImage = 0x00000004,
ofManifestMetadata = 0x00000008,
ofReadOnly = 0x00000010,
ofTakeOwnership = 0x00000020,
ofNoTypeLib = 0x00000080,
ofReserved1 = 0x00000100,
ofReserved2 = 0x00000200,
ofReserved = 0xffffff40,
};
}
}
tests/PEVerify/MonoHelpers.cs 已删除 100644 → 0
浏览文件 @ da72a987
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
using System;
namespace PEVerify
{
public class MonoHelpers
{
public static bool IsRunningOnMono()
{
return Type.GetType("Mono.Runtime") != null;
}
}
}
tests/PEVerify/PEVerify.csproj 已删除 100644 → 0
浏览文件 @ da72a987
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net7.0</TargetFrameworks>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
<!-- Workaround to get rid of:
error NU1505: Duplicate 'PackageDownload' items found.
Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior.
The duplicate 'PackageDownload' items are:
Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2].
-->
<NoWarn>$(NoWarn);NU1505</NoWarn>
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>
<Target Name="RemoveAnalyzers"
DependsOnTargets="ResolveAssemblyReferences"
BeforeTargets="CoreCompile">
<ItemGroup>
<Analyzers Remove="@(Analyzers)" />
</ItemGroup>
</Target>
</Project>
tests/PEVerify/Program.cs 已删除 100644 → 0
浏览文件 @ da72a987
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
using System;
using System.IO;
using Roslyn.Test.Utilities.Desktop;
using System.Globalization;
namespace PEVerify
{
class Program
{
static int Main(string[] args)
{
// this version of PEVerify is only intended to run F# test suit
// force the en-US culture so that tests warning/error message comparision
// is not culture dependent
var culture = new CultureInfo("en-US");
CultureInfo.CurrentCulture = culture;
CultureInfo.CurrentUICulture = culture;
string assemblyPath = null;
bool metadataOnly = false;
foreach (var arg in args)
{
switch (arg.ToUpperInvariant())
{
case "/IL":
case "/NOLOGO":
case "/UNIQUE":
// ignore these options
break;
case "/MD":
metadataOnly = true;
break;
default:
if (assemblyPath != null)
{
Console.WriteLine("Assembly already specified or unknown option.");
return -1;
}
assemblyPath = arg;
break;
}
}
if (!Path.IsPathRooted(assemblyPath))
{
var workingDir = Directory.GetCurrentDirectory();
assemblyPath = Path.Combine(workingDir, assemblyPath);
}
var errors = CLRHelpers.PeVerify(assemblyPath, metadataOnly);
foreach (var error in errors)
{
Console.WriteLine(error);
}
return errors.Length;
}
}
}
tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/CS/MicroPerfCSharp.csproj
浏览文件 @ 03714a0d
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net7.0</TargetFrameworks>
<OutputType>Library</OutputType>
<LangVersion>8.0</LangVersion>
</PropertyGroup>
......
tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj
浏览文件 @ 03714a0d
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<OutputType>Exe</OutputType>
<!-- Workaround to get rid of:
error NU1505: Duplicate 'PackageDownload' items found.
......@@ -30,7 +30,6 @@
<Compile Include="Collections.fs" />
<Compile Include="Benchmarks.fs" />
<ProjectReference Include="..\..\..\..\src\FSharp.Core\FSharp.Core.fsproj" />
<ProjectReference Include="CS\MicroPerfCSharp.csproj" />
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" />
</ItemGroup>
......
tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj
浏览文件 @ 03714a0d
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<OutputType>Exe</OutputType>
<!-- Workaround to get rid of:
error NU1505: Duplicate 'PackageDownload' items found.
......
tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerfPreviousCompiler/TaskPerfPreviousCompiler.fsproj
浏览文件 @ 03714a0d
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<OutputType>Exe</OutputType>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<OtherFlags>$(OtherFlags) --define:ASYNC_PERF</OtherFlags>
......
tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
浏览文件 @ 03714a0d
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RootNamespace>HistoricalBenchmark.Utilities</RootNamespace>
</PropertyGroup>
......
tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
浏览文件 @ 03714a0d
......@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<Configurations>Release</Configurations>
<!-- Workaround to get rid of:
......@@ -18,7 +18,7 @@
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
</PropertyGroup>
<PropertyGroup>
<FcsReferenceType Condition="'$(FcsReferenceType)' == ''">project</FcsReferenceType>
<FcsProjectPath Condition="'$(FcsProjectPath)' == ''">..\..\..\..\src\Compiler\FSharp.Compiler.Service.fsproj</FcsProjectPath>
......
tests/benchmarks/FCSBenchmarks/BenchmarkComparison/runner.ipynb
浏览文件 @ 03714a0d
......@@ -18,7 +18,7 @@
"#r \"nuget: Plotly.NET.Interactive, 3.0.0\"\n",
"#r \"nuget: LibGit2Sharp, 0.26.2\"\n",
"#r \"nuget: BenchmarkDotnet, 0.13.1\"\n",
"#r \"../../../../artifacts/bin/HistoricalBenchmark.Runner/Release/net6.0/HistoricalBenchmark.Runner.dll\"\n",
"#r \"../../../../artifacts/bin/HistoricalBenchmark.Runner/Release/net7.0/HistoricalBenchmark.Runner.dll\"\n",
"\n",
"open HistoricalBenchmark.Runner\n",
"\n",
......
tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
浏览文件 @ 03714a0d
......@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<!-- Workaround to get rid of:
error NU1505: Duplicate 'PackageDownload' items found.
......
tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/benchmarks.ipynb
浏览文件 @ 03714a0d
......@@ -3,80 +3,67 @@
{
"cell_type": "code",
"execution_count": null,
"source": [
"#!pwsh\r\n",
"dotnet build -c release\r\n"
],
"outputs": [],
"metadata": {
"dotnet_interactive": {
"language": "pwsh"
},
"vscode": {
"languageId": "dotnet-interactive.pwsh"
}
}
},
"outputs": [],
"source": [
"#!pwsh\n",
"dotnet build -c release\n"
]
},
{
"cell_type": "code",
"execution_count": null,
"source": [
"#r \"../../../artifacts/bin/FSharp.Compiler.Benchmarks/Release/net6.0/FSharp.Compiler.Benchmarks.dll\"\r\n",
"#r \"../../../artifacts/bin/FSharp.Compiler.Benchmarks/Release/net6.0/BenchmarkDotNet.dll\""
],
"outputs": [],
"metadata": {
"dotnet_interactive": {
"language": "fsharp"
},
"vscode": {
"languageId": "dotnet-interactive.fsharp"
}
}
},
"outputs": [],
"source": [
"#r \"../../../artifacts/bin/FSharp.Compiler.Benchmarks/Release/net7.0/FSharp.Compiler.Benchmarks.dll\"\n",
"#r \"../../../artifacts/bin/FSharp.Compiler.Benchmarks/Release/net7.0/BenchmarkDotNet.dll\""
]
},
{
"cell_type": "code",
"execution_count": null,
"source": [
"open BenchmarkDotNet.Running\r\n",
"open FSharp.Compiler.Benchmarks\r\n",
"\r\n",
"let summary = BenchmarkRunner.Run<TypeCheckingBenchmark1>()"
],
"outputs": [],
"metadata": {
"dotnet_interactive": {
"language": "fsharp"
},
"vscode": {
"languageId": "dotnet-interactive.fsharp"
}
}
},
"outputs": [],
"source": [
"open BenchmarkDotNet.Running\n",
"open FSharp.Compiler.Benchmarks\n",
"\n",
"let summary = BenchmarkRunner.Run<TypeCheckingBenchmark1>()"
]
},
{
"cell_type": "code",
"execution_count": null,
"source": [
"// https://benchmarkdotnet.org/api/BenchmarkDotNet.Reports.BenchmarkReport.html\r\n",
"#r \"nuget: XPlot.Plotly.Interactive, 4.0.2\"\r\n",
"\r\n",
"open XPlot.Plotly\r\n",
"\r\n",
"let gcStats = summary.Reports |> Seq.map (fun x -> x.GcStats)\r\n",
"\r\n",
"let gen0Series =\r\n",
" Bar(\r\n",
" name = \"Gen 0\",\r\n",
" y = (gcStats |> Seq.map (fun x -> x.Gen0Collections))\r\n",
" )\r\n",
"\r\n",
"let gen1Series =\r\n",
" Bar(\r\n",
" name = \"Gen 1\",\r\n",
" y = (gcStats |> Seq.map (fun x -> x.Gen1Collections))\r\n",
" )\r\n",
"\r\n",
"let gen2Series =\r\n",
" Bar(\r\n",
" name = \"Gen 2\",\r\n",
" y = (gcStats |> Seq.map (fun x -> x.Gen2Collections))\r\n",
" )\r\n",
"\r\n",
"[gen0Series;gen1Series;gen2Series]\r\n",
"|> Chart.Plot\r\n",
"|> Chart.WithTitle(\"F# Type-Checking Benchmark 1 - GC Collection Counts\")"
],
"metadata": {
"dotnet_interactive": {
"language": "fsharp"
},
"vscode": {
"languageId": "dotnet-interactive.fsharp"
}
},
"outputs": [
{
"data": {
......@@ -127,15 +114,44 @@
"output_type": "display_data"
}
],
"metadata": {
"dotnet_interactive": {
"language": "fsharp"
}
}
"source": [
"// https://benchmarkdotnet.org/api/BenchmarkDotNet.Reports.BenchmarkReport.html\n",
"#r \"nuget: XPlot.Plotly.Interactive, 4.0.2\"\n",
"\n",
"open XPlot.Plotly\n",
"\n",
"let gcStats = summary.Reports |> Seq.map (fun x -> x.GcStats)\n",
"\n",
"let gen0Series =\n",
" Bar(\n",
" name = \"Gen 0\",\n",
" y = (gcStats |> Seq.map (fun x -> x.Gen0Collections))\n",
" )\n",
"\n",
"let gen1Series =\n",
" Bar(\n",
" name = \"Gen 1\",\n",
" y = (gcStats |> Seq.map (fun x -> x.Gen1Collections))\n",
" )\n",
"\n",
"let gen2Series =\n",
" Bar(\n",
" name = \"Gen 2\",\n",
" y = (gcStats |> Seq.map (fun x -> x.Gen2Collections))\n",
" )\n",
"\n",
"[gen0Series;gen1Series;gen2Series]\n",
"|> Chart.Plot\n",
"|> Chart.WithTitle(\"F# Type-Checking Benchmark 1 - GC Collection Counts\")"
]
}
],
"metadata": {
"orig_nbformat": 4,
"kernelspec": {
"display_name": ".NET (C#)",
"language": "C#",
"name": ".net-csharp"
},
"language_info": {
"file_extension": ".cs",
"mimetype": "text/x-csharp",
......@@ -143,12 +159,8 @@
"pygments_lexer": "csharp",
"version": "9.0"
},
"kernelspec": {
"display_name": ".NET (C#)",
"language": "C#",
"name": ".net-csharp"
}
"orig_nbformat": 4
},
"nbformat": 4,
"nbformat_minor": 2
}
\ No newline at end of file
}
tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
浏览文件 @ 03714a0d
......@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
......
tests/fsharp/single-test.fs
浏览文件 @ 03714a0d
......@@ -215,7 +215,7 @@ let singleTestBuildAndRunCore cfg copyFiles p languageVersion =
let extraSources = ["testlib.fsi";"testlib.fs";"test.mli";"test.ml";"test.fsi";"test.fs";"test2.fsi";"test2.fs";"test.fsx";"test2.fsx"]
let utilitySources = [__SOURCE_DIRECTORY__ ++ "coreclr_utilities.fs"]
let referenceItems = if String.IsNullOrEmpty(copyFiles) then [] else [copyFiles]
let framework = "net6.0"
let framework = "net7.0"
// Arguments:
// outputType = OutputType.Exe, OutputType.Library or OutputType.Script
......@@ -311,8 +311,8 @@ let singleTestBuildAndRunCore cfg copyFiles p languageVersion =
match p with
#if NETCOREAPP
| FSC_NETCORE (optimized, buildOnly) -> executeSingleTestBuildAndRun OutputType.Exe "coreclr" "net6.0" optimized buildOnly
| FSI_NETCORE -> executeSingleTestBuildAndRun OutputType.Script "coreclr" "net6.0" true false
| FSC_NETCORE (optimized, buildOnly) -> executeSingleTestBuildAndRun OutputType.Exe "coreclr" "net7.0" optimized buildOnly
| FSI_NETCORE -> executeSingleTestBuildAndRun OutputType.Script "coreclr" "net7.0" true false
#else
| FSC_NETFX (optimized, buildOnly) -> executeSingleTestBuildAndRun OutputType.Exe "net40" "net472" optimized buildOnly
| FSI_NETFX -> executeSingleTestBuildAndRun OutputType.Script "net40" "net472" true false
......
tests/fsharp/tests.fs
浏览文件 @ 03714a0d
......@@ -60,7 +60,7 @@ module CoreTests =
[<Test>]
let ``array-FSC_OPTIMIZED-5.0`` () = singleTestBuildAndRunVersion "core/array" FSC_OPTIMIZED "5.0"
[<Test; Ignore("Some tests fail on .NET6 preview6, and fixed in preview7, disabling until preview7 gets released.")>]
[<Test>]
let ``array-FSI-5.0`` () = singleTestBuildAndRunVersion "core/array" FSI "5.0"
[<Test>]
......
tests/fsharpqa/Source/run.pl
浏览文件 @ 03714a0d
......@@ -278,6 +278,11 @@ if($ENV{REDUCED_RUNTIME} ne "1"){
}
}
unless(-e $PEVERIFY) {
$PEVERIFY = "PEVerify.exe";
$ENV{PEVERIFY} = $PEVERIFY;
}
# Use $ENV{PEVER} if it is defined
my $PEVER_ARG = $ENV{PEVER};
......
tests/projects/Sample_ConsoleApp_FileSystemTests/Sample_ConsoleApp_net7.fsproj
浏览文件 @ 03714a0d
......@@ -2,13 +2,13 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>
<PropertyGroup>
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net6.0/fsc.dll</DotnetFscCompilerPath>
<Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net6.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
<DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net7.0/fsc.dll</DotnetFscCompilerPath>
<Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net7.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
<FSharpPreferNetFrameworkTools>False</FSharpPreferNetFrameworkTools>
<FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
</PropertyGroup>
......
tests/projects/SelfContained_Trimming_Test/check.ps1
浏览文件 @ 03714a0d
......@@ -14,10 +14,10 @@ if (-not ($output -eq $expected))
}
# Checking that FSharp.Core binary is of expected size (needs adjustments if test is updated).
$expected_len = 2181119 # In bytes
$expected_len = 245248 # In bytes
$file = Get-Item .\bin\Release\net7.0\win-x64\publish\FSharp.Core.dll
$file_len = $file.Length
if ($file_len -le $expected_len)
if (-not ($file_len -eq $expected_len))
{
Write-Error "Test failed with unexpected FSharp.Core length:`nExpected:`n`t${expected_len} Bytes`nActual:`n`t${file_len} Bytes" -ErrorAction Stop
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或