diff --git a/eng/slngen.targets b/eng/slngen.targets
index 551f4fc486c..d7622098f1e 100644
--- a/eng/slngen.targets
+++ b/eng/slngen.targets
@@ -1,10 +1,10 @@
- $(SlnGenSolutionFolder)gen
- $(SlnGenSolutionFolder)ref
- $(SlnGenSolutionFolder)tests
- $(SlnGenSolutionFolder)src
+ $(SlnGenSolutionFolder)gen$(SlnGenSolutionInnerFolder)
+ $(SlnGenSolutionFolder)ref$(SlnGenSolutionInnerFolder)
+ $(SlnGenSolutionFolder)tests$(SlnGenSolutionInnerFolder)
+ $(SlnGenSolutionFolder)src$(SlnGenSolutionInnerFolder)
diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln
index 597708767e0..6672fa99e73 100644
--- a/src/libraries/System.Runtime/System.Runtime.sln
+++ b/src/libraries/System.Runtime/System.Runtime.sln
@@ -225,6 +225,56 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{28140562-A65A-48E9-ABAB-53BA939084F0}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Buffers.Tests", "tests\System.Buffers.Tests", "{A8F66678-BCB4-4F6B-B25A-600FE36C8564}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Diagnostics.Debug.Tests", "tests\System.Diagnostics.Debug.Tests", "{21065BE2-2867-4CE8-A903-8B740CC64B78}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Diagnostics.Tools.Tests", "tests\System.Diagnostics.Tools.Tests", "{23D9BABE-C96D-44F2-A9F6-C26D5AD62AF9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Dynamic.Runtime.Tests", "tests\System.Dynamic.Runtime.Tests", "{3DFDB754-40F3-4D77-92DE-C5375D6C7A57}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Globalization.Calendars.Tests", "tests\System.Globalization.Calendars.Tests", "{606124FE-6314-43D7-AA19-35334046FF29}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Globalization.Extensions.Tests", "tests\System.Globalization.Extensions.Tests", "{BB82924E-1218-401C-85C2-F455FFA797F4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Globalization.Tests", "tests\System.Globalization.Tests", "{8518F031-3709-45D6-B577-356E32BB5FF7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.IO.FileSystem.Primitives.Tests", "tests\System.IO.FileSystem.Primitives.Tests", "{9DAF4ABC-9D97-4B12-9524-02DEEA8BF5B0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.IO.FileSystem.Tests", "tests\System.IO.FileSystem.Tests", "{242CC51B-8B02-4679-8899-77631E6B6AD0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.IO.Tests", "tests\System.IO.Tests", "{60ED493D-0A65-4052-9B5E-547451CB1E6B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.IO.UnmanagedMemoryStream.Tests", "tests\System.IO.UnmanagedMemoryStream.Tests", "{34FC303C-B543-4E5B-BDA8-DE9B3C4BFEFA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Reflection.Tests", "tests\System.Reflection.Tests", "{0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Resources.Reader.Tests", "tests\System.Resources.Reader.Tests", "{AAC70548-7854-4CEE-A06F-C148602C1993}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Resources.ResourceManager.Tests", "tests\System.Resources.ResourceManager.Tests", "{BBB16624-A02E-443C-AFE2-A4A98F42B59C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Runtime.CompilerServices.Unsafe.Tests", "tests\System.Runtime.CompilerServices.Unsafe.Tests", "{E0CBE95A-2098-4848-BB89-87D92AA9FE0D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Runtime.Extensions.Tests", "tests\System.Runtime.Extensions.Tests", "{E38C85C0-9609-4CAA-B55B-2B78B0BC70FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Runtime.Handles.Tests", "tests\System.Runtime.Handles.Tests", "{B7E9D0DA-FE45-4CB8-9CE1-D5E52917E3B3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Runtime.InteropServices.RuntimeInformation.Tests", "tests\System.Runtime.InteropServices.RuntimeInformation.Tests", "{AF750AE8-AB38-44E3-BECD-5267DD578957}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Runtime.Tests", "tests\System.Runtime.Tests", "{88C12684-74BD-4E2F-8F95-587EC30FE39B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Security.SecureString.Tests", "tests\System.Security.SecureString.Tests", "{6433F4E3-DFC6-4549-8632-797CB749D880}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Text.Encoding.Tests", "tests\System.Text.Encoding.Tests", "{5961F488-A1DD-4B28-A610-F3D616ED6766}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Threading.Tasks.Extensions.Tests", "tests\System.Threading.Tasks.Extensions.Tests", "{87ED1E88-3518-4BAA-9DEA-3379A48DCFD4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Threading.Tasks.Tests", "tests\System.Threading.Tasks.Tests", "{2B160F79-3016-4753-A009-00DC97F2730C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.Threading.Timer.Tests", "tests\System.Threading.Timer.Tests", "{0527FC3D-2997-4C7B-B63C-306F7A52BEBD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.ValueTuple.Tests", "tests\System.ValueTuple.Tests", "{DBFE9843-8DB5-46BC-B243-B3A0B98326C9}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FD72C125-C10D-457B-8AFC-6B4E5237AF6A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5B2B5E7E-A2FB-4095-9E79-404BF53E0133}"
@@ -2639,78 +2689,103 @@ Global
{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13} = {28140562-A65A-48E9-ABAB-53BA939084F0}
{50F1165C-5F71-472C-B317-35FFC14665EA} = {28140562-A65A-48E9-ABAB-53BA939084F0}
{069C2B51-069A-4FBB-BFE9-42D573F1CEEA} = {28140562-A65A-48E9-ABAB-53BA939084F0}
+ {A3873DDB-47E7-4DB6-872C-4B46A779913A} = {A8F66678-BCB4-4F6B-B25A-600FE36C8564}
+ {A8F66678-BCB4-4F6B-B25A-600FE36C8564} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {23D41678-453F-4F2A-85F1-167E63DA6D67} = {21065BE2-2867-4CE8-A903-8B740CC64B78}
+ {21065BE2-2867-4CE8-A903-8B740CC64B78} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {6790611D-ACE0-47C6-83E0-E404364B5210} = {23D9BABE-C96D-44F2-A9F6-C26D5AD62AF9}
+ {23D9BABE-C96D-44F2-A9F6-C26D5AD62AF9} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9} = {3DFDB754-40F3-4D77-92DE-C5375D6C7A57}
+ {3DFDB754-40F3-4D77-92DE-C5375D6C7A57} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {B73090B8-20CB-4586-A586-B7F37C1A06FF} = {606124FE-6314-43D7-AA19-35334046FF29}
+ {4C1F2761-857C-40A4-8CDD-7139380DA4D7} = {606124FE-6314-43D7-AA19-35334046FF29}
+ {70441C80-1F14-42F9-8225-A891E3C9A82A} = {606124FE-6314-43D7-AA19-35334046FF29}
+ {EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6} = {606124FE-6314-43D7-AA19-35334046FF29}
+ {606124FE-6314-43D7-AA19-35334046FF29} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {1C44735B-C77E-479A-ABBB-8B6EB83299CF} = {BB82924E-1218-401C-85C2-F455FFA797F4}
+ {0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531} = {BB82924E-1218-401C-85C2-F455FFA797F4}
+ {CA97D5F2-4D71-4448-8DEB-E18C237C76B3} = {BB82924E-1218-401C-85C2-F455FFA797F4}
+ {BB82924E-1218-401C-85C2-F455FFA797F4} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {C5F86889-E147-4424-9165-D2DF453741F2} = {8518F031-3709-45D6-B577-356E32BB5FF7}
+ {67D9B289-AA6D-4FD8-A99D-F8651A51BE7E} = {8518F031-3709-45D6-B577-356E32BB5FF7}
+ {B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12} = {8518F031-3709-45D6-B577-356E32BB5FF7}
+ {EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9} = {8518F031-3709-45D6-B577-356E32BB5FF7}
+ {32247916-74DE-4A62-AE68-04976D2B0149} = {8518F031-3709-45D6-B577-356E32BB5FF7}
+ {5090E2BE-4BC9-4027-BF67-452049996F43} = {8518F031-3709-45D6-B577-356E32BB5FF7}
+ {8518F031-3709-45D6-B577-356E32BB5FF7} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {61164A2A-D90F-4122-AF5D-9704564E80E0} = {9DAF4ABC-9D97-4B12-9524-02DEEA8BF5B0}
+ {9DAF4ABC-9D97-4B12-9524-02DEEA8BF5B0} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {FDAB957F-5C83-4946-ACF5-825B2B6DAFE6} = {242CC51B-8B02-4679-8899-77631E6B6AD0}
+ {652F0921-C134-4882-A9D0-0CBB2F8D75B2} = {242CC51B-8B02-4679-8899-77631E6B6AD0}
+ {C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016} = {242CC51B-8B02-4679-8899-77631E6B6AD0}
+ {242CC51B-8B02-4679-8899-77631E6B6AD0} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {CFC724F4-18A2-401F-AED4-7D7A779CE3EA} = {60ED493D-0A65-4052-9B5E-547451CB1E6B}
+ {60ED493D-0A65-4052-9B5E-547451CB1E6B} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {9AA6AAD7-E09B-4F9E-B398-1734A5815B6B} = {34FC303C-B543-4E5B-BDA8-DE9B3C4BFEFA}
+ {34FC303C-B543-4E5B-BDA8-DE9B3C4BFEFA} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {E73952E5-C929-4566-962A-B9AF65289871} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {9299BE78-5A00-425A-A38F-7F1DC9C3F63E} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {A6D86695-D570-43F9-99A3-6C7445362D53} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {852EA6A6-CED9-467C-9B58-9983ADBEA89A} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {259CC89C-F5E0-4CF0-92FA-3075E0142589} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {E884B43D-FD9D-41C6-9C1D-5F49C472032D} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {A5260207-E621-4792-A09D-9DF5DA16FFE6} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {55C65AC8-0FC0-4A3B-B342-61D4686ABB9A} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {D592CC73-099B-499C-80E6-FFBE5E4FA14A} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {673597FC-FDC9-46A8-B503-D670FC9BD22E} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {CC8D4A15-9101-4041-B992-B6AA4D5F3C64} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {049319F0-D438-404C-A6D4-4D1E99DAE647} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {691D460F-764F-48E7-9A3F-7D1A32388542} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {9F1AC402-BFAD-4EA2-AD31-BBCA73375953} = {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013}
+ {0A2BFEE4-98EE-4AB5-8811-BB1B3207D013} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {DBDA55A9-4BB9-4FF8-9066-EE7157E627C1} = {AAC70548-7854-4CEE-A06F-C148602C1993}
+ {AAC70548-7854-4CEE-A06F-C148602C1993} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {00807FA3-A9B3-4AF4-86CD-CF10255E6E8C} = {BBB16624-A02E-443C-AFE2-A4A98F42B59C}
+ {BBB16624-A02E-443C-AFE2-A4A98F42B59C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {E88FDBA9-3D1D-480D-8AB3-341C9E442D03} = {E0CBE95A-2098-4848-BB89-87D92AA9FE0D}
+ {E0CBE95A-2098-4848-BB89-87D92AA9FE0D} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {AD4767E9-57F6-47DD-ABD3-D3AFDF384703} = {E38C85C0-9609-4CAA-B55B-2B78B0BC70FC}
+ {E1847313-0072-49CA-A1E6-6C05CECAB77A} = {E38C85C0-9609-4CAA-B55B-2B78B0BC70FC}
+ {D86CC877-79A0-4AFA-9A76-7263B414614D} = {E38C85C0-9609-4CAA-B55B-2B78B0BC70FC}
+ {E5E5C278-EBB9-4704-B7BA-56D39A5A343C} = {E38C85C0-9609-4CAA-B55B-2B78B0BC70FC}
+ {59CD73F2-1310-46EE-B99A-594859FD8A37} = {E38C85C0-9609-4CAA-B55B-2B78B0BC70FC}
+ {3D58505D-F17F-49E0-9131-42F273E3F5B9} = {E38C85C0-9609-4CAA-B55B-2B78B0BC70FC}
+ {E38C85C0-9609-4CAA-B55B-2B78B0BC70FC} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {0BF9F165-888D-486A-B6FD-6F3029913D70} = {B7E9D0DA-FE45-4CB8-9CE1-D5E52917E3B3}
+ {B7E9D0DA-FE45-4CB8-9CE1-D5E52917E3B3} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {C485C170-2B88-4EA9-8826-7BC4C9BA2324} = {AF750AE8-AB38-44E3-BECD-5267DD578957}
+ {AF750AE8-AB38-44E3-BECD-5267DD578957} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {43C40A0B-0B0E-4D27-8534-11CD5A540F7C} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {3B79DD71-8C2F-41BC-A1A7-86A490D6C726} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {4EE36055-AD7C-4779-B3F6-08687960DCC3} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {C3F25EEF-04B4-407A-960B-0C1CE9C04430} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {47E26787-7C27-4572-AD8B-868DE44E2C48} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {C230AC88-A377-4BEB-824F-AB174C14DC86} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {0F83B07B-2E3F-4708-BE6D-7A8DA8168803} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {833C1D45-9BBB-4A92-93B7-4EFFD9E945AD} = {88C12684-74BD-4E2F-8F95-587EC30FE39B}
+ {88C12684-74BD-4E2F-8F95-587EC30FE39B} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B} = {6433F4E3-DFC6-4549-8632-797CB749D880}
+ {6433F4E3-DFC6-4549-8632-797CB749D880} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {697C63A2-2517-4F85-8B88-C94E538BE407} = {5961F488-A1DD-4B28-A610-F3D616ED6766}
+ {5961F488-A1DD-4B28-A610-F3D616ED6766} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {90F8C08F-A6D0-4AA0-8615-9279E5E4FC19} = {87ED1E88-3518-4BAA-9DEA-3379A48DCFD4}
+ {87ED1E88-3518-4BAA-9DEA-3379A48DCFD4} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {172F6EB9-6001-4657-8AE2-83DB23B371CA} = {2B160F79-3016-4753-A009-00DC97F2730C}
+ {2B160F79-3016-4753-A009-00DC97F2730C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {7E3B4C81-9010-4473-BD3C-5B90F9533CD7} = {0527FC3D-2997-4C7B-B63C-306F7A52BEBD}
+ {0527FC3D-2997-4C7B-B63C-306F7A52BEBD} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
+ {BBC59E42-DC0B-4847-B336-13ACF4279F17} = {DBFE9843-8DB5-46BC-B243-B3A0B98326C9}
+ {DBFE9843-8DB5-46BC-B243-B3A0B98326C9} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
{F86D6534-1A96-489E-A807-C14E616686D6} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
{AF7BA66D-EA0E-4755-8DA8-4CFE9B935F83} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
{9DF0247E-5B81-4EF3-82CA-3E70B3A56742} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
{FB17AC52-1633-4845-932B-9218DF895957} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {A3873DDB-47E7-4DB6-872C-4B46A779913A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {23D41678-453F-4F2A-85F1-167E63DA6D67} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {6790611D-ACE0-47C6-83E0-E404364B5210} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {68DE62F3-AB3A-4AC9-BCEB-CAD95B48D5F9} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {B73090B8-20CB-4586-A586-B7F37C1A06FF} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {4C1F2761-857C-40A4-8CDD-7139380DA4D7} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {70441C80-1F14-42F9-8225-A891E3C9A82A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {EA3FA657-060E-43A3-9CF0-45FCC8E7E5B6} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {1C44735B-C77E-479A-ABBB-8B6EB83299CF} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {0AB5F4E7-A0D5-44C5-A1CF-37CDBDC2F531} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {CA97D5F2-4D71-4448-8DEB-E18C237C76B3} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {C5F86889-E147-4424-9165-D2DF453741F2} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {67D9B289-AA6D-4FD8-A99D-F8651A51BE7E} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {B6F2F0D5-9275-4F00-A2C3-2048AF0CAF12} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {EF24E79E-0E96-4228-9D8E-44E1C2D8BDA9} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {32247916-74DE-4A62-AE68-04976D2B0149} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {5090E2BE-4BC9-4027-BF67-452049996F43} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {61164A2A-D90F-4122-AF5D-9704564E80E0} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {FDAB957F-5C83-4946-ACF5-825B2B6DAFE6} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {652F0921-C134-4882-A9D0-0CBB2F8D75B2} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {C51DBBBF-3BBA-4345-AEAA-E6A21F9F7016} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {CFC724F4-18A2-401F-AED4-7D7A779CE3EA} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {9AA6AAD7-E09B-4F9E-B398-1734A5815B6B} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {E73952E5-C929-4566-962A-B9AF65289871} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {9299BE78-5A00-425A-A38F-7F1DC9C3F63E} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {A6D86695-D570-43F9-99A3-6C7445362D53} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {852EA6A6-CED9-467C-9B58-9983ADBEA89A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {259CC89C-F5E0-4CF0-92FA-3075E0142589} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {E884B43D-FD9D-41C6-9C1D-5F49C472032D} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {8C5E25F3-C1ED-44DC-9019-D60E5CD24BDB} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {0B62ADE9-B3E6-4727-8F35-6C7A46B0DB1C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {9DE2AE90-EB4B-45D6-84AD-A4C4FAEF5658} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {A5260207-E621-4792-A09D-9DF5DA16FFE6} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {55C65AC8-0FC0-4A3B-B342-61D4686ABB9A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {D592CC73-099B-499C-80E6-FFBE5E4FA14A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {3E97D9E1-4C2B-4FA2-98F7-977B593F8DB5} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {673597FC-FDC9-46A8-B503-D670FC9BD22E} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {F17096B7-5C4E-4FE0-BD5A-0180C0D34B6A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {CC8D4A15-9101-4041-B992-B6AA4D5F3C64} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {049319F0-D438-404C-A6D4-4D1E99DAE647} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {691D460F-764F-48E7-9A3F-7D1A32388542} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {9F1AC402-BFAD-4EA2-AD31-BBCA73375953} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {DBDA55A9-4BB9-4FF8-9066-EE7157E627C1} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {00807FA3-A9B3-4AF4-86CD-CF10255E6E8C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {E88FDBA9-3D1D-480D-8AB3-341C9E442D03} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {AD4767E9-57F6-47DD-ABD3-D3AFDF384703} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {E1847313-0072-49CA-A1E6-6C05CECAB77A} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {D86CC877-79A0-4AFA-9A76-7263B414614D} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {E5E5C278-EBB9-4704-B7BA-56D39A5A343C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {59CD73F2-1310-46EE-B99A-594859FD8A37} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {3D58505D-F17F-49E0-9131-42F273E3F5B9} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {0BF9F165-888D-486A-B6FD-6F3029913D70} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {C485C170-2B88-4EA9-8826-7BC4C9BA2324} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {43C40A0B-0B0E-4D27-8534-11CD5A540F7C} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {3B79DD71-8C2F-41BC-A1A7-86A490D6C726} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {4EE36055-AD7C-4779-B3F6-08687960DCC3} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {C3F25EEF-04B4-407A-960B-0C1CE9C04430} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {47E26787-7C27-4572-AD8B-868DE44E2C48} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {C230AC88-A377-4BEB-824F-AB174C14DC86} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {0F83B07B-2E3F-4708-BE6D-7A8DA8168803} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {833C1D45-9BBB-4A92-93B7-4EFFD9E945AD} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {26676FE3-DDF7-4A5E-9ABA-417E0C24CA7B} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {697C63A2-2517-4F85-8B88-C94E538BE407} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {90F8C08F-A6D0-4AA0-8615-9279E5E4FC19} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {172F6EB9-6001-4657-8AE2-83DB23B371CA} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {7E3B4C81-9010-4473-BD3C-5B90F9533CD7} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
- {BBC59E42-DC0B-4847-B336-13ACF4279F17} = {FD72C125-C10D-457B-8AFC-6B4E5237AF6A}
{86CF47B3-D607-4F59-896F-982FEA116086} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
{484B12B8-F027-4960-BAA9-14D646C80A28} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
{F0BB4F76-7697-49A8-8204-FD4516EB325C} = {5B2B5E7E-A2FB-4095-9E79-404BF53E0133}
diff --git a/src/libraries/System.Runtime/tests/Directory.Build.props b/src/libraries/System.Runtime/tests/Directory.Build.props
new file mode 100644
index 00000000000..e5cc0e5eda0
--- /dev/null
+++ b/src/libraries/System.Runtime/tests/Directory.Build.props
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+ $(MSBuildProjectFullPath.Replace('$(MSBuildThisFileDirectory)', ''))
+ \$(ThisProjectRelativePath.Remove($(ThisProjectRelativePath.IndexOf('$([System.IO.Path]::DirectorySeparatorChar)'))).Replace('/', '\'))
+
+
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/tests/System.Reflection.Tests/System.Reflection.Tests.slnf b/src/libraries/System.Runtime/tests/System.Reflection.Tests/System.Reflection.Tests.slnf
new file mode 100644
index 00000000000..ea61d91a05e
--- /dev/null
+++ b/src/libraries/System.Runtime/tests/System.Reflection.Tests/System.Reflection.Tests.slnf
@@ -0,0 +1,41 @@
+{
+ "solution": {
+ "path": "..\\..\\System.Runtime.sln",
+ "projects": [
+ "..\\..\\coreclr\\System.Private.CoreLib\\System.Private.CoreLib.csproj",
+ "..\\..\\tools\\illink\\src\\ILLink.CodeFix\\ILLink.CodeFixProvider.csproj",
+ "..\\..\\tools\\illink\\src\\ILLink.RoslynAnalyzer\\ILLink.RoslynAnalyzer.csproj",
+ "..\\..\\tools\\illink\\src\\ILLink.Tasks\\ILLink.Tasks.csproj",
+ "..\\..\\tools\\illink\\src\\linker\\Mono.Linker.csproj",
+ "..\\..\\tools\\illink\\src\\linker\\ref\\Mono.Linker.csproj",
+ "..\\Common\\tests\\TestUtilities\\TestUtilities.csproj",
+ "..\\System.Private.CoreLib\\gen\\System.Private.CoreLib.Generators.csproj",
+ "..\\System.Private.CoreLib\\ref\\System.Private.CoreLib.csproj",
+ "..\\System.Private.Uri\\src\\System.Private.Uri.csproj",
+ "..\\System.Runtime.InteropServices\\gen\\ComInterfaceGenerator\\ComInterfaceGenerator.csproj",
+ "..\\System.Runtime.InteropServices\\gen\\LibraryImportGenerator\\LibraryImportGenerator.csproj",
+ "..\\System.Runtime.InteropServices\\gen\\Microsoft.Interop.SourceGeneration\\Microsoft.Interop.SourceGeneration.csproj",
+ "ref\\System.Runtime.csproj",
+ "src\\System.Runtime.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_0_0_0_0.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_0_0_0.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_1_0_0.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_1_1_0.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_1_1_2.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_1_1_3.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_1_2_0.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_1_3_0.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_2_0_0.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_1_3_0_0.csproj",
+ "tests\\System.Reflection.Tests\\AssemblyVersion\\System.Reflection.Tests.Assembly_3_0_0_0.csproj",
+ "tests\\System.Reflection.Tests\\CoreCLR\\System.Reflection.CoreCLR.Tests.csproj",
+ "tests\\System.Reflection.Tests\\ForwardedTypesAssembly\\ForwardedTypesAssembly.csproj",
+ "tests\\System.Reflection.Tests\\InvokeEmit\\System.Reflection.InvokeEmit.Tests.csproj",
+ "tests\\System.Reflection.Tests\\InvokeInterpreted\\System.Reflection.InvokeInterpreted.Tests.csproj",
+ "tests\\System.Reflection.Tests\\System.Reflection.Tests.csproj",
+ "tests\\System.Reflection.Tests\\TestAssembly\\TestAssembly.csproj",
+ "tests\\System.Reflection.Tests\\TestExe\\System.Reflection.TestExe.csproj",
+ "tests\\System.Reflection.Tests\\UnloadableAssembly\\UnloadableAssembly.csproj"
+ ]
+ }
+}
\ No newline at end of file