Skip to content

Commit ea8a7ed

Browse files
safesparrowsafesparrow
committed
Merge upstream/main
2 parents 6783b97 + 43579c0 commit ea8a7ed

File tree

126 files changed

+11023
-1989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+11023
-1989
lines changed

‎FSharp.sln‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks",
4444
tests\benchmarks\README.md = tests\benchmarks\README.md
4545
EndProjectSection
4646
EndProject
47-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroPerfCSharp", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\CS\MicroPerfCSharp.csproj", "{348DCC13-DD3E-4214-B040-5A74E8C6B782}"
48-
EndProject
49-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MicroPerf", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\MicroPerf.fsproj", "{9735B522-37F7-478C-A0C6-6C60BCC53390}"
50-
EndProject
5147
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskPerfCSharp", "tests\benchmarks\CompiledCodeBenchmarks\TaskPerf\TaskPerfCSharp\TaskPerfCSharp.csproj", "{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB}"
5248
EndProject
5349
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
9086
docs\fcs\untypedtree.fsx = docs\fcs\untypedtree.fsx
9187
EndProjectSection
9288
EndProject
93-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PEVerify", "tests\PEVerify\PEVerify.csproj", "{358821CB-4D63-4157-9EFF-65C06EBD4E36}"
94-
EndProject
9589
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsc", "src\fsc\fscProject\fsc.fsproj", "{10D15DBB-EFF0-428C-BA83-41600A93EEC4}"
9690
EndProject
9791
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fscAnyCpu", "src\fsc\fscAnyCpuProject\fscAnyCpu.fsproj", "{B9EFC4FB-E702-45C8-A885-A05A25C5BCAA}"
@@ -290,30 +284,6 @@ Global
290284
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|Any CPU.Build.0 = Release|Any CPU
291285
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|x86.ActiveCfg = Release|Any CPU
292286
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634}.Release|x86.Build.0 = Release|Any CPU
293-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
294-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Debug|Any CPU.Build.0 = Debug|Any CPU
295-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Debug|x86.ActiveCfg = Debug|Any CPU
296-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Debug|x86.Build.0 = Debug|Any CPU
297-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
298-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Proto|Any CPU.Build.0 = Debug|Any CPU
299-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Proto|x86.ActiveCfg = Debug|Any CPU
300-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Proto|x86.Build.0 = Debug|Any CPU
301-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Release|Any CPU.ActiveCfg = Release|Any CPU
302-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Release|Any CPU.Build.0 = Release|Any CPU
303-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Release|x86.ActiveCfg = Release|Any CPU
304-
{348DCC13-DD3E-4214-B040-5A74E8C6B782}.Release|x86.Build.0 = Release|Any CPU
305-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
306-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Debug|Any CPU.Build.0 = Debug|Any CPU
307-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Debug|x86.ActiveCfg = Debug|Any CPU
308-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Debug|x86.Build.0 = Debug|Any CPU
309-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
310-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Proto|Any CPU.Build.0 = Debug|Any CPU
311-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Proto|x86.ActiveCfg = Debug|Any CPU
312-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Proto|x86.Build.0 = Debug|Any CPU
313-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Release|Any CPU.ActiveCfg = Release|Any CPU
314-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Release|Any CPU.Build.0 = Release|Any CPU
315-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Release|x86.ActiveCfg = Release|Any CPU
316-
{9735B522-37F7-478C-A0C6-6C60BCC53390}.Release|x86.Build.0 = Release|Any CPU
317287
{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
318288
{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
319289
{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -362,18 +332,6 @@ Global
362332
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|Any CPU.Build.0 = Release|Any CPU
363333
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|x86.ActiveCfg = Release|Any CPU
364334
{7BFA159A-BF9D-4489-BF46-1B83ACCEEE0F}.Release|x86.Build.0 = Release|Any CPU
365-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
366-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Debug|Any CPU.Build.0 = Debug|Any CPU
367-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Debug|x86.ActiveCfg = Debug|Any CPU
368-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Debug|x86.Build.0 = Debug|Any CPU
369-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
370-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Proto|Any CPU.Build.0 = Debug|Any CPU
371-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Proto|x86.ActiveCfg = Debug|Any CPU
372-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Proto|x86.Build.0 = Debug|Any CPU
373-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Release|Any CPU.ActiveCfg = Release|Any CPU
374-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Release|Any CPU.Build.0 = Release|Any CPU
375-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Release|x86.ActiveCfg = Release|Any CPU
376-
{358821CB-4D63-4157-9EFF-65C06EBD4E36}.Release|x86.Build.0 = Release|Any CPU
377335
{10D15DBB-EFF0-428C-BA83-41600A93EEC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
378336
{10D15DBB-EFF0-428C-BA83-41600A93EEC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
379337
{10D15DBB-EFF0-428C-BA83-41600A93EEC4}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -489,8 +447,6 @@ Global
489447
{FAC5A3BF-C0D6-437A-868A-E962AA00B418} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
490448
{DDFD06DC-D7F2-417F-9177-107764EEBCD8} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
491449
{9B4CF83C-C215-4EA0-9F8B-B5A77090F634} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
492-
{348DCC13-DD3E-4214-B040-5A74E8C6B782} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
493-
{9735B522-37F7-478C-A0C6-6C60BCC53390} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
494450
{CF9F3F98-7BFB-4945-A4A5-668DF0AC65AB} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
495451
{51B569A8-17C5-4EBD-8AAC-240E0B3AD8C4} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
496452
{452EED3C-AA87-471F-B9AC-0F4479C5820C} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}

‎Microsoft.FSharp.Compiler.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.1.32113.165
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.csproj", "{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.fsproj", "{BBEDE3FA-6E2C-4C53-8B61-FBB545CD4FFC}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎VisualFSharp.sln‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks",
170170
EndProject
171171
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{564E7DC5-11CB-4FCF-ABDD-23AD93AF3A61}"
172172
EndProject
173-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MicroPerfCSharp", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\CS\MicroPerfCSharp.csproj", "{208E36EE-665C-42D2-B767-C6DB03C4FEB2}"
174-
EndProject
175-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MicroPerf", "tests\benchmarks\CompiledCodeBenchmarks\MicroPerf\MicroPerf.fsproj", "{EE08E954-AE91-4EFA-8595-10931D29E628}"
176-
EndProject
177-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicroPerf", "MicroPerf", "{47112E07-9FF1-43E7-8021-F2A21D6A19A0}"
178-
EndProject
179173
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "shims", "vsintegration\shims\shims.csproj", "{B1E30F2C-894F-47A9-9C8A-3324831E7D26}"
180174
EndProject
181-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PEVerify", "tests\PEVerify\PEVerify.csproj", "{035CF639-9704-44C0-96AA-BCB132AA881A}"
182-
EndProject
183175
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fscAnyCpu", "src\fsc\fscAnyCpuProject\fscAnyCpu.fsproj", "{597D9896-4B90-4E9E-9C99-445C2CB9FF60}"
184176
EndProject
185177
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fscArm64", "src\fsc\fscArm64Project\fscArm64.fsproj", "{0973C362-585C-4838-9459-D7E45C6B784B}"
@@ -931,30 +923,6 @@ Global
931923
{564E7DC5-11CB-4FCF-ABDD-23AD93AF3A61}.Release|Any CPU.Build.0 = Release|Any CPU
932924
{564E7DC5-11CB-4FCF-ABDD-23AD93AF3A61}.Release|x86.ActiveCfg = Release|Any CPU
933925
{564E7DC5-11CB-4FCF-ABDD-23AD93AF3A61}.Release|x86.Build.0 = Release|Any CPU
934-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
935-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
936-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Debug|x86.ActiveCfg = Debug|Any CPU
937-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Debug|x86.Build.0 = Debug|Any CPU
938-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
939-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Proto|Any CPU.Build.0 = Debug|Any CPU
940-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Proto|x86.ActiveCfg = Debug|Any CPU
941-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Proto|x86.Build.0 = Debug|Any CPU
942-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
943-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Release|Any CPU.Build.0 = Release|Any CPU
944-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Release|x86.ActiveCfg = Release|Any CPU
945-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2}.Release|x86.Build.0 = Release|Any CPU
946-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
947-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Debug|Any CPU.Build.0 = Debug|Any CPU
948-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Debug|x86.ActiveCfg = Debug|Any CPU
949-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Debug|x86.Build.0 = Debug|Any CPU
950-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
951-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Proto|Any CPU.Build.0 = Debug|Any CPU
952-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Proto|x86.ActiveCfg = Debug|Any CPU
953-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Proto|x86.Build.0 = Debug|Any CPU
954-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Release|Any CPU.ActiveCfg = Release|Any CPU
955-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Release|Any CPU.Build.0 = Release|Any CPU
956-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Release|x86.ActiveCfg = Release|Any CPU
957-
{EE08E954-AE91-4EFA-8595-10931D29E628}.Release|x86.Build.0 = Release|Any CPU
958926
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
959927
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Debug|Any CPU.Build.0 = Debug|Any CPU
960928
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -967,18 +935,6 @@ Global
967935
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Release|Any CPU.Build.0 = Release|Any CPU
968936
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Release|x86.ActiveCfg = Release|Any CPU
969937
{B1E30F2C-894F-47A9-9C8A-3324831E7D26}.Release|x86.Build.0 = Release|Any CPU
970-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
971-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Debug|Any CPU.Build.0 = Debug|Any CPU
972-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Debug|x86.ActiveCfg = Debug|Any CPU
973-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Debug|x86.Build.0 = Debug|Any CPU
974-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
975-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Proto|Any CPU.Build.0 = Debug|Any CPU
976-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Proto|x86.ActiveCfg = Debug|Any CPU
977-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Proto|x86.Build.0 = Debug|Any CPU
978-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Release|Any CPU.ActiveCfg = Release|Any CPU
979-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Release|Any CPU.Build.0 = Release|Any CPU
980-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Release|x86.ActiveCfg = Release|Any CPU
981-
{035CF639-9704-44C0-96AA-BCB132AA881A}.Release|x86.Build.0 = Release|Any CPU
982938
{597D9896-4B90-4E9E-9C99-445C2CB9FF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
983939
{597D9896-4B90-4E9E-9C99-445C2CB9FF60}.Debug|Any CPU.Build.0 = Debug|Any CPU
984940
{597D9896-4B90-4E9E-9C99-445C2CB9FF60}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1133,11 +1089,7 @@ Global
11331089
{B5A9BBD9-2F45-4722-A6CA-BAE3C64CD4E2} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
11341090
{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
11351091
{A422D673-8E3B-4924-821B-DD3174173426} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
1136-
{208E36EE-665C-42D2-B767-C6DB03C4FEB2} = {47112E07-9FF1-43E7-8021-F2A21D6A19A0}
1137-
{EE08E954-AE91-4EFA-8595-10931D29E628} = {47112E07-9FF1-43E7-8021-F2A21D6A19A0}
1138-
{47112E07-9FF1-43E7-8021-F2A21D6A19A0} = {DFB6ADD7-3149-43D9-AFA0-FC4A818B472B}
11391092
{B1E30F2C-894F-47A9-9C8A-3324831E7D26} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
1140-
{035CF639-9704-44C0-96AA-BCB132AA881A} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
11411093
{597D9896-4B90-4E9E-9C99-445C2CB9FF60} = {B8DDA694-7939-42E3-95E5-265C2217C142}
11421094
{0973C362-585C-4838-9459-D7E45C6B784B} = {B8DDA694-7939-42E3-95E5-265C2217C142}
11431095
{E54456F4-D51A-4334-B225-92EBBED92B40} = {B8DDA694-7939-42E3-95E5-265C2217C142}

‎azure-pipelines.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,50 @@ stages:
605605
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
606606
displayName: Regular rebuild of FSharp.Compiler.Service.sln
607607

608+
# Test trimming on Windows
609+
- job: Build_And_Test_Trimming_Windows
610+
pool:
611+
name: NetCore-Public
612+
demands: ImageOverride -equals $(WindowsMachineQueueName)
613+
strategy:
614+
maxParallel: 2
615+
matrix:
616+
compressed_metadata:
617+
_kind: "-compressAllMetadata"
618+
classic_metadata:
619+
_kind: ""
620+
variables:
621+
- name: _BuildConfig
622+
value: Release
623+
steps:
624+
- checkout: self
625+
clean: true
626+
- task: UseDotNet@2
627+
displayName: install SDK
628+
inputs:
629+
packageType: sdk
630+
useGlobalJson: true
631+
includePreviewVersions: true
632+
workingDirectory: $(Build.SourcesDirectory)
633+
installationPath: $(Agent.ToolsDirectory)/dotnet
634+
- script: dotnet --list-sdks
635+
displayName: Report dotnet SDK versions
636+
- script: .\Build.cmd $(_kind) -pack -c $(_BuildConfig)
637+
displayName: Initial build and prepare packages.
638+
- script: dotnet publish -c $(_BuildConfig) -bl:\"./bin/$(_BuildConfig)/net7.0/win-x64/publish/Trimming.binlog\"
639+
displayName: Build and publish a trim test package.
640+
workingDirectory: $(Build.SourcesDirectory)/tests/projects/SelfContained_Trimming_Test
641+
- script: .\check.cmd
642+
displayName: Check the state of the trimmed app.
643+
workingDirectory: $(Build.SourcesDirectory)/tests/projects/SelfContained_Trimming_Test
644+
- task: PublishPipelineArtifact@1
645+
displayName: Publish Trim Tests Logs
646+
inputs:
647+
targetPath: '$(Build.SourcesDirectory)/tests/projects/SelfContained_Trimming_Test/bin/$(_BuildConfig)/net7.0/win-x64/publish'
648+
artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)'
649+
continueOnError: true
650+
condition: always()
651+
608652
# Arcade-powered source build
609653
# turned off until https://github.com/dotnet/source-build/issues/1795 is fixed
610654
# - template: /eng/common/templates/jobs/jobs.yml

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22419.1">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22466.3">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha>
13+
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22466.3">
17+
<Uri>https://github.com/dotnet/arcade</Uri>
18+
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
19+
</Dependency>
1620
</ToolsetDependencies>
1721
</Dependencies>

‎eng/Versions.props‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -83,35 +83,16 @@
8383
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
8484
</RestoreSources>
8585
<!-- System.* packages -->
86+
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
87+
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
8688
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
8789
<SystemCollectionsImmutableVersion>5.0.0</SystemCollectionsImmutableVersion>
88-
<SystemConsoleVersion>4.3.0</SystemConsoleVersion>
89-
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
90-
<SystemDesignVersion>4.0.0</SystemDesignVersion>
91-
<SystemDiagnosticsDiagnosticSourceVersion>5.0.1</SystemDiagnosticsDiagnosticSourceVersion>
92-
<SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
93-
<SystemDiagnosticsTraceSourceVersion>4.3.0</SystemDiagnosticsTraceSourceVersion>
9490
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
95-
<SystemIoCompressionVersion>4.3.0</SystemIoCompressionVersion>
96-
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
97-
<SystemLinqQueryableVersion>4.3.0</SystemLinqQueryableVersion>
91+
<SystemDiagnosticsDiagnosticSourceVersion>5.0.1</SystemDiagnosticsDiagnosticSourceVersion>
9892
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
99-
<SystemNetRequestsVersion>4.3.0</SystemNetRequestsVersion>
100-
<SystemNetSecurityVersion>4.3.1</SystemNetSecurityVersion>
101-
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
93+
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
10294
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
103-
<SystemReflectionTypeExtensionsVersion>4.3.0</SystemReflectionTypeExtensionsVersion>
104-
<SystemRuntimeCachingVersion>1.5.0</SystemRuntimeCachingVersion>
105-
<SystemRuntimeVersion>4.3.0</SystemRuntimeVersion>
106-
<SystemRuntimeInteropServicesVersion>4.3.0</SystemRuntimeInteropServicesVersion>
107-
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
108-
<SystemSecurityClaimsVersion>4.3.0</SystemSecurityClaimsVersion>
109-
<SystemSecurityCryptographyAlgorithmsVersion>4.3.0</SystemSecurityCryptographyAlgorithmsVersion>
110-
<SystemSecurityPrincipalVersion>4.3.0</SystemSecurityPrincipalVersion>
111-
<SystemThreadingTasksParallelVersion>4.3.0</SystemThreadingTasksParallelVersion>
11295
<SystemThreadingTasksDataflow>4.11.1</SystemThreadingTasksDataflow>
113-
<SystemThreadingThreadVersion>4.3.0</SystemThreadingThreadVersion>
114-
<SystemThreadingThreadPoolVersion>4.3.0</SystemThreadingThreadPoolVersion>
11596
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
11697
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
11798
<!-- Versions for package groups -->
@@ -130,6 +111,7 @@
130111
<MicrosoftCodeAnalysisCSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion>
131112
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
132113
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
114+
<MicrosoftCodeAnalysisCompilersVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCompilersVersion>
133115
<!-- Visual Studio Shell packages -->
134116
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
135117
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
@@ -203,6 +185,7 @@
203185
<MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
204186
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
205187
<!-- other packages -->
188+
<BenchmarkDotNetVersion>0.13.2</BenchmarkDotNetVersion>
206189
<FsCheckVersion>2.16.5</FsCheckVersion>
207190
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
208191
<MicrosoftCompositionVersion>1.0.30</MicrosoftCompositionVersion>

0 commit comments

Comments
 (0)