From af0227fad06abc47fe109960a695054b0dcdd473 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 13 Nov 2023 17:00:14 +0100 Subject: [PATCH] Fix slngen CoreLib folder (#94668) CoreLib was placed in a "srcsrc" folder instead of "src" as SlnGenSolutionFolder was defined twice. --- .../System.Private.CoreLib.csproj | 1 - .../Microsoft.Win32.Primitives.sln | 8 ++--- .../System.Collections.Concurrent.sln | 14 ++++---- .../System.Collections/System.Collections.sln | 8 ++--- ...tem.Configuration.ConfigurationManager.sln | 10 +++--- .../System.Data.Common/System.Data.Common.sln | 18 +++++----- .../System.Data.OleDb/System.Data.Oledb.sln | 10 +++--- .../System.Diagnostics.Contracts.sln | 8 ++--- .../System.Diagnostics.PerformanceCounter.sln | 10 +++--- .../System.Diagnostics.Process.sln | 28 +++++++-------- .../System.Diagnostics.StackTrace.sln | 24 ++++++------- .../System.Diagnostics.TraceSource.sln | 12 +++---- .../System.Diagnostics.Tracing.sln | 8 ++--- ...em.DirectoryServices.AccountManagement.sln | 10 +++--- .../System.DirectoryServices.Protocols.sln | 10 +++--- .../System.DirectoryServices.sln | 10 +++--- .../System.IO.FileSystem.AccessControl.sln | 10 +++--- .../System.IO.IsolatedStorage.sln | 10 +++--- .../System.IO.Pipes/System.IO.Pipes.sln | 12 +++---- src/libraries/System.Memory/System.Memory.sln | 8 ++--- .../System.Numerics.Vectors.sln | 8 ++--- .../System.Private.Uri/System.Private.Uri.sln | 8 ++--- .../System.Reflection.Emit.ILGeneration.sln | 8 ++--- .../System.Reflection.Emit.Lightweight.sln | 8 ++--- .../System.Reflection.Emit.sln | 18 +++++----- .../System.Reflection.Primitives.sln | 8 ++--- .../System.Reflection.TypeExtensions.sln | 8 ++--- .../System.Resources.Extensions.sln | 10 +++--- .../System.Runtime.Caching.sln | 10 +++--- .../System.Runtime.InteropServices.sln | 16 ++++----- .../System.Runtime.Intrinsics.sln | 8 ++--- .../System.Runtime.Loader.sln | 32 ++++++++++++++--- ...ystem.Runtime.Serialization.Formatters.sln | 10 +++--- .../System.Runtime/System.Runtime.sln | 34 +++++++++---------- .../System.Security.Permissions.sln | 10 +++--- .../System.Text.Encoding.Extensions.sln | 8 ++--- .../System.Threading.Overlapped.sln | 8 ++--- .../System.Threading.Thread.sln | 8 ++--- .../System.Threading.ThreadPool.sln | 8 ++--- .../System.Threading/System.Threading.sln | 8 ++--- .../System.Windows.Extensions.sln | 10 +++--- .../System.Private.CoreLib.csproj | 1 - 42 files changed, 209 insertions(+), 267 deletions(-) diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj index 4531c27a2f6e6d..63e400de025bc3 100644 --- a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -56,7 +56,6 @@ true $(OutputPath)$(MSBuildProjectName).xml - src diff --git a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln index ef2dca7943a2e1..43eab4816f4a98 100644 --- a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln +++ b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln @@ -29,14 +29,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{C21B76F3-8455-4F3C-88D3-E733D388F317}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{FE54742C-ABB4-4863-8EAE-B72933AAD4F9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{44B79C97-BA70-4955-8478-87D5CB5CD3B5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CEC48784-C8F0-46DF-AA1E-07850E754180}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{08BAF9E0-068B-4201-91E6-91B725ABE3D2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{44B79C97-BA70-4955-8478-87D5CB5CD3B5}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A48D1F08-4510-44F9-9E77-7164B2769064}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{32BFF540-62FE-4B93-BE7E-A41853C63CA9}" @@ -395,13 +393,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {7D1AFE3C-882D-4D27-A915-B87A1BC82D2D} = {FE54742C-ABB4-4863-8EAE-B72933AAD4F9} + {7D1AFE3C-882D-4D27-A915-B87A1BC82D2D} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} + {B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} {069C76AC-B41A-4E17-A066-12233592145D} = {CEC48784-C8F0-46DF-AA1E-07850E754180} {B43D6BB6-1760-4DB9-87CB-792D42846C62} = {CEC48784-C8F0-46DF-AA1E-07850E754180} {EA142E29-EE37-4751-868B-27516AE0A209} = {08BAF9E0-068B-4201-91E6-91B725ABE3D2} {895AA9ED-9EBE-489A-B765-22D3358A3438} = {08BAF9E0-068B-4201-91E6-91B725ABE3D2} {EC1A6210-05C0-4F57-969C-0EE0F29B5B67} = {08BAF9E0-068B-4201-91E6-91B725ABE3D2} - {B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E} = {44B79C97-BA70-4955-8478-87D5CB5CD3B5} {5F4ABB4F-CE69-47B7-860F-40B0DA68A7DB} = {A48D1F08-4510-44F9-9E77-7164B2769064} {5918B01B-FCAE-4321-8DCA-44466A57C04E} = {A48D1F08-4510-44F9-9E77-7164B2769064} {EE5972A3-AD58-430B-ACEB-4F608FD1C0D6} = {A48D1F08-4510-44F9-9E77-7164B2769064} diff --git a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln index a9bd722e27fce0..5b118d03742c41 100644 --- a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln +++ b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln @@ -41,14 +41,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{86053D20-DEBA-4A02-A9A0-8E9F1EA088CE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{4AAACB52-764E-41A5-BAE3-BCAD7F69CFBB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{64657647-6C2C-4D36-A5D4-7E7534F3C66F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CA1F4ADE-3F2A-40E3-9242-549F88F0367F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{66E1333A-027B-4577-AED6-A2457698A6D9}" @@ -533,7 +531,11 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322} = {4AAACB52-764E-41A5-BAE3-BCAD7F69CFBB} + {A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} + {BFA1A52C-48B4-45C7-8595-B98236A11ED1} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} + {34C59132-692C-45D7-87BD-869A18F09E2C} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} + {93FB3527-B9E6-4ECA-8F36-56835F4F9236} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} + {FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} {7C2B8279-F7BB-4AD4-BA44-B9071090AF46} = {64657647-6C2C-4D36-A5D4-7E7534F3C66F} {C391ADBE-DD23-4F4A-B3EC-011974CC6CE8} = {64657647-6C2C-4D36-A5D4-7E7534F3C66F} {ADA6D062-1E28-47D8-A058-FE1F4551AA20} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F} @@ -542,10 +544,6 @@ Global {6C5BE0DF-C0E1-4971-9E4A-01105A4A013A} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F} {BE035215-7EB5-4B56-9DD2-67519A631A89} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F} {36F808C9-93D1-41D2-A2F8-E0F113B3F10F} = {CA1F4ADE-3F2A-40E3-9242-549F88F0367F} - {BFA1A52C-48B4-45C7-8595-B98236A11ED1} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} - {34C59132-692C-45D7-87BD-869A18F09E2C} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} - {93FB3527-B9E6-4ECA-8F36-56835F4F9236} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} - {FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2} = {C4EA7573-E0AC-45D9-A29A-F6C6DECED4B0} {431D18E4-4464-45C0-BBF2-1834B73E8095} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD} {1E072489-1073-4526-8C5D-64AC2A97BF9B} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD} {2DB3F8FB-BDD7-471E-BF8F-D3C4D6A2BDC3} = {93EF6213-7FD5-4A26-A8AB-AF8E4DB470FD} diff --git a/src/libraries/System.Collections/System.Collections.sln b/src/libraries/System.Collections/System.Collections.sln index b1f2bf2476b9ff..0eec5add565efc 100644 --- a/src/libraries/System.Collections/System.Collections.sln +++ b/src/libraries/System.Collections/System.Collections.sln @@ -29,14 +29,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F89047A1-9155-4856-B680-8871CE20E943}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{DFD58F3F-A3F8-4263-9C79-78FC2A01BEF4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C848C534-DD16-4A69-81FF-894456E4B099}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{06AE90FB-F007-4E70-BCD2-5CAD106A7C97}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C848C534-DD16-4A69-81FF-894456E4B099}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B958B834-96D2-4B18-AA42-22B312BE9925}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{ECAFEE63-F771-4990-B11D-86F64675F943}" @@ -395,13 +393,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {4385739F-14A1-4F21-96E3-12EA90580575} = {DFD58F3F-A3F8-4263-9C79-78FC2A01BEF4} + {4385739F-14A1-4F21-96E3-12EA90580575} = {C848C534-DD16-4A69-81FF-894456E4B099} + {DF501250-4105-4F79-A508-90B3A13A975A} = {C848C534-DD16-4A69-81FF-894456E4B099} {38D8F258-655E-459B-B2CE-0DED144AFBF7} = {6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805} {BB54ED9D-FF71-4D91-B7C0-984AB0976798} = {6CD2C5E3-B5BA-4219-B8EF-9B5D486BF805} {77E9C47D-4AC4-4402-8613-40DF427174BD} = {06AE90FB-F007-4E70-BCD2-5CAD106A7C97} {2B114AFB-EB05-4615-B0AC-8FFF0D5D0D13} = {06AE90FB-F007-4E70-BCD2-5CAD106A7C97} {EE21C87C-5515-45E1-9F94-F11BE4CEE2CA} = {06AE90FB-F007-4E70-BCD2-5CAD106A7C97} - {DF501250-4105-4F79-A508-90B3A13A975A} = {C848C534-DD16-4A69-81FF-894456E4B099} {F2E57833-4968-430D-8149-733DE03A7314} = {B958B834-96D2-4B18-AA42-22B312BE9925} {389B3CD7-FF7C-4004-A6BA-29B39B4BDF3A} = {B958B834-96D2-4B18-AA42-22B312BE9925} {00398A78-1620-4996-9922-C82D1AF84714} = {B958B834-96D2-4B18-AA42-22B312BE9925} diff --git a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln index cdac58ca71fee8..0e9382f21c09ce 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln +++ b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln @@ -53,12 +53,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4D98A009-1732-446B-A276-F299ABCA1936}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{7F9B8DF1-8408-48E2-8362-BA5E483A0201}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3393D976-CAF0-47D0-850E-7A44DF892122}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{751DA007-D916-4F22-AF16-85F343C2992C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BFBE3E0E-4E75-4665-A373-132D283D366D}" @@ -671,9 +669,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {2BA69856-B7AB-4113-ABC9-93E3613DF70E} = {7F9B8DF1-8408-48E2-8362-BA5E483A0201} - {15012FB4-9C7C-4DE0-AB44-83A64654D738} = {3393D976-CAF0-47D0-850E-7A44DF892122} - {9476F50F-E44C-4420-96AB-448259A47C4F} = {3393D976-CAF0-47D0-850E-7A44DF892122} + {2BA69856-B7AB-4113-ABC9-93E3613DF70E} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} {7228C70B-37CB-4200-A6D4-88724E3EBC76} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} {7C9D7BE4-BF9C-486C-8ADF-53DE282E018A} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} {B9C6FFBB-A992-4402-93DC-254C660CF16A} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} @@ -683,6 +679,8 @@ Global {7B2CA04A-9DFB-471E-B4CB-1937D0049B96} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} {2BE20C4A-C20B-4A0C-8E4A-31B681B6967D} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} {E34EBFC8-D1BC-4ED7-8335-C183A5994EE1} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A} + {15012FB4-9C7C-4DE0-AB44-83A64654D738} = {3393D976-CAF0-47D0-850E-7A44DF892122} + {9476F50F-E44C-4420-96AB-448259A47C4F} = {3393D976-CAF0-47D0-850E-7A44DF892122} {6F662E39-BB56-4BCF-B053-B4A1782A33E1} = {751DA007-D916-4F22-AF16-85F343C2992C} {C70C30E4-56DC-44FA-B621-9BB4C4E365D0} = {751DA007-D916-4F22-AF16-85F343C2992C} {412BDE9C-0383-4B72-8638-21F6427AA70D} = {751DA007-D916-4F22-AF16-85F343C2992C} diff --git a/src/libraries/System.Data.Common/System.Data.Common.sln b/src/libraries/System.Data.Common/System.Data.Common.sln index 518977d6e617b4..e377ad86749222 100644 --- a/src/libraries/System.Data.Common/System.Data.Common.sln +++ b/src/libraries/System.Data.Common/System.Data.Common.sln @@ -69,14 +69,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{AEC3AFB1-5825-4C79-89AE-679F510329B8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{83E4FB59-E8AB-41DD-9770-7ACC71364E6A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5924BF80-8349-4021-A4A3-853FE714A7C7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{79588763-C99B-4C1B-88D3-181A92A98364}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5924BF80-8349-4021-A4A3-853FE714A7C7}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{837B27D3-08EF-4E05-AFBF-7E84AEEC1C03}" @@ -855,7 +853,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {F3DC1DF9-698A-4970-9A5E-AB946D6F763B} = {83E4FB59-E8AB-41DD-9770-7ACC71364E6A} + {F3DC1DF9-698A-4970-9A5E-AB946D6F763B} = {5924BF80-8349-4021-A4A3-853FE714A7C7} + {4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5} = {5924BF80-8349-4021-A4A3-853FE714A7C7} + {0FCF2BA6-A5B3-4E1C-A49A-424E77602313} = {5924BF80-8349-4021-A4A3-853FE714A7C7} + {0AE3ABFE-6284-4119-A5DC-1844E6AB8E02} = {5924BF80-8349-4021-A4A3-853FE714A7C7} + {C3F9A601-07D8-43A3-A3CA-7A002358A102} = {5924BF80-8349-4021-A4A3-853FE714A7C7} + {7AB121D2-0AAC-48E0-A834-6E220ECFEC4D} = {5924BF80-8349-4021-A4A3-853FE714A7C7} + {09129981-6B0D-44C7-9F0A-AD2426106332} = {5924BF80-8349-4021-A4A3-853FE714A7C7} {0BD22D2A-C12C-4641-8F12-73D21AAAFBA3} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D} {BEBD7B5B-9544-42EB-B878-F009560CAAF4} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D} {23C88520-DA42-4015-9238-D3B211B00F8E} = {B1861E5E-4FCA-4CA5-9BB5-5A3C3DBC7F7D} @@ -874,12 +878,6 @@ Global {7E7FA8BC-C1F8-44D3-82BB-82D204B7BEA6} = {79588763-C99B-4C1B-88D3-181A92A98364} {5AD0D9CB-C773-4BBC-87BD-9BDFF172936E} = {79588763-C99B-4C1B-88D3-181A92A98364} {521CFFC1-DB45-4FB2-87EF-6BF4F413A011} = {79588763-C99B-4C1B-88D3-181A92A98364} - {4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {0FCF2BA6-A5B3-4E1C-A49A-424E77602313} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {0AE3ABFE-6284-4119-A5DC-1844E6AB8E02} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {C3F9A601-07D8-43A3-A3CA-7A002358A102} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {7AB121D2-0AAC-48E0-A834-6E220ECFEC4D} = {5924BF80-8349-4021-A4A3-853FE714A7C7} - {09129981-6B0D-44C7-9F0A-AD2426106332} = {5924BF80-8349-4021-A4A3-853FE714A7C7} {D5A85F0E-509A-424F-BFD0-A7CC38D43CCD} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782} {293AF059-A4CC-43FE-9A5F-E19579B4F7AC} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782} {44DCA516-EEB1-4976-9794-9D6A26A952E9} = {D92FD5A3-15A6-4EFA-ADC9-4DDEE8D31782} diff --git a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln index 087b3e513523d6..608a8ce7732b3f 100644 --- a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln +++ b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln @@ -61,12 +61,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F090E986-15B1-4C2C-94DF-ADE84C8A8D62}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{C0F27DD2-DED0-4FA5-8319-64CA1FBCEC31}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B964147-AE9C-454F-B971-4F4BD9541280}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B964147-AE9C-454F-B971-4F4BD9541280}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9AB0B44D-9A64-449F-A0CD-07D39ABEF343}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{39D097CC-4757-405F-B3C5-17B8050F438C}" @@ -763,9 +761,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {5DE5039B-D68C-4B66-9F5E-54613FC76423} = {C0F27DD2-DED0-4FA5-8319-64CA1FBCEC31} - {30142600-D924-4FDC-9A98-D621C3A2CCEA} = {BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F} - {84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A} = {BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F} + {5DE5039B-D68C-4B66-9F5E-54613FC76423} = {4B964147-AE9C-454F-B971-4F4BD9541280} {ACD7A742-0474-4C95-9769-437A26E7B010} = {4B964147-AE9C-454F-B971-4F4BD9541280} {636E099B-BFAB-4C0E-B9D8-09BB1FE85B45} = {4B964147-AE9C-454F-B971-4F4BD9541280} {9C557B87-DEE3-4B28-A82D-796418B3F608} = {4B964147-AE9C-454F-B971-4F4BD9541280} @@ -777,6 +773,8 @@ Global {15628477-9D25-41FA-81B0-59D43D1363F4} = {4B964147-AE9C-454F-B971-4F4BD9541280} {877B4329-854A-412F-B631-6315D77F9C8A} = {4B964147-AE9C-454F-B971-4F4BD9541280} {A3AC9584-763B-4686-B6D8-49140FC62EC4} = {4B964147-AE9C-454F-B971-4F4BD9541280} + {30142600-D924-4FDC-9A98-D621C3A2CCEA} = {BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F} + {84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A} = {BC37CE7C-7BD7-4495-9BC9-810D34DC5B1F} {048AD79E-A0A9-4C0E-8942-4778BBE4B2F1} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} {55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} {F7379254-05CC-4F91-B230-4DD992502C75} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343} diff --git a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln index aeac1fd484e031..9848440e26a6bd 100644 --- a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln +++ b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln @@ -29,14 +29,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9132E794-A863-4073-86A2-3A6FA9B6C6CD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{5F95C6BC-43E8-4E5D-93AC-80500F798AEF}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ABC2D63C-77D2-49D8-AF86-2530D6672269}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{56A31E71-2D11-484D-A9D0-97E4A2AD9354}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8B71FA04-1D67-4607-94A4-E2A85977B1FA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ABC2D63C-77D2-49D8-AF86-2530D6672269}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{24204C7B-8FCC-4D46-8E72-BB7128DB5572}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0FD77A15-66A8-4E7D-BE30-4976EB1A74B9}" @@ -395,13 +393,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {D5A81248-C2F8-464A-8EA4-2AB2528206BC} = {5F95C6BC-43E8-4E5D-93AC-80500F798AEF} + {D5A81248-C2F8-464A-8EA4-2AB2528206BC} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} + {158DD2BA-5789-49B8-A801-77EF5D4FD324} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} {E4B95B10-EC2A-4874-8E71-858A90A4BDFE} = {56A31E71-2D11-484D-A9D0-97E4A2AD9354} {2F113EAD-602B-4EBD-97E4-24C97CDFEB50} = {56A31E71-2D11-484D-A9D0-97E4A2AD9354} {DD15B8D0-013A-43B3-AC3D-1B0D626B35E0} = {8B71FA04-1D67-4607-94A4-E2A85977B1FA} {B0B27299-653F-4B2C-A69B-81056AC2FE46} = {8B71FA04-1D67-4607-94A4-E2A85977B1FA} {CA4E8737-E42F-4524-A1A0-D2673B7B7AAF} = {8B71FA04-1D67-4607-94A4-E2A85977B1FA} - {158DD2BA-5789-49B8-A801-77EF5D4FD324} = {ABC2D63C-77D2-49D8-AF86-2530D6672269} {452B9C44-BE4A-4D0E-9412-07280582D3BB} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572} {B1366F4C-E5CC-4AF3-A67F-C28216E570B3} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572} {9C3EAF3C-A96C-4D5F-95FE-BBCB1580DECA} = {24204C7B-8FCC-4D46-8E72-BB7128DB5572} diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln index bf2afdb2c49ec2..9eee96af24b052 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln +++ b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln @@ -57,12 +57,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{5489EFA6-E32A-4B53-AC04-862DCE8B4E86}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{0C89B197-6F7B-48BE-A6B9-885DAD4BDFBE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2408438-D7E0-4D89-97B1-EDCC83EA8442}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B9925565-A803-4F7E-BABC-377A5DE41344}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2408438-D7E0-4D89-97B1-EDCC83EA8442}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{651A1BB1-501D-45DA-9284-77F8FC083889}" @@ -717,9 +715,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {0BC84292-E0FC-4A10-87A3-3F0A5167541F} = {0C89B197-6F7B-48BE-A6B9-885DAD4BDFBE} - {20B92E8C-E720-4B5A-8647-97CC1BD71E84} = {B9925565-A803-4F7E-BABC-377A5DE41344} - {EB8EF358-4028-4272-B71E-523F8D0A73F0} = {B9925565-A803-4F7E-BABC-377A5DE41344} + {0BC84292-E0FC-4A10-87A3-3F0A5167541F} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} {1E95BC53-583D-4DDD-9E70-6F04D2D0C991} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} {96328529-3EB5-4BA4-9998-CB85E279E7F2} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} {4D35D50B-936F-4867-A600-8D3A9A0CD0B5} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} @@ -730,6 +726,8 @@ Global {43214093-FA08-4699-A62B-D7BC858BAC78} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} {1E0AB255-7FD0-4DE0-9675-59DE81B12E54} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} {60DB3C65-9EDA-45AA-85E6-37F1375CF1E7} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442} + {20B92E8C-E720-4B5A-8647-97CC1BD71E84} = {B9925565-A803-4F7E-BABC-377A5DE41344} + {EB8EF358-4028-4272-B71E-523F8D0A73F0} = {B9925565-A803-4F7E-BABC-377A5DE41344} {067570A0-D55A-4ECC-A478-B1CBC676E9F3} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} {084CF5E8-1BD4-4AD3-A80F-FD9E1C269826} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} {D0C681EE-D578-4CD6-AA62-33874FCE3E37} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872} diff --git a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln index 6ac4b2f6d0d21d..f36893f7f24aa2 100644 --- a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln +++ b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln @@ -87,14 +87,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3A466C9C-F42B-462A-9D0B-96CDA47A8210}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{C5847D76-464F-49B7-B5BE-80F9FCA55883}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B27D0964-41D3-4520-8D68-AD69F010A6B9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0F383187-7D3B-4EF3-844B-CFBE0276A7B8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B27D0964-41D3-4520-8D68-AD69F010A6B9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8CB89ED5-7600-48B5-B7F4-72026EB9F533}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{AB1A5F67-F907-4B8C-9076-1279BC039D8C}" @@ -1062,7 +1060,18 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {946BAB0E-CD71-4456-9FBB-2066470A83B5} = {C5847D76-464F-49B7-B5BE-80F9FCA55883} + {946BAB0E-CD71-4456-9FBB-2066470A83B5} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {E5AE4EB3-DB23-4F33-858B-63B68A60F7F1} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {33163E79-02D8-4ED2-BED9-3A96D94B7D41} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {F65F6021-37F2-450B-B8BF-66F04B56DE56} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {314810DF-262E-490E-8F05-F31695C31F0C} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {84075D59-9D5E-40F7-A914-911087419FE4} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {FD0788DC-C765-41A8-9EBF-93DAAA92F9AD} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {CEAF6846-A3EB-4DBF-897A-BD6A95BFB384} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {B8F3933C-7C0D-41B3-8B1F-D507EF92156B} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {DCBDA200-E9E4-49E9-A928-A50FA719F9ED} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} + {9C521ED1-5221-4C93-BBA0-86C13D4C23C7} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} {3742D5F8-5C86-49FD-BAEA-050742CCEB7A} = {0F383187-7D3B-4EF3-844B-CFBE0276A7B8} {C67553AE-F09B-407D-AD3E-D61950E06BE8} = {0F383187-7D3B-4EF3-844B-CFBE0276A7B8} {ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D} = {0F383187-7D3B-4EF3-844B-CFBE0276A7B8} @@ -1086,17 +1095,6 @@ Global {DB8A84A1-64F7-46E4-8DDC-20491E3D4AF9} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD} {B43FFBD4-DD4A-4ED8-A69F-C562769A5085} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD} {546D7B53-3A00-47A4-BBE0-F4BA12126D6F} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD} - {E5AE4EB3-DB23-4F33-858B-63B68A60F7F1} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {33163E79-02D8-4ED2-BED9-3A96D94B7D41} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {F65F6021-37F2-450B-B8BF-66F04B56DE56} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {D4C21BE3-FAA7-4FB6-A2AF-3F160A9386FC} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {314810DF-262E-490E-8F05-F31695C31F0C} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {84075D59-9D5E-40F7-A914-911087419FE4} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {FD0788DC-C765-41A8-9EBF-93DAAA92F9AD} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {CEAF6846-A3EB-4DBF-897A-BD6A95BFB384} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {B8F3933C-7C0D-41B3-8B1F-D507EF92156B} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {DCBDA200-E9E4-49E9-A928-A50FA719F9ED} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} - {9C521ED1-5221-4C93-BBA0-86C13D4C23C7} = {B27D0964-41D3-4520-8D68-AD69F010A6B9} {4165769D-C4EE-46C4-9FA2-068DBF1BDB0A} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533} {ABF31AAD-012E-4DD3-9B10-2F4590333A22} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533} {C8F1CF01-F4E9-4459-9FBB-34363A0C377E} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533} diff --git a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln index ff6b2879f563cb..d331a126e9b859 100644 --- a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln +++ b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln @@ -61,14 +61,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{04974279-7D70-4BE6-9F4C-23AF30F64C9B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{A801F00E-81F9-4531-B2D8-1C15CB6A34B0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C81302E5-C312-4C10-ACC7-D7201A16FAC6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A376B9EB-8223-464D-A8F5-0000B26254F4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ED3F0225-44AC-415A-80C8-18D9CAD10A64}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C81302E5-C312-4C10-ACC7-D7201A16FAC6}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CAB63FAF-D862-451E-84FF-115A7DABB4CA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A118A4EF-D9D1-4AC9-B0A6-C7A2A15A63C5}" @@ -763,7 +761,16 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E34F351F-8EB7-4D44-BA44-85F791F662CC} = {A801F00E-81F9-4531-B2D8-1C15CB6A34B0} + {E34F351F-8EB7-4D44-BA44-85F791F662CC} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {26367C54-C1A4-462F-AA71-E48644208AE9} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {1A44729F-AFB5-4BB0-8348-58833378AE55} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {B1632FA3-4F01-4B41-BB61-F7676A25EDA0} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {96501106-36D0-4093-8FEE-AF90713D09ED} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {E6DD9860-2824-43D3-BD9D-87ED396B4E46} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {E5EB0B0B-FFAC-4C1B-AD59-292849F847FE} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {623D46A5-8ED4-43CF-A01B-528F0A505090} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} + {039BB256-1BCF-4398-B586-C05F7C5225C4} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {65FFFD20-CE5D-4FC0-A525-1C308186A16F} = {A376B9EB-8223-464D-A8F5-0000B26254F4} {63860D71-D351-4285-9154-9864DC883647} = {A376B9EB-8223-464D-A8F5-0000B26254F4} {956E53A2-5A41-44A7-900A-49044376B2BD} = {A376B9EB-8223-464D-A8F5-0000B26254F4} @@ -776,15 +783,6 @@ Global {1885EF4C-6A85-4170-8E5B-7C158C4BECDB} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64} {A311F690-FBE4-4102-849A-ABCCAC63805A} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64} {E93A6617-A6C4-4886-BADB-4D52690ACE8E} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64} - {26367C54-C1A4-462F-AA71-E48644208AE9} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {1A44729F-AFB5-4BB0-8348-58833378AE55} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {B1632FA3-4F01-4B41-BB61-F7676A25EDA0} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {96501106-36D0-4093-8FEE-AF90713D09ED} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {E6DD9860-2824-43D3-BD9D-87ED396B4E46} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {E5EB0B0B-FFAC-4C1B-AD59-292849F847FE} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {623D46A5-8ED4-43CF-A01B-528F0A505090} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} - {039BB256-1BCF-4398-B586-C05F7C5225C4} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6} {0269FFAF-E680-4BC8-A1B4-0333D77911BC} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA} {F18C3460-7F92-4570-9DE9-32B3C3DA6DA8} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA} {56B120CF-EBB5-4422-A7B5-5216FE4F71E3} = {CAB63FAF-D862-451E-84FF-115A7DABB4CA} diff --git a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln index a6d348a0919a21..2ee4c7c5430086 100644 --- a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln +++ b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln @@ -83,12 +83,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A634ABF4-A81F-4FA7-B35D-152B670045BC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{DFFC308C-63D3-45CC-A904-5AC273DD82C8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{315BC231-270B-456C-919A-3E9BB50CDD7A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6BA02609-AE23-4E80-8B4B-9C6548AA147A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{315BC231-270B-456C-919A-3E9BB50CDD7A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1826CD8D-A5E3-4C8E-A49A-E746D9682B87}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BDABB39C-A9FF-4A9B-8BA2-EF873C5EEB16}" @@ -1016,10 +1014,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {89B01AF7-F0CE-4168-8C4A-33FCDCF33B73} = {DFFC308C-63D3-45CC-A904-5AC273DD82C8} - {F6BCA6EF-777E-408B-B49B-B055B5A0BA19} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A} - {422C9340-E720-4554-B6AC-560A19FE16B1} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A} - {0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A} + {89B01AF7-F0CE-4168-8C4A-33FCDCF33B73} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {A4D49082-19F6-4402-AF2B-7C3074C175C0} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {89C01491-2BE8-438C-8F1D-24DE9AFD7A86} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {64F83961-AECA-4D5C-B467-A1A94AE6FFB4} = {315BC231-270B-456C-919A-3E9BB50CDD7A} @@ -1035,6 +1030,9 @@ Global {51055F1B-B97E-46DE-8D94-9EB885D22D20} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {7C0A6923-A9BC-4F10-81E0-C535EEF537BB} = {315BC231-270B-456C-919A-3E9BB50CDD7A} {7492A8FA-F70F-4B7F-8514-8C9B7BE6D4CA} = {315BC231-270B-456C-919A-3E9BB50CDD7A} + {F6BCA6EF-777E-408B-B49B-B055B5A0BA19} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A} + {422C9340-E720-4554-B6AC-560A19FE16B1} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A} + {0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0} = {6BA02609-AE23-4E80-8B4B-9C6548AA147A} {A26E9B9C-AFE7-4740-AC73-626D9823E515} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87} {51AEBD0E-0A93-4532-A010-CAAF8E320D6C} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87} {279066F9-4DB9-4897-8CE4-66BC31118323} = {1826CD8D-A5E3-4C8E-A49A-E746D9682B87} diff --git a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln index e7145687e3a110..e0ce9b4d5678e7 100644 --- a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln +++ b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln @@ -29,14 +29,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4902CFA5-3299-42C3-8171-7E809C83CAEC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{004D5B4C-87B3-4499-9638-1B317B762BEF}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{269A342C-D693-495C-8A07-11E08C881F6B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{21E11D21-3706-49C7-ACA7-10BA9A021908}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{61AC03AE-7090-458C-A3AB-5A4CCFF6AD08}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{269A342C-D693-495C-8A07-11E08C881F6B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F2FD3769-35C6-481A-AF35-9BDDEE550B54}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E44548BC-2CFB-47A3-B98A-1D5754ADCFA7}" @@ -395,13 +393,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {370DCE61-CBDF-466E-91DB-5AE622BF2E52} = {004D5B4C-87B3-4499-9638-1B317B762BEF} + {370DCE61-CBDF-466E-91DB-5AE622BF2E52} = {269A342C-D693-495C-8A07-11E08C881F6B} + {63783D6D-0848-4303-8E7A-BBB7F65DCE9E} = {269A342C-D693-495C-8A07-11E08C881F6B} {6E159831-C97C-40FD-AD1A-E8B1EE3E7168} = {21E11D21-3706-49C7-ACA7-10BA9A021908} {24605C4D-2465-433D-A393-45CB950E0834} = {21E11D21-3706-49C7-ACA7-10BA9A021908} {D7C16DED-127A-4CBB-BBCF-DF133816413B} = {61AC03AE-7090-458C-A3AB-5A4CCFF6AD08} {79F03506-0B08-46BB-B99D-ABDBA8CFFFAC} = {61AC03AE-7090-458C-A3AB-5A4CCFF6AD08} {58E24DB7-4207-49F8-BC73-A665A2A961A6} = {61AC03AE-7090-458C-A3AB-5A4CCFF6AD08} - {63783D6D-0848-4303-8E7A-BBB7F65DCE9E} = {269A342C-D693-495C-8A07-11E08C881F6B} {3969DA9E-6C7D-421D-ABCC-BD02DFA36DA4} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54} {7D67652E-7840-42AF-A830-F9A336AD8CBE} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54} {38416350-0E7B-4201-8B7E-3FA80FCFA81A} = {F2FD3769-35C6-481A-AF35-9BDDEE550B54} diff --git a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln index da0db7405e86bc..ee4dba7a0f7521 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln +++ b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln @@ -65,12 +65,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{945D5BB6-FB9B-4489-816A-7B4E97843CF8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{34998B2E-86EF-4DB2-BBD1-442F5FD0D83D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C2159C53-1E91-486D-A66C-E658FB73A87F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DE91E835-DB5D-4FAD-B992-1A98B24B87E9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C2159C53-1E91-486D-A66C-E658FB73A87F}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CBDB0A5C-FDD0-4B00-8840-D40E4D6B17DB}" @@ -809,9 +807,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {3F896EC8-24DC-453E-A937-8AC663EE2AB2} = {34998B2E-86EF-4DB2-BBD1-442F5FD0D83D} - {05604AC6-E1DA-460E-9A38-57EB19BE3327} = {DE91E835-DB5D-4FAD-B992-1A98B24B87E9} - {44080626-DF98-470B-BCA1-CC3DFFCB94E3} = {DE91E835-DB5D-4FAD-B992-1A98B24B87E9} + {3F896EC8-24DC-453E-A937-8AC663EE2AB2} = {C2159C53-1E91-486D-A66C-E658FB73A87F} {516999D7-BFBD-41D1-A96C-69EBCDB6CF64} = {C2159C53-1E91-486D-A66C-E658FB73A87F} {A62FC401-7B8B-4CDE-8D46-3776980C94F0} = {C2159C53-1E91-486D-A66C-E658FB73A87F} {82747414-420A-47A9-886A-A042E46780B6} = {C2159C53-1E91-486D-A66C-E658FB73A87F} @@ -824,6 +820,8 @@ Global {A6769C35-8C53-46BF-84AE-44C921C39BEA} = {C2159C53-1E91-486D-A66C-E658FB73A87F} {46B233B0-01EA-4569-BDA9-1A7526FAF6E6} = {C2159C53-1E91-486D-A66C-E658FB73A87F} {A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A} = {C2159C53-1E91-486D-A66C-E658FB73A87F} + {05604AC6-E1DA-460E-9A38-57EB19BE3327} = {DE91E835-DB5D-4FAD-B992-1A98B24B87E9} + {44080626-DF98-470B-BCA1-CC3DFFCB94E3} = {DE91E835-DB5D-4FAD-B992-1A98B24B87E9} {33637A81-A335-474A-814D-648881BB403B} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {8710F08A-F3C3-4E92-B0ED-E787C4523EC0} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {7BC4C9CF-F8E4-424B-9F30-237B801F435D} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} diff --git a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln index 93d0471fae67e2..e98e45de653005 100644 --- a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln +++ b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln @@ -47,12 +47,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9C89654D-40D8-406E-AE79-9ABBE1C9FDC7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{3AC935C8-2FD6-4B40-96D8-FCF4D64E2524}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D7459AB-75AF-4AEF-90CA-11FD253C2B1C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FF4142E3-375C-4658-A1FD-F4C895F7B7B5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6BC70A1F-00D5-482D-9603-DD6C6E84AE4B}" @@ -602,9 +600,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6} = {3AC935C8-2FD6-4B40-96D8-FCF4D64E2524} - {59D900EB-CABB-4CA9-9BE4-9855ADC32752} = {58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A} - {621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0} = {58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A} + {F8D0F6E7-0543-4BF7-BE0D-089D5F1CCEC6} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} {7A9021C4-769A-4A19-9244-0F575D4E96AE} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} {71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} {E1F18567-C282-456B-8CCC-677702609FAF} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} @@ -612,6 +608,8 @@ Global {E0FFABB4-08A9-4259-B9DB-52E11AEBA4F3} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} {167E89F1-63F0-4E47-B67E-9931589E75CE} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} {19B414C5-ACD0-4E78-B0A0-C698132F1988} = {7D7459AB-75AF-4AEF-90CA-11FD253C2B1C} + {59D900EB-CABB-4CA9-9BE4-9855ADC32752} = {58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A} + {621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0} = {58AD219B-7E2F-4587-9D50-8ED0E0F9CF6A} {E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} {B7E5B25A-0E3A-4FF8-958C-3FEB057DE330} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} {25243F48-E92B-4EA8-B1D2-7DE846C03AC5} = {FF4142E3-375C-4658-A1FD-F4C895F7B7B5} diff --git a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln index 6bcbc7480b85ba..e75fc76cc221e6 100644 --- a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln +++ b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln @@ -43,12 +43,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{9CC076AE-C3BC-4F17-8C01-E330D03F4657}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{3D6F1FD7-42FB-42BE-87D9-21202EC40845}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87FDB279-F475-45C0-92EF-7893E25AA0A6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EB30CC4C-9662-46E0-8BC5-DFC16A24365F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87FDB279-F475-45C0-92EF-7893E25AA0A6}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{902318E3-C881-4BB3-8EEA-FC24A836B5AE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C1A58B90-FE26-4840-9D69-60DFC77BF485}" @@ -556,15 +554,15 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {16140308-2197-4634-A664-3A73DA182FAE} = {3D6F1FD7-42FB-42BE-87D9-21202EC40845} - {1A19656D-1047-4E43-B9C5-73423399D1D4} = {EB30CC4C-9662-46E0-8BC5-DFC16A24365F} - {197926DA-9180-4AD4-AC71-B95FC5CA7557} = {EB30CC4C-9662-46E0-8BC5-DFC16A24365F} + {16140308-2197-4634-A664-3A73DA182FAE} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} {A0621F43-D8FF-4EDE-9165-1B2757F8AB14} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} {6870504E-8490-4A4C-938A-C68DA9A2F65D} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} {8323FADF-3D4E-46EE-8CA8-45C523142B77} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} {CBF80530-F3DF-4305-B45D-87F89D3FCBC5} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} {E2B0069E-C11C-4829-87C8-A98ED298CB8A} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} {B3473ABA-A06B-445E-AE21-C7432AD14482} = {87FDB279-F475-45C0-92EF-7893E25AA0A6} + {1A19656D-1047-4E43-B9C5-73423399D1D4} = {EB30CC4C-9662-46E0-8BC5-DFC16A24365F} + {197926DA-9180-4AD4-AC71-B95FC5CA7557} = {EB30CC4C-9662-46E0-8BC5-DFC16A24365F} {DB7964E8-6761-47C7-B120-DAF13FDDE01B} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} {843D7E6B-5F25-41C1-8469-764854BA2D86} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} {3FFDE907-1181-40F7-AC06-F3AD3D029AAA} = {902318E3-C881-4BB3-8EEA-FC24A836B5AE} diff --git a/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln b/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln index 810005d6ae4252..a49ca6dcd0b468 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln +++ b/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln @@ -57,12 +57,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{293533FE-82F7-4679-912B-5A2C6E3C4B0C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{57A0D612-ABD4-4328-A51D-0D913B57D0ED}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{92BBE16A-0444-4CDD-9351-C2018859DD3A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{7227D008-BBBE-48D0-979B-9BC483BA7E60}" @@ -717,9 +715,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {C08AA67B-28B8-4E38-AE15-28491454DAB7} = {57A0D612-ABD4-4328-A51D-0D913B57D0ED} - {18FD488A-2A3F-4B40-B65D-7108688D350F} = {92BBE16A-0444-4CDD-9351-C2018859DD3A} - {9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2} = {92BBE16A-0444-4CDD-9351-C2018859DD3A} + {C08AA67B-28B8-4E38-AE15-28491454DAB7} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {A12C0558-44E2-48FB-9075-1EB8A2D0F247} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {4EF591E4-175E-494D-8191-15C2D6C6E2E6} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {35D57A83-8A9D-4531-BF0D-EA1BCA62D475} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} @@ -727,6 +723,8 @@ Global {82D2A3A9-0784-4CFC-91E1-8A963FE22ADB} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {87E03C4D-FFE2-43AD-9CFE-BB67A2448186} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} {83F2D6C4-C3C7-4428-A0CA-577162C5DBCA} = {B25E0DAF-8162-4D76-B7A6-F7E6E59CD74A} + {18FD488A-2A3F-4B40-B65D-7108688D350F} = {92BBE16A-0444-4CDD-9351-C2018859DD3A} + {9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2} = {92BBE16A-0444-4CDD-9351-C2018859DD3A} {D5DE5382-A5FD-46FD-9EAF-02541C26586B} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} {071FC282-9840-4920-B0FD-BE778449B5FF} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} {D7E6A261-C80A-4E51-BCDD-85DD595866B9} = {27A6AAE3-D2A8-4C35-8A90-2B8E23AD8094} diff --git a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln index e5d27f175e630a..280bc8c08f5292 100644 --- a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln +++ b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln @@ -47,12 +47,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{034E0757-DF29-4FB0-B75F-0E60C13979FB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{6BC78072-0377-4A0D-890F-C69B51C4FD86}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D4881A9A-F082-40A1-ABC4-DE232ABB22BA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BF25957F-9188-4CD6-9581-8E1C998E5AAB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D4881A9A-F082-40A1-ABC4-DE232ABB22BA}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CBCF137A-F5AD-4CCC-8888-F4B30426B5DE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3424E375-E1DA-46BA-91D2-E1EA86BAF98F}" @@ -602,9 +600,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {DC7157AB-FE04-4031-BCF5-400DFCFB1265} = {6BC78072-0377-4A0D-890F-C69B51C4FD86} - {16B2F442-5A88-4C59-A9FE-AB4357D3E657} = {BF25957F-9188-4CD6-9581-8E1C998E5AAB} - {88125FEA-D679-4A1A-8736-A18EC13AFC75} = {BF25957F-9188-4CD6-9581-8E1C998E5AAB} + {DC7157AB-FE04-4031-BCF5-400DFCFB1265} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {2D7986A0-48B8-4DB3-A111-CA8DE1F74769} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {D9ACE205-2927-4D66-8E6F-D2C1E6E6239D} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} @@ -612,6 +608,8 @@ Global {ACABB6EA-7DBE-4AF8-81F8-6F86CCF4142C} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} {2C9EFD7A-F153-47BF-B2E6-73094696DF45} = {D4881A9A-F082-40A1-ABC4-DE232ABB22BA} + {16B2F442-5A88-4C59-A9FE-AB4357D3E657} = {BF25957F-9188-4CD6-9581-8E1C998E5AAB} + {88125FEA-D679-4A1A-8736-A18EC13AFC75} = {BF25957F-9188-4CD6-9581-8E1C998E5AAB} {CBD0D70E-1470-43BF-BE8D-59756A3A2364} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} {CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} {4BE9DDC8-B128-4913-9B2F-0513E9C69991} = {CBCF137A-F5AD-4CCC-8888-F4B30426B5DE} diff --git a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln index 1ba746b56d2c88..ddb39f55587386 100644 --- a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln +++ b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln @@ -73,12 +73,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{16A18208-CD5B-4490-866D-F3CD25D8CF76}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{2271988B-3D42-40FD-A57F-296AB05E15B6}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B90127A0-E005-44FE-9D2B-3DE06444CE37}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78D8A09F-59F1-4F02-8FA9-14243A052080}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B90127A0-E005-44FE-9D2B-3DE06444CE37}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B64B7581-6925-4823-B7AF-97FBC53A4146}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{FE4693B5-3585-4555-BABA-A8BE2AA9C85E}" @@ -901,10 +899,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1} = {2271988B-3D42-40FD-A57F-296AB05E15B6} - {9220284A-2366-43C3-8ED0-D6ED46EC8175} = {78D8A09F-59F1-4F02-8FA9-14243A052080} - {7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B} = {78D8A09F-59F1-4F02-8FA9-14243A052080} - {DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC} = {78D8A09F-59F1-4F02-8FA9-14243A052080} + {D0A3B572-E4C5-4ACC-B84A-C71FED0A20B1} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {8D254FBD-C46E-4701-B2B5-238CABBE81F8} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {FED8B31F-94BB-48AF-9A0A-03C777BD805B} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {F97B792B-B1B0-47B5-BC93-72FCD6E0BD93} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} @@ -918,6 +913,9 @@ Global {E565DD4A-0749-4F5E-8476-EF44D742E377} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {15CB5F16-593B-460D-BDC3-134A56EF3B5F} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} {CDC3E87D-26B7-45BA-87D4-D6417D64D9E5} = {B90127A0-E005-44FE-9D2B-3DE06444CE37} + {9220284A-2366-43C3-8ED0-D6ED46EC8175} = {78D8A09F-59F1-4F02-8FA9-14243A052080} + {7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B} = {78D8A09F-59F1-4F02-8FA9-14243A052080} + {DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC} = {78D8A09F-59F1-4F02-8FA9-14243A052080} {64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {616A1164-8B49-42C1-BD86-F416B47F7543} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {9A567CB8-B318-42C0-B05F-B0746E50DBFD} = {B64B7581-6925-4823-B7AF-97FBC53A4146} diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln index 0a42d856783e9f..9d5e4920369ac7 100644 --- a/src/libraries/System.Memory/System.Memory.sln +++ b/src/libraries/System.Memory/System.Memory.sln @@ -29,14 +29,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{5FC9F6FF-CB7A-4011-803D-36BBA7AE49EF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{E09A57A2-B2DC-492A-915B-DD6EF4FD1F8A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C352AC7D-959D-431F-AF83-2CA506B70D59}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FA259C32-B79B-4DE2-9677-055D5D25FA33}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C352AC7D-959D-431F-AF83-2CA506B70D59}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2BEB1A89-DD2D-42BD-95DD-89860A0C9663}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{24985D32-AECC-4F31-A921-294FA81577F1}" @@ -395,13 +393,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {E09A57A2-B2DC-492A-915B-DD6EF4FD1F8A} + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {C352AC7D-959D-431F-AF83-2CA506B70D59} + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {C352AC7D-959D-431F-AF83-2CA506B70D59} {6A54FACA-933E-4C1D-92AB-1A5506CFC212} = {FA259C32-B79B-4DE2-9677-055D5D25FA33} {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {FA259C32-B79B-4DE2-9677-055D5D25FA33} {9112BAE3-344D-4DD0-ADC9-478D82B84584} = {7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D} {D0EEF7E0-BD51-4C39-AF4F-DD583D01AEBE} = {7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D} {B773D664-C00B-4DB3-823B-947576EE7A46} = {7212FBCF-E89D-4065-9DCE-D5F7E5D3EF1D} - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {C352AC7D-959D-431F-AF83-2CA506B70D59} {EFF00253-633C-4D2F-86EE-F40C721F6A68} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663} {84AD7BF6-D76C-4BEE-9879-5A23150DD3F7} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663} {DA7CEED7-1A86-4221-B4AD-4307AB83A31F} = {2BEB1A89-DD2D-42BD-95DD-89860A0C9663} diff --git a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln index 148f7e813c4c1b..a1508feb9fc6d3 100644 --- a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln +++ b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln @@ -29,14 +29,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{79CFC9F5-5B4B-4B29-9EBD-1A2FA2D6325A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{C3847F2F-603E-467F-99C3-A4B619E25544}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC10C682-DF71-4EEA-A3A5-E716C1C88AC0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2C4425BA-8478-4BCB-B616-E6FC28ADEAB9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC10C682-DF71-4EEA-A3A5-E716C1C88AC0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{38837FDE-8CFE-4676-B3CE-48165E0FD6CF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{06497322-6B9A-48E6-BEA8-C96362AD7180}" @@ -395,13 +393,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {634A3B2B-09F5-4810-B630-ADE4D36C47DF} = {C3847F2F-603E-467F-99C3-A4B619E25544} + {634A3B2B-09F5-4810-B630-ADE4D36C47DF} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0} + {ED450846-85A0-4CED-B4D9-9EB769CF794B} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0} {9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F} = {2C4425BA-8478-4BCB-B616-E6FC28ADEAB9} {B38797B1-BB45-4B30-9D4F-79D9F4B3735B} = {2C4425BA-8478-4BCB-B616-E6FC28ADEAB9} {5B2027FA-F43A-4E80-880F-B3A7A2720AA7} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC} {1542B12A-6A37-49F9-B87B-4B1BB1F689E4} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC} {728E34E5-10B0-4181-940B-EB3FB7784DFA} = {ED90FF1C-59D4-4AB0-860E-2872ECA1BFEC} - {ED450846-85A0-4CED-B4D9-9EB769CF794B} = {FC10C682-DF71-4EEA-A3A5-E716C1C88AC0} {88F4A78E-4EF9-4EB6-995E-CD24152C4704} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF} {547EC332-29FE-47A8-B477-4E19BE521235} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF} {F99EAF58-533E-4941-A0C5-5101309D8AB9} = {38837FDE-8CFE-4676-B3CE-48165E0FD6CF} diff --git a/src/libraries/System.Private.Uri/System.Private.Uri.sln b/src/libraries/System.Private.Uri/System.Private.Uri.sln index 542bed9a2680f8..57f3c06adfe256 100644 --- a/src/libraries/System.Private.Uri/System.Private.Uri.sln +++ b/src/libraries/System.Private.Uri/System.Private.Uri.sln @@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{742F7AAD-8263-4188-911B-F0E50944B92A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{DD4121CE-1AFF-4250-BE6E-C736D001CDCB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A30957A2-C729-49F1-8C75-C42D5BCB8309}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05}" EndProject @@ -37,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E3179181-D7E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{89A8524B-6E70-43E0-AD13-E53D499BB0A1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A30957A2-C729-49F1-8C75-C42D5BCB8309}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{7FA9EE1D-CB88-4D56-85CB-83B0E7B4A8C9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{E6972740-3028-41F0-B4D8-D0F77F0AEFD0}" @@ -395,7 +393,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {C150B694-015F-48BD-8CB0-EFF1F7A84DCE} = {DD4121CE-1AFF-4250-BE6E-C736D001CDCB} + {C150B694-015F-48BD-8CB0-EFF1F7A84DCE} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} + {98AC821B-892E-4F58-AF3D-503747FD6A8F} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} {ADD88187-83E2-4EAF-BFB4-BC6249E76457} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05} {37859855-7E5C-4772-B5D2-7029211EAB92} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05} {BDD0866A-D856-40EE-A9D5-1DAC11095E42} = {DBF81CE3-B7A6-4A62-9C66-DDB2D87CBB05} @@ -404,7 +403,6 @@ Global {DC61379F-5CAE-4744-A71C-3E7AAF921877} = {E3179181-D7ED-459C-B0ED-40DF10FC1959} {B532288A-97AF-473C-B334-E5F6F572907C} = {E3179181-D7ED-459C-B0ED-40DF10FC1959} {8153A96E-335B-4872-9EC0-39178850617B} = {89A8524B-6E70-43E0-AD13-E53D499BB0A1} - {98AC821B-892E-4F58-AF3D-503747FD6A8F} = {A30957A2-C729-49F1-8C75-C42D5BCB8309} {4E14547F-0FA7-4558-B0BB-50F093DF78FC} = {7FA9EE1D-CB88-4D56-85CB-83B0E7B4A8C9} {EB163378-F08A-4B9B-B32B-374386A30F8E} = {7FA9EE1D-CB88-4D56-85CB-83B0E7B4A8C9} {7FA9EE1D-CB88-4D56-85CB-83B0E7B4A8C9} = {7D76502A-347E-40EB-8EA2-F96040EEEEEF} diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln b/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln index d05eb1efa931d0..1915a3759b935f 100644 --- a/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln +++ b/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln @@ -35,7 +35,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A6E681A5-2AFD-4BCE-8825-AF7DBECDA2F1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{F8E304FE-819F-483A-B1B2-883C6E18B41F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C723F596-B189-428C-A090-F4965F87A73D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{61C529DF-66C4-42E9-AE70-3427838FAFE3}" EndProject @@ -43,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A20A0878-564 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{155A2103-05C1-4020-8922-4F6275F6AE7E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C723F596-B189-428C-A090-F4965F87A73D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CA60D894-129C-47A8-BDC7-C11E8D67913A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{FC6D5A7E-628F-43EE-A2D9-A07C7032EA5F}" @@ -464,7 +462,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {B1053D24-237E-4E55-9413-20B34ED79F23} = {F8E304FE-819F-483A-B1B2-883C6E18B41F} + {B1053D24-237E-4E55-9413-20B34ED79F23} = {C723F596-B189-428C-A090-F4965F87A73D} + {A18E814C-13D6-4859-B6FA-3CAB8673B31F} = {C723F596-B189-428C-A090-F4965F87A73D} {05696F45-ACF1-4C02-B8D9-E8C1F5E28717} = {61C529DF-66C4-42E9-AE70-3427838FAFE3} {EA6F01DF-1F63-49FF-A6E8-CA9104296196} = {61C529DF-66C4-42E9-AE70-3427838FAFE3} {5EC8FDE3-DD46-4D89-80AC-AEF571C405B1} = {A20A0878-5647-4145-B224-C390446B7676} @@ -476,7 +475,6 @@ Global {8843EA69-AD8F-4C73-8436-1641470199DC} = {155A2103-05C1-4020-8922-4F6275F6AE7E} {FFA71ACB-EAD8-4242-A5D6-FBB3F704949D} = {155A2103-05C1-4020-8922-4F6275F6AE7E} {3461E542-7F19-4B98-B206-BDF932529A5B} = {155A2103-05C1-4020-8922-4F6275F6AE7E} - {A18E814C-13D6-4859-B6FA-3CAB8673B31F} = {C723F596-B189-428C-A090-F4965F87A73D} {6B47F791-1C84-4B75-B04B-076E9ACBF954} = {CA60D894-129C-47A8-BDC7-C11E8D67913A} {134F392F-0DDF-4C9C-A35C-CD6A43DBD992} = {CA60D894-129C-47A8-BDC7-C11E8D67913A} {CA60D894-129C-47A8-BDC7-C11E8D67913A} = {62AB992D-D3B5-4704-8915-4CF93A6E9AD0} diff --git a/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln b/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln index 5f45d76e495bd3..a00acd7f39a69a 100644 --- a/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln +++ b/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln @@ -37,7 +37,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{78AAA7F3-D266-4508-A5CF-4B83EEFBF85A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{302F3CA0-2A35-4497-9A9A-D251385565A9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C3D946CF-3A37-4EA5-AE14-AC84AF9746F1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FF41EFDD-DD1F-428F-B25E-DD9B85D5A992}" EndProject @@ -45,8 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2AB40A0A-24D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{09AE6FA7-7363-4994-BC62-3685AE151227}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C3D946CF-3A37-4EA5-AE14-AC84AF9746F1}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{81C68A3F-A099-40EE-9F8C-FDA2EEFF1B7B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{59929B38-7B6B-4433-82F0-73B8950B76A1}" @@ -487,7 +485,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {209EDA22-1D20-4180-BE4C-53DEE1758B5D} = {302F3CA0-2A35-4497-9A9A-D251385565A9} + {209EDA22-1D20-4180-BE4C-53DEE1758B5D} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} + {BC6947B4-C61B-4066-B75F-937992548E54} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} {ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A} = {FF41EFDD-DD1F-428F-B25E-DD9B85D5A992} {13447BAB-2762-4CCC-95DF-531FC82FE39A} = {FF41EFDD-DD1F-428F-B25E-DD9B85D5A992} {9F022877-F110-4761-BA97-CC89BBC16D5A} = {2AB40A0A-24D5-40B9-AA94-5BF17878879A} @@ -500,7 +499,6 @@ Global {165A3077-1F79-46E7-8BFA-88AACEB6D026} = {09AE6FA7-7363-4994-BC62-3685AE151227} {40E15C1B-0AB8-4FC5-9CE2-062B736F9021} = {09AE6FA7-7363-4994-BC62-3685AE151227} {913E983B-B16C-4B1E-BD37-906CFF93CAB4} = {09AE6FA7-7363-4994-BC62-3685AE151227} - {BC6947B4-C61B-4066-B75F-937992548E54} = {C3D946CF-3A37-4EA5-AE14-AC84AF9746F1} {5EA13609-79BF-4B45-A288-ED20A54E4263} = {81C68A3F-A099-40EE-9F8C-FDA2EEFF1B7B} {C8D32DC5-846B-4236-8C9B-583E1C137DEB} = {81C68A3F-A099-40EE-9F8C-FDA2EEFF1B7B} {81C68A3F-A099-40EE-9F8C-FDA2EEFF1B7B} = {E3A09A0E-7044-406D-89D8-CC3B3BDC8D98} diff --git a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln index 4799520a8e5e6a..c55b5a73e9a306 100644 --- a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln +++ b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln @@ -55,14 +55,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{4F5987F2-614A-42B6-A652-FE4C03330DE0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{ED65A29E-5F42-409D-BAAC-548799C6C35A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74F4AB97-3DBC-48FB-A2EA-2B4141749800}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2FC35C2F-76DB-4D84-B421-9700BEA4D161}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C36D185D-9B3D-42E5-985F-E21B3BAF3B6D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74F4AB97-3DBC-48FB-A2EA-2B4141749800}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{611CB559-49A7-4046-9425-50E25205E891}" @@ -694,7 +692,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {772C93D4-FC45-46AA-B09F-26F01B672EDC} = {ED65A29E-5F42-409D-BAAC-548799C6C35A} + {772C93D4-FC45-46AA-B09F-26F01B672EDC} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} + {C2FF5BC7-825E-437E-92C3-F505EB6D1D40} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} + {D5FD16CF-7435-4E47-928A-9BC94968091D} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} + {B479A4BF-A3A5-4255-A3EF-135015BD877F} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} + {F33093A8-FF33-4F95-B256-F2AB712C956A} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} + {9F3970FF-F138-4F23-A2F8-2387858E723D} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} + {BB96A2BA-44E9-43FA-91B1-CCEE212C6A8A} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} {E5543842-139D-43BD-B604-E65EBB91649E} = {2FC35C2F-76DB-4D84-B421-9700BEA4D161} {82899000-791E-42FF-A594-6DE65DE07C9E} = {2FC35C2F-76DB-4D84-B421-9700BEA4D161} {DE04D45B-7E15-409D-A176-985D814A6AEB} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D} @@ -707,12 +711,6 @@ Global {FD4D647F-490B-420A-B2FD-29751E0C3454} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D} {8E08BBCB-E2D1-464F-96F1-7B1801CE48B6} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D} {613C42F2-847A-42B3-9F5E-F5A670356BF7} = {C36D185D-9B3D-42E5-985F-E21B3BAF3B6D} - {C2FF5BC7-825E-437E-92C3-F505EB6D1D40} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {D5FD16CF-7435-4E47-928A-9BC94968091D} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {B479A4BF-A3A5-4255-A3EF-135015BD877F} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {F33093A8-FF33-4F95-B256-F2AB712C956A} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {9F3970FF-F138-4F23-A2F8-2387858E723D} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} - {BB96A2BA-44E9-43FA-91B1-CCEE212C6A8A} = {74F4AB97-3DBC-48FB-A2EA-2B4141749800} {848EFB55-86B5-4259-BAA2-A49C6E3421A9} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B} {A2A7CB52-1BC2-40EA-885F-DD5DE607AC96} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B} {73EA94AD-0C65-47C8-851C-12D136A0DCC1} = {EB17DB9D-7058-48E8-98C3-A3B3C3BCE99B} diff --git a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln index 6d26b4d35d6ff1..54b6617bac016a 100644 --- a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln +++ b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln @@ -25,14 +25,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E7D92072-71A6-47A2-90C0-75CBA3672693}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{908620B9-2483-46A3-A93E-78ECB5417BAF}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{654344FB-C5C8-4364-B43B-C2C9530B96F8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4599348B-0480-47D4-9763-F3C6716D3CCC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{6165604E-507C-41D7-AE23-C2CE4E64F685}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{CD5918A8-A5E7-4B14-AF36-015CE2D6EB2D}" @@ -347,14 +345,14 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {661E0A3D-E151-45B2-AA38-B30F8227A741} = {908620B9-2483-46A3-A93E-78ECB5417BAF} + {661E0A3D-E151-45B2-AA38-B30F8227A741} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50} + {5D40069E-7CC2-4B40-A41D-6B003CCB4075} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50} {869B6F76-2329-474A-854E-5AD5541A1CA0} = {654344FB-C5C8-4364-B43B-C2C9530B96F8} {E8860A76-C8CE-4965-8B6D-C64F1BCAB9F2} = {654344FB-C5C8-4364-B43B-C2C9530B96F8} {6DF455E8-D2C8-40EC-AEF2-AE05A66405F7} = {654344FB-C5C8-4364-B43B-C2C9530B96F8} {B6734AD0-410E-4B0F-B767-D586E92D4D56} = {4599348B-0480-47D4-9763-F3C6716D3CCC} {9D308994-9721-4883-B32D-531FA8D9025B} = {4599348B-0480-47D4-9763-F3C6716D3CCC} {04E09F3E-1897-43EE-94D3-786B679CB741} = {4599348B-0480-47D4-9763-F3C6716D3CCC} - {5D40069E-7CC2-4B40-A41D-6B003CCB4075} = {8B893AF4-4C52-4EA7-B4DF-A5ED0E6BEA50} {935F95BD-C858-4E4D-8C48-057B9F9A6FD1} = {6165604E-507C-41D7-AE23-C2CE4E64F685} {CF805175-A3E1-4EB4-8C1A-525C0CF517F5} = {6165604E-507C-41D7-AE23-C2CE4E64F685} {6165604E-507C-41D7-AE23-C2CE4E64F685} = {72BF7E3E-3778-4D65-8362-F301090B8B02} diff --git a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln index 4f090542c594de..8fe653fd60fa92 100644 --- a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln +++ b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln @@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E9711A78-8BF9-4898-AB8B-4A910F636DFA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{983D609F-487D-4B85-9757-6AD4E7AAA312}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A79F8E8-9E66-44C6-94E7-DE8C24F80E59}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9BB99B5C-97D7-4247-B682-27CBBFCF1BB4}" EndProject @@ -37,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{89B14D9D-2BB EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B05E90C8-0282-4D7D-955E-3BE8A400D3A6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A79F8E8-9E66-44C6-94E7-DE8C24F80E59}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F5608419-456B-4AD8-B4BA-1465B70080E8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{C573542D-035B-4E60-BE4E-AEFD5FEF9C3D}" @@ -395,7 +393,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {F3F9D019-086A-4093-BD49-11B6B204D94A} = {983D609F-487D-4B85-9757-6AD4E7AAA312} + {F3F9D019-086A-4093-BD49-11B6B204D94A} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} + {B958EACD-B145-4B48-A11B-C5E5B565E311} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} {41438432-4DC0-4724-8C8F-0D100083490F} = {9BB99B5C-97D7-4247-B682-27CBBFCF1BB4} {FEFD49C5-E2A2-411E-ABF4-DE7B58861750} = {9BB99B5C-97D7-4247-B682-27CBBFCF1BB4} {EAE41D82-CFFA-4934-89B2-399D12530E84} = {89B14D9D-2BBE-446A-8ED8-020F7BBA6CFC} @@ -404,7 +403,6 @@ Global {919F14ED-E86A-4757-BFEB-8AEEDBCB09E4} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6} {03C0F6B8-A04B-4822-8089-3918F02AD281} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6} {35509CE1-7BCA-4390-8F9E-56997A2AD9AB} = {B05E90C8-0282-4D7D-955E-3BE8A400D3A6} - {B958EACD-B145-4B48-A11B-C5E5B565E311} = {3A79F8E8-9E66-44C6-94E7-DE8C24F80E59} {166D4A87-2AEF-4CB1-8699-07F3B8C2FBF2} = {F5608419-456B-4AD8-B4BA-1465B70080E8} {D61ED890-B208-4564-B77F-8C953E797502} = {F5608419-456B-4AD8-B4BA-1465B70080E8} {F5608419-456B-4AD8-B4BA-1465B70080E8} = {0AFB8AA2-7483-4E63-A8A0-7CFE2906D253} diff --git a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln index 40d0d38533bcc8..ca370f65dd119b 100644 --- a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln +++ b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln @@ -39,12 +39,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{7E29F73C-D2DE-4DA4-B399-F6A2475A11EC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{02C30DE1-6A8F-402C-B137-EDEFBF1AE807}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CF5D1CDD-1A13-475D-BD12-13202A620D8A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2195CD2B-EF9E-46A7-B4AA-A2CD31625957}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CF5D1CDD-1A13-475D-BD12-13202A620D8A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F5B0A1AE-8B97-4B49-B5C8-8E63C6FAAED3}" @@ -510,14 +508,14 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {78128772-D609-4144-8654-6D8403DEF0C9} = {02C30DE1-6A8F-402C-B137-EDEFBF1AE807} - {174DC291-4C4A-41D0-B351-8054872AB46A} = {2195CD2B-EF9E-46A7-B4AA-A2CD31625957} - {F4A98D66-BA15-4C42-94A9-4732965A969A} = {2195CD2B-EF9E-46A7-B4AA-A2CD31625957} + {78128772-D609-4144-8654-6D8403DEF0C9} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} {42F8E509-4629-4FE6-8E55-02E272D0209E} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} {8BEA8A00-B086-45A7-B21A-0E58A1542D06} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} {F826EEA7-C53C-4C46-8715-D3E9FACB9ED5} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} {E6F71289-D9DC-439E-9093-9ECA2E533564} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} {0174A61A-7E2B-47FC-9CB7-E9EABB898820} = {CF5D1CDD-1A13-475D-BD12-13202A620D8A} + {174DC291-4C4A-41D0-B351-8054872AB46A} = {2195CD2B-EF9E-46A7-B4AA-A2CD31625957} + {F4A98D66-BA15-4C42-94A9-4732965A969A} = {2195CD2B-EF9E-46A7-B4AA-A2CD31625957} {C5F4AA26-CCDF-474B-911F-8204E69FC622} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22} {1C4E0357-1AA5-4DD4-B38F-2A2D10DE7872} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22} {E6F1606F-5731-44BA-B9F9-8FE32E2A4D84} = {6DCAB55C-A3EE-46AB-94C0-57DBE27E2A22} diff --git a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln index 436ee74a19e205..16f1476545b162 100644 --- a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln +++ b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln @@ -57,12 +57,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{88BF890E-ED98-4505-8710-F9FB3DE5CE64}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{31DE693C-394A-461E-918B-2F3FEC37FBCC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{28BE2B3F-890C-45EF-B90A-9FA92302365E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C315269F-EEA6-4F74-BA10-65ECAA6351C8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5E28270B-1EEB-4D0E-9A3C-6959BEA9647E}" @@ -717,9 +715,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {537CECFF-20AE-4AD4-A433-C1753A88E4E8} = {31DE693C-394A-461E-918B-2F3FEC37FBCC} - {4DD7C7A6-6F4C-497B-A836-20F2D4F66748} = {28BE2B3F-890C-45EF-B90A-9FA92302365E} - {AA05074D-88AF-482E-A44A-F1AC13494E9F} = {28BE2B3F-890C-45EF-B90A-9FA92302365E} + {537CECFF-20AE-4AD4-A433-C1753A88E4E8} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} {6DBEA1D1-448D-4C27-B329-19F4F214E536} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} {2AC9B23C-C788-4607-86EB-E7F66F14AFDB} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} {F4F0D06A-2324-4B3F-A2D2-E74330DA1B7C} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} @@ -730,6 +726,8 @@ Global {AFBFBBE6-F5EC-4889-9F34-03E07562630D} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} {6383A7BA-20DC-4025-9BB3-E1C6FEA669E8} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} {EC5D61F1-E77B-4E3D-968C-710FCFB9E028} = {7CAD8D92-ABBF-4ED8-ACF7-7121F99F89EC} + {4DD7C7A6-6F4C-497B-A836-20F2D4F66748} = {28BE2B3F-890C-45EF-B90A-9FA92302365E} + {AA05074D-88AF-482E-A44A-F1AC13494E9F} = {28BE2B3F-890C-45EF-B90A-9FA92302365E} {D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} {7F228E60-0AD6-4CBE-BD88-2D9AFCCE5B16} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} {2F5E19AA-B790-403E-860E-2569CC1ADF02} = {C315269F-EEA6-4F74-BA10-65ECAA6351C8} diff --git a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln index cc2e37126a5928..bf5acb02867e8d 100644 --- a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln +++ b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln @@ -63,14 +63,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{B36C9254-0C55-414E-8403-03B4F18D5F35}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{052823B7-A9E0-41DE-87D8-D1CAF407B41D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7B3C7C2F-58E0-4EE5-B904-9C978F40FD33}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FB99AC59-1744-4F12-A4B0-0D54FCA048BF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5114BD7E-8492-452A-8DAA-BF971D74A66D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7B3C7C2F-58E0-4EE5-B904-9C978F40FD33}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{8826C1E1-CEBD-49F8-9BC8-97FECE60F9B9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0522E1B2-BF32-4B3A-A74C-1CBF642E85E4}" @@ -786,7 +784,12 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {94B59BA0-491F-4B59-ADFF-A057EC3EC835} = {052823B7-A9E0-41DE-87D8-D1CAF407B41D} + {94B59BA0-491F-4B59-ADFF-A057EC3EC835} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} + {F552E4E4-20EE-484C-84F8-4FB3A3BD2E69} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} + {C4B641C3-3317-4913-91DA-0DA3B64BABED} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} + {716ED44B-37C8-4776-BE70-285952D2B30D} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} + {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} + {C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} {1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF} {79F7BE0E-01AA-4AFB-B047-CF7C0B38F81E} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF} {3741C833-C364-4269-9B1D-D442055DA7CE} = {FB99AC59-1744-4F12-A4B0-0D54FCA048BF} @@ -804,11 +807,6 @@ Global {8671F164-F78C-44FA-93B7-A310F67890FE} = {5114BD7E-8492-452A-8DAA-BF971D74A66D} {0B5FD0C2-367D-4AD6-8001-80AD79B2441C} = {5114BD7E-8492-452A-8DAA-BF971D74A66D} {C7DAC270-CC93-4C97-9A8D-6E724A10727D} = {5114BD7E-8492-452A-8DAA-BF971D74A66D} - {F552E4E4-20EE-484C-84F8-4FB3A3BD2E69} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} - {C4B641C3-3317-4913-91DA-0DA3B64BABED} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} - {716ED44B-37C8-4776-BE70-285952D2B30D} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} - {4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} - {C9B349C8-7B11-4DE4-A4BB-8D957A1D2A82} = {7B3C7C2F-58E0-4EE5-B904-9C978F40FD33} {1B248B4C-7584-4C04-850A-A50EB592052C} = {8826C1E1-CEBD-49F8-9BC8-97FECE60F9B9} {C3EA0A28-A597-4946-9E08-EBBBFA94BFA5} = {8826C1E1-CEBD-49F8-9BC8-97FECE60F9B9} {90CDAD9F-3ACC-43B0-9696-0C849FCD8C40} = {8826C1E1-CEBD-49F8-9BC8-97FECE60F9B9} diff --git a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln index e71c73901eb772..bf8bf7e0a73104 100644 --- a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln +++ b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln @@ -33,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{A87F8371-F4AD-4214-86BD-0A9B59CCA0AE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{80C7CB4D-47F4-416B-AE32-656C04C8CA87}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F110DBFA-22D7-486A-993D-5461A57A1D50}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C5014AA7-5C35-45D5-B7C6-48A5E93A758E}" EndProject @@ -41,8 +41,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E7A9B89D-A9F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A499E9EC-3C82-4B0A-AC49-111C706B1835}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F110DBFA-22D7-486A-993D-5461A57A1D50}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0ECF6939-6099-448F-A3E5-B8069E092C2F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5D25490B-EE25-44ED-9B06-D0A41C73DB12}" @@ -441,7 +439,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {5965CFFE-886A-418C-854F-5967D91DE914} = {80C7CB4D-47F4-416B-AE32-656C04C8CA87} + {5965CFFE-886A-418C-854F-5967D91DE914} = {F110DBFA-22D7-486A-993D-5461A57A1D50} + {5AD79501-BEA5-48C7-B466-021A9DCB9D5C} = {F110DBFA-22D7-486A-993D-5461A57A1D50} {2644B828-C37C-45C1-933D-27E82DA0A098} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E} {EFF55B56-D92B-4573-94EA-AF5B3B001C34} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E} {80AFB6EB-AB23-48A1-951C-76E6FEA29D19} = {C5014AA7-5C35-45D5-B7C6-48A5E93A758E} @@ -452,7 +451,6 @@ Global {A4058388-97C1-492A-86A4-5240C4166BFF} = {A499E9EC-3C82-4B0A-AC49-111C706B1835} {FE8C7C64-1759-4175-BA6E-03F8D6B7C6EF} = {A499E9EC-3C82-4B0A-AC49-111C706B1835} {9A0BF7EC-AD07-44C8-9B70-9DACB2C894C7} = {A499E9EC-3C82-4B0A-AC49-111C706B1835} - {5AD79501-BEA5-48C7-B466-021A9DCB9D5C} = {F110DBFA-22D7-486A-993D-5461A57A1D50} {022E0D70-D39E-4715-8484-8D2AC264304B} = {0ECF6939-6099-448F-A3E5-B8069E092C2F} {31B3B363-9E3C-4B29-B040-804F65F03D12} = {0ECF6939-6099-448F-A3E5-B8069E092C2F} {0ECF6939-6099-448F-A3E5-B8069E092C2F} = {D9C1BAD0-2991-4FC9-9718-3EF7D2B7A54F} diff --git a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln index f8535b8ab49ffb..2e85dc41acfbae 100644 --- a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln +++ b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln @@ -45,6 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1\System.Reflection.Metadata.ApplyUpdate.Test.MethodBody1.csproj", "{71B8CD61-839D-445C-8E7D-F0F67CE00527}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.NewMethodThrows", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.NewMethodThrows\System.Reflection.Metadata.ApplyUpdate.Test.NewMethodThrows.csproj", "{E700DD52-C4FD-414A-8284-CC2BBA0A59BD}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewMethod", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewMethod\System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewMethod.csproj", "{FEDAEDAE-1466-4AE2-A89F-B220B5B6A3C8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType", "tests\ApplyUpdate\System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType\System.Reflection.Metadata.ApplyUpdate.Test.ReflectionAddNewType.csproj", "{3BE510B3-9A9F-4348-9E47-FB397F1FE2DC}" @@ -85,7 +87,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{E17CFEB5-16A1-4AC3-99AF-EA6728B41E71}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{6C305566-89A5-422C-8C99-5329E4D63CB0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6963C709-FD2F-45A7-9A9D-431B1E9A4796}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F36F0790-5CF7-4CAD-B903-4A3EE0DC1345}" EndProject @@ -93,8 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{153EEF5A-58C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C75ECE17-3CF5-409D-B26F-E2F5053DD5B9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6963C709-FD2F-45A7-9A9D-431B1E9A4796}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CE02FBA2-6B23-42AB-AB33-7FD47B1C9B57}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D6103051-0541-4BA6-A966-C1E090F6099E}" @@ -614,6 +614,27 @@ Global {71B8CD61-839D-445C-8E7D-F0F67CE00527}.Checked|arm64.ActiveCfg = Debug|Any CPU {71B8CD61-839D-445C-8E7D-F0F67CE00527}.Checked|x64.ActiveCfg = Debug|Any CPU {71B8CD61-839D-445C-8E7D-F0F67CE00527}.Checked|x86.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Debug|arm.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Debug|arm64.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Debug|x64.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Debug|x64.Build.0 = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Debug|x86.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Debug|x86.Build.0 = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Release|Any CPU.Build.0 = Release|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Release|arm.ActiveCfg = Release|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Release|arm64.ActiveCfg = Release|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Release|x64.ActiveCfg = Release|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Release|x64.Build.0 = Release|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Release|x86.ActiveCfg = Release|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Release|x86.Build.0 = Release|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Checked|arm.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Checked|arm64.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Checked|x64.ActiveCfg = Debug|Any CPU + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD}.Checked|x86.ActiveCfg = Debug|Any CPU {FEDAEDAE-1466-4AE2-A89F-B220B5B6A3C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FEDAEDAE-1466-4AE2-A89F-B220B5B6A3C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {FEDAEDAE-1466-4AE2-A89F-B220B5B6A3C8}.Debug|arm.ActiveCfg = Debug|Any CPU @@ -1039,7 +1060,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {64DDD2AF-BF90-4DD8-AC24-D2084DB8D558} = {6C305566-89A5-422C-8C99-5329E4D63CB0} + {64DDD2AF-BF90-4DD8-AC24-D2084DB8D558} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} + {B8F22D73-B183-4F17-9D5E-04B80699E56A} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} {D6D16FFD-FD76-4700-B456-1DC4D093D1B5} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {C9E75518-3DA7-4831-97D5-DCC2E8E99D34} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {C0B73BCE-3D60-4737-B958-C4AA39C7056A} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} @@ -1056,6 +1078,7 @@ Global {9D747A8D-A9DE-4470-9CF6-F73DF60FC5F6} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {D80CE4B6-896E-4243-B2BA-443E821AC8FF} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {71B8CD61-839D-445C-8E7D-F0F67CE00527} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} + {E700DD52-C4FD-414A-8284-CC2BBA0A59BD} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {FEDAEDAE-1466-4AE2-A89F-B220B5B6A3C8} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {3BE510B3-9A9F-4348-9E47-FB397F1FE2DC} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} {FFEB0A53-0624-4F88-A810-B345560EA734} = {F36F0790-5CF7-4CAD-B903-4A3EE0DC1345} @@ -1076,7 +1099,6 @@ Global {D7654D83-1D00-4121-BA8B-187EDD1E9EC1} = {C75ECE17-3CF5-409D-B26F-E2F5053DD5B9} {95B66B14-BCC7-407A-930C-4B34D4F7EC98} = {C75ECE17-3CF5-409D-B26F-E2F5053DD5B9} {06E15C97-C87D-473E-9E44-DCE169B1CE4E} = {C75ECE17-3CF5-409D-B26F-E2F5053DD5B9} - {B8F22D73-B183-4F17-9D5E-04B80699E56A} = {6963C709-FD2F-45A7-9A9D-431B1E9A4796} {56597012-9BD9-4167-8DF3-539119192932} = {CE02FBA2-6B23-42AB-AB33-7FD47B1C9B57} {29B354FC-0F90-4D2D-9104-3A7966D53C08} = {CE02FBA2-6B23-42AB-AB33-7FD47B1C9B57} {CE02FBA2-6B23-42AB-AB33-7FD47B1C9B57} = {034612B2-91C8-4334-8F13-7AB773150F72} diff --git a/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln b/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln index 5d7a0150f09e33..b68ad50ebfba3c 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln +++ b/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln @@ -123,12 +123,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{5149AC24-C1A7-4A4C-BE83-FF3037B99E4C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{092510BD-C3F8-4397-A2BC-149309C2B0D3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{56502718-F82A-46E2-9AD0-532C437EC51E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A8ED4215-E7B8-4F14-B61D-F737E24C856A}" @@ -1476,9 +1474,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {096171D9-C978-4509-B9D3-B6DBCD78420D} = {092510BD-C3F8-4397-A2BC-149309C2B0D3} - {25F48B11-0D57-47B7-88EE-7D407AFBA7B6} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2} - {3D4DD468-10FE-4606-BA10-F848447AF157} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2} + {096171D9-C978-4509-B9D3-B6DBCD78420D} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {1388F142-B5C8-4AC7-ABEA-07391751511C} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {FA9FDA97-57C2-421C-A578-EEB0B600A412} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {82E81182-3C80-40A9-978A-4152461F4FE4} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} @@ -1505,6 +1501,8 @@ Global {B6953324-8866-4D94-B352-20EF38EA6774} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {0A103F2A-2FF6-4291-AB51-203E5CA00B2D} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} {78994C91-3A4F-4825-86C2-21FB4F082CA7} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7} + {25F48B11-0D57-47B7-88EE-7D407AFBA7B6} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2} + {3D4DD468-10FE-4606-BA10-F848447AF157} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2} {A1BEF14B-0C13-4854-8299-DADF0D1181D9} = {56502718-F82A-46E2-9AD0-532C437EC51E} {A71C8379-F67C-42A1-B6CD-8C0942757B93} = {56502718-F82A-46E2-9AD0-532C437EC51E} {348D0950-A458-487D-9A30-FF60BCB715D9} = {56502718-F82A-46E2-9AD0-532C437EC51E} diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln index 7652469a8f609a..597708767e01a3 100644 --- a/src/libraries/System.Runtime/System.Runtime.sln +++ b/src/libraries/System.Runtime/System.Runtime.sln @@ -223,12 +223,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{3F5ABC5D-42DE-44C4-BEFC-741F4974C744}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{5B542214-BAF3-4FA7-8424-D0E9C631A2E9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{28140562-A65A-48E9-ABAB-53BA939084F0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FD72C125-C10D-457B-8AFC-6B4E5237AF6A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{28140562-A65A-48E9-ABAB-53BA939084F0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5B2B5E7E-A2FB-4095-9E79-404BF53E0133}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F362E63A-2B1A-445B-B198-3071D7DDE8CF}" @@ -2626,7 +2624,21 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {5B542214-BAF3-4FA7-8424-D0E9C631A2E9} + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {21791340-49C4-4C07-97FD-CAA1B72D3256} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {D16B3A49-5709-44CB-B6F8-8E3D585D236F} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {B876CC90-CB87-4B1B-B6F5-247990192578} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {999B1A08-2C7F-43AD-BC50-5F950320BBFF} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {9ECF9E5C-860F-49C3-95D0-501147F19548} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {B11DD674-FFF7-4343-BA1B-F4C788B16DDA} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {E7A05515-DABE-4C09-83CB-CE84EFDCD4CC} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {F977B04F-675C-4B78-8FCE-19D70504166D} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {A83A8520-F5E2-49B4-83BC-0F82A412951D} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {F6A8185B-07C6-401D-9B40-3C560239E05F} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {8C0E3201-1F0E-45A0-9897-A679C0C4F684} = {28140562-A65A-48E9-ABAB-53BA939084F0} + {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} {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} @@ -2699,20 +2711,6 @@ Global {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} - {21791340-49C4-4C07-97FD-CAA1B72D3256} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {D16B3A49-5709-44CB-B6F8-8E3D585D236F} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {B876CC90-CB87-4B1B-B6F5-247990192578} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {999B1A08-2C7F-43AD-BC50-5F950320BBFF} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {9ECF9E5C-860F-49C3-95D0-501147F19548} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {B11DD674-FFF7-4343-BA1B-F4C788B16DDA} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {E7A05515-DABE-4C09-83CB-CE84EFDCD4CC} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {F977B04F-675C-4B78-8FCE-19D70504166D} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {A83A8520-F5E2-49B4-83BC-0F82A412951D} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {F6A8185B-07C6-401D-9B40-3C560239E05F} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {8C0E3201-1F0E-45A0-9897-A679C0C4F684} = {28140562-A65A-48E9-ABAB-53BA939084F0} - {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} {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.Security.Permissions/System.Security.Permissions.sln b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln index b233dfa3928248..a8c48f68420d39 100644 --- a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln +++ b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln @@ -43,12 +43,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{63AEC067-DCBE-4531-8E89-EBFBEB507503}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{2B31BB89-A386-4177-8BD8-3AAB0CA50E25}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9C0E3C0E-FFF8-4241-8942-A77093C003F1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{25C80847-6651-4D9D-B625-24D756EC48CA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9C0E3C0E-FFF8-4241-8942-A77093C003F1}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{97C6E424-BBBA-495D-8261-E5ADBABA2B29}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{EA13AEBA-B53D-4A6C-8BA1-FB1748B87675}" @@ -556,15 +554,15 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {C7F0324A-249D-4F7E-8C9C-6AF05A9357A9} = {2B31BB89-A386-4177-8BD8-3AAB0CA50E25} - {74374CDE-23F8-4041-8F94-D5CBC23735C6} = {25C80847-6651-4D9D-B625-24D756EC48CA} - {B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1} = {25C80847-6651-4D9D-B625-24D756EC48CA} + {C7F0324A-249D-4F7E-8C9C-6AF05A9357A9} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} {B4058365-B232-433F-882B-1ADC77198BFE} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} {7E64D2D1-7ED9-490A-B658-5E2162F571D6} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} {6029A164-8081-4469-8248-18FF73050660} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} {371555F7-F80C-448F-93A3-C43EFE5AC12B} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} {CE88C6B8-C9B6-4695-BA23-BE8955018E26} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} {F2FF3B73-B971-4C07-B9C9-9EA600C288BD} = {9C0E3C0E-FFF8-4241-8942-A77093C003F1} + {74374CDE-23F8-4041-8F94-D5CBC23735C6} = {25C80847-6651-4D9D-B625-24D756EC48CA} + {B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1} = {25C80847-6651-4D9D-B625-24D756EC48CA} {A629F9A5-1EA5-475F-9A49-29C81198CF34} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} {92D383A1-2440-4D89-8071-6A5159A7C6EF} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} {E248AA4A-5E55-43D6-BC81-8578542F605A} = {97C6E424-BBBA-495D-8261-E5ADBABA2B29} diff --git a/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln b/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln index 9bb9383a5c456d..61ae88b2408107 100644 --- a/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln +++ b/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln @@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{53CE003A-23D7-472C-A5DD-365A623359AE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{7E622A8A-54B7-44AA-8C6F-DA8CEFF1CA4C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B98CEFA4-10F4-49B1-A922-5ECBB4C20599}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6A521BB6-5A53-4871-8EF7-15C4FCF0B416}" EndProject @@ -37,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{6906BA55-F0A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4F19285-4785-496C-8F6C-579249EAA5BB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B98CEFA4-10F4-49B1-A922-5ECBB4C20599}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{457F6647-316B-43ED-9227-081CE0E21C77}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D03A5220-CAD5-4EB4-9DB4-426FBB54C017}" @@ -395,7 +393,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E70D3A84-3053-4E44-82FC-A56A574BF6F8} = {7E622A8A-54B7-44AA-8C6F-DA8CEFF1CA4C} + {E70D3A84-3053-4E44-82FC-A56A574BF6F8} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} + {EF713897-15F9-42E4-979F-271FA1EF6ECA} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} {CC6D3524-D6C8-468B-B908-CE746C1DB175} = {6A521BB6-5A53-4871-8EF7-15C4FCF0B416} {777B4928-6EE5-42D2-8F95-E43EB027D14E} = {6A521BB6-5A53-4871-8EF7-15C4FCF0B416} {0FB90CF0-6B17-4FAB-A737-0532B5BCAADB} = {6906BA55-F0A0-4E71-942D-E24C6C85A353} @@ -404,7 +403,6 @@ Global {D6104D98-DF18-4142-A171-E1A38BA8512E} = {F4F19285-4785-496C-8F6C-579249EAA5BB} {0B2A96B8-0B17-4FF5-B95E-4D98CAFF9363} = {F4F19285-4785-496C-8F6C-579249EAA5BB} {F66FD767-48C4-4AD2-B5CF-36AB39AEB78C} = {F4F19285-4785-496C-8F6C-579249EAA5BB} - {EF713897-15F9-42E4-979F-271FA1EF6ECA} = {B98CEFA4-10F4-49B1-A922-5ECBB4C20599} {27FD5826-07FC-4F1B-B837-CD8A717694DD} = {457F6647-316B-43ED-9227-081CE0E21C77} {DF7EE76F-F06B-45E7-81C9-72DAB5F35083} = {457F6647-316B-43ED-9227-081CE0E21C77} {457F6647-316B-43ED-9227-081CE0E21C77} = {EF9F14E6-7E8D-43E1-883A-34A4DBC0F0F8} diff --git a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln index 65575c7acc17f4..477cc316132e26 100644 --- a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln +++ b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln @@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{59717A0E-4E75-4E9C-9C48-CDDAAF388AF6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{034CAAEB-FF8A-4EC7-AA23-838E8D212279}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4741C000-E701-406A-93B9-ABE5A5CF3D1C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA}" EndProject @@ -37,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D07DC3DB-723 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1CC21763-DACE-400F-808F-7B9DCF90DCBA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4741C000-E701-406A-93B9-ABE5A5CF3D1C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1170143C-D620-429E-B55E-4201C9C7F82A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0CB511B6-7611-48B6-86A6-7F5EEFB871BD}" @@ -395,7 +393,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {2F704A4A-944B-487C-BB11-D66CA63F3B05} = {034CAAEB-FF8A-4EC7-AA23-838E8D212279} + {2F704A4A-944B-487C-BB11-D66CA63F3B05} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} + {A3D9C10B-53A3-483C-8D90-BE7C078B82DF} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} {A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F} = {8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA} {3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1} = {8B1F1ACE-FD0A-4083-8DE6-8148C541A2CA} {8BAAF37B-C3C1-4DED-A89A-5513AE866360} = {D07DC3DB-723F-41C6-99A0-56F395D4D055} @@ -404,7 +403,6 @@ Global {4687BA7A-AF17-43B9-BB8A-5B802FDD4482} = {1CC21763-DACE-400F-808F-7B9DCF90DCBA} {765BE4C9-9DB4-42AF-A4A5-9BA3CCA341A4} = {1CC21763-DACE-400F-808F-7B9DCF90DCBA} {05F39036-EF46-438F-8033-084B5C14832B} = {1CC21763-DACE-400F-808F-7B9DCF90DCBA} - {A3D9C10B-53A3-483C-8D90-BE7C078B82DF} = {4741C000-E701-406A-93B9-ABE5A5CF3D1C} {2CBEE8BD-6E52-4B6B-BE53-590241EC95EF} = {1170143C-D620-429E-B55E-4201C9C7F82A} {0C2A4261-EE14-46E4-AB3C-798F2C0B3F6C} = {1170143C-D620-429E-B55E-4201C9C7F82A} {1170143C-D620-429E-B55E-4201C9C7F82A} = {8468914A-B50E-4DB5-95F8-AA5344CD9FB0} diff --git a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln index ed737e9fe8168b..cfa8dff0ee083c 100644 --- a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln +++ b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln @@ -37,7 +37,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{99025780-1164-4FD8-8E8E-BDE8F8703929}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{56E33627-D3D8-4893-898D-730A4DE8ED60}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{576969A4-D9EB-4AD1-8767-240EDD9C23DF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{73AA6FCA-8FDC-41AA-8539-91562296190B}" EndProject @@ -45,8 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5B2563E3-FF5 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CC8272C5-AC82-4A51-B88C-018FF4284B25}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{576969A4-D9EB-4AD1-8767-240EDD9C23DF}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{367F3353-6D8C-4AC0-B351-C848366BFB6A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{29AD62BC-AD6E-4BBB-ADFF-19D1FE37FAEC}" @@ -487,7 +485,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {B811926D-CFBB-4C22-80D2-0CCD566D980C} = {56E33627-D3D8-4893-898D-730A4DE8ED60} + {B811926D-CFBB-4C22-80D2-0CCD566D980C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} + {A73DCB15-F3DF-48CB-A4CA-62102E94122C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} {BF6A7CA7-DDF9-44D4-AD00-D807765663F9} = {73AA6FCA-8FDC-41AA-8539-91562296190B} {12A6F314-B08D-417D-82EC-0D8799D7C1A2} = {73AA6FCA-8FDC-41AA-8539-91562296190B} {F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE} = {73AA6FCA-8FDC-41AA-8539-91562296190B} @@ -500,7 +499,6 @@ Global {793E2BF9-9E41-49A4-ACED-9FF37AEFACBE} = {CC8272C5-AC82-4A51-B88C-018FF4284B25} {AD5C441F-05EA-452D-B3D2-514B304AA673} = {CC8272C5-AC82-4A51-B88C-018FF4284B25} {EDC3F7A0-3C48-4962-9D28-4EC6B7560F32} = {CC8272C5-AC82-4A51-B88C-018FF4284B25} - {A73DCB15-F3DF-48CB-A4CA-62102E94122C} = {576969A4-D9EB-4AD1-8767-240EDD9C23DF} {3B0827D8-B4B5-43C6-A316-862B10095973} = {367F3353-6D8C-4AC0-B351-C848366BFB6A} {205F2D7B-2F70-4C95-9378-198145111664} = {367F3353-6D8C-4AC0-B351-C848366BFB6A} {367F3353-6D8C-4AC0-B351-C848366BFB6A} = {E668657B-7AF8-4E07-A07C-3919797A8B8A} diff --git a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln index 5b9ec36af16afc..4423169ee38392 100644 --- a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln +++ b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln @@ -33,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{F621411F-F1E9-47DF-AB80-268B18777990}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{1D6F62EA-A796-4A6D-985E-745D3086CAD1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3358539E-11F4-4294-8D94-A9A31E9F47F5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DB513386-C3B1-4891-92E1-1BE5D38562DC}" EndProject @@ -41,8 +41,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{1445280F-1F0 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6A32653B-8FAC-4B01-A0E0-E6379DE90A1A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3358539E-11F4-4294-8D94-A9A31E9F47F5}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{AB444D50-7800-4DC8-A982-7C78E3BE7AE2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5A4AE8D4-AD8F-4ED5-AA39-A702899A15E4}" @@ -441,7 +439,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {BEACD8A1-3C09-450E-931F-561D44986BFB} = {1D6F62EA-A796-4A6D-985E-745D3086CAD1} + {BEACD8A1-3C09-450E-931F-561D44986BFB} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} + {53A0D29E-8633-4FF8-AB0E-86EF331DD379} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} {CD477FC8-AF27-46A2-A451-4A2D4C11600D} = {DB513386-C3B1-4891-92E1-1BE5D38562DC} {71ACA28C-A4F1-4A07-A1B3-39DB86C11A75} = {DB513386-C3B1-4891-92E1-1BE5D38562DC} {2EBEBCB5-9AC0-49E7-BCE3-C8A73E068CAE} = {DB513386-C3B1-4891-92E1-1BE5D38562DC} @@ -452,7 +451,6 @@ Global {E8E31BA1-DC94-40F1-9606-6922941582DC} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A} {08FEC21B-875E-499A-B5CA-7D921B7A484B} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A} {54134937-585D-48D5-AB60-79493BE2C9E7} = {6A32653B-8FAC-4B01-A0E0-E6379DE90A1A} - {53A0D29E-8633-4FF8-AB0E-86EF331DD379} = {3358539E-11F4-4294-8D94-A9A31E9F47F5} {DB9B5380-2F48-4C50-820C-FAFA254A2E3E} = {AB444D50-7800-4DC8-A982-7C78E3BE7AE2} {EBA33C2D-BC48-4E26-8CC7-845BC9716574} = {AB444D50-7800-4DC8-A982-7C78E3BE7AE2} {AB444D50-7800-4DC8-A982-7C78E3BE7AE2} = {4802A624-17FB-421B-A300-4F1B67DF9290} diff --git a/src/libraries/System.Threading/System.Threading.sln b/src/libraries/System.Threading/System.Threading.sln index ff8d6d982954af..bb83a6dabf93a4 100644 --- a/src/libraries/System.Threading/System.Threading.sln +++ b/src/libraries/System.Threading/System.Threading.sln @@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{B429DF7B-86B7-4134-BFCE-351300338853}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{6BC1276F-47F0-40C0-BA63-C89C4D4BA0C9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C50DDA85-E391-4BC7-BF37-758B9CD35CF3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CCC80DF2-8B4E-497C-84A9-4E6344294566}" EndProject @@ -37,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A928B9C7-28E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C50DDA85-E391-4BC7-BF37-758B9CD35CF3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{063A0284-C30F-4DEE-BFD8-EDC926C057CD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{D58ED978-7B6A-43B7-9DBC-D11DA1268F7F}" @@ -395,7 +393,8 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1F14F4DD-AE65-407B-9E10-F5786A847AD6} = {6BC1276F-47F0-40C0-BA63-C89C4D4BA0C9} + {1F14F4DD-AE65-407B-9E10-F5786A847AD6} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} + {F4D0710C-6A53-44F9-A28B-63F008FEF808} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} {387778C0-0405-4FE2-9D85-034254EAAD46} = {CCC80DF2-8B4E-497C-84A9-4E6344294566} {3DD929D8-346F-4CF3-B157-22E052F73A91} = {CCC80DF2-8B4E-497C-84A9-4E6344294566} {AB7F1F45-5C20-40C7-B6DA-192B37012DD8} = {A928B9C7-28EC-4D20-9A63-87221C52EC87} @@ -404,7 +403,6 @@ Global {7B40C562-C082-451C-8281-5088EBFE0079} = {BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36} {C6F7ADFF-7D13-4773-B886-48F51809F73E} = {BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36} {0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49} = {BEFD8C2C-3355-40A5-8C06-3CE0BFB66C36} - {F4D0710C-6A53-44F9-A28B-63F008FEF808} = {C50DDA85-E391-4BC7-BF37-758B9CD35CF3} {24A2CE1A-6995-477E-925D-BA928E909F36} = {063A0284-C30F-4DEE-BFD8-EDC926C057CD} {1DEE16F0-CA56-4315-B87F-CF80C689A77C} = {063A0284-C30F-4DEE-BFD8-EDC926C057CD} {063A0284-C30F-4DEE-BFD8-EDC926C057CD} = {382C1313-228D-4211-9C54-AB54CE678707} diff --git a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln index 6db9e2a03ffed0..05ce876384a3c5 100644 --- a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln +++ b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln @@ -35,12 +35,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\illink\src\linker\ref\Mono.Linker.csproj", "{D50B3619-E571-4DCF-99CD-4C8982717C98}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "srcsrc", "srcsrc", "{C1F9B6EA-2B79-4304-AB6C-6CB80BEC7F4E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{099F43C3-B397-4871-AA29-0B32869E7B48}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2B702044-D081-480E-877C-6CD7A7BDC726}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{099F43C3-B397-4871-AA29-0B32869E7B48}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{45BD3F1C-C44C-484B-8759-41BFCA7CEFF8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C881B8F0-59DE-411B-AA11-2729C3273BE2}" @@ -464,13 +462,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {FBB5EE77-1102-4F26-B849-A24205935920} = {C1F9B6EA-2B79-4304-AB6C-6CB80BEC7F4E} - {E51D8981-999E-4516-82BF-5766CE531E53} = {2B702044-D081-480E-877C-6CD7A7BDC726} - {5CE6447B-ECCE-461C-918D-A37A7ACDF2AC} = {2B702044-D081-480E-877C-6CD7A7BDC726} + {FBB5EE77-1102-4F26-B849-A24205935920} = {099F43C3-B397-4871-AA29-0B32869E7B48} {B7ABB2BF-17E7-4F6E-8773-92B81AC72ECC} = {099F43C3-B397-4871-AA29-0B32869E7B48} {79A37A2A-E133-486E-9DB5-5FA5147184E1} = {099F43C3-B397-4871-AA29-0B32869E7B48} {9A4570D2-9199-47AA-8178-52ECA60C3A08} = {099F43C3-B397-4871-AA29-0B32869E7B48} {6324EAB4-058A-4D80-8D99-5DFB7AEA8928} = {099F43C3-B397-4871-AA29-0B32869E7B48} + {E51D8981-999E-4516-82BF-5766CE531E53} = {2B702044-D081-480E-877C-6CD7A7BDC726} + {5CE6447B-ECCE-461C-918D-A37A7ACDF2AC} = {2B702044-D081-480E-877C-6CD7A7BDC726} {8DF21599-94FF-4B57-8179-67DA3D54D005} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8} {BF9DE7F9-08A1-4482-8F81-2895BB99D651} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8} {B5485369-6E0E-4F8E-AF41-FA9583C7B1CA} = {45BD3F1C-C44C-484B-8759-41BFCA7CEFF8} diff --git a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj index e3b21af1f895a2..81533cfc10ba4b 100644 --- a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -42,7 +42,6 @@ true $(OutputPath)$(MSBuildProjectName).xml - src