From a12ce4bb6001703337606f6d185d92c79d8900a1 Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Mon, 7 Dec 2020 14:49:36 -0600 Subject: [PATCH 1/5] Avoid OutOfMemoryException in some test environments --- .../ArrayBufferWriterTests.Byte.cs | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs b/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs index 8b079c8e71f895..40b3f01795b2a9 100644 --- a/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs +++ b/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs @@ -106,12 +106,21 @@ public void GetMemory_ExceedMaximumBufferSize() output.Advance(initialCapacity); // Validate we can't double the buffer size, but can grow - Memory memory = output.GetMemory(1); - - // The buffer should grow more than the 1 byte requested otherwise performance will not be usable - // between 1GB and 2GB. The current implementation maxes out the buffer size to MaxArrayLength. - Assert.Equal(MaxArrayLength - initialCapacity, memory.Length); - + Memory memory; + try + { + memory = output.GetMemory(1); + + // The buffer should grow more than the 1 byte requested otherwise performance will not be usable + // between 1GB and 2GB. The current implementation maxes out the buffer size to MaxArrayLength. + Assert.Equal(MaxArrayLength - initialCapacity, memory.Length); + } + catch (OutOfMemoryException) + { + // On memory constrained devices, we can get an OutOfMemoryException, which we can safely ignore. + } + + // Validate > MaxArrayLength. Assert.Throws(() => output.GetMemory(int.MaxValue)); } } From 24f366b595abcbb2383d48aaa5f91b044282b356 Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Tue, 15 Dec 2020 12:00:16 -0600 Subject: [PATCH 2/5] Wrap the 1GB test as well --- .../ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs b/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs index 40b3f01795b2a9..71ee32182677fb 100644 --- a/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs +++ b/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs @@ -102,13 +102,14 @@ public void GetMemory_ExceedMaximumBufferSize() int initialCapacity = int.MaxValue / 2 + 1; - var output = new ArrayBufferWriter(initialCapacity); - output.Advance(initialCapacity); - - // Validate we can't double the buffer size, but can grow - Memory memory; + ArrayBufferWriter output; try { + output = new ArrayBufferWriter(initialCapacity); + output.Advance(initialCapacity); + + // Validate we can't double the buffer size, but can grow + Memory memory; memory = output.GetMemory(1); // The buffer should grow more than the 1 byte requested otherwise performance will not be usable @@ -121,6 +122,7 @@ public void GetMemory_ExceedMaximumBufferSize() } // Validate > MaxArrayLength. + output = new ArrayBufferWriter(1); Assert.Throws(() => output.GetMemory(int.MaxValue)); } } From c1fadce6e35315fff23e9fb781fb74556de4514c Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Wed, 16 Dec 2020 09:34:45 -0600 Subject: [PATCH 3/5] Move last check within try statement --- src/libraries/System.Memory/System.Memory.sln | 129 +++++++++--------- .../ArrayBufferWriterTests.Byte.cs | 9 +- 2 files changed, 70 insertions(+), 68 deletions(-) diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln index 6db556d3fb964f..aa53e88a97bbbb 100644 --- a/src/libraries/System.Memory/System.Memory.sln +++ b/src/libraries/System.Memory/System.Memory.sln @@ -1,4 +1,8 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30814.10 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6A54FACA-933E-4C1D-92AB-1A5506CFC212}" @@ -13,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Tests", "test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{089B3C51-5542-4D01-A946-8DBD1E8EDE96}" EndProject @@ -26,30 +30,27 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F16E4E5E-F256-48DE-8BEE-826C415BBC8C}" EndProject Global - GlobalSection(NestedProjects) = preSolution - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} - {6A54FACA-933E-4C1D-92AB-1A5506CFC212} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415} - {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415} - {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - {9112BAE3-344D-4DD0-ADC9-478D82B84584} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - {089B3C51-5542-4D01-A946-8DBD1E8EDE96} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - {E140387C-8659-4B75-8987-53F169CFD5F9} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{7746bfd6-e6d6-4703-aa2d-43380b5dea22}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 - Checked|Any CPU = Checked|Any CPU - Checked|x64 = Checked|x64 - Checked|x86 = Checked|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.ActiveCfg = Checked|x64 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.Build.0 = Checked|x64 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.ActiveCfg = Checked|x64 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.Build.0 = Checked|x64 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.ActiveCfg = Checked|x86 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.Build.0 = Checked|x86 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|Any CPU.ActiveCfg = Debug|x64 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|Any CPU.Build.0 = Debug|x64 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|x64.ActiveCfg = Debug|x64 @@ -62,12 +63,9 @@ Global {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x64.Build.0 = Release|x64 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x86.ActiveCfg = Release|x86 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x86.Build.0 = Release|x86 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.ActiveCfg = Checked|x64 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.Build.0 = Checked|x64 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.ActiveCfg = Checked|x64 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.Build.0 = Checked|x64 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.ActiveCfg = Checked|x86 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.Build.0 = Checked|x86 + {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x64.ActiveCfg = Debug|Any CPU + {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x86.ActiveCfg = Debug|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -80,9 +78,9 @@ Global {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x64.Build.0 = Release|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x86.ActiveCfg = Release|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x86.Build.0 = Release|Any CPU - {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x64.ActiveCfg = Debug|Any CPU - {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x86.ActiveCfg = Debug|Any CPU + {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x64.ActiveCfg = Debug|Any CPU + {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x86.ActiveCfg = Debug|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -95,9 +93,9 @@ Global {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x64.Build.0 = Release|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x86.ActiveCfg = Release|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x86.Build.0 = Release|Any CPU - {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x64.ActiveCfg = Debug|Any CPU - {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x86.ActiveCfg = Debug|Any CPU + {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x64.ActiveCfg = Debug|Any CPU + {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x86.ActiveCfg = Debug|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|Any CPU.Build.0 = Debug|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -110,9 +108,9 @@ Global {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x64.Build.0 = Release|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x86.ActiveCfg = Release|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x86.Build.0 = Release|Any CPU - {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x64.ActiveCfg = Debug|Any CPU - {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x86.ActiveCfg = Debug|Any CPU + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x64.ActiveCfg = Debug|Any CPU + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x86.ActiveCfg = Debug|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -125,9 +123,9 @@ Global {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x64.Build.0 = Release|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x86.ActiveCfg = Release|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x86.Build.0 = Release|Any CPU - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x64.ActiveCfg = Debug|Any CPU - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x86.ActiveCfg = Debug|Any CPU + {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x64.ActiveCfg = Debug|Any CPU + {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x86.ActiveCfg = Debug|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -140,9 +138,9 @@ Global {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x64.Build.0 = Release|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x86.ActiveCfg = Release|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x86.Build.0 = Release|Any CPU - {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x64.ActiveCfg = Debug|Any CPU - {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x86.ActiveCfg = Debug|Any CPU + {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x64.ActiveCfg = Debug|Any CPU + {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x86.ActiveCfg = Debug|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|Any CPU.Build.0 = Debug|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -155,24 +153,24 @@ Global {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x64.Build.0 = Release|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x86.ActiveCfg = Release|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x86.Build.0 = Release|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x64.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x86.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x64.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x64.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x86.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x86.Build.0 = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|Any CPU.Build.0 = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x64.ActiveCfg = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x64.Build.0 = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x86.ActiveCfg = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x86.Build.0 = Release|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x64.ActiveCfg = Debug|Any CPU - {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x86.ActiveCfg = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x64.ActiveCfg = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x86.ActiveCfg = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.ActiveCfg = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.Build.0 = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.ActiveCfg = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.Build.0 = Debug|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = Release|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.ActiveCfg = Release|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.Build.0 = Release|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.ActiveCfg = Release|Any CPU + {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.Build.0 = Release|Any CPU + {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x64.ActiveCfg = Debug|Any CPU + {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x86.ActiveCfg = Debug|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|Any CPU.Build.0 = Debug|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -185,9 +183,9 @@ Global {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x64.Build.0 = Release|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x86.ActiveCfg = Release|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x86.Build.0 = Release|Any CPU - {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x64.ActiveCfg = Debug|Any CPU - {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x86.ActiveCfg = Debug|Any CPU + {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x64.ActiveCfg = Debug|Any CPU + {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x86.ActiveCfg = Debug|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -200,13 +198,22 @@ Global {E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x64.Build.0 = Release|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x86.ActiveCfg = Release|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x86.Build.0 = Release|Any CPU - {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x64.ActiveCfg = Debug|Any CPU - {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x86.ActiveCfg = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} + {6A54FACA-933E-4C1D-92AB-1A5506CFC212} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415} + {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + {9112BAE3-344D-4DD0-ADC9-478D82B84584} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} + {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415} + {94F64A00-DB8D-49F1-BB5E-25527DCE9F42} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + {04BA3E3C-6979-4792-B19E-C797AD607F42} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} + {089B3C51-5542-4D01-A946-8DBD1E8EDE96} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + {E140387C-8659-4B75-8987-53F169CFD5F9} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {65DB6A6B-0AAC-4BC2-A61A-641679771DC7} EndGlobalSection diff --git a/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs b/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs index 71ee32182677fb..c41ef5a54a136b 100644 --- a/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs +++ b/src/libraries/System.Memory/tests/ArrayBufferWriter/ArrayBufferWriterTests.Byte.cs @@ -99,13 +99,11 @@ public async Task WriteAndCopyToStreamAsync() public void GetMemory_ExceedMaximumBufferSize() { const int MaxArrayLength = 0X7FEFFFFF; - int initialCapacity = int.MaxValue / 2 + 1; - ArrayBufferWriter output; try { - output = new ArrayBufferWriter(initialCapacity); + var output = new ArrayBufferWriter(initialCapacity); output.Advance(initialCapacity); // Validate we can't double the buffer size, but can grow @@ -115,15 +113,12 @@ public void GetMemory_ExceedMaximumBufferSize() // The buffer should grow more than the 1 byte requested otherwise performance will not be usable // between 1GB and 2GB. The current implementation maxes out the buffer size to MaxArrayLength. Assert.Equal(MaxArrayLength - initialCapacity, memory.Length); + Assert.Throws(() => output.GetMemory(int.MaxValue)); } catch (OutOfMemoryException) { // On memory constrained devices, we can get an OutOfMemoryException, which we can safely ignore. } - - // Validate > MaxArrayLength. - output = new ArrayBufferWriter(1); - Assert.Throws(() => output.GetMemory(int.MaxValue)); } } } From 14e71a19f2f15a8a84a30b4288c94c798b13bb0d Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Mon, 4 Jan 2021 11:02:08 -0600 Subject: [PATCH 4/5] Undo auto changes to SLN --- src/libraries/System.Memory/System.Memory.sln | 131 +++++++++--------- 1 file changed, 62 insertions(+), 69 deletions(-) diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln index aa53e88a97bbbb..63f9436b6adc59 100644 --- a/src/libraries/System.Memory/System.Memory.sln +++ b/src/libraries/System.Memory/System.Memory.sln @@ -1,9 +1,5 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30814.10 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}" +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6A54FACA-933E-4C1D-92AB-1A5506CFC212}" EndProject @@ -17,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Tests", "test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{089B3C51-5542-4D01-A946-8DBD1E8EDE96}" EndProject @@ -30,27 +26,30 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F16E4E5E-F256-48DE-8BEE-826C415BBC8C}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{7746bfd6-e6d6-4703-aa2d-43380b5dea22}*SharedItemsImports = 5 + GlobalSection(NestedProjects) = preSolution + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} + {6A54FACA-933E-4C1D-92AB-1A5506CFC212} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415} + {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415} + {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + {9112BAE3-344D-4DD0-ADC9-478D82B84584} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + {94F64A00-DB8D-49F1-BB5E-25527DCE9F42} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + {089B3C51-5542-4D01-A946-8DBD1E8EDE96} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} + {E140387C-8659-4B75-8987-53F169CFD5F9} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Checked|Any CPU = Checked|Any CPU - Checked|x64 = Checked|x64 - Checked|x86 = Checked|x86 Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.ActiveCfg = Checked|x64 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.Build.0 = Checked|x64 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.ActiveCfg = Checked|x64 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.Build.0 = Checked|x64 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.ActiveCfg = Checked|x86 - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.Build.0 = Checked|x86 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|Any CPU.ActiveCfg = Debug|x64 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|Any CPU.Build.0 = Debug|x64 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|x64.ActiveCfg = Debug|x64 @@ -63,9 +62,12 @@ Global {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x64.Build.0 = Release|x64 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x86.ActiveCfg = Release|x86 {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x86.Build.0 = Release|x86 - {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x64.ActiveCfg = Debug|Any CPU - {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x86.ActiveCfg = Debug|Any CPU + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.ActiveCfg = Checked|x64 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.Build.0 = Checked|x64 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.ActiveCfg = Checked|x64 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.Build.0 = Checked|x64 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.ActiveCfg = Checked|x86 + {7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.Build.0 = Checked|x86 {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -78,9 +80,9 @@ Global {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x64.Build.0 = Release|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x86.ActiveCfg = Release|Any CPU {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x86.Build.0 = Release|Any CPU - {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x64.ActiveCfg = Debug|Any CPU - {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x86.ActiveCfg = Debug|Any CPU + {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x64.ActiveCfg = Debug|Any CPU + {6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x86.ActiveCfg = Debug|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -93,9 +95,9 @@ Global {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x64.Build.0 = Release|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x86.ActiveCfg = Release|Any CPU {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x86.Build.0 = Release|Any CPU - {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x64.ActiveCfg = Debug|Any CPU - {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x86.ActiveCfg = Debug|Any CPU + {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x64.ActiveCfg = Debug|Any CPU + {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x86.ActiveCfg = Debug|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|Any CPU.Build.0 = Debug|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -108,9 +110,9 @@ Global {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x64.Build.0 = Release|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x86.ActiveCfg = Release|Any CPU {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x86.Build.0 = Release|Any CPU - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x64.ActiveCfg = Debug|Any CPU - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x86.ActiveCfg = Debug|Any CPU + {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x64.ActiveCfg = Debug|Any CPU + {9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x86.ActiveCfg = Debug|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -123,9 +125,9 @@ Global {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x64.Build.0 = Release|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x86.ActiveCfg = Release|Any CPU {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x86.Build.0 = Release|Any CPU - {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x64.ActiveCfg = Debug|Any CPU - {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x86.ActiveCfg = Debug|Any CPU + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x64.ActiveCfg = Debug|Any CPU + {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x86.ActiveCfg = Debug|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -138,9 +140,9 @@ Global {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x64.Build.0 = Release|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x86.ActiveCfg = Release|Any CPU {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x86.Build.0 = Release|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x64.ActiveCfg = Debug|Any CPU - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x86.ActiveCfg = Debug|Any CPU + {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x64.ActiveCfg = Debug|Any CPU + {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x86.ActiveCfg = Debug|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|Any CPU.Build.0 = Debug|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -153,24 +155,24 @@ Global {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x64.Build.0 = Release|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x86.ActiveCfg = Release|Any CPU {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x86.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x64.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Checked|x86.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x64.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.ActiveCfg = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|x86.Build.0 = Debug|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x64.Build.0 = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.ActiveCfg = Release|Any CPU - {04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|x86.Build.0 = Release|Any CPU - {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x64.ActiveCfg = Debug|Any CPU - {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x86.ActiveCfg = Debug|Any CPU + {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x64.ActiveCfg = Debug|Any CPU + {94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x86.ActiveCfg = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x64.ActiveCfg = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x64.Build.0 = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x86.ActiveCfg = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x86.Build.0 = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|Any CPU.Build.0 = Release|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x64.ActiveCfg = Release|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x64.Build.0 = Release|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x86.ActiveCfg = Release|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x86.Build.0 = Release|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x64.ActiveCfg = Debug|Any CPU + {4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x86.ActiveCfg = Debug|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|Any CPU.Build.0 = Debug|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -183,9 +185,9 @@ Global {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x64.Build.0 = Release|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x86.ActiveCfg = Release|Any CPU {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x86.Build.0 = Release|Any CPU - {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x64.ActiveCfg = Debug|Any CPU - {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x86.ActiveCfg = Debug|Any CPU + {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x64.ActiveCfg = Debug|Any CPU + {089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x86.ActiveCfg = Debug|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -198,22 +200,13 @@ Global {E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x64.Build.0 = Release|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x86.ActiveCfg = Release|Any CPU {E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x86.Build.0 = Release|Any CPU + {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x64.ActiveCfg = Debug|Any CPU + {E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x86.ActiveCfg = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} - {6A54FACA-933E-4C1D-92AB-1A5506CFC212} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415} - {FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - {9112BAE3-344D-4DD0-ADC9-478D82B84584} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - {C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} - {C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415} - {94F64A00-DB8D-49F1-BB5E-25527DCE9F42} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - {04BA3E3C-6979-4792-B19E-C797AD607F42} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE} - {089B3C51-5542-4D01-A946-8DBD1E8EDE96} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - {E140387C-8659-4B75-8987-53F169CFD5F9} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {65DB6A6B-0AAC-4BC2-A61A-641679771DC7} EndGlobalSection From 87ff1f1388000b9599d1c93e55f5c82e292802df Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Mon, 4 Jan 2021 11:08:37 -0600 Subject: [PATCH 5/5] Manually undo changes to SLN --- src/libraries/System.Memory/System.Memory.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln index 63f9436b6adc59..6db556d3fb964f 100644 --- a/src/libraries/System.Memory/System.Memory.sln +++ b/src/libraries/System.Memory/System.Memory.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6A54FACA-933E-4C1D-92AB-1A5506CFC212}" EndProject