From fd3011f2339f38bbdc9036fd8a46a8c3284ae735 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 23:40:37 -0400 Subject: [PATCH 01/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20240719.3 (#105236) optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.24223.3 -> To Version 1.0.0-prerelease.24369.3 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.24204.1 -> To Version 19.0.0-alpha.1.24359.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport Co-authored-by: dotnet-maestro[bot] Co-authored-by: Larry Ewing --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65ca0d63c75fee..2ae8d471dfd8af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -336,21 +336,21 @@ https://github.com/dotnet/arcade 4dc25182f9153b892628ef0d4e98663774ad2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c3acfd159662959ff09f3a0d7663023db48bb78a + 5553d120d993730b2dbb7a1d086eec81017f3d66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c3acfd159662959ff09f3a0d7663023db48bb78a + 5553d120d993730b2dbb7a1d086eec81017f3d66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c3acfd159662959ff09f3a0d7663023db48bb78a + 5553d120d993730b2dbb7a1d086eec81017f3d66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c3acfd159662959ff09f3a0d7663023db48bb78a + 5553d120d993730b2dbb7a1d086eec81017f3d66 https://github.com/dotnet/hotreload-utils @@ -396,13 +396,13 @@ 29904b25a99c8984bacb86473df7d98735fb3207 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c3acfd159662959ff09f3a0d7663023db48bb78a + 5553d120d993730b2dbb7a1d086eec81017f3d66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c3acfd159662959ff09f3a0d7663023db48bb78a + 5553d120d993730b2dbb7a1d086eec81017f3d66 diff --git a/eng/Versions.props b/eng/Versions.props index 45fbd35631cded..76a0c4983dbb17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,12 +153,12 @@ 9.0.0-beta.24365.1 9.0.0-beta.24365.1 - 1.0.0-prerelease.24223.3 - 1.0.0-prerelease.24223.3 - 1.0.0-prerelease.24223.3 - 1.0.0-prerelease.24223.3 - 1.0.0-prerelease.24223.3 - 1.0.0-prerelease.24223.3 + 1.0.0-prerelease.24369.3 + 1.0.0-prerelease.24369.3 + 1.0.0-prerelease.24369.3 + 1.0.0-prerelease.24369.3 + 1.0.0-prerelease.24369.3 + 1.0.0-prerelease.24369.3 2.0.0 17.10.0-beta1.24272.1 From b420a49be6abf4247f35f9380adbc06e10a72d05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 23:41:21 -0400 Subject: [PATCH 02/27] [main] Update dependencies from dotnet/roslyn (#104959) * Update dependencies from https://github.com/dotnet/roslyn build 20240716.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-1.24362.11 -> To Version 4.12.0-1.24366.2 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.24204.1 -> To Version 19.0.0-alpha.1.24359.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport * Update dependencies from https://github.com/dotnet/roslyn build 20240716.6 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-1.24362.11 -> To Version 4.12.0-1.24366.6 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.24204.1 -> To Version 19.0.0-alpha.1.24359.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport * Update dependencies from https://github.com/dotnet/roslyn build 20240716.6 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-1.24362.11 -> To Version 4.12.0-1.24366.6 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.24204.1 -> To Version 19.0.0-alpha.1.24359.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport * Update dependencies from https://github.com/dotnet/roslyn build 20240716.6 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-1.24362.11 -> To Version 4.12.0-1.24366.6 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.24204.1 -> To Version 19.0.0-alpha.1.24359.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport * Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.24204.1 -> To Version 19.0.0-alpha.1.24359.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport * Update dependencies from https://github.com/dotnet/roslyn build 20240722.3 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-1.24362.11 -> To Version 4.12.0-1.24372.3 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.24204.1 -> To Version 19.0.0-alpha.1.24359.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport * Update dependencies from https://github.com/dotnet/roslyn build 20240722.18 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-1.24362.11 -> To Version 4.12.0-1.24372.18 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Larry Ewing --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ae8d471dfd8af..cfd4da21f2a939 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -360,17 +360,17 @@ https://github.com/dotnet/runtime-assets 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/roslyn - cada394f99c521861c39e2a5334678e6aba1ac62 + aea9e82da403c397265f7fd0fefee5ebbb886179 - + https://github.com/dotnet/roslyn - cada394f99c521861c39e2a5334678e6aba1ac62 + aea9e82da403c397265f7fd0fefee5ebbb886179 - + https://github.com/dotnet/roslyn - cada394f99c521861c39e2a5334678e6aba1ac62 + aea9e82da403c397265f7fd0fefee5ebbb886179 https://github.com/dotnet/roslyn-analyzers @@ -381,9 +381,9 @@ 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/roslyn - cada394f99c521861c39e2a5334678e6aba1ac62 + aea9e82da403c397265f7fd0fefee5ebbb886179 diff --git a/eng/Versions.props b/eng/Versions.props index 76a0c4983dbb17..fef70a9d8a52ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.12.0-1.24362.11 - 4.12.0-1.24362.11 - 4.12.0-1.24362.11 + 4.12.0-1.24372.18 + 4.12.0-1.24372.18 + 4.12.0-1.24372.18 - + https://github.com/dotnet/emsdk - 99ea0c06b84d3084d090da537080dd35d2a193cf + 40781ca2fc6be1dd81143d8773105a0f9f77d923 diff --git a/eng/Versions.props b/eng/Versions.props index fef70a9d8a52ce..d70101a928ed76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -239,7 +239,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.0-preview.7.24365.1 + 9.0.0-rc.1.24373.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 9.0.0-preview.7.24352.2 From a70e8ab165146c21b15d9cb03dbc991d2eb44f4e Mon Sep 17 00:00:00 2001 From: xtqqczze <45661989+xtqqczze@users.noreply.github.com> Date: Wed, 24 Jul 2024 04:49:10 +0100 Subject: [PATCH 04/27] Fix span write in `InvariantCreateSortKeyOrdinalIgnoreCase` (#105344) --- .../src/System/Globalization/CompareInfo.Invariant.cs | 7 ++++--- .../System.Globalization.Tests/Invariant/InvariantMode.cs | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs index a26ba62928bcd2..96149749ca5db4 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Invariant.cs @@ -66,10 +66,11 @@ private static void InvariantCreateSortKeyOrdinalIgnoreCase(ReadOnlySpan s if (char.IsLowSurrogate(cl)) { SurrogateCasing.ToUpper(c, cl, out char hr, out char lr); - BinaryPrimitives.WriteUInt16BigEndian(sortKey, hr); - BinaryPrimitives.WriteUInt16BigEndian(sortKey, lr); - i++; + Span tmp = sortKey.Slice(0, 2 * sizeof(ushort)); // help with bounds check elimination + BinaryPrimitives.WriteUInt16BigEndian(tmp, hr); + BinaryPrimitives.WriteUInt16BigEndian(tmp.Slice(sizeof(ushort)), lr); sortKey = sortKey.Slice(2 * sizeof(ushort)); + i++; continue; } } diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/Invariant/InvariantMode.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/Invariant/InvariantMode.cs index 287de904ae8be7..3b72d1d219cf34 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/Invariant/InvariantMode.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/Invariant/InvariantMode.cs @@ -773,6 +773,7 @@ public unsafe void TestGetSortKeyLength_OverlongArgument(int inputLength) [InlineData("Hello", CompareOptions.IgnoreCase | CompareOptions.IgnoreWidth, "HELLO")] [InlineData("Hell\u00F6", CompareOptions.None, "Hell\u00F6")] // U+00F6 = LATIN SMALL LETTER O WITH DIAERESIS [InlineData("Hell\u00F6", CompareOptions.IgnoreCase, "HELL\u00D6")] + [InlineData("Hell\uD82A\uDC15", CompareOptions.IgnoreCase, "HELL\uD82A\uDC15")] // U+D82A = High Surrogate; U+DC15 = Low Surrogate public unsafe void TestSortKey_FromSpan(string input, CompareOptions options, string expected) { byte[] expectedOutputBytes = GetExpectedInvariantOrdinalSortKey(expected); From 703df3b3d7ef6c92ffdf3e9221d82539a9dd5fce Mon Sep 17 00:00:00 2001 From: Manish Godse <61718172+mangod9@users.noreply.github.com> Date: Tue, 23 Jul 2024 22:22:49 -0700 Subject: [PATCH 05/27] Disable unhandled exception tests on macos x64 (#105342) --- src/tests/issues.targets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 253b385f699504..92b076d829ac0b 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -430,6 +430,12 @@ + + https://github.com/dotnet/runtime/issues/80356 + + + https://github.com/dotnet/runtime/issues/80356 + From 5788b6a4061ccb50495156d3443d596c2e0f6960 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 24 Jul 2024 01:13:08 -0700 Subject: [PATCH 06/27] Delete unnecessary null checks (#105382) Delete unnecessary null checks that are confusing some static code analysis tools. Fixes #100210 and #100212 --- src/coreclr/vm/eepolicy.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/coreclr/vm/eepolicy.cpp b/src/coreclr/vm/eepolicy.cpp index dbbc672ee36cd1..861fb5552d9bf8 100644 --- a/src/coreclr/vm/eepolicy.cpp +++ b/src/coreclr/vm/eepolicy.cpp @@ -432,7 +432,7 @@ void EEPolicy::LogFatalError(UINT exitCode, UINT_PTR address, LPCWSTR pszMessage // Fire an ETW FailFast event FireEtwFailFast(pszMessage, (const PVOID)address, - ((pExceptionInfo && pExceptionInfo->ExceptionRecord) ? pExceptionInfo->ExceptionRecord->ExceptionCode : 0), + pExceptionInfo->ExceptionRecord ? pExceptionInfo->ExceptionRecord->ExceptionCode : 0, exitCode, GetClrInstanceId()); } @@ -477,7 +477,7 @@ void EEPolicy::LogFatalError(UINT exitCode, UINT_PTR address, LPCWSTR pszMessage else { WCHAR addressString[MaxIntegerDecHexString + 1]; - FormatInteger(addressString, ARRAY_SIZE(addressString), "%p", pExceptionInfo ? (SIZE_T)pExceptionInfo->ExceptionRecord->ExceptionAddress : (SIZE_T)address); + FormatInteger(addressString, ARRAY_SIZE(addressString), "%p", (SIZE_T)pExceptionInfo->ExceptionRecord->ExceptionAddress); // We should always have the reference to the runtime's instance _ASSERTE(GetClrModuleBase() != NULL); @@ -610,6 +610,8 @@ void DECLSPEC_NORETURN EEPolicy::HandleFatalStackOverflow(EXCEPTION_POINTERS *pE WRAPPER_NO_CONTRACT; + _ASSERTE(pExceptionInfo != NULL); + // Disable GC stress triggering GC at this point, we don't want the GC to start running // on this thread when we have only a very limited space left on the stack GCStressPolicy::InhibitHolder iholder; @@ -620,7 +622,7 @@ void DECLSPEC_NORETURN EEPolicy::HandleFatalStackOverflow(EXCEPTION_POINTERS *pE #if defined(FEATURE_EH_FUNCLETS) *((&fef)->GetGSCookiePtr()) = GetProcessGSCookie(); #endif // FEATURE_EH_FUNCLETS - if (pExceptionInfo && pExceptionInfo->ContextRecord) + if (pExceptionInfo->ContextRecord) { GCX_COOP(); CONTEXT *pExceptionContext = pExceptionInfo->ContextRecord; @@ -689,8 +691,8 @@ void DECLSPEC_NORETURN EEPolicy::HandleFatalStackOverflow(EXCEPTION_POINTERS *pE { // Fire an ETW FailFast event FireEtwFailFast(W("StackOverflowException"), - (const PVOID)((pExceptionInfo && pExceptionInfo->ContextRecord) ? GetIP(pExceptionInfo->ContextRecord) : 0), - ((pExceptionInfo && pExceptionInfo->ExceptionRecord) ? pExceptionInfo->ExceptionRecord->ExceptionCode : 0), + (const PVOID)(pExceptionInfo->ContextRecord ? GetIP(pExceptionInfo->ContextRecord) : 0), + pExceptionInfo->ExceptionRecord ? pExceptionInfo->ExceptionRecord->ExceptionCode : 0, COR_E_STACKOVERFLOW, GetClrInstanceId()); } @@ -728,8 +730,6 @@ void DECLSPEC_NORETURN EEPolicy::HandleFatalStackOverflow(EXCEPTION_POINTERS *pE #ifndef TARGET_UNIX if (IsWatsonEnabled() && (g_pDebugInterface != NULL)) { - _ASSERTE(pExceptionInfo != NULL); - ResetWatsonBucketsParams param; param.m_pThread = pThread; param.pExceptionRecord = pExceptionInfo->ExceptionRecord; From a49f1c2d4501bda68aae8819198a7a900fc197bd Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 24 Jul 2024 10:24:35 +0200 Subject: [PATCH 07/27] Update sln files again (#105340) In reaction to some recent ProjectReference changes. --- .../Microsoft.Bcl.AsyncInterfaces.sln | 9 -- .../Microsoft.Bcl.Cryptography.sln | 17 ++-- .../Microsoft.Bcl.Memory.sln | 9 -- .../Microsoft.Bcl.Numerics.sln | 9 -- .../Microsoft.Bcl.TimeProvider.sln | 16 ---- .../Microsoft.Extensions.Caching.Memory.sln | 29 +++---- ...rosoft.Extensions.Configuration.Binder.sln | 45 +++++----- ...icrosoft.Extensions.Configuration.Json.sln | 37 ++++----- ...t.Extensions.Configuration.UserSecrets.sln | 37 ++++----- ...Microsoft.Extensions.Configuration.Xml.sln | 37 ++++----- .../Microsoft.Extensions.Configuration.sln | 62 ++++++-------- ...sions.DependencyInjection.Abstractions.sln | 13 +-- ...crosoft.Extensions.DependencyInjection.sln | 15 +--- .../Microsoft.Extensions.DependencyModel.sln | 21 ++--- ...ft.Extensions.Diagnostics.Abstractions.sln | 25 ++---- .../Microsoft.Extensions.Diagnostics.sln | 79 ++++++++---------- ...crosoft.Extensions.HostFactoryResolver.sln | 81 +++++++++--------- ...rosoft.Extensions.Hosting.Abstractions.sln | 31 +++---- .../Microsoft.Extensions.Hosting.Systemd.sln | 81 +++++++++--------- ...oft.Extensions.Hosting.WindowsServices.sln | 83 +++++++++---------- .../Microsoft.Extensions.Hosting.sln | 79 ++++++++---------- .../Microsoft.Extensions.Http.sln | 41 ++++----- ...rosoft.Extensions.Logging.Abstractions.sln | 19 ++--- ...osoft.Extensions.Logging.Configuration.sln | 37 ++++----- .../Microsoft.Extensions.Logging.Console.sln | 45 +++++----- .../Microsoft.Extensions.Logging.Debug.sln | 29 +++---- .../Microsoft.Extensions.Logging.EventLog.sln | 31 +++---- ...crosoft.Extensions.Logging.EventSource.sln | 35 ++++---- ...crosoft.Extensions.Logging.TraceSource.sln | 29 +++---- .../Microsoft.Extensions.Logging.sln | 65 +++++++-------- ...nsions.Options.ConfigurationExtensions.sln | 27 +++--- ...oft.Extensions.Options.DataAnnotations.sln | 19 ++--- .../Microsoft.Extensions.Options.sln | 83 +++++++++---------- ...em.DirectoryServices.AccountManagement.sln | 24 ------ .../System.IO.Pipes/System.IO.Pipes.sln | 24 ------ .../System.Memory.Data/System.Memory.Data.sln | 21 ++--- .../System.Net.Http.Json.sln | 21 ++--- .../System.Net.Http.WinHttpHandler.sln | 25 ++---- .../System.Net.Http/System.Net.Http.sln | 24 ------ .../System.Net.ServerSentEvents.sln | 13 +-- .../System.Net.WebSockets.Client.sln | 24 ------ .../System.Numerics.Tensors.sln | 13 +-- ...tem.Runtime.InteropServices.JavaScript.sln | 24 ------ ...ystem.Runtime.Serialization.Formatters.sln | 48 ----------- .../System.Security.Cryptography.Pkcs.sln | 17 ++-- .../System.Security.Cryptography.Xml.sln | 19 ++--- .../System.Security.Cryptography.sln | 19 ++--- .../System.Text.Json/System.Text.Json.sln | 23 ++--- .../System.Text.RegularExpressions.sln | 21 ++--- .../System.Threading.Channels.sln | 15 +--- .../System.Threading.RateLimiting.sln | 13 +-- 51 files changed, 579 insertions(+), 1084 deletions(-) diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln index 54d14ae5c2cf66..8fe54df3154edd 100644 --- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln +++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "src\Microsoft.Bcl.AsyncInterfaces.csproj", "{4D4BED71-8904-4A74-88CD-63D002CCACD0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces.Tests", "tests\Microsoft.Bcl.AsyncInterfaces.Tests.csproj", "{51D9518A-464D-4257-9567-3BDCFF24F3EE}" @@ -23,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A004-4C05-9A8C-E0931DADA5FB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D6A9108E-553B-445E-A037-FA4F3140A279}" @@ -47,10 +43,6 @@ Global {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Debug|Any CPU.Build.0 = Debug|Any CPU {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.ActiveCfg = Release|Any CPU {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.Build.0 = Release|Any CPU - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Release|Any CPU.Build.0 = Release|Any CPU {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -94,7 +86,6 @@ Global GlobalSection(NestedProjects) = preSolution {CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} {51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} {4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} {0AE44453-273B-4F0E-9901-A87891A73C1B} = {D6A9108E-553B-445E-A037-FA4F3140A279} {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279} diff --git a/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln b/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln index 8c6655b0675a46..6ff99b02d0a022 100644 --- a/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln +++ b/src/libraries/Microsoft.Bcl.Cryptography/Microsoft.Bcl.Cryptography.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1AEF7C7B-5A86-4A5E-9F8B-3933F7624751}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "ref\Microsoft.Bcl.Cryptography.csproj", "{63655B2E-6A06-4E48-9F01-D0B910063165}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "src\Microsoft.Bcl.Cryptography.csproj", "{B0716D7E-B824-4866-A1ED-DF31BA2970B9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography.Tests", "tests\Microsoft.Bcl.Cryptography.Tests.csproj", "{E66D17AB-BBAF-4F2B-AC9C-8E89BDCC6191}" @@ -39,10 +37,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8C3BD4AD-1A56-4204-9826-F8B74251D19F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7E9F6DE1-771B-4E25-A603-EC43D0291C8B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{98708A22-7268-4EDB-AE37-70AA958A772A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7E9F6DE1-771B-4E25-A603-EC43D0291C8B}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{34897637-11A1-48A4-AF1F-E11463A61D0B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{568C437D-072B-48BA-BBB4-20F39E2ADA15}" @@ -63,10 +61,6 @@ Global {1AEF7C7B-5A86-4A5E-9F8B-3933F7624751}.Debug|Any CPU.Build.0 = Debug|Any CPU {1AEF7C7B-5A86-4A5E-9F8B-3933F7624751}.Release|Any CPU.ActiveCfg = Release|Any CPU {1AEF7C7B-5A86-4A5E-9F8B-3933F7624751}.Release|Any CPU.Build.0 = Release|Any CPU - {63655B2E-6A06-4E48-9F01-D0B910063165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63655B2E-6A06-4E48-9F01-D0B910063165}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63655B2E-6A06-4E48-9F01-D0B910063165}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63655B2E-6A06-4E48-9F01-D0B910063165}.Release|Any CPU.Build.0 = Release|Any CPU {B0716D7E-B824-4866-A1ED-DF31BA2970B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B0716D7E-B824-4866-A1ED-DF31BA2970B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {B0716D7E-B824-4866-A1ED-DF31BA2970B9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -142,15 +136,14 @@ Global GlobalSection(NestedProjects) = preSolution {1AEF7C7B-5A86-4A5E-9F8B-3933F7624751} = {8C3BD4AD-1A56-4204-9826-F8B74251D19F} {E66D17AB-BBAF-4F2B-AC9C-8E89BDCC6191} = {8C3BD4AD-1A56-4204-9826-F8B74251D19F} - {63655B2E-6A06-4E48-9F01-D0B910063165} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B} + {B0716D7E-B824-4866-A1ED-DF31BA2970B9} = {98708A22-7268-4EDB-AE37-70AA958A772A} + {BA87E988-0C2B-4267-B9BF-CA3F65AF5F6B} = {98708A22-7268-4EDB-AE37-70AA958A772A} + {0485EBE9-BE3E-42A8-8438-FA711F3D3437} = {98708A22-7268-4EDB-AE37-70AA958A772A} {3F12ED84-63B7-477A-BD6A-37AC807773D9} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B} {E199E852-0896-4F1B-B4CA-48F5393693F0} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B} {05F6E3BF-B4EC-44F4-A51A-207ECB9A1049} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B} {A2B1AF52-7F1C-49DA-A5B0-0BCF85031DC0} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B} {FBFED603-DDBC-4EE3-B252-4C46883D8CC5} = {7E9F6DE1-771B-4E25-A603-EC43D0291C8B} - {B0716D7E-B824-4866-A1ED-DF31BA2970B9} = {98708A22-7268-4EDB-AE37-70AA958A772A} - {BA87E988-0C2B-4267-B9BF-CA3F65AF5F6B} = {98708A22-7268-4EDB-AE37-70AA958A772A} - {0485EBE9-BE3E-42A8-8438-FA711F3D3437} = {98708A22-7268-4EDB-AE37-70AA958A772A} {F512A7E1-C119-4803-9312-020005D4FF5F} = {34897637-11A1-48A4-AF1F-E11463A61D0B} {E9271403-BEF5-46E9-B68B-16EF69AA7149} = {34897637-11A1-48A4-AF1F-E11463A61D0B} {A4C2BDDC-1AFB-45A8-9E9B-4AD7396A4DF2} = {34897637-11A1-48A4-AF1F-E11463A61D0B} diff --git a/src/libraries/Microsoft.Bcl.Memory/Microsoft.Bcl.Memory.sln b/src/libraries/Microsoft.Bcl.Memory/Microsoft.Bcl.Memory.sln index af48c3d49ace9e..d9b6edccf34ac2 100644 --- a/src/libraries/Microsoft.Bcl.Memory/Microsoft.Bcl.Memory.sln +++ b/src/libraries/Microsoft.Bcl.Memory/Microsoft.Bcl.Memory.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DC079FC4-E827-4F1C-9C85-803E2D92B3D4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Memory", "ref\Microsoft.Bcl.Memory.csproj", "{97D0AA68-5D2E-4E18-9651-19D0143EA98A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Memory", "src\Microsoft.Bcl.Memory.csproj", "{D4D9D9AC-E482-457A-8047-5267BDF2C2EE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Memory.Tests", "tests\Microsoft.Bcl.Memory.Tests.csproj", "{6916DB98-2958-498D-83E7-90080BEA9D39}" @@ -23,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E78D7A3F-384B-4AA3-ABF1-C4464BE9237C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{76EDDEA8-0E0E-4A94-9D8F-F4DB250E8EB8}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76C22FE9-D65E-40C3-BE2D-98BD628779EC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{101F8A3D-BAEB-4D16-B83E-1136CDF98795}" @@ -47,10 +43,6 @@ Global {DC079FC4-E827-4F1C-9C85-803E2D92B3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU {DC079FC4-E827-4F1C-9C85-803E2D92B3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU {DC079FC4-E827-4F1C-9C85-803E2D92B3D4}.Release|Any CPU.Build.0 = Release|Any CPU - {97D0AA68-5D2E-4E18-9651-19D0143EA98A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97D0AA68-5D2E-4E18-9651-19D0143EA98A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97D0AA68-5D2E-4E18-9651-19D0143EA98A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97D0AA68-5D2E-4E18-9651-19D0143EA98A}.Release|Any CPU.Build.0 = Release|Any CPU {D4D9D9AC-E482-457A-8047-5267BDF2C2EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D4D9D9AC-E482-457A-8047-5267BDF2C2EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4D9D9AC-E482-457A-8047-5267BDF2C2EE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -94,7 +86,6 @@ Global GlobalSection(NestedProjects) = preSolution {DC079FC4-E827-4F1C-9C85-803E2D92B3D4} = {E78D7A3F-384B-4AA3-ABF1-C4464BE9237C} {6916DB98-2958-498D-83E7-90080BEA9D39} = {E78D7A3F-384B-4AA3-ABF1-C4464BE9237C} - {97D0AA68-5D2E-4E18-9651-19D0143EA98A} = {76EDDEA8-0E0E-4A94-9D8F-F4DB250E8EB8} {D4D9D9AC-E482-457A-8047-5267BDF2C2EE} = {76C22FE9-D65E-40C3-BE2D-98BD628779EC} {C5E6E7BE-85A7-411C-942D-58D1CF536B69} = {101F8A3D-BAEB-4D16-B83E-1136CDF98795} {BDF81187-85CE-4BA7-8354-A248CF38F6A3} = {101F8A3D-BAEB-4D16-B83E-1136CDF98795} diff --git a/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln b/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln index 2490a78a68c41c..4680502ea0efe5 100644 --- a/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln +++ b/src/libraries/Microsoft.Bcl.Numerics/Microsoft.Bcl.Numerics.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "ref\Microsoft.Bcl.Numerics.csproj", "{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "src\Microsoft.Bcl.Numerics.csproj", "{4D4BED71-8904-4A74-88CD-63D002CCACD0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics.Tests", "tests\Microsoft.Bcl.Numerics.Tests.csproj", "{51D9518A-464D-4257-9567-3BDCFF24F3EE}" @@ -23,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A004-4C05-9A8C-E0931DADA5FB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D6A9108E-553B-445E-A037-FA4F3140A279}" @@ -47,10 +43,6 @@ Global {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Debug|Any CPU.Build.0 = Debug|Any CPU {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.ActiveCfg = Release|Any CPU {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.Build.0 = Release|Any CPU - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Release|Any CPU.Build.0 = Release|Any CPU {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4D4BED71-8904-4A74-88CD-63D002CCACD0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -94,7 +86,6 @@ Global GlobalSection(NestedProjects) = preSolution {CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} {51D9518A-464D-4257-9567-3BDCFF24F3EE} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} - {73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} {4D4BED71-8904-4A74-88CD-63D002CCACD0} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} {0AE44453-273B-4F0E-9901-A87891A73C1B} = {D6A9108E-553B-445E-A037-FA4F3140A279} {D0F1936C-CF7C-4448-9F90-B9DEABE89EBB} = {D6A9108E-553B-445E-A037-FA4F3140A279} diff --git a/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln b/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln index 7a81cb778189d6..63d59f21f6f0f8 100644 --- a/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln +++ b/src/libraries/Microsoft.Bcl.TimeProvider/Microsoft.Bcl.TimeProvider.sln @@ -1,12 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{93081883-21C2-4B93-B459-3DA4BE7C4B12}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{9A776D8A-1411-4272-A006-5016F3B4EFF8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{C3AF8C81-DFF3-474F-8CDD-3E30319AEBB4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.TimeProvider", "ref\Microsoft.Bcl.TimeProvider.csproj", "{A4806044-E9CE-4744-86A3-7B0968466474}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.TimeProvider", "src\Microsoft.Bcl.TimeProvider.csproj", "{6BF3C14F-036A-4A04-90EC-82ADC2900805}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.TimeProvider.Tests", "tests\Microsoft.Bcl.TimeProvider.Tests.csproj", "{8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E}" @@ -27,8 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B7AA510C-BBAF-4D08-A81C-56A134460112}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{88C727A1-C9E9-4381-AC3A-5213CAE17602}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C2DE61FC-AB38-4E50-8892-1363AFFCEC63}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62}" @@ -51,18 +45,10 @@ Global {93081883-21C2-4B93-B459-3DA4BE7C4B12}.Debug|Any CPU.Build.0 = Debug|Any CPU {93081883-21C2-4B93-B459-3DA4BE7C4B12}.Release|Any CPU.ActiveCfg = Release|Any CPU {93081883-21C2-4B93-B459-3DA4BE7C4B12}.Release|Any CPU.Build.0 = Release|Any CPU - {9A776D8A-1411-4272-A006-5016F3B4EFF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A776D8A-1411-4272-A006-5016F3B4EFF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A776D8A-1411-4272-A006-5016F3B4EFF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A776D8A-1411-4272-A006-5016F3B4EFF8}.Release|Any CPU.Build.0 = Release|Any CPU {C3AF8C81-DFF3-474F-8CDD-3E30319AEBB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3AF8C81-DFF3-474F-8CDD-3E30319AEBB4}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3AF8C81-DFF3-474F-8CDD-3E30319AEBB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3AF8C81-DFF3-474F-8CDD-3E30319AEBB4}.Release|Any CPU.Build.0 = Release|Any CPU - {A4806044-E9CE-4744-86A3-7B0968466474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4806044-E9CE-4744-86A3-7B0968466474}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4806044-E9CE-4744-86A3-7B0968466474}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4806044-E9CE-4744-86A3-7B0968466474}.Release|Any CPU.Build.0 = Release|Any CPU {6BF3C14F-036A-4A04-90EC-82ADC2900805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6BF3C14F-036A-4A04-90EC-82ADC2900805}.Debug|Any CPU.Build.0 = Debug|Any CPU {6BF3C14F-036A-4A04-90EC-82ADC2900805}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -106,8 +92,6 @@ Global GlobalSection(NestedProjects) = preSolution {93081883-21C2-4B93-B459-3DA4BE7C4B12} = {B7AA510C-BBAF-4D08-A81C-56A134460112} {8DBA87BA-C9C5-48AF-9D34-4B9877B28F9E} = {B7AA510C-BBAF-4D08-A81C-56A134460112} - {9A776D8A-1411-4272-A006-5016F3B4EFF8} = {88C727A1-C9E9-4381-AC3A-5213CAE17602} - {A4806044-E9CE-4744-86A3-7B0968466474} = {88C727A1-C9E9-4381-AC3A-5213CAE17602} {C3AF8C81-DFF3-474F-8CDD-3E30319AEBB4} = {C2DE61FC-AB38-4E50-8892-1363AFFCEC63} {6BF3C14F-036A-4A04-90EC-82ADC2900805} = {C2DE61FC-AB38-4E50-8892-1363AFFCEC63} {4FB1DB0F-1371-4635-8160-6AB3B3D3BB04} = {2DA8DE52-952C-4E9B-8C4D-5FF6AC27CA62} diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln index 0cdc1213467f57..73d835e6eef486 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{950759B3-269E-4768-9107-4D1C3B0F9DC8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{21CD6C35-65E2-414A-B9A1-22A0DD57977A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Abstractions", "..\Microsoft.Extensions.Caching.Abstractions\ref\Microsoft.Extensions.Caching.Abstractions.csproj", "{7521082D-62A8-4B62-A6D0-E6A94B2BC8EC}" @@ -67,10 +65,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D430F7D3-0FCA-4C78-9BBA-2E525DF7EABE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FF162B75-76DC-493E-8AE1-23CBDAC2A7A2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{67719AA1-52DC-4E35-B6F7-2F53A50B913A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FF162B75-76DC-493E-8AE1-23CBDAC2A7A2}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C77F6550-84B5-4C20-8541-8B6118A8651A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{DD1F186A-F6F9-4409-8CB3-81EBE93D68E5}" @@ -91,10 +89,6 @@ Global {5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}.Release|Any CPU.Build.0 = Release|Any CPU - {950759B3-269E-4768-9107-4D1C3B0F9DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {950759B3-269E-4768-9107-4D1C3B0F9DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {950759B3-269E-4768-9107-4D1C3B0F9DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {950759B3-269E-4768-9107-4D1C3B0F9DC8}.Release|Any CPU.Build.0 = Release|Any CPU {21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Debug|Any CPU.Build.0 = Debug|Any CPU {21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -226,16 +220,6 @@ Global GlobalSection(NestedProjects) = preSolution {5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A} = {D430F7D3-0FCA-4C78-9BBA-2E525DF7EABE} {19E7C366-8F61-4E7A-8C31-02FDDB26665A} = {D430F7D3-0FCA-4C78-9BBA-2E525DF7EABE} - {950759B3-269E-4768-9107-4D1C3B0F9DC8} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {7521082D-62A8-4B62-A6D0-E6A94B2BC8EC} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {BE9DB8BC-43B1-47A5-B232-FCAAE9D03251} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {9F0655E7-42FE-4AE0-A351-5624C73A35AC} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {4A6F459B-FBFE-44D9-9F52-944302D6D027} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {FCF170AC-100A-4EEE-849E-497A299EDE3F} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {106E86B1-87E6-4000-BD84-2126A6BB5802} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} - {F1D0DEF7-C4E7-4982-B878-F78ED17EE588} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} {21CD6C35-65E2-414A-B9A1-22A0DD57977A} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {AA9524B1-37B3-4A6D-B2D5-A6A2C910E1A9} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {CD3D6F5B-0500-4035-A60A-592A2E231011} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} @@ -245,6 +229,15 @@ Global {5A9310B4-82AB-46F8-83C1-72D21A6A761F} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} {36C918EF-8756-467F-8781-821C07F07897} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A} + {7521082D-62A8-4B62-A6D0-E6A94B2BC8EC} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} + {BE9DB8BC-43B1-47A5-B232-FCAAE9D03251} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} + {9F0655E7-42FE-4AE0-A351-5624C73A35AC} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} + {4A6F459B-FBFE-44D9-9F52-944302D6D027} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} + {BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} + {1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} + {FCF170AC-100A-4EEE-849E-497A299EDE3F} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} + {106E86B1-87E6-4000-BD84-2126A6BB5802} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} + {F1D0DEF7-C4E7-4982-B878-F78ED17EE588} = {FF162B75-76DC-493E-8AE1-23CBDAC2A7A2} {A7F69E1A-D6DF-46A9-A347-66354425BC9E} = {C77F6550-84B5-4C20-8541-8B6118A8651A} {11D672F4-D640-423D-A79A-2A5EA498D3BF} = {C77F6550-84B5-4C20-8541-8B6118A8651A} {51A94A31-6734-4BD1-AACF-73A0D704C985} = {C77F6550-84B5-4C20-8541-8B6118A8651A} diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln b/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln index 606a7a9b07ab90..e62a6091c5061d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5FB89358-3575-45AA-ACFE-EF3598B9AB7E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{64CB04AC-E5B9-4FB8-A1AF-636A6DF23829}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{3E443131-1C04-48F8-9635-99ABD9DA0E6A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{CB09105A-F475-4A91-8836-434FA175F4F9}" @@ -111,10 +109,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AAE738F3-89AC-4406-B1D9-A61A2C3A1CF0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F43534CA-C419-405E-B239-CDE2BDC703BE}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{94EEF122-C307-4BF0-88FE-263B89B59F9F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F43534CA-C419-405E-B239-CDE2BDC703BE}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CC3961B0-C62D-44B9-91DB-11D94A3F91A5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{04FEFFC9-5F1D-47CA-885C-3D7F9643D63D}" @@ -135,10 +133,6 @@ Global {5FB89358-3575-45AA-ACFE-EF3598B9AB7E}.Debug|Any CPU.Build.0 = Debug|Any CPU {5FB89358-3575-45AA-ACFE-EF3598B9AB7E}.Release|Any CPU.ActiveCfg = Release|Any CPU {5FB89358-3575-45AA-ACFE-EF3598B9AB7E}.Release|Any CPU.Build.0 = Release|Any CPU - {64CB04AC-E5B9-4FB8-A1AF-636A6DF23829}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64CB04AC-E5B9-4FB8-A1AF-636A6DF23829}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64CB04AC-E5B9-4FB8-A1AF-636A6DF23829}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64CB04AC-E5B9-4FB8-A1AF-636A6DF23829}.Release|Any CPU.Build.0 = Release|Any CPU {3E443131-1C04-48F8-9635-99ABD9DA0E6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E443131-1C04-48F8-9635-99ABD9DA0E6A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E443131-1C04-48F8-9635-99ABD9DA0E6A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -359,7 +353,23 @@ Global {5FB89358-3575-45AA-ACFE-EF3598B9AB7E} = {AAE738F3-89AC-4406-B1D9-A61A2C3A1CF0} {56F4D38E-41A0-45E2-9F04-9E670D002E71} = {AAE738F3-89AC-4406-B1D9-A61A2C3A1CF0} {75BA0154-A24D-421E-9046-C7949DF12A55} = {AAE738F3-89AC-4406-B1D9-A61A2C3A1CF0} - {64CB04AC-E5B9-4FB8-A1AF-636A6DF23829} = {F43534CA-C419-405E-B239-CDE2BDC703BE} + {3E443131-1C04-48F8-9635-99ABD9DA0E6A} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {958E5946-FD21-4167-B471-8CEC2CB8D75D} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {8C7443D8-864A-4DAE-8835-108580C289F5} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {C5073E23-D3CD-43D3-9AE3-87E570B1B930} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {45DB88E7-487F-49F2-A309-64315FB218B8} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {5177A566-05AF-4DF0-93CC-D2876F7E6EBB} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {56C28B9C-C3FA-4A22-A304-1549F681CE7F} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {7F71CC3D-D4DA-42C4-8470-72C22806FD89} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {091844B8-A79E-4DF4-9A73-B2F01968E982} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {7F2A8B79-8E07-4D70-A7A3-144E71647110} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {6C8B4068-73D3-47A0-B9A7-840475175FC6} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {856C015E-982A-4834-88F7-3F8FFD33981C} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {78D796C3-227B-4648-9BCB-2A000852B2F7} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {9B21B87F-084B-411B-A513-C22B5B961BF3} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {B3B16A0C-C864-4B96-8387-3247C9B13E00} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {5DF5B4A7-D78A-400E-A49E-54F33CA51006} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} + {94C9AA55-C6AD-41CC-B6C8-9186C27A6FFE} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} {CB09105A-F475-4A91-8836-434FA175F4F9} = {F43534CA-C419-405E-B239-CDE2BDC703BE} {F05212B2-FD66-4E8E-AEA0-FAC06A0D6808} = {F43534CA-C419-405E-B239-CDE2BDC703BE} {CB5C87BF-7E0D-4BAC-86BB-06FFC7D1CEE1} = {F43534CA-C419-405E-B239-CDE2BDC703BE} @@ -380,23 +390,6 @@ Global {ACD597F0-0A1A-476A-8AE5-2FB6A0039ACD} = {F43534CA-C419-405E-B239-CDE2BDC703BE} {71F7FC59-D0B0-459C-9AFB-0A41B7B73E4C} = {F43534CA-C419-405E-B239-CDE2BDC703BE} {DA0EC3F6-1D31-41DA-B2A5-CEC8D32E1023} = {F43534CA-C419-405E-B239-CDE2BDC703BE} - {3E443131-1C04-48F8-9635-99ABD9DA0E6A} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {958E5946-FD21-4167-B471-8CEC2CB8D75D} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {8C7443D8-864A-4DAE-8835-108580C289F5} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {C5073E23-D3CD-43D3-9AE3-87E570B1B930} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {45DB88E7-487F-49F2-A309-64315FB218B8} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {5177A566-05AF-4DF0-93CC-D2876F7E6EBB} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {56C28B9C-C3FA-4A22-A304-1549F681CE7F} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {7F71CC3D-D4DA-42C4-8470-72C22806FD89} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {091844B8-A79E-4DF4-9A73-B2F01968E982} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {7F2A8B79-8E07-4D70-A7A3-144E71647110} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {6C8B4068-73D3-47A0-B9A7-840475175FC6} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {856C015E-982A-4834-88F7-3F8FFD33981C} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {78D796C3-227B-4648-9BCB-2A000852B2F7} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {9B21B87F-084B-411B-A513-C22B5B961BF3} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {B3B16A0C-C864-4B96-8387-3247C9B13E00} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {5DF5B4A7-D78A-400E-A49E-54F33CA51006} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} - {94C9AA55-C6AD-41CC-B6C8-9186C27A6FFE} = {94EEF122-C307-4BF0-88FE-263B89B59F9F} {D4B3EEA1-7394-49EA-A088-897C0CD26D11} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5} {F132C649-6660-4583-8AD1-36D38711A994} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5} {9E2C43CF-2E01-4570-8C02-F678607DDAFF} = {CC3961B0-C62D-44B9-91DB-11D94A3F91A5} diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln b/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln index 6c864f0efce9af..80f8ea66c2328f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{78219FF4-C28B-4EA4-B0F9-B5467296A267}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{68210977-E10C-4BC3-B235-31B6E2AF9830}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{5374E4B3-FFA0-47E3-9400-C086E6C236CD}" @@ -91,10 +89,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9C37B729-046B-4419-ADAD-18081467884C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F57E720-CBFF-4648-A507-EFCBCECB5FD3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1789A282-9C08-40AB-9FD0-0FB1FAB99621}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F57E720-CBFF-4648-A507-EFCBCECB5FD3}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{4A53588F-1002-42FB-8717-D68E3FF3FBB8}" @@ -115,10 +113,6 @@ Global {C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Debug|Any CPU.Build.0 = Debug|Any CPU {C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Release|Any CPU.ActiveCfg = Release|Any CPU {C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Release|Any CPU.Build.0 = Release|Any CPU - {78219FF4-C28B-4EA4-B0F9-B5467296A267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78219FF4-C28B-4EA4-B0F9-B5467296A267}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78219FF4-C28B-4EA4-B0F9-B5467296A267}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78219FF4-C28B-4EA4-B0F9-B5467296A267}.Release|Any CPU.Build.0 = Release|Any CPU {68210977-E10C-4BC3-B235-31B6E2AF9830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {68210977-E10C-4BC3-B235-31B6E2AF9830}.Debug|Any CPU.Build.0 = Debug|Any CPU {68210977-E10C-4BC3-B235-31B6E2AF9830}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -298,7 +292,19 @@ Global GlobalSection(NestedProjects) = preSolution {C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38} = {9C37B729-046B-4419-ADAD-18081467884C} {9F495CC2-5325-4F18-831C-8DEFB2F89206} = {9C37B729-046B-4419-ADAD-18081467884C} - {78219FF4-C28B-4EA4-B0F9-B5467296A267} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} + {68210977-E10C-4BC3-B235-31B6E2AF9830} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {B5018015-F6E7-404B-99C5-980FF8298832} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {01CEF916-5FF9-4566-A507-08FD019E04F9} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {405D047F-59EB-47FA-A32D-FA4F5B97D5D6} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {6D8F8AC7-027F-4DB9-9299-4F3873310B8F} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {263497F5-8AAC-4E15-97EC-4871E1E9606F} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {B059E91C-DA44-46BB-BD06-D208258ED8E7} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {6A80D098-69EC-45FE-A064-4CBDFA44BA43} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {FE50757B-7862-49D2-812E-1646F6FE0070} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {489E7D4F-4E7C-4ACD-AB35-3847D10F45A9} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} + {A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} {5374E4B3-FFA0-47E3-9400-C086E6C236CD} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {0D650281-5B86-4A2C-9D09-41BD3846B072} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {4DD667F9-B4EB-47DE-B5FF-6B30442AE921} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} @@ -315,19 +321,6 @@ Global {8834DD69-D545-472B-BEBF-20A87F1084C9} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {3203A6CE-6513-442C-9849-9DAAAFCCB759} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} {6EB2865B-C9F6-4F9B-82DA-4C577587B577} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3} - {68210977-E10C-4BC3-B235-31B6E2AF9830} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {B5018015-F6E7-404B-99C5-980FF8298832} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {01CEF916-5FF9-4566-A507-08FD019E04F9} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {405D047F-59EB-47FA-A32D-FA4F5B97D5D6} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {6D8F8AC7-027F-4DB9-9299-4F3873310B8F} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {263497F5-8AAC-4E15-97EC-4871E1E9606F} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {B059E91C-DA44-46BB-BD06-D208258ED8E7} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {6A80D098-69EC-45FE-A064-4CBDFA44BA43} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {FE50757B-7862-49D2-812E-1646F6FE0070} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {489E7D4F-4E7C-4ACD-AB35-3847D10F45A9} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} - {A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621} {D011C341-C474-499C-B262-4C57C6D64901} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1} {DC7A797D-9D21-4D38-8611-BE0E3D7BA541} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1} {774F9552-3770-461E-BAAA-9D50222497BA} = {B4A09B09-2C03-4FC7-B12F-5DD6FC10A5B1} diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln index 847b0794c95a21..fc0ebb6af9bc19 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0E83BD1A-DB95-4DC8-82C0-D380761B4285}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{54B89407-FCD9-4B1A-8F83-04585D437443}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{925D218A-9DE4-4237-814B-BE68CC0D35E9}" @@ -89,10 +87,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2434A707-1012-4104-81A0-1A1B25D9FEEA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{48CD61B8-2937-4229-8BAB-3F1167B54E61}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{6918E83F-B61D-4E29-9975-B3D3BF1CB91B}" @@ -113,10 +111,6 @@ Global {0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Release|Any CPU.ActiveCfg = Release|Any CPU {0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Release|Any CPU.Build.0 = Release|Any CPU - {A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Release|Any CPU.Build.0 = Release|Any CPU {54B89407-FCD9-4B1A-8F83-04585D437443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {54B89407-FCD9-4B1A-8F83-04585D437443}.Debug|Any CPU.Build.0 = Debug|Any CPU {54B89407-FCD9-4B1A-8F83-04585D437443}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -292,7 +286,19 @@ Global GlobalSection(NestedProjects) = preSolution {0E83BD1A-DB95-4DC8-82C0-D380761B4285} = {2434A707-1012-4104-81A0-1A1B25D9FEEA} {B1445194-8B98-467C-BC04-979E7D1B5942} = {2434A707-1012-4104-81A0-1A1B25D9FEEA} - {A12F26F8-8161-4E9E-B55E-53A72BDE57BB} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} + {54B89407-FCD9-4B1A-8F83-04585D437443} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {DC24B0F6-C434-470F-9AAE-0C4CA59BF591} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {7A05EA4C-E84C-4498-AEF3-964DB25A8348} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {5B82C8CD-9F71-40D9-AF7D-F186EF57CB67} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {26891E23-5E9D-4A36-996B-B41FEA3C0162} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {52E22D6B-87AB-4499-AE22-C834925456E9} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {CB0A5C33-5CDF-441D-8166-459437381CDD} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {AFB63B04-4583-45CD-BA20-C7FC005AE81A} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {7B717013-4B83-4CB5-8749-828936EF660E} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} + {82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} {925D218A-9DE4-4237-814B-BE68CC0D35E9} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {32B3C48F-3691-496D-AE05-6E6D20B1D0BA} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {08D7C8C6-53E5-42F7-9967-0F8173F56DC1} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} @@ -309,19 +315,6 @@ Global {7D2401F2-4534-4197-B47C-B2581A90D592} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {D3256E08-CC12-4C90-848B-6A2F68DFFB97} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} {705F880D-3E27-4ACA-87CC-808BB7DDA610} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3} - {54B89407-FCD9-4B1A-8F83-04585D437443} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {DC24B0F6-C434-470F-9AAE-0C4CA59BF591} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {7A05EA4C-E84C-4498-AEF3-964DB25A8348} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {5B82C8CD-9F71-40D9-AF7D-F186EF57CB67} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {26891E23-5E9D-4A36-996B-B41FEA3C0162} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {52E22D6B-87AB-4499-AE22-C834925456E9} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {CB0A5C33-5CDF-441D-8166-459437381CDD} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {AFB63B04-4583-45CD-BA20-C7FC005AE81A} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {7B717013-4B83-4CB5-8749-828936EF660E} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} - {82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF} {AE3A3D06-1D92-477D-9A55-21F457430FAD} = {48CD61B8-2937-4229-8BAB-3F1167B54E61} {5C82F684-E28B-4487-9606-3AA0B6909EF7} = {48CD61B8-2937-4229-8BAB-3F1167B54E61} {0243557C-E886-4392-8E9F-ECA0820E094B} = {48CD61B8-2937-4229-8BAB-3F1167B54E61} diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln b/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln index a6ac0767cf9c3d..e51db2012de09f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\ref\Microsoft.Bcl.Cryptography.csproj", "{E6BB7E0B-5553-4C15-BE4A-A0FBBB428D2D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\src\Microsoft.Bcl.Cryptography.csproj", "{C9E1BE1D-AA8C-41A1-850F-0DC14DD7DA63}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{B1E05D83-5479-43B7-B25C-D8243FE6B89F}" @@ -81,10 +79,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC596411-85F4-49FD-8A23-BE2983825CF1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB0BAC3A-1FE6-4649-83DF-DC165669C74F}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB0BAC3A-1FE6-4649-83DF-DC165669C74F}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E8CBBF0B-CA7F-46F8-BBA7-94520481757B}" @@ -105,10 +103,6 @@ Global {8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Release|Any CPU.Build.0 = Release|Any CPU - {E6BB7E0B-5553-4C15-BE4A-A0FBBB428D2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6BB7E0B-5553-4C15-BE4A-A0FBBB428D2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6BB7E0B-5553-4C15-BE4A-A0FBBB428D2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6BB7E0B-5553-4C15-BE4A-A0FBBB428D2D}.Release|Any CPU.Build.0 = Release|Any CPU {C9E1BE1D-AA8C-41A1-850F-0DC14DD7DA63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9E1BE1D-AA8C-41A1-850F-0DC14DD7DA63}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9E1BE1D-AA8C-41A1-850F-0DC14DD7DA63}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -268,7 +262,19 @@ Global GlobalSection(NestedProjects) = preSolution {8AF3BFFC-9727-4E21-8E91-11501C9F97E4} = {AC596411-85F4-49FD-8A23-BE2983825CF1} {B05F7183-70C1-4C10-9FFE-66301E0B076B} = {AC596411-85F4-49FD-8A23-BE2983825CF1} - {E6BB7E0B-5553-4C15-BE4A-A0FBBB428D2D} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} + {C9E1BE1D-AA8C-41A1-850F-0DC14DD7DA63} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {9C73A2E3-B370-4B24-ACB0-0C3A9069250D} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {21E44CA2-5355-4092-9EF7-A94520EBDD40} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {EFC0C2A3-1F51-4299-BE43-78284F6AC670} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {5CB1D123-853E-4FE7-9484-AAAD7330897C} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {1999A9E7-2C0F-4C1D-8656-6FA5B0F32469} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {564B50A2-16A3-4AE9-ABE0-F1582F3E97C6} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {03A8EBF2-F912-480F-99E1-34A9A33DD525} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {6824AD93-4154-4710-A018-81DA1FA98C40} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {26C61EB7-2798-4314-B750-8CD2837D4216} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {84E43ED2-A2ED-49F9-B592-92270F0F2EC3} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {A00E22C3-A552-4F4C-AF2C-813B96A54582} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} + {8CBDDA63-8388-42AF-934E-7C60832A9B1C} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} {B1E05D83-5479-43B7-B25C-D8243FE6B89F} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {81370E0B-BC7E-4F49-BCF1-49E0F67F75F4} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {CA8D3F2F-410D-4E32-B104-12929767D1A8} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} @@ -284,19 +290,6 @@ Global {714FBC72-7481-4B87-B8A5-0925DD860EC6} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {91F63A74-902E-44DF-8A78-FD74D030E619} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} {A3C9F01C-6D4D-413B-BADE-A8B9046F985F} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F} - {C9E1BE1D-AA8C-41A1-850F-0DC14DD7DA63} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {9C73A2E3-B370-4B24-ACB0-0C3A9069250D} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {21E44CA2-5355-4092-9EF7-A94520EBDD40} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {EFC0C2A3-1F51-4299-BE43-78284F6AC670} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {5CB1D123-853E-4FE7-9484-AAAD7330897C} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {1999A9E7-2C0F-4C1D-8656-6FA5B0F32469} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {564B50A2-16A3-4AE9-ABE0-F1582F3E97C6} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {03A8EBF2-F912-480F-99E1-34A9A33DD525} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {6824AD93-4154-4710-A018-81DA1FA98C40} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {26C61EB7-2798-4314-B750-8CD2837D4216} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {84E43ED2-A2ED-49F9-B592-92270F0F2EC3} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {A00E22C3-A552-4F4C-AF2C-813B96A54582} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} - {8CBDDA63-8388-42AF-934E-7C60832A9B1C} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD} {880064B4-71DF-49DC-B052-38F93DF02527} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9} {38A073CB-D9DA-4075-B8A1-57B491AA0CDA} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9} {03B854C7-609C-4C64-B7EA-266D65E2E548} = {A3D28D8F-E2E7-4A24-A8E6-12C51D7A55E9} diff --git a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln index 16fbd0857ee63c..da81a9a7038b2a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln +++ b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln @@ -1,12 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6B148547-AC7D-45DC-A059-064D72A6E501}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{32CE4366-07A8-4874-9A12-46D5430A2203}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{CDC60461-56B7-4941-AD08-90228BD450CE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\ref\Microsoft.Bcl.Cryptography.csproj", "{D36AC237-C113-4FCC-9D92-7C9E05609266}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\src\Microsoft.Bcl.Cryptography.csproj", "{956E22D7-5391-4FC1-B167-F00D52BC48EF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{8C395040-9876-47BE-A2EE-4485A6815F89}" @@ -131,10 +127,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC224BF8-12E5-4992-B750-B12011238C26}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76107BEB-02C0-4A83-9631-B226340752A7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC224BF8-12E5-4992-B750-B12011238C26}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{DCF01C23-85A0-4385-B480-D1276ED99A92}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D82FB13A-8138-4F91-95E9-B7436D57A59F}" @@ -155,18 +151,10 @@ Global {6B148547-AC7D-45DC-A059-064D72A6E501}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B148547-AC7D-45DC-A059-064D72A6E501}.Release|Any CPU.ActiveCfg = Release|Any CPU {6B148547-AC7D-45DC-A059-064D72A6E501}.Release|Any CPU.Build.0 = Release|Any CPU - {32CE4366-07A8-4874-9A12-46D5430A2203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32CE4366-07A8-4874-9A12-46D5430A2203}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32CE4366-07A8-4874-9A12-46D5430A2203}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32CE4366-07A8-4874-9A12-46D5430A2203}.Release|Any CPU.Build.0 = Release|Any CPU {CDC60461-56B7-4941-AD08-90228BD450CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CDC60461-56B7-4941-AD08-90228BD450CE}.Debug|Any CPU.Build.0 = Debug|Any CPU {CDC60461-56B7-4941-AD08-90228BD450CE}.Release|Any CPU.ActiveCfg = Release|Any CPU {CDC60461-56B7-4941-AD08-90228BD450CE}.Release|Any CPU.Build.0 = Release|Any CPU - {D36AC237-C113-4FCC-9D92-7C9E05609266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D36AC237-C113-4FCC-9D92-7C9E05609266}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D36AC237-C113-4FCC-9D92-7C9E05609266}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D36AC237-C113-4FCC-9D92-7C9E05609266}.Release|Any CPU.Build.0 = Release|Any CPU {956E22D7-5391-4FC1-B167-F00D52BC48EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {956E22D7-5391-4FC1-B167-F00D52BC48EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {956E22D7-5391-4FC1-B167-F00D52BC48EF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -419,8 +407,28 @@ Global {6B148547-AC7D-45DC-A059-064D72A6E501} = {CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78} {E971240B-FAB5-4C6D-8742-3E22C17913EA} = {CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78} {A786592E-9550-4091-9697-FDCD6FFFDA88} = {CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78} - {32CE4366-07A8-4874-9A12-46D5430A2203} = {DC224BF8-12E5-4992-B750-B12011238C26} - {D36AC237-C113-4FCC-9D92-7C9E05609266} = {DC224BF8-12E5-4992-B750-B12011238C26} + {CDC60461-56B7-4941-AD08-90228BD450CE} = {76107BEB-02C0-4A83-9631-B226340752A7} + {956E22D7-5391-4FC1-B167-F00D52BC48EF} = {76107BEB-02C0-4A83-9631-B226340752A7} + {9AF25AFA-6E25-4CA1-AD4F-FF77FD771714} = {76107BEB-02C0-4A83-9631-B226340752A7} + {71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1} = {76107BEB-02C0-4A83-9631-B226340752A7} + {6242406A-B80A-43EA-A589-F3C665F23662} = {76107BEB-02C0-4A83-9631-B226340752A7} + {ACFDD440-9823-4590-98FA-5C3E0832330D} = {76107BEB-02C0-4A83-9631-B226340752A7} + {EC87683C-72A1-47BA-B1FE-CBA0D7664896} = {76107BEB-02C0-4A83-9631-B226340752A7} + {E62E55D1-C18C-43BF-8E61-1AFADC46E7E2} = {76107BEB-02C0-4A83-9631-B226340752A7} + {2CC46F81-A2A5-4B5D-93A9-0596F33D4301} = {76107BEB-02C0-4A83-9631-B226340752A7} + {8F234107-D9B1-4678-A5FA-FDBBDC85204A} = {76107BEB-02C0-4A83-9631-B226340752A7} + {3468613D-25D9-43DE-9A43-42E4E070E6F6} = {76107BEB-02C0-4A83-9631-B226340752A7} + {67E83D85-6D5D-446E-90D7-9A8DCB7959D1} = {76107BEB-02C0-4A83-9631-B226340752A7} + {9B33CC5B-8010-4D4E-B39D-B6805A16C7E1} = {76107BEB-02C0-4A83-9631-B226340752A7} + {42C10152-F747-443F-9AC1-5738CB62EA6C} = {76107BEB-02C0-4A83-9631-B226340752A7} + {8F65DFBB-9196-4E69-879A-C99C641B3E49} = {76107BEB-02C0-4A83-9631-B226340752A7} + {165EBE5E-E512-4E7E-8C2D-1F4297483D3E} = {76107BEB-02C0-4A83-9631-B226340752A7} + {F50B881E-8A70-48C3-80B0-2094F6868974} = {76107BEB-02C0-4A83-9631-B226340752A7} + {6785832C-7D49-42D3-A68F-BD977109D40F} = {76107BEB-02C0-4A83-9631-B226340752A7} + {95FB3CCD-3174-4BAA-8BF6-67E0A16B8965} = {76107BEB-02C0-4A83-9631-B226340752A7} + {BAA953EF-6529-4F2C-8F89-C76A05258677} = {76107BEB-02C0-4A83-9631-B226340752A7} + {23F4102D-67BD-4865-BB19-195C47945733} = {76107BEB-02C0-4A83-9631-B226340752A7} + {41234DB5-1F3A-4E4A-8BD9-4A277C249666} = {76107BEB-02C0-4A83-9631-B226340752A7} {8C395040-9876-47BE-A2EE-4485A6815F89} = {DC224BF8-12E5-4992-B750-B12011238C26} {D4008AFA-F81B-4879-A059-438355A77754} = {DC224BF8-12E5-4992-B750-B12011238C26} {EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95} = {DC224BF8-12E5-4992-B750-B12011238C26} @@ -446,28 +454,6 @@ Global {F74DB3B7-243F-447D-AE39-672348F661A1} = {DC224BF8-12E5-4992-B750-B12011238C26} {39AA6ECB-A46E-47B8-A90B-286C1C59D962} = {DC224BF8-12E5-4992-B750-B12011238C26} {CFDBC0E2-792D-4F88-8AB5-978DF8E2167D} = {DC224BF8-12E5-4992-B750-B12011238C26} - {CDC60461-56B7-4941-AD08-90228BD450CE} = {76107BEB-02C0-4A83-9631-B226340752A7} - {956E22D7-5391-4FC1-B167-F00D52BC48EF} = {76107BEB-02C0-4A83-9631-B226340752A7} - {9AF25AFA-6E25-4CA1-AD4F-FF77FD771714} = {76107BEB-02C0-4A83-9631-B226340752A7} - {71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1} = {76107BEB-02C0-4A83-9631-B226340752A7} - {6242406A-B80A-43EA-A589-F3C665F23662} = {76107BEB-02C0-4A83-9631-B226340752A7} - {ACFDD440-9823-4590-98FA-5C3E0832330D} = {76107BEB-02C0-4A83-9631-B226340752A7} - {EC87683C-72A1-47BA-B1FE-CBA0D7664896} = {76107BEB-02C0-4A83-9631-B226340752A7} - {E62E55D1-C18C-43BF-8E61-1AFADC46E7E2} = {76107BEB-02C0-4A83-9631-B226340752A7} - {2CC46F81-A2A5-4B5D-93A9-0596F33D4301} = {76107BEB-02C0-4A83-9631-B226340752A7} - {8F234107-D9B1-4678-A5FA-FDBBDC85204A} = {76107BEB-02C0-4A83-9631-B226340752A7} - {3468613D-25D9-43DE-9A43-42E4E070E6F6} = {76107BEB-02C0-4A83-9631-B226340752A7} - {67E83D85-6D5D-446E-90D7-9A8DCB7959D1} = {76107BEB-02C0-4A83-9631-B226340752A7} - {9B33CC5B-8010-4D4E-B39D-B6805A16C7E1} = {76107BEB-02C0-4A83-9631-B226340752A7} - {42C10152-F747-443F-9AC1-5738CB62EA6C} = {76107BEB-02C0-4A83-9631-B226340752A7} - {8F65DFBB-9196-4E69-879A-C99C641B3E49} = {76107BEB-02C0-4A83-9631-B226340752A7} - {165EBE5E-E512-4E7E-8C2D-1F4297483D3E} = {76107BEB-02C0-4A83-9631-B226340752A7} - {F50B881E-8A70-48C3-80B0-2094F6868974} = {76107BEB-02C0-4A83-9631-B226340752A7} - {6785832C-7D49-42D3-A68F-BD977109D40F} = {76107BEB-02C0-4A83-9631-B226340752A7} - {95FB3CCD-3174-4BAA-8BF6-67E0A16B8965} = {76107BEB-02C0-4A83-9631-B226340752A7} - {BAA953EF-6529-4F2C-8F89-C76A05258677} = {76107BEB-02C0-4A83-9631-B226340752A7} - {23F4102D-67BD-4865-BB19-195C47945733} = {76107BEB-02C0-4A83-9631-B226340752A7} - {41234DB5-1F3A-4E4A-8BD9-4A277C249666} = {76107BEB-02C0-4A83-9631-B226340752A7} {63ECC588-0E61-49BF-9E8E-2A2C81AFC192} = {DCF01C23-85A0-4385-B480-D1276ED99A92} {1CAC17CE-D864-4482-9774-F3289F92543A} = {DCF01C23-85A0-4385-B480-D1276ED99A92} {D937FDF2-45B2-470B-98F0-ED57F768BC31} = {DCF01C23-85A0-4385-B480-D1276ED99A92} diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln index 9ec285d66437a0..f7ee598f0f42c1 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln @@ -1,6 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{57D9CDC0-FB4C-4408-8E75-B04079EAE7C8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{F170EDB3-E92B-456A-8749-F3ACE3471510}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{B8B63EFF-64D9-49AB-ACE9-6182DADC7574}" @@ -21,10 +19,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", "{8DE4021B-2C3E-4DB2-A33A-A26FBF527118}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{09E0C315-2A88-4F30-93DA-E22625BF82AB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BF723277-314D-45F4-B29A-6A8683860A93}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{83FB9805-C27B-4039-A30D-7010422CCDCE}" @@ -41,10 +39,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {57D9CDC0-FB4C-4408-8E75-B04079EAE7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57D9CDC0-FB4C-4408-8E75-B04079EAE7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57D9CDC0-FB4C-4408-8E75-B04079EAE7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57D9CDC0-FB4C-4408-8E75-B04079EAE7C8}.Release|Any CPU.Build.0 = Release|Any CPU {F170EDB3-E92B-456A-8749-F3ACE3471510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F170EDB3-E92B-456A-8749-F3ACE3471510}.Debug|Any CPU.Build.0 = Debug|Any CPU {F170EDB3-E92B-456A-8749-F3ACE3471510}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -90,10 +84,9 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {57D9CDC0-FB4C-4408-8E75-B04079EAE7C8} = {C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6} - {B8B63EFF-64D9-49AB-ACE9-6182DADC7574} = {C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6} {F170EDB3-E92B-456A-8749-F3ACE3471510} = {09E0C315-2A88-4F30-93DA-E22625BF82AB} {D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF} = {09E0C315-2A88-4F30-93DA-E22625BF82AB} + {B8B63EFF-64D9-49AB-ACE9-6182DADC7574} = {C494A755-24D9-4E80-AEC3-CF8FEBAFCAC6} {DAC5CD72-8A72-40C3-BD9D-703B7CB6FE04} = {BF723277-314D-45F4-B29A-6A8683860A93} {B7469EEF-415C-485B-9FEC-3D9640400A7B} = {BF723277-314D-45F4-B29A-6A8683860A93} {C1EC51FB-C819-4CC5-9600-42CCE195DE78} = {83FB9805-C27B-4039-A30D-7010422CCDCE} diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln index 9345a6ded34b0d..3a32a185ff3cca 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{30201F60-A891-4C3F-A1A6-DDDD1C8525E3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{047FD3F2-B3A0-4639-B4F0-40D29E61725D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{3068B34E-D975-4C11-B2F2-F10790051F2E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{6D90C067-5CCD-4443-81A5-B9C385011F68}" @@ -37,10 +35,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E168C5B8-F2EB-4BDE-942A-59C1EB130D59}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{74C4FAFF-491D-448C-8CA0-F8E5FC838CC5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E168C5B8-F2EB-4BDE-942A-59C1EB130D59}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{28065F40-B930-4A5D-95D8-A3BD5F86CE11}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0B56ECAF-7B4A-4135-A343-1577ACE09920}" @@ -61,10 +59,6 @@ Global {30201F60-A891-4C3F-A1A6-DDDD1C8525E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {30201F60-A891-4C3F-A1A6-DDDD1C8525E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {30201F60-A891-4C3F-A1A6-DDDD1C8525E3}.Release|Any CPU.Build.0 = Release|Any CPU - {047FD3F2-B3A0-4639-B4F0-40D29E61725D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {047FD3F2-B3A0-4639-B4F0-40D29E61725D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {047FD3F2-B3A0-4639-B4F0-40D29E61725D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {047FD3F2-B3A0-4639-B4F0-40D29E61725D}.Release|Any CPU.Build.0 = Release|Any CPU {3068B34E-D975-4C11-B2F2-F10790051F2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3068B34E-D975-4C11-B2F2-F10790051F2E}.Debug|Any CPU.Build.0 = Debug|Any CPU {3068B34E-D975-4C11-B2F2-F10790051F2E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -138,13 +132,12 @@ Global {2C6983BB-3CB4-4EB7-9AF1-2F24FE1ECEAB} = {5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8} {F11DD75C-122C-4B98-9EED-F71551F9562A} = {5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8} {1EE6CA66-6585-459D-8889-666D4C2D4C27} = {5F2D3A6A-76D3-4C22-A7F7-8D73D67A98F8} - {047FD3F2-B3A0-4639-B4F0-40D29E61725D} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} - {6D90C067-5CCD-4443-81A5-B9C385011F68} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} - {66E6ADF5-200F-41F3-9CA4-858EF69D2A61} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} {3068B34E-D975-4C11-B2F2-F10790051F2E} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5} {9CD9F9EB-379C-44C1-9016-33DFEC821C76} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5} {4532D9F9-1E0D-4A62-8038-D3454B255E86} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5} {C5ECD02C-FA5A-4B56-9CA2-47AD8989714A} = {74C4FAFF-491D-448C-8CA0-F8E5FC838CC5} + {6D90C067-5CCD-4443-81A5-B9C385011F68} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} + {66E6ADF5-200F-41F3-9CA4-858EF69D2A61} = {E168C5B8-F2EB-4BDE-942A-59C1EB130D59} {FD3C8D4F-0EAA-4575-A685-F77C6D340E60} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11} {9E5124E4-BEDA-4B2D-9699-60E2A7B1881D} = {28065F40-B930-4A5D-95D8-A3BD5F86CE11} {C85FD264-C77B-44F3-926C-D61C5DAD369E} = {0B56ECAF-7B4A-4135-A343-1577ACE09920} diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln index 201ad1c9f8a994..3220c6925a9e38 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln +++ b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E5B6A94F-615E-4DAF-8110-E5A776BB8296}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{696D69C9-C5F6-405E-A8B5-5375D08BBADC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyModel", "ref\Microsoft.Extensions.DependencyModel.csproj", "{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6}" @@ -59,10 +57,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{155C3F40-F63D-49DF-87D3-A3EEA27036E8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{50BA55F5-BD05-4C05-910F-2BFD20BD3465}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5725D7DF-DC33-47D2-90C9-D8736C579E77}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{50BA55F5-BD05-4C05-910F-2BFD20BD3465}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{55D04C80-4A8F-40AC-967D-3FA77C814D7B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{9C13782D-F7D7-4F02-A39D-D7BD992EB257}" @@ -83,10 +81,6 @@ Global {E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Release|Any CPU.Build.0 = Release|Any CPU - {696D69C9-C5F6-405E-A8B5-5375D08BBADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {696D69C9-C5F6-405E-A8B5-5375D08BBADC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {696D69C9-C5F6-405E-A8B5-5375D08BBADC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {696D69C9-C5F6-405E-A8B5-5375D08BBADC}.Release|Any CPU.Build.0 = Release|Any CPU {2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -203,7 +197,11 @@ Global {E5B6A94F-615E-4DAF-8110-E5A776BB8296} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8} {F5E89C81-2D78-4F86-ABD2-7D983F46EB58} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8} {5351C410-530D-4724-A8E6-430831E7332B} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8} - {696D69C9-C5F6-405E-A8B5-5375D08BBADC} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} + {2AED2951-7724-4EFC-8E16-6DF877C6B4A6} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} + {5C580568-6072-4F27-B5C6-FA04556E3B98} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} + {57D6EF89-ACBC-45E7-A87A-365199E67DFE} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} + {7902A0CA-E94D-4C96-A112-455A1E5E2390} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} + {FA7201FE-097D-4197-BDEC-329986814D8D} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} {6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} {C8C58A2A-B254-4A74-8C7B-9B0CA0A9E67A} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} {CC0E8CC8-88F5-4D72-9B3F-0281DD58461A} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} @@ -212,11 +210,6 @@ Global {536A305D-DC57-4E7F-B21B-B8DE916A63C3} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} {50F89560-1449-44E4-844E-72815256534B} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} {8E212A9D-391B-4EFA-943D-7D104A9D3D7E} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465} - {2AED2951-7724-4EFC-8E16-6DF877C6B4A6} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} - {5C580568-6072-4F27-B5C6-FA04556E3B98} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} - {57D6EF89-ACBC-45E7-A87A-365199E67DFE} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} - {7902A0CA-E94D-4C96-A112-455A1E5E2390} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} - {FA7201FE-097D-4197-BDEC-329986814D8D} = {5725D7DF-DC33-47D2-90C9-D8736C579E77} {FA796FCD-5901-407B-BF40-166169718A0F} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B} {7B4B86A8-EF62-45F0-A431-05F4C11A2E0D} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B} {6F992337-EAEE-4F7A-BF3B-DDC526F054F7} = {55D04C80-4A8F-40AC-967D-3FA77C814D7B} diff --git a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/Microsoft.Extensions.Diagnostics.Abstractions.sln b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/Microsoft.Extensions.Diagnostics.Abstractions.sln index 87e92fa7c67c60..740065aa2921e3 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/Microsoft.Extensions.Diagnostics.Abstractions.sln +++ b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/Microsoft.Extensions.Diagnostics.Abstractions.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{79CE8C7E-A4AF-413C-A54D-86F17073559C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{9052AC86-4B89-4311-BEF2-7C49FB72DC0F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{FA353FC1-2D03-426A-8973-0CDA8DF5E5DD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D6778DF4-DA03-43E7-BD9D-2E2C35DCCE7F}" @@ -53,10 +51,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7631380A-FB73-4241-9987-0891A21E9769}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{548DF5F7-790C-4A1C-89EB-BD904CA1BA86}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7631380A-FB73-4241-9987-0891A21E9769}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D64F512B-CF20-4CE0-8FE8-1E65C1A84E90}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D4B78CD9-7251-426B-AA22-48BC8EDD396A}" @@ -77,10 +75,6 @@ Global {79CE8C7E-A4AF-413C-A54D-86F17073559C}.Debug|Any CPU.Build.0 = Debug|Any CPU {79CE8C7E-A4AF-413C-A54D-86F17073559C}.Release|Any CPU.ActiveCfg = Release|Any CPU {79CE8C7E-A4AF-413C-A54D-86F17073559C}.Release|Any CPU.Build.0 = Release|Any CPU - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F}.Release|Any CPU.Build.0 = Release|Any CPU {FA353FC1-2D03-426A-8973-0CDA8DF5E5DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FA353FC1-2D03-426A-8973-0CDA8DF5E5DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA353FC1-2D03-426A-8973-0CDA8DF5E5DD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -184,14 +178,6 @@ Global GlobalSection(NestedProjects) = preSolution {79CE8C7E-A4AF-413C-A54D-86F17073559C} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} {CB373FE5-F976-4CB2-A04E-6188D67A5816} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F} = {7631380A-FB73-4241-9987-0891A21E9769} - {D6778DF4-DA03-43E7-BD9D-2E2C35DCCE7F} = {7631380A-FB73-4241-9987-0891A21E9769} - {7FC1EF40-C815-4046-956E-79E9A359BC46} = {7631380A-FB73-4241-9987-0891A21E9769} - {EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C} = {7631380A-FB73-4241-9987-0891A21E9769} - {DB82EB74-4E33-4552-968C-C159FA5F58D1} = {7631380A-FB73-4241-9987-0891A21E9769} - {F2B87668-F1C2-48ED-B91F-7BB03EA5F9A0} = {7631380A-FB73-4241-9987-0891A21E9769} - {EF6988FC-AE49-4E27-910F-A06434211988} = {7631380A-FB73-4241-9987-0891A21E9769} - {69D08457-EC2F-4BC8-A562-6154C2D6D2DC} = {7631380A-FB73-4241-9987-0891A21E9769} {FA353FC1-2D03-426A-8973-0CDA8DF5E5DD} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} {527CCF66-AC37-487C-871E-A4F6B94E1731} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} {305A2903-7F06-48C7-92B6-B9D11B34DCC0} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} @@ -199,6 +185,13 @@ Global {D2AF2EAB-409E-48B8-8D48-BE21719FCAF2} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} {3C3BAA89-2A16-46D8-B50B-101174989814} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} {A4117DE8-D141-4B09-9A83-4FA4E497FECC} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} + {D6778DF4-DA03-43E7-BD9D-2E2C35DCCE7F} = {7631380A-FB73-4241-9987-0891A21E9769} + {7FC1EF40-C815-4046-956E-79E9A359BC46} = {7631380A-FB73-4241-9987-0891A21E9769} + {EF2C8F2A-6088-4A89-9AE2-9C2FDFB0241C} = {7631380A-FB73-4241-9987-0891A21E9769} + {DB82EB74-4E33-4552-968C-C159FA5F58D1} = {7631380A-FB73-4241-9987-0891A21E9769} + {F2B87668-F1C2-48ED-B91F-7BB03EA5F9A0} = {7631380A-FB73-4241-9987-0891A21E9769} + {EF6988FC-AE49-4E27-910F-A06434211988} = {7631380A-FB73-4241-9987-0891A21E9769} + {69D08457-EC2F-4BC8-A562-6154C2D6D2DC} = {7631380A-FB73-4241-9987-0891A21E9769} {AA2E94ED-4C40-4028-84E5-7459EDB8F66E} = {D64F512B-CF20-4CE0-8FE8-1E65C1A84E90} {40058320-9546-45A9-9D6E-CC80EB2E4D95} = {D64F512B-CF20-4CE0-8FE8-1E65C1A84E90} {2DB6B79C-C8B4-428F-AC57-1B5947C75021} = {D64F512B-CF20-4CE0-8FE8-1E65C1A84E90} diff --git a/src/libraries/Microsoft.Extensions.Diagnostics/Microsoft.Extensions.Diagnostics.sln b/src/libraries/Microsoft.Extensions.Diagnostics/Microsoft.Extensions.Diagnostics.sln index bcf1334f430d75..dd27ac7234e873 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics/Microsoft.Extensions.Diagnostics.sln +++ b/src/libraries/Microsoft.Extensions.Diagnostics/Microsoft.Extensions.Diagnostics.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{E7A3B914-598D-4ABC-B973-6CC444DAFE52}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{280FDDEA-50B1-4BD3-83B1-475B15829538}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{2D529E61-474E-45C6-8A7E-35AAD70B9801}" @@ -181,10 +179,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9BF048D0-411D-4C2A-8C32-3A3255501D27}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A447D0CB-601B-479E-A2B2-76E48F5D4D61}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9BF048D0-411D-4C2A-8C32-3A3255501D27}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{66953A8A-9E31-486F-AF8E-7310F6707E4F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C3E784CB-8296-4960-B679-9A5D3153D5B5}" @@ -205,10 +203,6 @@ Global {B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU {B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU {B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}.Release|Any CPU.Build.0 = Release|Any CPU - {E7A3B914-598D-4ABC-B973-6CC444DAFE52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7A3B914-598D-4ABC-B973-6CC444DAFE52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7A3B914-598D-4ABC-B973-6CC444DAFE52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7A3B914-598D-4ABC-B973-6CC444DAFE52}.Release|Any CPU.Build.0 = Release|Any CPU {280FDDEA-50B1-4BD3-83B1-475B15829538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {280FDDEA-50B1-4BD3-83B1-475B15829538}.Debug|Any CPU.Build.0 = Debug|Any CPU {280FDDEA-50B1-4BD3-83B1-475B15829538}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -568,7 +562,40 @@ Global GlobalSection(NestedProjects) = preSolution {B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3} {43DBAD84-A865-4F5F-AB76-7F3EB6784E99} = {76DC9C4C-EE53-47E6-B6BF-7B135EA8CAF3} - {E7A3B914-598D-4ABC-B973-6CC444DAFE52} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} + {280FDDEA-50B1-4BD3-83B1-475B15829538} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {ECF14067-8633-4DDA-8EAE-124989F8E09E} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {8CAF1C73-3C4B-4FF9-B753-6A3E9F24A68B} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {DA9F343E-6798-45CD-B62B-F4902BE70F1C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {D5583F37-02B3-489B-8D05-861FD5DA2831} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {658AC451-ED0C-4A16-9A71-307D5329C29B} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {51FD6BBF-ABE5-47EE-9BE3-8D0FA9786A5E} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {A77E804D-4576-4962-A248-92E538ED997C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {3B8833A4-2E9E-47BD-93DE-65934DCEB9A6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {1D851FA7-2F3C-4E3C-8F22-AF5E13D9BEE6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {40525D17-4553-405E-8B21-4603B07D126A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {09E28D94-B771-48EB-800C-5A80C2C0055C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {9C5071C4-CF40-44BA-AD0A-F84114763D79} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {7A5EA83B-B050-44D3-BAF8-3A850E762454} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {7E92DACA-8B45-40D8-ACB2-CB0D695BF4AA} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {005F8573-5160-4025-932E-722C0BC8974A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {E9880311-5A49-434B-9CC2-E5640E51B9F8} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {F7B32149-992E-49B0-9D57-F2997755C50A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {EB40FEF1-FC6E-47C3-80FD-1C11E3DB201B} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {E7212B73-1083-4857-92D5-C11D626A10C8} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {ED35D47D-16A0-48B2-AE6C-3AED72A93884} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {FC4B0D3F-4536-4EFC-BE5F-9EDF3B006648} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {1D4C92E9-A11A-4417-8C51-57F69062C2AB} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {7E33613A-3CAA-4541-B831-7460C61F07C9} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {A2853038-B04A-4BAA-B0B4-0481457003B8} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {B233AB55-788C-48B6-9557-098B8D0DDBFF} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {711B2905-FDC7-4D67-B40B-9DEFF042CB01} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {AE5566CE-EC5E-47B0-B5A3-89E90B3893F0} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {7F4D4D8E-C425-4FBA-9242-CEE5A872B0EA} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {CB87FAA6-A774-470A-9913-34E6A8E9963A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {EF05A7EA-E591-4615-AF74-25B6DE2462D6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {6270CABD-0CEE-430C-99F4-A9AD5C71C8A3} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} + {9B2C9329-B5EA-4F69-B818-11AC8E4BA4B4} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} {2D529E61-474E-45C6-8A7E-35AAD70B9801} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} {D835A0A8-C213-461F-8B41-6F2715DBEC43} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} {422A286D-79A7-4D09-A3D9-B0FB7499D7E0} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} @@ -605,40 +632,6 @@ Global {3D040E9F-C39B-49C6-8C87-68D427AECA8F} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} {62CFD5A4-8EB7-4CB7-9FDC-64D3CB64B4C5} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} {14E6DD62-2682-4583-9B33-6F13E42B82F7} = {9BF048D0-411D-4C2A-8C32-3A3255501D27} - {280FDDEA-50B1-4BD3-83B1-475B15829538} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {30E93D8B-4B53-4DC1-A5E3-FCAC1E37303D} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {ECF14067-8633-4DDA-8EAE-124989F8E09E} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {8CAF1C73-3C4B-4FF9-B753-6A3E9F24A68B} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {DA9F343E-6798-45CD-B62B-F4902BE70F1C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {D5583F37-02B3-489B-8D05-861FD5DA2831} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {658AC451-ED0C-4A16-9A71-307D5329C29B} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {51FD6BBF-ABE5-47EE-9BE3-8D0FA9786A5E} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {A77E804D-4576-4962-A248-92E538ED997C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {3B8833A4-2E9E-47BD-93DE-65934DCEB9A6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {1D851FA7-2F3C-4E3C-8F22-AF5E13D9BEE6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {40525D17-4553-405E-8B21-4603B07D126A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {09E28D94-B771-48EB-800C-5A80C2C0055C} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {9C5071C4-CF40-44BA-AD0A-F84114763D79} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {7A5EA83B-B050-44D3-BAF8-3A850E762454} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {7E92DACA-8B45-40D8-ACB2-CB0D695BF4AA} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {005F8573-5160-4025-932E-722C0BC8974A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {E9880311-5A49-434B-9CC2-E5640E51B9F8} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {F7B32149-992E-49B0-9D57-F2997755C50A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {EB40FEF1-FC6E-47C3-80FD-1C11E3DB201B} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {E7212B73-1083-4857-92D5-C11D626A10C8} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {ED35D47D-16A0-48B2-AE6C-3AED72A93884} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {FC4B0D3F-4536-4EFC-BE5F-9EDF3B006648} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {1D4C92E9-A11A-4417-8C51-57F69062C2AB} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {7E33613A-3CAA-4541-B831-7460C61F07C9} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {A2853038-B04A-4BAA-B0B4-0481457003B8} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {B233AB55-788C-48B6-9557-098B8D0DDBFF} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {711B2905-FDC7-4D67-B40B-9DEFF042CB01} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {AE5566CE-EC5E-47B0-B5A3-89E90B3893F0} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {7F4D4D8E-C425-4FBA-9242-CEE5A872B0EA} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {CB87FAA6-A774-470A-9913-34E6A8E9963A} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {EF05A7EA-E591-4615-AF74-25B6DE2462D6} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {6270CABD-0CEE-430C-99F4-A9AD5C71C8A3} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} - {9B2C9329-B5EA-4F69-B818-11AC8E4BA4B4} = {A447D0CB-601B-479E-A2B2-76E48F5D4D61} {1F3CFA6D-3142-4616-8A46-F05C7BBF1EC6} = {66953A8A-9E31-486F-AF8E-7310F6707E4F} {D1F09C9A-DA50-468E-8024-E7B67650E7D6} = {66953A8A-9E31-486F-AF8E-7310F6707E4F} {BF1009F3-B0E9-47B4-B6D6-F8AC93962ED7} = {66953A8A-9E31-486F-AF8E-7310F6707E4F} diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.sln b/src/libraries/Microsoft.Extensions.HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.sln index 355adaeb6158d0..b61f2909824ee0 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.sln +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2AF15470-C85F-461A-A5D1-A1B78CC6106A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{5D864DEC-93F4-4BCF-89B4-5191FC6F77BF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{1C002BCE-629C-43ED-9024-B4546A9E3636}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{00C619C1-D5AE-4A4B-9255-866CE9BEA94F}" @@ -215,10 +213,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{41A601F5-19D8-45A9-AE63-33F040315BA6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{42F6092F-A377-42AF-A595-C382F04899A5}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{549715BC-A4E3-49F5-A8AC-84D2F65FAC0F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{42F6092F-A377-42AF-A595-C382F04899A5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{64423F79-97D4-45E8-9F06-6CFB06A36C0F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{1B8DE64E-4034-4A22-8807-365AA93AFB60}" @@ -239,10 +237,6 @@ Global {2AF15470-C85F-461A-A5D1-A1B78CC6106A}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AF15470-C85F-461A-A5D1-A1B78CC6106A}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AF15470-C85F-461A-A5D1-A1B78CC6106A}.Release|Any CPU.Build.0 = Release|Any CPU - {5D864DEC-93F4-4BCF-89B4-5191FC6F77BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D864DEC-93F4-4BCF-89B4-5191FC6F77BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D864DEC-93F4-4BCF-89B4-5191FC6F77BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D864DEC-93F4-4BCF-89B4-5191FC6F77BF}.Release|Any CPU.Build.0 = Release|Any CPU {1C002BCE-629C-43ED-9024-B4546A9E3636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C002BCE-629C-43ED-9024-B4546A9E3636}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C002BCE-629C-43ED-9024-B4546A9E3636}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -686,7 +680,41 @@ Global {4A6E64E7-81B3-4EBA-909D-19BA4F044603} = {41A601F5-19D8-45A9-AE63-33F040315BA6} {CA2E1701-3424-4D6B-8FA3-542852CF0887} = {41A601F5-19D8-45A9-AE63-33F040315BA6} {57DE3636-2AF8-4DCA-B997-88A0D074C9CF} = {41A601F5-19D8-45A9-AE63-33F040315BA6} - {5D864DEC-93F4-4BCF-89B4-5191FC6F77BF} = {42F6092F-A377-42AF-A595-C382F04899A5} + {1C002BCE-629C-43ED-9024-B4546A9E3636} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {67F6FF8D-4EBB-4BCC-A531-7844935E9CA6} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {2142ADA1-1367-4C02-B9B4-49D5D8F8167B} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {AB581AAB-9F78-434C-8BC0-6092B8B7ED68} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {F628C9CB-8CD6-4287-83D1-173CD6A9995B} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {846D7254-BB95-42B6-B392-FEE335848C0E} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {2C3D40A1-5800-4DFF-ABCA-13AC282FFA36} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {D8B2FC03-04AD-446A-B415-52321AD060F9} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {94F88257-62C7-4F38-A838-5C327E61B3CC} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {117EACAD-89DC-48F1-895B-BC750EE39121} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {0B776D27-DC71-432D-AC41-7BCDA6F2001D} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {E448C7D4-D00F-4663-9D5B-C90F3C746617} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {6D9E9140-E7EA-4BE2-84A8-AC5E3791D8EB} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {A44460E9-1ADD-4059-966B-677F6971FB5D} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {98F4DDD9-F3C5-47E1-8B3F-AA4893642DFA} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {D8D0E8B9-8D10-4E94-9CEF-EF38097BA193} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {317C456F-8F26-4441-93F7-9042B0DC7119} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {AA3D6223-18CD-4BD5-9B67-FCFF33717F22} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {1ED0C2C4-117A-468D-931C-3C7BDBB0748C} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {1EDBDC83-B048-49CB-A43D-C61C07127AAA} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {0622DCD8-F260-47C2-BE3C-88B470F3AE39} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {27798D1A-51B1-451F-A8B9-51AAD25995DD} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {E8A5F873-D1BB-4D5C-AE28-3D31D73B35A4} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {2F1F0FA2-7461-417E-A6CC-ED76F1C1340D} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {8B9B0679-457A-4F46-BF56-3374C237780C} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {02301154-A76E-46C4-81CF-DC3094B888F3} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {4B4E38AB-2BB4-4958-A791-440252601444} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {3BAC864E-1F70-48B1-A7B3-C46DD997D9EA} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {02045C89-3D53-416F-8006-6C4180929846} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {549F0FC6-12EF-4366-A2C8-EFEB03DD13ED} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {52F8C052-7A48-43F5-8559-6E4EAB36E36A} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {516D2203-B660-4D05-94A4-DA69C48A74AC} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {7DE2F3A0-6997-4AD3-96BC-C012487FA9A5} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {6D474B99-2B7A-4460-BFBF-D5AF7F7D5EA1} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} + {1D04506B-4530-4BC4-B0F7-7E46DF497454} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} {00C619C1-D5AE-4A4B-9255-866CE9BEA94F} = {42F6092F-A377-42AF-A595-C382F04899A5} {A573897A-051C-476B-91D9-D121D2301340} = {42F6092F-A377-42AF-A595-C382F04899A5} {5069F809-0494-4A84-BE4C-908631DB5F67} = {42F6092F-A377-42AF-A595-C382F04899A5} @@ -723,41 +751,6 @@ Global {66425071-C02D-4B9E-88AB-B738334AF758} = {42F6092F-A377-42AF-A595-C382F04899A5} {06DC7A1A-3D70-4637-A5F2-44392327C18C} = {42F6092F-A377-42AF-A595-C382F04899A5} {ADCD61FC-DA64-4448-889C-E0B1DC937A33} = {42F6092F-A377-42AF-A595-C382F04899A5} - {1C002BCE-629C-43ED-9024-B4546A9E3636} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {67F6FF8D-4EBB-4BCC-A531-7844935E9CA6} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {2142ADA1-1367-4C02-B9B4-49D5D8F8167B} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {AB581AAB-9F78-434C-8BC0-6092B8B7ED68} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {F628C9CB-8CD6-4287-83D1-173CD6A9995B} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {846D7254-BB95-42B6-B392-FEE335848C0E} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {2C3D40A1-5800-4DFF-ABCA-13AC282FFA36} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {D8B2FC03-04AD-446A-B415-52321AD060F9} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {94F88257-62C7-4F38-A838-5C327E61B3CC} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {117EACAD-89DC-48F1-895B-BC750EE39121} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {0B776D27-DC71-432D-AC41-7BCDA6F2001D} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {E448C7D4-D00F-4663-9D5B-C90F3C746617} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {6D9E9140-E7EA-4BE2-84A8-AC5E3791D8EB} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {A44460E9-1ADD-4059-966B-677F6971FB5D} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {98F4DDD9-F3C5-47E1-8B3F-AA4893642DFA} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {D8D0E8B9-8D10-4E94-9CEF-EF38097BA193} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {317C456F-8F26-4441-93F7-9042B0DC7119} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {AA3D6223-18CD-4BD5-9B67-FCFF33717F22} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {1ED0C2C4-117A-468D-931C-3C7BDBB0748C} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {1EDBDC83-B048-49CB-A43D-C61C07127AAA} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {0622DCD8-F260-47C2-BE3C-88B470F3AE39} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {27798D1A-51B1-451F-A8B9-51AAD25995DD} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {E8A5F873-D1BB-4D5C-AE28-3D31D73B35A4} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {2F1F0FA2-7461-417E-A6CC-ED76F1C1340D} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {8B9B0679-457A-4F46-BF56-3374C237780C} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {02301154-A76E-46C4-81CF-DC3094B888F3} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {4B4E38AB-2BB4-4958-A791-440252601444} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {3BAC864E-1F70-48B1-A7B3-C46DD997D9EA} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {02045C89-3D53-416F-8006-6C4180929846} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {549F0FC6-12EF-4366-A2C8-EFEB03DD13ED} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {52F8C052-7A48-43F5-8559-6E4EAB36E36A} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {516D2203-B660-4D05-94A4-DA69C48A74AC} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {7DE2F3A0-6997-4AD3-96BC-C012487FA9A5} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {6D474B99-2B7A-4460-BFBF-D5AF7F7D5EA1} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} - {1D04506B-4530-4BC4-B0F7-7E46DF497454} = {549715BC-A4E3-49F5-A8AC-84D2F65FAC0F} {B3A888B8-B506-40A4-B43F-95862E572964} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F} {B764D730-34BD-4BED-A756-373F2F17391A} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F} {0540EF81-262A-4A23-92E3-14A3971A17A5} = {64423F79-97D4-45E8-9F06-6CFB06A36C0F} diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln index 4a0ce06c5af1bf..0fc42beb0b8003 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln @@ -1,6 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{D1DAA13A-B302-46AB-965A-7610EE55F588}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{E9CC25E1-367A-41E4-A710-5C5AB7475F40}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{47F05662-AD13-4955-A205-0FCE6913FDDB}" @@ -65,10 +63,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", "{EEE0C0A5-DE33-4F7E-A7CB-3A4D1E2B5CA6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{39B9C1F2-8309-41E5-B048-921219977818}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{39B9C1F2-8309-41E5-B048-921219977818}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CE599F12-D209-41F2-964F-BECBE6D1812D}" @@ -85,10 +83,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D1DAA13A-B302-46AB-965A-7610EE55F588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1DAA13A-B302-46AB-965A-7610EE55F588}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1DAA13A-B302-46AB-965A-7610EE55F588}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1DAA13A-B302-46AB-965A-7610EE55F588}.Release|Any CPU.Build.0 = Release|Any CPU {E9CC25E1-367A-41E4-A710-5C5AB7475F40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E9CC25E1-367A-41E4-A710-5C5AB7475F40}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9CC25E1-367A-41E4-A710-5C5AB7475F40}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -222,17 +216,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {D1DAA13A-B302-46AB-965A-7610EE55F588} = {39B9C1F2-8309-41E5-B048-921219977818} - {47F05662-AD13-4955-A205-0FCE6913FDDB} = {39B9C1F2-8309-41E5-B048-921219977818} - {963867EB-DEAF-487E-A3E8-71AE9379AD53} = {39B9C1F2-8309-41E5-B048-921219977818} - {E134FF77-0925-4370-85C0-10EFC5F7ED26} = {39B9C1F2-8309-41E5-B048-921219977818} - {08064208-D005-4C34-B152-D03C7D173D60} = {39B9C1F2-8309-41E5-B048-921219977818} - {7CCF5CE0-3840-4AA1-810F-138D001F2486} = {39B9C1F2-8309-41E5-B048-921219977818} - {C4FD2984-3E22-47AF-8584-FF908D9D3E43} = {39B9C1F2-8309-41E5-B048-921219977818} - {320005A1-5A96-4C1C-AAC5-F9714B93CA1D} = {39B9C1F2-8309-41E5-B048-921219977818} - {99CF7377-8E77-4EDB-B04F-E546ACCCE84D} = {39B9C1F2-8309-41E5-B048-921219977818} - {BE9283F7-19A3-4349-B9EE-656466A9CD62} = {39B9C1F2-8309-41E5-B048-921219977818} - {AE4B08F2-A568-4B2E-BAED-065172234D58} = {39B9C1F2-8309-41E5-B048-921219977818} {E9CC25E1-367A-41E4-A710-5C5AB7475F40} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} {7F238E01-3021-4F87-B463-A4AB5B91F753} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} {60641184-B841-4F48-A917-76618114916A} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} @@ -243,6 +226,16 @@ Global {7FB59953-BA25-4A9E-864D-219E8CCFEEFE} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} {A7370C94-090B-4F79-A964-8029481D60FC} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} {72EC9B5C-B125-4B84-87DD-6AC0C92C4A74} = {6C6C2D2B-C83F-4513-A9BB-33F8204B9EA9} + {47F05662-AD13-4955-A205-0FCE6913FDDB} = {39B9C1F2-8309-41E5-B048-921219977818} + {963867EB-DEAF-487E-A3E8-71AE9379AD53} = {39B9C1F2-8309-41E5-B048-921219977818} + {E134FF77-0925-4370-85C0-10EFC5F7ED26} = {39B9C1F2-8309-41E5-B048-921219977818} + {08064208-D005-4C34-B152-D03C7D173D60} = {39B9C1F2-8309-41E5-B048-921219977818} + {7CCF5CE0-3840-4AA1-810F-138D001F2486} = {39B9C1F2-8309-41E5-B048-921219977818} + {C4FD2984-3E22-47AF-8584-FF908D9D3E43} = {39B9C1F2-8309-41E5-B048-921219977818} + {320005A1-5A96-4C1C-AAC5-F9714B93CA1D} = {39B9C1F2-8309-41E5-B048-921219977818} + {99CF7377-8E77-4EDB-B04F-E546ACCCE84D} = {39B9C1F2-8309-41E5-B048-921219977818} + {BE9283F7-19A3-4349-B9EE-656466A9CD62} = {39B9C1F2-8309-41E5-B048-921219977818} + {AE4B08F2-A568-4B2E-BAED-065172234D58} = {39B9C1F2-8309-41E5-B048-921219977818} {3A11089C-B572-4F57-AB9A-B9F54D2CD1DE} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15} {95E4261F-F449-48A5-83AF-3BA144A023A3} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15} {40F96C08-9936-47DA-AA41-E54954F02EE8} = {BC6A7FDF-74EB-4DA1-9C71-4A8D46D39C15} diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln index 4cd55b9fb8b3d5..556f81b68e35c2 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln +++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{93D90E13-0DD3-4468-9FB0-19BD70DAA83D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{AD24AFAB-7F9F-4534-88E3-82006BC0068C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{0ABC0B71-96A4-43A0-9DCF-40F3F34095A3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{C9FF7864-8BBD-4345-830E-D812E7F2B863}" @@ -185,10 +183,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9504A671-7FF4-41AA-AF67-5EBD0CF86561}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{192FD259-E55F-40C5-82EE-9E924EA6C3CB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{694561D4-7901-4727-B87C-109C7CED0404}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{578F9128-4119-40F9-8276-3643FA73D2D6}" @@ -209,10 +207,6 @@ Global {93D90E13-0DD3-4468-9FB0-19BD70DAA83D}.Debug|Any CPU.Build.0 = Debug|Any CPU {93D90E13-0DD3-4468-9FB0-19BD70DAA83D}.Release|Any CPU.ActiveCfg = Release|Any CPU {93D90E13-0DD3-4468-9FB0-19BD70DAA83D}.Release|Any CPU.Build.0 = Release|Any CPU - {AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Release|Any CPU.Build.0 = Release|Any CPU {0ABC0B71-96A4-43A0-9DCF-40F3F34095A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0ABC0B71-96A4-43A0-9DCF-40F3F34095A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {0ABC0B71-96A4-43A0-9DCF-40F3F34095A3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -580,7 +574,41 @@ Global GlobalSection(NestedProjects) = preSolution {93D90E13-0DD3-4468-9FB0-19BD70DAA83D} = {9504A671-7FF4-41AA-AF67-5EBD0CF86561} {1CC22FE5-BF97-42AB-9EDB-884CCA5B24B9} = {9504A671-7FF4-41AA-AF67-5EBD0CF86561} - {AD24AFAB-7F9F-4534-88E3-82006BC0068C} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} + {0ABC0B71-96A4-43A0-9DCF-40F3F34095A3} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {0789D138-6900-4E23-8A40-3A507B1229A8} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {179B28E8-3755-438F-AC0B-F41ECB96508A} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {23B739AD-9913-41C5-AEF2-0A233760FACB} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {4FAF7C83-659D-4262-B828-844E99090E21} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {C722A5A2-0004-4625-A2B6-CE2F11C6FC00} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {72D66519-79C0-47C2-91AB-888465D7510D} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {F0ADD390-3C63-41D9-823D-803D23D94DF4} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {CE8EDD88-76E2-4154-A41C-45B2004634BD} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {AF0F4768-8A3D-42CF-ACA9-79E989EB4A72} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {4067DFDE-ECAE-42EE-BFC9-920BC95B2109} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {064D2FE8-D638-4E0A-821F-002ED3571D72} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {079248AE-6567-497E-ACF7-3A0F8A0F7981} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {D8C3A422-16FC-4992-A501-EE53DAA0EDD1} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {410F3407-0106-442D-9BA2-88395D62BF2C} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {9C03BBD2-3EC8-4E82-9C3E-E4C869A65611} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {4B72FC27-F786-44B4-88DF-996D478873B8} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {CFF29AA4-794A-416B-BF4C-FD2A442FB83F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {AFC1BDAA-7E40-4118-BB80-F8057752A600} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {A0AF82AE-ED18-4EEB-AD9A-B44017510F0C} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {D61B6530-0055-4DFE-85D1-58BEDFC7AA2F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {509B5AB4-8F9F-4856-811F-7C8E727BF2E6} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {75BE42D7-1A41-46DF-941A-45F1B1FAC09E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {8A8E8E0F-5441-40F3-8C6E-ADF557156100} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {CFDC7964-D436-4B9D-92AD-8B71A1298937} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {1D2145F9-AE33-4873-99BF-F0E0B7457F35} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {2E027B76-275A-4FCE-9774-A2F8C3CD0C7E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {C206A9B3-F9FE-4771-93F4-7AC7930CF844} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {807B54D5-5807-4D9C-BD26-ECE5B12AECE4} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {3488D63C-0C29-442C-8145-407DE19C7480} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {01DB5E6D-40C5-42F7-8F9D-6F8DBC591129} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {578661A4-C136-4533-819E-AF3352F79953} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {95F7CD95-F906-40A9-B676-2EA949105F3E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {47A3CDB0-8252-4536-B61F-C2E10F6EC2B9} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} + {25474DE2-4D3D-4950-BDA7-CF6FE3CCD940} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {C9FF7864-8BBD-4345-830E-D812E7F2B863} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {B0F58507-0DEC-49BB-BF3F-0746541A852F} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {E436D227-3000-481E-BCA0-9D6FE45007C7} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} @@ -618,41 +646,6 @@ Global {16696A6A-63C3-468D-B4DA-B47E44CC50D1} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {FAF186F6-CE14-4FBE-8757-97CC12704FA4} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} {AA2CD494-414F-42BF-9C68-7822DEB09255} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C} - {0ABC0B71-96A4-43A0-9DCF-40F3F34095A3} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {0789D138-6900-4E23-8A40-3A507B1229A8} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {179B28E8-3755-438F-AC0B-F41ECB96508A} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {23B739AD-9913-41C5-AEF2-0A233760FACB} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {4FAF7C83-659D-4262-B828-844E99090E21} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {C722A5A2-0004-4625-A2B6-CE2F11C6FC00} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {72D66519-79C0-47C2-91AB-888465D7510D} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {F0ADD390-3C63-41D9-823D-803D23D94DF4} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {CE8EDD88-76E2-4154-A41C-45B2004634BD} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {AF0F4768-8A3D-42CF-ACA9-79E989EB4A72} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {4067DFDE-ECAE-42EE-BFC9-920BC95B2109} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {064D2FE8-D638-4E0A-821F-002ED3571D72} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {079248AE-6567-497E-ACF7-3A0F8A0F7981} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {D8C3A422-16FC-4992-A501-EE53DAA0EDD1} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {410F3407-0106-442D-9BA2-88395D62BF2C} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {9C03BBD2-3EC8-4E82-9C3E-E4C869A65611} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {4B72FC27-F786-44B4-88DF-996D478873B8} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {CFF29AA4-794A-416B-BF4C-FD2A442FB83F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {AFC1BDAA-7E40-4118-BB80-F8057752A600} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {A0AF82AE-ED18-4EEB-AD9A-B44017510F0C} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {D61B6530-0055-4DFE-85D1-58BEDFC7AA2F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {509B5AB4-8F9F-4856-811F-7C8E727BF2E6} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {75BE42D7-1A41-46DF-941A-45F1B1FAC09E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {8A8E8E0F-5441-40F3-8C6E-ADF557156100} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {CFDC7964-D436-4B9D-92AD-8B71A1298937} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {1D2145F9-AE33-4873-99BF-F0E0B7457F35} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {2E027B76-275A-4FCE-9774-A2F8C3CD0C7E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {C206A9B3-F9FE-4771-93F4-7AC7930CF844} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {807B54D5-5807-4D9C-BD26-ECE5B12AECE4} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {3488D63C-0C29-442C-8145-407DE19C7480} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {01DB5E6D-40C5-42F7-8F9D-6F8DBC591129} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {578661A4-C136-4533-819E-AF3352F79953} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {95F7CD95-F906-40A9-B676-2EA949105F3E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {47A3CDB0-8252-4536-B61F-C2E10F6EC2B9} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} - {25474DE2-4D3D-4950-BDA7-CF6FE3CCD940} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB} {4246E7C4-2590-4CC4-8F75-747F2499FA44} = {694561D4-7901-4727-B87C-109C7CED0404} {5F69DAFF-F4BC-4E29-A4FA-E96A4D55EC2D} = {694561D4-7901-4727-B87C-109C7CED0404} {0D1BFEB4-CEF6-4319-9212-E3E7840B287A} = {694561D4-7901-4727-B87C-109C7CED0404} diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln index 546bddfbfdb470..0ce0f5d8e72d9f 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1A334989-9DEB-4E7D-8006-77ECA8475B9A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{44AC224A-BB08-434A-9443-A1C98805B582}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}" @@ -189,10 +187,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6D06A6CA-BD7E-44A3-8BE5-E071E1B27993}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFC0CC54-6781-45CB-865F-72E9FABBD023}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76933DF1-12AA-4B5B-8863-EF38F10B1EC9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFC0CC54-6781-45CB-865F-72E9FABBD023}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0D30E826-4EE9-4404-A74D-5255FDB76A12}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{54C0A08B-8701-4156-95C2-FE76F944D6DD}" @@ -213,10 +211,6 @@ Global {1A334989-9DEB-4E7D-8006-77ECA8475B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {1A334989-9DEB-4E7D-8006-77ECA8475B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {1A334989-9DEB-4E7D-8006-77ECA8475B9A}.Release|Any CPU.Build.0 = Release|Any CPU - {44AC224A-BB08-434A-9443-A1C98805B582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44AC224A-BB08-434A-9443-A1C98805B582}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44AC224A-BB08-434A-9443-A1C98805B582}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44AC224A-BB08-434A-9443-A1C98805B582}.Release|Any CPU.Build.0 = Release|Any CPU {1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -592,7 +586,42 @@ Global GlobalSection(NestedProjects) = preSolution {1A334989-9DEB-4E7D-8006-77ECA8475B9A} = {6D06A6CA-BD7E-44A3-8BE5-E071E1B27993} {3900B089-D869-4845-B0B9-014AE62DEEB4} = {6D06A6CA-BD7E-44A3-8BE5-E071E1B27993} - {44AC224A-BB08-434A-9443-A1C98805B582} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} + {1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {6120E7CF-3074-46C6-BDD1-1863784EAC69} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {A70A8EA7-24B3-42BF-83A6-94EB9B5C3C6C} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {9026F7BB-2FB6-4B37-A4E7-32030FBA4B92} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {7E9B3AA8-5E87-4B19-9604-FE51C6548882} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {F9745791-BD7B-4337-BE8B-8AEEEB933E84} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {D7EC07C4-7679-4E97-B3A9-60D03607F758} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {720A0CB6-828B-47EF-BC1C-0B98E52BBFCE} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {B1AEB3DD-F8D6-48D1-8DB4-B232DA4103A0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {C9B7388B-0963-49A3-AB52-3E3B724EE2A9} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {C913A82A-3C17-4991-8F66-9D9F0B841E5E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {CA0D9981-F876-4287-9004-CADF6FC3857B} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {37802587-1E56-4DFD-A402-DB290D76B892} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {67A6FA6A-F171-4A00-80ED-113736B2B5B5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {07A9935C-015D-43DD-9CDE-809301151F7C} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {FB7C602E-3ED6-472A-85BD-420B61BA293D} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {89A6E38E-1118-4FC6-957D-17751DAD8EAF} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {36FAE390-EAAE-4193-98E7-34F10D3FA8E1} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {E5F61C36-FB9B-4DA7-96C0-056FBEADBB53} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {C573763D-C24C-4222-AAF0-66B0C2260EB4} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {388F4768-2C2B-43F1-910A-E50F47130368} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {FCD95D0E-50AC-4FCF-AE52-8B38DB9B15C3} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {90DFE463-DBD1-42F3-A33F-4D22E5C1DA4D} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {DDB95DB9-3E70-4F3E-B9D0-217A14215356} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {83D8F9FB-0A8D-4E48-A7CF-D169432A41AD} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {2F2D5292-9A79-4654-A470-2C7E974C4EF0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {3BB5B390-66F6-4FCD-A7FE-1A9326A4D914} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {166F8860-E965-4E2D-A6C6-4CA44C9B5A1E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {E628527E-B7BD-4F3B-8045-EC7C887B1FC1} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {7E5147A3-1483-4559-81B5-E29804F6D8B0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} + {C50BBD27-2445-4DF4-9A1D-C7919D016BBC} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {064D7281-3211-40E2-ABE1-B3F16160B027} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {C84980C7-A5FF-479E-838D-DB1D8F9F930C} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} @@ -631,42 +660,6 @@ Global {55B88031-3C95-499F-B2AF-CF531312F1FD} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {7233680A-1706-4A7C-906B-8D6C7E60D56A} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} {35F7F32D-B404-46B3-8FCE-CFEBEC7114C3} = {BFC0CC54-6781-45CB-865F-72E9FABBD023} - {1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {6120E7CF-3074-46C6-BDD1-1863784EAC69} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {A70A8EA7-24B3-42BF-83A6-94EB9B5C3C6C} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {9026F7BB-2FB6-4B37-A4E7-32030FBA4B92} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {7E9B3AA8-5E87-4B19-9604-FE51C6548882} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {F9745791-BD7B-4337-BE8B-8AEEEB933E84} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {D7EC07C4-7679-4E97-B3A9-60D03607F758} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {720A0CB6-828B-47EF-BC1C-0B98E52BBFCE} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {B1AEB3DD-F8D6-48D1-8DB4-B232DA4103A0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {C9B7388B-0963-49A3-AB52-3E3B724EE2A9} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {C913A82A-3C17-4991-8F66-9D9F0B841E5E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {CA0D9981-F876-4287-9004-CADF6FC3857B} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {37802587-1E56-4DFD-A402-DB290D76B892} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {67A6FA6A-F171-4A00-80ED-113736B2B5B5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {07A9935C-015D-43DD-9CDE-809301151F7C} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {FB7C602E-3ED6-472A-85BD-420B61BA293D} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {89A6E38E-1118-4FC6-957D-17751DAD8EAF} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {36FAE390-EAAE-4193-98E7-34F10D3FA8E1} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {E5F61C36-FB9B-4DA7-96C0-056FBEADBB53} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {C573763D-C24C-4222-AAF0-66B0C2260EB4} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {388F4768-2C2B-43F1-910A-E50F47130368} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {FCD95D0E-50AC-4FCF-AE52-8B38DB9B15C3} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {90DFE463-DBD1-42F3-A33F-4D22E5C1DA4D} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {DDB95DB9-3E70-4F3E-B9D0-217A14215356} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {83D8F9FB-0A8D-4E48-A7CF-D169432A41AD} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {2F2D5292-9A79-4654-A470-2C7E974C4EF0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {3BB5B390-66F6-4FCD-A7FE-1A9326A4D914} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {166F8860-E965-4E2D-A6C6-4CA44C9B5A1E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {E628527E-B7BD-4F3B-8045-EC7C887B1FC1} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {7E5147A3-1483-4559-81B5-E29804F6D8B0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} - {C50BBD27-2445-4DF4-9A1D-C7919D016BBC} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9} {04A0EC08-60F5-4B7A-9377-D1C8B9C6D45E} = {0D30E826-4EE9-4404-A74D-5255FDB76A12} {D3A7C7B1-10DC-45E9-8678-2C964A1459D7} = {0D30E826-4EE9-4404-A74D-5255FDB76A12} {59BC5420-D5C8-4689-8F9E-1E8AC338180E} = {0D30E826-4EE9-4404-A74D-5255FDB76A12} diff --git a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln index 4b317b5f021c56..db22fb4c0094f4 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln +++ b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{BCAE2699-A994-48FE-B9B0-5580D267BD2E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{47ACDB6F-34CB-478D-9E43-F3662EE5838D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{C24E4188-27CB-4E00-A5F0-62AE23D536EE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{EDAC3418-1D4E-4216-9371-0A36EA1E13FE}" @@ -185,10 +183,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E041754F-1A93-443A-9294-87DC1C30B471}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{59A29BF0-B76B-41F8-A733-E2A0847AB992}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E041754F-1A93-443A-9294-87DC1C30B471}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{A9A8D649-4C09-4FD1-9837-EE7B9D902253}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A946CE10-3582-4BA0-92CA-92D356344C91}" @@ -209,10 +207,6 @@ Global {BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Release|Any CPU.ActiveCfg = Release|Any CPU {BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Release|Any CPU.Build.0 = Release|Any CPU - {47ACDB6F-34CB-478D-9E43-F3662EE5838D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47ACDB6F-34CB-478D-9E43-F3662EE5838D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47ACDB6F-34CB-478D-9E43-F3662EE5838D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47ACDB6F-34CB-478D-9E43-F3662EE5838D}.Release|Any CPU.Build.0 = Release|Any CPU {C24E4188-27CB-4E00-A5F0-62AE23D536EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C24E4188-27CB-4E00-A5F0-62AE23D536EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {C24E4188-27CB-4E00-A5F0-62AE23D536EE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -582,7 +576,40 @@ Global {2A882DCC-96C1-4EDF-A7F0-B526EC81533F} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D} {495208B7-31BB-4802-A769-CEE4917BDF75} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D} {33C3D8F0-297F-4471-92B0-F4E8717F10E3} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D} - {47ACDB6F-34CB-478D-9E43-F3662EE5838D} = {E041754F-1A93-443A-9294-87DC1C30B471} + {C24E4188-27CB-4E00-A5F0-62AE23D536EE} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {020874FC-11A2-4FC7-8929-527462F8819A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {3411D565-223A-44B5-864C-E30F826001B4} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {ECA6E734-3908-45B4-9DFA-FDDA49AD620D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {0C041643-1217-466B-AF2E-1E44C7B117B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {6DB8DE55-5419-48EA-B4CD-2880E00409FB} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {0A738527-821F-4089-B64E-3C0F4714DC78} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {EA9E6747-867B-4312-94B3-624EEB1C7A7A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {EB889E78-AE59-4D41-AC29-8BC4D58BCE16} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {FB173557-75BD-4943-B813-0AD13E0337A3} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {5B630ECF-5C4D-4F66-9AB9-59B014520A5C} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {0A021166-613C-430C-8460-50F1E0DF7AD8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {1E3D564C-A79E-4E28-8E13-626EE7780831} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {9C06E60B-2D45-4284-B7C8-7AE6D8194CE0} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {973CE6DA-B55D-4E55-88D5-53BE69D44410} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {8845E6FF-94B2-4994-A8F4-DF30844A2168} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {99C8FB58-8718-4E76-AEFA-3C42F2F729B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {B729474D-0E96-4296-B317-450EE24F6B48} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {D466E363-F930-4D26-AE55-0256182961DD} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {518D4AE0-FBFF-493A-A2DF-8ACBA842AE19} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {0AEAD15B-CD38-4462-A36C-655ED8D0CBD1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {25C5119A-AAFB-4C74-9E12-F747CA4D80E7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {D975AE29-0CA2-43FC-90A0-B266DF7D4C2A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {A5DD36AF-F0AD-4616-AB91-BC63E89B2744} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {4ED9C0A9-C1EF-47ED-99F8-74B7411C971B} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {0A60A0E2-8CEE-483C-B2D2-B607A7A61D57} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {B41AA17B-5129-41CC-8EA4-250B80BABF87} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} + {0813853E-8C78-429A-B01A-3FB2EF1898F8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {EDAC3418-1D4E-4216-9371-0A36EA1E13FE} = {E041754F-1A93-443A-9294-87DC1C30B471} {670AB88D-85C9-4674-A652-C27488ED73F9} = {E041754F-1A93-443A-9294-87DC1C30B471} {4AB3E652-6709-4011-AC2F-C379A0415BAC} = {E041754F-1A93-443A-9294-87DC1C30B471} @@ -619,40 +646,6 @@ Global {000F87DC-0D56-4B37-8A0E-F7BCB3C3B61A} = {E041754F-1A93-443A-9294-87DC1C30B471} {C595A27A-FA05-4BC8-9048-402338D7AF76} = {E041754F-1A93-443A-9294-87DC1C30B471} {1E3D79D4-51D6-46C6-BF0F-DF51A47C5952} = {E041754F-1A93-443A-9294-87DC1C30B471} - {C24E4188-27CB-4E00-A5F0-62AE23D536EE} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {020874FC-11A2-4FC7-8929-527462F8819A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {3411D565-223A-44B5-864C-E30F826001B4} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {ECA6E734-3908-45B4-9DFA-FDDA49AD620D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0C041643-1217-466B-AF2E-1E44C7B117B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {6DB8DE55-5419-48EA-B4CD-2880E00409FB} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0A738527-821F-4089-B64E-3C0F4714DC78} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {EA9E6747-867B-4312-94B3-624EEB1C7A7A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {EB889E78-AE59-4D41-AC29-8BC4D58BCE16} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {FB173557-75BD-4943-B813-0AD13E0337A3} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {5B630ECF-5C4D-4F66-9AB9-59B014520A5C} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0A021166-613C-430C-8460-50F1E0DF7AD8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {1E3D564C-A79E-4E28-8E13-626EE7780831} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {9C06E60B-2D45-4284-B7C8-7AE6D8194CE0} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {973CE6DA-B55D-4E55-88D5-53BE69D44410} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {8845E6FF-94B2-4994-A8F4-DF30844A2168} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {99C8FB58-8718-4E76-AEFA-3C42F2F729B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {B729474D-0E96-4296-B317-450EE24F6B48} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {D466E363-F930-4D26-AE55-0256182961DD} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {518D4AE0-FBFF-493A-A2DF-8ACBA842AE19} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0AEAD15B-CD38-4462-A36C-655ED8D0CBD1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {25C5119A-AAFB-4C74-9E12-F747CA4D80E7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {D975AE29-0CA2-43FC-90A0-B266DF7D4C2A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {A5DD36AF-F0AD-4616-AB91-BC63E89B2744} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {4ED9C0A9-C1EF-47ED-99F8-74B7411C971B} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0A60A0E2-8CEE-483C-B2D2-B607A7A61D57} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {B41AA17B-5129-41CC-8EA4-250B80BABF87} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} - {0813853E-8C78-429A-B01A-3FB2EF1898F8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992} {53A78CBA-7270-4F79-84EF-09F669729079} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253} {1B235247-6666-4B62-95A4-AC043626FDEA} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253} {5F6EF6F2-A742-445B-9418-682188F61130} = {A9A8D649-4C09-4FD1-9837-EE7B9D902253} diff --git a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln index 127ab92e837f47..7f2baaf6515298 100644 --- a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln +++ b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DE515C8F-654E-4434-8F3F-014ECD86369D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{7110AF00-8902-4693-8697-64B89F6ADFEB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{8E552A7E-0C8C-49C2-8988-19469A732E26}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{E5AA98EF-5984-4BC4-9C74-996DB070BEB3}" @@ -93,10 +91,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC22531E-0F15-4324-9241-2BD562CB7C6B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ACFC297E-FE60-47EE-99A0-501E795FF4D6}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{96EA71C4-C73B-4C6C-AA06-05635B20A2DC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ACFC297E-FE60-47EE-99A0-501E795FF4D6}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{D1CE7D63-2182-40E3-83E0-618DA3770779}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{FDC92BCB-A135-47C1-A3A3-30D5D743D0A1}" @@ -117,10 +115,6 @@ Global {DE515C8F-654E-4434-8F3F-014ECD86369D}.Debug|Any CPU.Build.0 = Debug|Any CPU {DE515C8F-654E-4434-8F3F-014ECD86369D}.Release|Any CPU.ActiveCfg = Release|Any CPU {DE515C8F-654E-4434-8F3F-014ECD86369D}.Release|Any CPU.Build.0 = Release|Any CPU - {7110AF00-8902-4693-8697-64B89F6ADFEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7110AF00-8902-4693-8697-64B89F6ADFEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7110AF00-8902-4693-8697-64B89F6ADFEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7110AF00-8902-4693-8697-64B89F6ADFEB}.Release|Any CPU.Build.0 = Release|Any CPU {8E552A7E-0C8C-49C2-8988-19469A732E26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E552A7E-0C8C-49C2-8988-19469A732E26}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E552A7E-0C8C-49C2-8988-19469A732E26}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -304,22 +298,6 @@ Global GlobalSection(NestedProjects) = preSolution {DE515C8F-654E-4434-8F3F-014ECD86369D} = {AC22531E-0F15-4324-9241-2BD562CB7C6B} {58A1E42E-5DA1-452A-B39C-A1819171970A} = {AC22531E-0F15-4324-9241-2BD562CB7C6B} - {7110AF00-8902-4693-8697-64B89F6ADFEB} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {E5AA98EF-5984-4BC4-9C74-996DB070BEB3} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {DCFA391D-345B-4272-81EB-2C46DB12F760} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {35FEC7D0-BA1A-49B3-B183-309CC182E60B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {1C037F40-BDCD-4DFD-B6BE-3244D22065F3} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {C914A1FF-48C4-42AD-9581-6846FFD8BF5B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {D4D155B6-2A90-4ECD-97F9-A288F7979375} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {85615392-9242-4CAF-A0FE-A439FF615462} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {40143A60-7177-4173-90D4-2891584748CA} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {933CC409-0AD9-4C63-997F-9E4EA9A0F977} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {BECC7A6E-1438-4EAC-B34B-276DEF463769} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {DE012146-4D34-44CC-8701-53C42F2943D2} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {9E199047-514B-4D38-A8A3-0F5F18547F88} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} - {4F6E71CD-E4CE-4FF6-AAD9-3A07A0ADBE0D} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} {8E552A7E-0C8C-49C2-8988-19469A732E26} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {65753AD0-5912-4EC7-A109-51AD5CC2A631} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {02CBE5AC-8D26-4865-830C-39EAA631316F} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} @@ -335,6 +313,21 @@ Global {A12B92C6-071A-4C61-8934-371DBB240873} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {68B501BC-5281-4BC8-B631-C34013E4505E} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} {1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC} + {E5AA98EF-5984-4BC4-9C74-996DB070BEB3} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {DCFA391D-345B-4272-81EB-2C46DB12F760} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {B69CDA6C-D2C9-4A23-BDC7-D2EAE11503C4} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {35FEC7D0-BA1A-49B3-B183-309CC182E60B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {1C037F40-BDCD-4DFD-B6BE-3244D22065F3} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {C914A1FF-48C4-42AD-9581-6846FFD8BF5B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {D4D155B6-2A90-4ECD-97F9-A288F7979375} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {85615392-9242-4CAF-A0FE-A439FF615462} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {40143A60-7177-4173-90D4-2891584748CA} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {933CC409-0AD9-4C63-997F-9E4EA9A0F977} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {BECC7A6E-1438-4EAC-B34B-276DEF463769} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {DE012146-4D34-44CC-8701-53C42F2943D2} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {9E199047-514B-4D38-A8A3-0F5F18547F88} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} + {4F6E71CD-E4CE-4FF6-AAD9-3A07A0ADBE0D} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6} {0946F780-A82A-478E-A3A6-08C00A9B56BB} = {D1CE7D63-2182-40E3-83E0-618DA3770779} {2F7292AF-429F-4888-B938-B6615F06E838} = {D1CE7D63-2182-40E3-83E0-618DA3770779} {136C7622-75EE-4C95-9642-DAD4A5392274} = {D1CE7D63-2182-40E3-83E0-618DA3770779} diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln index 368875bf30cd6b..cd1cb498c9b0d5 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{79CE8C7E-A4AF-413C-A54D-86F17073559C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{9052AC86-4B89-4311-BEF2-7C49FB72DC0F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{FA353FC1-2D03-426A-8973-0CDA8DF5E5DD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D6778DF4-DA03-43E7-BD9D-2E2C35DCCE7F}" @@ -49,10 +47,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7631380A-FB73-4241-9987-0891A21E9769}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{548DF5F7-790C-4A1C-89EB-BD904CA1BA86}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7631380A-FB73-4241-9987-0891A21E9769}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{03F31CEE-D63E-4E7F-949F-139B33DC3385}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{87F606D1-D311-4EDC-9A37-8F008B55597C}" @@ -73,10 +71,6 @@ Global {79CE8C7E-A4AF-413C-A54D-86F17073559C}.Debug|Any CPU.Build.0 = Debug|Any CPU {79CE8C7E-A4AF-413C-A54D-86F17073559C}.Release|Any CPU.ActiveCfg = Release|Any CPU {79CE8C7E-A4AF-413C-A54D-86F17073559C}.Release|Any CPU.Build.0 = Release|Any CPU - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F}.Release|Any CPU.Build.0 = Release|Any CPU {FA353FC1-2D03-426A-8973-0CDA8DF5E5DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FA353FC1-2D03-426A-8973-0CDA8DF5E5DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA353FC1-2D03-426A-8973-0CDA8DF5E5DD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -174,15 +168,14 @@ Global {C333EC5A-F386-4A01-AE20-12D499551304} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} {1CB869A7-2EEC-4A53-9C33-DF9E0C75825B} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} {D6167506-0671-46A3-94E5-7A98032DCEC6} = {4DE63935-DCA9-4D63-9C1F-AAE79C89CA8B} - {9052AC86-4B89-4311-BEF2-7C49FB72DC0F} = {7631380A-FB73-4241-9987-0891A21E9769} - {D6778DF4-DA03-43E7-BD9D-2E2C35DCCE7F} = {7631380A-FB73-4241-9987-0891A21E9769} - {7F536552-0E2A-4642-B7CF-863727C2F9CD} = {7631380A-FB73-4241-9987-0891A21E9769} - {70921178-E884-49A6-BD11-1D9855299366} = {7631380A-FB73-4241-9987-0891A21E9769} - {6412735E-B1CD-4C25-A5C0-C09B70FA8B81} = {7631380A-FB73-4241-9987-0891A21E9769} {FA353FC1-2D03-426A-8973-0CDA8DF5E5DD} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} {527CCF66-AC37-487C-871E-A4F6B94E1731} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} {75C579F7-F20B-41F1-8CAF-641DE7ADA4EE} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} {2520B731-D54D-440A-A460-92C2BCDDCD75} = {548DF5F7-790C-4A1C-89EB-BD904CA1BA86} + {D6778DF4-DA03-43E7-BD9D-2E2C35DCCE7F} = {7631380A-FB73-4241-9987-0891A21E9769} + {7F536552-0E2A-4642-B7CF-863727C2F9CD} = {7631380A-FB73-4241-9987-0891A21E9769} + {70921178-E884-49A6-BD11-1D9855299366} = {7631380A-FB73-4241-9987-0891A21E9769} + {6412735E-B1CD-4C25-A5C0-C09B70FA8B81} = {7631380A-FB73-4241-9987-0891A21E9769} {1491B9C9-955D-4DB0-B1D5-70137A78EAAE} = {03F31CEE-D63E-4E7F-949F-139B33DC3385} {A5439E79-96D6-4F02-8DD0-23DFF979851D} = {03F31CEE-D63E-4E7F-949F-139B33DC3385} {BF948816-45E1-4F0F-985A-0B4DB4D3BF40} = {03F31CEE-D63E-4E7F-949F-139B33DC3385} diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln b/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln index d3bcec2ebd569c..9d3e292fb1b270 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln @@ -1,6 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{5C771533-F8F4-47A0-9E3C-614F87A72744}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{CD09F265-2818-40E4-8732-C41DE48A4EF7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}" @@ -79,10 +77,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", "{0869A065-1C81-4332-BAA8-A882C6F8E7AC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B592E91-F7DB-4B78-A1CE-CB1CA436220E}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B592E91-F7DB-4B78-A1CE-CB1CA436220E}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B51C2035-38E7-4F22-9F9B-A49DC2B6C92F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{D7763B6D-EFA4-4393-B548-EBA806172FA1}" @@ -99,10 +97,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5C771533-F8F4-47A0-9E3C-614F87A72744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C771533-F8F4-47A0-9E3C-614F87A72744}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C771533-F8F4-47A0-9E3C-614F87A72744}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C771533-F8F4-47A0-9E3C-614F87A72744}.Release|Any CPU.Build.0 = Release|Any CPU {CD09F265-2818-40E4-8732-C41DE48A4EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD09F265-2818-40E4-8732-C41DE48A4EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU {CD09F265-2818-40E4-8732-C41DE48A4EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -264,20 +258,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {5C771533-F8F4-47A0-9E3C-614F87A72744} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {CC5ACC22-9AD1-49DF-8F84-64AF0D71006C} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {02F90254-A566-440D-9B98-A31A8A1A4D5B} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {20D72006-BAEF-4604-A9DC-2864FED9DF9A} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {D9979978-4230-427D-88F6-455F1D59FE96} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {91D63569-CA51-4362-B4FC-9BD66302373F} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {D482622B-7B40-4311-977F-11C09B98BA4F} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {5645B3B9-A523-4C61-8417-4EE0C90380AB} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {723E756F-943A-438F-AC38-21A9670BF798} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} - {F0673641-1B37-485D-9CEA-DB45AC93AA75} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} {CD09F265-2818-40E4-8732-C41DE48A4EF7} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {1717DDEF-8917-4382-B5DC-073B2F2F4361} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} @@ -291,6 +271,19 @@ Global {93C7964F-6A2F-48C7-A3EA-322401532E8C} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {531F1DAF-B4DE-4240-B7BE-E206330E3792} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} {B077F55F-E15A-4B91-A1EB-8178B8313908} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B} + {CC5ACC22-9AD1-49DF-8F84-64AF0D71006C} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {02F90254-A566-440D-9B98-A31A8A1A4D5B} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {20D72006-BAEF-4604-A9DC-2864FED9DF9A} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {D9979978-4230-427D-88F6-455F1D59FE96} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {91D63569-CA51-4362-B4FC-9BD66302373F} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {D482622B-7B40-4311-977F-11C09B98BA4F} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {5645B3B9-A523-4C61-8417-4EE0C90380AB} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {723E756F-943A-438F-AC38-21A9670BF798} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} + {F0673641-1B37-485D-9CEA-DB45AC93AA75} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E} {F9798860-5D4F-4B26-8C92-79D4DA8889C0} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F} {77AA759E-5BF0-4C86-91EB-2A33263553EC} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F} {A5BA71C3-A03C-43F7-B48E-96C301E87691} = {B51C2035-38E7-4F22-9F9B-A49DC2B6C92F} diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln b/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln index c0595313770b21..f9fcc592253402 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln +++ b/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B60701F7-43B3-4A85-B808-5FF9C1865898}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{60720C98-E619-40A6-9536-BC47AD0A056A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7}" @@ -115,10 +113,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A7BC3DE4-5E79-4552-8E42-D1D13B7293CB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB19DE2B-6A14-4CDA-94EF-845BAF293051}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB19DE2B-6A14-4CDA-94EF-845BAF293051}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{561502B1-98F5-40E0-B9D5-0F720E88E657}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{EEC72C1F-23B2-4486-B81F-46DFC2266BD3}" @@ -139,10 +137,6 @@ Global {B60701F7-43B3-4A85-B808-5FF9C1865898}.Debug|Any CPU.Build.0 = Debug|Any CPU {B60701F7-43B3-4A85-B808-5FF9C1865898}.Release|Any CPU.ActiveCfg = Release|Any CPU {B60701F7-43B3-4A85-B808-5FF9C1865898}.Release|Any CPU.Build.0 = Release|Any CPU - {60720C98-E619-40A6-9536-BC47AD0A056A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60720C98-E619-40A6-9536-BC47AD0A056A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60720C98-E619-40A6-9536-BC47AD0A056A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60720C98-E619-40A6-9536-BC47AD0A056A}.Release|Any CPU.Build.0 = Release|Any CPU {0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -370,7 +364,23 @@ Global GlobalSection(NestedProjects) = preSolution {B60701F7-43B3-4A85-B808-5FF9C1865898} = {A7BC3DE4-5E79-4552-8E42-D1D13B7293CB} {6A1C4B05-982A-4BD9-957F-E77992C54EBA} = {A7BC3DE4-5E79-4552-8E42-D1D13B7293CB} - {60720C98-E619-40A6-9536-BC47AD0A056A} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} + {0A49D42B-0C4D-46E0-ABBC-AE8600CDC472} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {ED51A791-65BB-4F8B-B76C-769D0663D4A7} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {EF05AB17-527F-40BC-B4D1-AAE510267F4E} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {1F272F82-E9D1-454A-8E3C-6BEAF02219D4} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {2E4D0EB0-E34B-4D47-A7F1-E35C696066E8} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {6A02D298-6899-4DD0-BFF4-40702BC30BCD} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {E09FB553-28C4-4C1C-8E86-CFAB3374A656} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {974792E2-0311-446A-BABF-18B3A8DDDEC5} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {27525A8A-61B3-4FDB-B096-36E977A6BE0F} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {D3E483FC-DF73-4CD8-AFAA-1DA752F49304} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {6316940A-1032-4A41-8D2E-4A9E08B612F6} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {3C9A4019-6151-4D27-BCA5-3EBAA0C71B39} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {5DCD1587-CC45-4105-8FFE-E4A43C60DA8D} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {6D4E2785-7330-4F75-8224-05504FCF8FB7} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} + {C9F3D8F9-8646-432E-82FC-2E4E8411CFFE} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {A3F1A3F6-86BC-4F38-B603-31BBA0A022B7} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {2299110F-60C7-4812-A15B-B74A14FFBFA7} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} @@ -391,23 +401,6 @@ Global {9E3839DD-242F-4592-97C6-15016936740C} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {83BE9E3B-ADB4-4E32-94A2-C827B7885A6B} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} {8C8B3A3F-A9C1-4E72-BA3F-DE8A8FE5B040} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051} - {0A49D42B-0C4D-46E0-ABBC-AE8600CDC472} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {ED51A791-65BB-4F8B-B76C-769D0663D4A7} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {EF05AB17-527F-40BC-B4D1-AAE510267F4E} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {1F272F82-E9D1-454A-8E3C-6BEAF02219D4} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {2E4D0EB0-E34B-4D47-A7F1-E35C696066E8} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {6A02D298-6899-4DD0-BFF4-40702BC30BCD} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {E09FB553-28C4-4C1C-8E86-CFAB3374A656} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {974792E2-0311-446A-BABF-18B3A8DDDEC5} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {27525A8A-61B3-4FDB-B096-36E977A6BE0F} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {D3E483FC-DF73-4CD8-AFAA-1DA752F49304} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {6316940A-1032-4A41-8D2E-4A9E08B612F6} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {3C9A4019-6151-4D27-BCA5-3EBAA0C71B39} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {5DCD1587-CC45-4105-8FFE-E4A43C60DA8D} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {6D4E2785-7330-4F75-8224-05504FCF8FB7} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} - {C9F3D8F9-8646-432E-82FC-2E4E8411CFFE} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322} {593C464E-5977-407A-BB66-4ED7A789F370} = {561502B1-98F5-40E0-B9D5-0F720E88E657} {424A18FB-010E-4B03-B1E7-6747E1C5E31E} = {561502B1-98F5-40E0-B9D5-0F720E88E657} {2ECBDD0B-43A8-408E-B770-878F64620915} = {561502B1-98F5-40E0-B9D5-0F720E88E657} diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln b/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln index 563292a17f208e..697e5414259e95 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln @@ -1,6 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{E3D3AF4B-1494-4272-8B7F-23385704E49A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{544BBE63-3650-42E0-AD83-B613907BE753}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4}" @@ -61,10 +59,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", "{EC051CA0-5FE0-4E40-AEB8-53DE784FCC3E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33C65345-4AE9-41DF-8CC8-5C81979DBD03}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33C65345-4AE9-41DF-8CC8-5C81979DBD03}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B1578203-268C-45C3-B62C-3D5CFC340AB4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B57846B6-4EB4-475F-AF4D-A4317F6B7754}" @@ -81,10 +79,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E3D3AF4B-1494-4272-8B7F-23385704E49A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3D3AF4B-1494-4272-8B7F-23385704E49A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3D3AF4B-1494-4272-8B7F-23385704E49A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3D3AF4B-1494-4272-8B7F-23385704E49A}.Release|Any CPU.Build.0 = Release|Any CPU {544BBE63-3650-42E0-AD83-B613907BE753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {544BBE63-3650-42E0-AD83-B613907BE753}.Debug|Any CPU.Build.0 = Debug|Any CPU {544BBE63-3650-42E0-AD83-B613907BE753}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -210,16 +204,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E3D3AF4B-1494-4272-8B7F-23385704E49A} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {BB19DE2F-5A32-4769-8CB5-80E59C500229} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {16E075F3-372C-4A98-BDAF-FF615B8A9855} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {7EAFD932-A183-488B-8688-531568CEE5B2} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {7DC15EBB-2614-473D-9B46-D764F8E1613C} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {B39EB467-7C81-482C-A1EA-D6B183E43DE9} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {AD197619-E574-41FD-A70F-FDE7C750E6DF} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {58DBC00E-C837-4232-BCE5-45DBDD8B89D3} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} - {17936926-B6EA-4194-AC9B-E7274BBF58B9} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} {544BBE63-3650-42E0-AD83-B613907BE753} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {5B4734D0-7CF9-4F4B-B27A-FAED72A81C71} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {850FBE78-DE29-480D-B4EE-6D260B0341B4} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} @@ -229,6 +213,15 @@ Global {6BDC5518-F6BA-4506-B9E6-505EDEEE340F} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {DACACFDC-C2ED-41A9-B2D4-2898FC4A938F} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} {A3AE4326-5EB6-454C-8276-93B1E5FA5A84} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526} + {47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} + {BB19DE2F-5A32-4769-8CB5-80E59C500229} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} + {16E075F3-372C-4A98-BDAF-FF615B8A9855} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} + {7EAFD932-A183-488B-8688-531568CEE5B2} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} + {7DC15EBB-2614-473D-9B46-D764F8E1613C} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} + {B39EB467-7C81-482C-A1EA-D6B183E43DE9} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} + {AD197619-E574-41FD-A70F-FDE7C750E6DF} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} + {58DBC00E-C837-4232-BCE5-45DBDD8B89D3} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} + {17936926-B6EA-4194-AC9B-E7274BBF58B9} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03} {6D60A144-E901-4BCB-8DE6-148B56157771} = {B1578203-268C-45C3-B62C-3D5CFC340AB4} {B974A465-1912-4E4A-ADA6-B2BAF9DDE89D} = {B1578203-268C-45C3-B62C-3D5CFC340AB4} {93655DA5-BC50-4F07-85B3-509076003CBD} = {B1578203-268C-45C3-B62C-3D5CFC340AB4} diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln b/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln index 7704349e524f27..21e9080752bf59 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln @@ -1,6 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{B67E21A5-9B87-46DB-99A1-F04074CBE466}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{F61FEA80-03CF-4F04-8362-EA64E3E27C58}" @@ -67,10 +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", "{3B773172-E0CC-405B-83D6-4A314838F718}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{677D11A9-4811-41EA-8F93-F8DB15BF27DD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{16797022-28AE-4250-970B-7A27D77C97FD}" @@ -87,10 +85,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}.Release|Any CPU.Build.0 = Release|Any CPU {B67E21A5-9B87-46DB-99A1-F04074CBE466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B67E21A5-9B87-46DB-99A1-F04074CBE466}.Debug|Any CPU.Build.0 = Debug|Any CPU {B67E21A5-9B87-46DB-99A1-F04074CBE466}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -228,17 +222,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {F15DA9A4-0AB3-4C41-999D-7653B7C5B18F} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {F61FEA80-03CF-4F04-8362-EA64E3E27C58} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {E74341EE-52F2-4649-AB89-5CB3C7D6415F} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {B1BE2665-7E3F-46FB-BCE1-774D5984F76C} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {738E67B2-2339-4A33-AE35-27D426CFF6DC} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {71AF748C-E5FD-46C7-9B6E-0643782CE5E1} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {D41F65C3-1D86-44FA-BE07-9E95392E2519} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {BEA7323C-7078-4F94-8AA6-E16C472DAB2C} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {C7296700-13E1-4D81-A479-992142F50718} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {3D501DAC-12C1-4423-AE63-7157624B65DB} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} - {A58AB418-69E1-41C8-A8DD-257924073646} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} {B67E21A5-9B87-46DB-99A1-F04074CBE466} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {A21DEE4B-F49B-4A19-95AC-7589757B8962} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {62D0B220-DABD-4C56-A0E2-640D74465328} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} @@ -250,6 +233,16 @@ Global {BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {3DCDA242-48D4-4611-B4A3-7EDBF84A9127} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} {204919F3-8E5C-4D4D-9E3B-ADFB1E453972} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC} + {F61FEA80-03CF-4F04-8362-EA64E3E27C58} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {E74341EE-52F2-4649-AB89-5CB3C7D6415F} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {B1BE2665-7E3F-46FB-BCE1-774D5984F76C} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {738E67B2-2339-4A33-AE35-27D426CFF6DC} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {71AF748C-E5FD-46C7-9B6E-0643782CE5E1} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {D41F65C3-1D86-44FA-BE07-9E95392E2519} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {BEA7323C-7078-4F94-8AA6-E16C472DAB2C} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {C7296700-13E1-4D81-A479-992142F50718} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {3D501DAC-12C1-4423-AE63-7157624B65DB} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} + {A58AB418-69E1-41C8-A8DD-257924073646} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1} {2F5646F6-8247-42E5-ACF5-8732ACB7067A} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD} {AA692D58-2C6C-4307-A13F-0884B6164026} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD} {4F09A07F-70C7-4288-A6F3-EFBD5306E1F7} = {677D11A9-4811-41EA-8F93-F8DB15BF27DD} diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln b/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln index 7987e27fad5d11..77fd2bd1bbadee 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{EF689C53-9B62-4E17-B412-92FAD527FA59}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8}" @@ -93,10 +91,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AFF4CCE7-94BD-42B0-8310-8D4CD00F18D3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5A06587C-82E8-4B40-9C0A-DD06CB986625}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{887BF6A4-CB22-4DF4-8E24-A1B267161ECB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5A06587C-82E8-4B40-9C0A-DD06CB986625}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{590E1BD9-E5AD-456B-B954-E26EA0BFE405}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{98D7969E-7743-4E1C-9AC0-BC69D3C3077D}" @@ -117,10 +115,6 @@ Global {ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Debug|Any CPU.Build.0 = Debug|Any CPU {ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Release|Any CPU.ActiveCfg = Release|Any CPU {ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Release|Any CPU.Build.0 = Release|Any CPU - {EF689C53-9B62-4E17-B412-92FAD527FA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF689C53-9B62-4E17-B412-92FAD527FA59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF689C53-9B62-4E17-B412-92FAD527FA59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF689C53-9B62-4E17-B412-92FAD527FA59}.Release|Any CPU.Build.0 = Release|Any CPU {9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -304,7 +298,18 @@ Global GlobalSection(NestedProjects) = preSolution {ABF4371B-507E-4F4C-85D0-2B5EAA12A976} = {AFF4CCE7-94BD-42B0-8310-8D4CD00F18D3} {7939B14F-FDE9-468C-8307-8CC1220EBC2A} = {AFF4CCE7-94BD-42B0-8310-8D4CD00F18D3} - {EF689C53-9B62-4E17-B412-92FAD527FA59} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} + {9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {AD133460-B832-44BE-BF0A-A699A77FA718} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {7834A5FC-A39B-4435-9D8C-2EEABFFA7A84} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {F4A703F8-3D69-4113-A86F-9AD908086092} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {4B621745-2446-4A51-96C1-E1F9D4FCE1E3} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {9B8BD276-447B-4E93-AC2F-2F5E9E355E8C} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {E06E4463-281C-46C1-A4D6-4593742C1CBC} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {23F45D4C-4E33-4334-A5BF-D34E24165E0B} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {1F7BE164-D79E-4700-9C39-58A04E24DB76} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} + {5A956452-F322-4C4F-8689-D2B425764293} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {A7E8D7C4-D468-486A-A8EA-93F260CD4FE8} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {1CFC41DE-18F8-4993-9B5D-64655D043158} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {F5B4A3CF-03B5-40A2-BE78-DA6230270113} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} @@ -320,18 +325,6 @@ Global {AB079044-3296-440E-9EA6-26471A47288D} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {F26D1D03-87AE-4E80-A3E2-6C085BC969ED} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} {3E80E645-8642-4944-9B45-0F317A8D2E58} = {5A06587C-82E8-4B40-9C0A-DD06CB986625} - {9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {AD133460-B832-44BE-BF0A-A699A77FA718} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {7834A5FC-A39B-4435-9D8C-2EEABFFA7A84} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {F4A703F8-3D69-4113-A86F-9AD908086092} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {4B621745-2446-4A51-96C1-E1F9D4FCE1E3} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {9B8BD276-447B-4E93-AC2F-2F5E9E355E8C} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {E06E4463-281C-46C1-A4D6-4593742C1CBC} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {23F45D4C-4E33-4334-A5BF-D34E24165E0B} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {1F7BE164-D79E-4700-9C39-58A04E24DB76} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} - {5A956452-F322-4C4F-8689-D2B425764293} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB} {332D5122-9FA6-41D5-ACDC-9EF680961C31} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405} {9E6D88B5-926D-494D-BC52-A429EFBF419F} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405} {1201F595-5DD2-400E-B707-16C215E39FF9} = {590E1BD9-E5AD-456B-B954-E26EA0BFE405} diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln index f476f5edfb7e74..0b80194fca646e 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln @@ -1,6 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{D72D9E03-5346-4E9E-9617-45BE57AB95E0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{1B7B708C-F860-478E-B3D4-1CB70E71A440}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55}" @@ -61,10 +59,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", "{BA16D62A-70ED-4A22-A05A-243CA692FBD2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C9FA428B-8564-4791-8CBF-2438F4783124}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C9FA428B-8564-4791-8CBF-2438F4783124}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E852D5A7-219C-4E2B-A327-6C6B988E65FC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{05ABF419-55CC-431B-845C-9899458A3DC5}" @@ -81,10 +79,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D72D9E03-5346-4E9E-9617-45BE57AB95E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D72D9E03-5346-4E9E-9617-45BE57AB95E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D72D9E03-5346-4E9E-9617-45BE57AB95E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D72D9E03-5346-4E9E-9617-45BE57AB95E0}.Release|Any CPU.Build.0 = Release|Any CPU {1B7B708C-F860-478E-B3D4-1CB70E71A440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B7B708C-F860-478E-B3D4-1CB70E71A440}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B7B708C-F860-478E-B3D4-1CB70E71A440}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -210,16 +204,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {D72D9E03-5346-4E9E-9617-45BE57AB95E0} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {C0F647A3-A299-441F-BE78-67022E0683E6} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {367922CE-A24E-4977-89BE-D1F2F678F8B2} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {2863DE0C-F23B-4A27-8C59-F42A9B27AFB8} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {3F1FF12D-6CAF-409D-BF8D-E299646B545C} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {0948BA1C-2BEA-4F82-8B08-F2F6B7031CBF} = {C9FA428B-8564-4791-8CBF-2438F4783124} - {4A46E882-070F-4EE6-B0BF-67CC1609B9D7} = {C9FA428B-8564-4791-8CBF-2438F4783124} {1B7B708C-F860-478E-B3D4-1CB70E71A440} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {A9250A96-9B27-46C5-A043-11F67D63B128} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {A64CC82B-B781-4469-B009-49A43A0A2A96} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} @@ -229,6 +213,15 @@ Global {15D8CD42-77C9-4DEC-9C53-E6C6C766A646} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {59BC50A1-510F-44A4-A507-AEC051EA8908} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} {D72BF608-9C7C-41BE-9288-22BA49AF954F} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC} + {B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55} = {C9FA428B-8564-4791-8CBF-2438F4783124} + {C0F647A3-A299-441F-BE78-67022E0683E6} = {C9FA428B-8564-4791-8CBF-2438F4783124} + {367922CE-A24E-4977-89BE-D1F2F678F8B2} = {C9FA428B-8564-4791-8CBF-2438F4783124} + {2863DE0C-F23B-4A27-8C59-F42A9B27AFB8} = {C9FA428B-8564-4791-8CBF-2438F4783124} + {EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6} = {C9FA428B-8564-4791-8CBF-2438F4783124} + {0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92} = {C9FA428B-8564-4791-8CBF-2438F4783124} + {3F1FF12D-6CAF-409D-BF8D-E299646B545C} = {C9FA428B-8564-4791-8CBF-2438F4783124} + {0948BA1C-2BEA-4F82-8B08-F2F6B7031CBF} = {C9FA428B-8564-4791-8CBF-2438F4783124} + {4A46E882-070F-4EE6-B0BF-67CC1609B9D7} = {C9FA428B-8564-4791-8CBF-2438F4783124} {B3511D68-4F4C-4632-B993-649BCF73DE46} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC} {D9B7AD79-A748-4D4F-9CF8-AB65D848085D} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC} {7B81FBBF-6DC2-4854-990F-0D4394E00A8A} = {E852D5A7-219C-4E2B-A327-6C6B988E65FC} diff --git a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln index 58bc1713de71ec..c3e4c25f3b3a82 100644 --- a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln +++ b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7F66E50D-B9E1-4229-85CE-61BCA70EA568}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{C4B04D68-8344-41D2-B46C-3BB5F31799EC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}" @@ -155,10 +153,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5C4849A9-0DE8-4184-85B0-11FC5A0833A9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8928AB2-2939-4421-90C5-56B789BF93E5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{BCF59319-979C-42FA-9B5E-19EFCC91D288}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{B4CF32E8-EF3E-45F0-A9B6-E1BE262A3141}" @@ -179,10 +177,6 @@ Global {7F66E50D-B9E1-4229-85CE-61BCA70EA568}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F66E50D-B9E1-4229-85CE-61BCA70EA568}.Release|Any CPU.ActiveCfg = Release|Any CPU {7F66E50D-B9E1-4229-85CE-61BCA70EA568}.Release|Any CPU.Build.0 = Release|Any CPU - {C4B04D68-8344-41D2-B46C-3BB5F31799EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4B04D68-8344-41D2-B46C-3BB5F31799EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4B04D68-8344-41D2-B46C-3BB5F31799EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4B04D68-8344-41D2-B46C-3BB5F31799EC}.Release|Any CPU.Build.0 = Release|Any CPU {2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -491,7 +485,33 @@ Global {7F66E50D-B9E1-4229-85CE-61BCA70EA568} = {5C4849A9-0DE8-4184-85B0-11FC5A0833A9} {8BA3C396-9F2E-4671-BC07-221DC714B855} = {5C4849A9-0DE8-4184-85B0-11FC5A0833A9} {78D7E710-1AE5-408B-AE64-99382A819D09} = {5C4849A9-0DE8-4184-85B0-11FC5A0833A9} - {C4B04D68-8344-41D2-B46C-3BB5F31799EC} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} + {2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {D698D832-B15A-4C2E-8C6A-D8F97044000A} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {AB6345AD-EF69-42DD-BC90-5A7FE394358F} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {CF5604F2-EDD6-4A63-8E60-E327D91BA532} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {6104AAC7-3F96-4674-9A26-A2D6DFEC0D76} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {2F7FA324-F7E6-4D71-891F-780B56DD9D3E} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {335D852A-CE30-4038-9AD4-B70B268BB69F} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {31E317F8-F766-4EC3-8101-2D92CDB407CD} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {5F0CF40F-D54D-4101-94EA-8FE7F9C843CB} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {7C562B37-19E5-44BE-85D5-15FFA9FAEF5A} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {4BEF5648-8DBF-4E16-B6E6-6F80694E140D} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {9D96B3BD-B371-4E44-A43F-50B8EEBEC889} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {F700E4AF-073D-4C1D-A8C2-84E744EBC374} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {25E16BD1-98CA-482E-87BB-3A2A596503C7} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {5A2CE5B3-A089-47FC-A1E0-455C54102C2D} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {91E18134-CEEA-4E42-9620-C4120EF34AEE} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {02437B60-112D-49D7-8C95-6118A147CC2A} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {4FAEF817-3333-4813-86FF-F0255E000F7D} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {E41BE1F8-AB36-414F-A914-62C7E1915473} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {7CB59805-CD93-4D2A-BD21-A97820DD35B0} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {D81BE8A0-A710-4B74-8AA7-1733B3DCC461} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {425C299F-7D53-49EC-92D0-22B77BEA12D2} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {5C3C9221-419F-496C-AFB8-C87872FAF2F2} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {B5B30447-25D0-42C0-920A-092247C95664} = {D8928AB2-2939-4421-90C5-56B789BF93E5} + {34C22E86-B0A3-457D-B8D9-7CF47AAF2570} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {9384A49A-C77F-44E1-A18C-E4EE831DE7F0} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {86FE36DC-1F35-4939-8937-18541614EF6D} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} @@ -521,33 +541,6 @@ Global {A1D0DB10-4CEE-4E22-85D4-1678E674D4AB} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {A5A45BB0-8993-4AFE-8D3C-BD1073D1B56A} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} {BB1EF0C4-822E-4476-8872-8620EA665C35} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7} - {2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {D698D832-B15A-4C2E-8C6A-D8F97044000A} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {AB6345AD-EF69-42DD-BC90-5A7FE394358F} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {CF5604F2-EDD6-4A63-8E60-E327D91BA532} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {6104AAC7-3F96-4674-9A26-A2D6DFEC0D76} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {2F7FA324-F7E6-4D71-891F-780B56DD9D3E} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {335D852A-CE30-4038-9AD4-B70B268BB69F} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {31E317F8-F766-4EC3-8101-2D92CDB407CD} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {5F0CF40F-D54D-4101-94EA-8FE7F9C843CB} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {7C562B37-19E5-44BE-85D5-15FFA9FAEF5A} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {4BEF5648-8DBF-4E16-B6E6-6F80694E140D} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {9D96B3BD-B371-4E44-A43F-50B8EEBEC889} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {F700E4AF-073D-4C1D-A8C2-84E744EBC374} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {25E16BD1-98CA-482E-87BB-3A2A596503C7} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {5A2CE5B3-A089-47FC-A1E0-455C54102C2D} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {91E18134-CEEA-4E42-9620-C4120EF34AEE} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {02437B60-112D-49D7-8C95-6118A147CC2A} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {4FAEF817-3333-4813-86FF-F0255E000F7D} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {E41BE1F8-AB36-414F-A914-62C7E1915473} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {7CB59805-CD93-4D2A-BD21-A97820DD35B0} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {D81BE8A0-A710-4B74-8AA7-1733B3DCC461} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {425C299F-7D53-49EC-92D0-22B77BEA12D2} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {5C3C9221-419F-496C-AFB8-C87872FAF2F2} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {B5B30447-25D0-42C0-920A-092247C95664} = {D8928AB2-2939-4421-90C5-56B789BF93E5} - {34C22E86-B0A3-457D-B8D9-7CF47AAF2570} = {D8928AB2-2939-4421-90C5-56B789BF93E5} {4B210580-AFF4-453D-B2E0-B551DB71BF8E} = {BCF59319-979C-42FA-9B5E-19EFCC91D288} {765ABDD6-8C3B-4CD8-9DAC-BE9DAB674726} = {BCF59319-979C-42FA-9B5E-19EFCC91D288} {95CB49D4-0754-49C6-8E97-868626614390} = {BCF59319-979C-42FA-9B5E-19EFCC91D288} diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln index 15e486ef599886..2bf3344b9df03c 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E6903177-761B-4A40-BD67-85095C73119D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{3654E473-6D57-4442-A5F6-5642C09BDC95}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{871819C7-366E-47E9-B737-ADB9715B0BCA}" @@ -61,10 +59,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3467065B-1F80-427C-81C1-09114914817F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1FFB0A3C-B679-431A-B36B-123EE6166D14}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6347567-2D24-4E99-8F15-3657FF95AB6D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1FFB0A3C-B679-431A-B36B-123EE6166D14}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F4006304-5C88-478E-A93C-621D71A5097F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{29852EC8-54F4-4C93-A9AA-D86D2B532042}" @@ -85,10 +83,6 @@ Global {E6903177-761B-4A40-BD67-85095C73119D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6903177-761B-4A40-BD67-85095C73119D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E6903177-761B-4A40-BD67-85095C73119D}.Release|Any CPU.Build.0 = Release|Any CPU - {12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}.Release|Any CPU.Build.0 = Release|Any CPU {3654E473-6D57-4442-A5F6-5642C09BDC95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3654E473-6D57-4442-A5F6-5642C09BDC95}.Debug|Any CPU.Build.0 = Debug|Any CPU {3654E473-6D57-4442-A5F6-5642C09BDC95}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,15 +203,6 @@ Global {E6903177-761B-4A40-BD67-85095C73119D} = {3467065B-1F80-427C-81C1-09114914817F} {A30F67CA-BDBF-4C1F-92F5-C41967C02F24} = {3467065B-1F80-427C-81C1-09114914817F} {2F5EC71C-0F0C-49AE-ADD8-42753384D91F} = {3467065B-1F80-427C-81C1-09114914817F} - {12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {871819C7-366E-47E9-B737-ADB9715B0BCA} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {DD82A650-1266-4BB0-8670-E42EE74B8E8A} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {D71B5E1B-8289-4B46-B679-80E32145EFA9} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {682D3494-5A45-4201-B981-19AF7C5319E8} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {E9C0F645-340E-4310-95A3-4971B0272546} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} - {E8051516-B4B6-479E-BA8D-F3355B169F8D} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} {3654E473-6D57-4442-A5F6-5642C09BDC95} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} {294A92FD-4500-4691-8309-6D11E5E6E6CB} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} {7AC93447-67F2-4445-86D2-E13D52156BAE} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} @@ -227,6 +212,14 @@ Global {4E761C7D-24C5-430B-AD84-1634164C6AF4} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} {AAB799C3-8D63-4334-A9AE-D645EC848174} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} {616C55BF-AE90-47F2-A005-980CADDBD990} = {E6347567-2D24-4E99-8F15-3657FF95AB6D} + {871819C7-366E-47E9-B737-ADB9715B0BCA} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} + {3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} + {DD82A650-1266-4BB0-8670-E42EE74B8E8A} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} + {D71B5E1B-8289-4B46-B679-80E32145EFA9} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} + {682D3494-5A45-4201-B981-19AF7C5319E8} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} + {E9C0F645-340E-4310-95A3-4971B0272546} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} + {3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} + {E8051516-B4B6-479E-BA8D-F3355B169F8D} = {1FFB0A3C-B679-431A-B36B-123EE6166D14} {8F355290-0867-40A2-8F92-E9A3C5F5BAAF} = {F4006304-5C88-478E-A93C-621D71A5097F} {13292F01-310D-434D-BC4D-7E102ABE17BB} = {F4006304-5C88-478E-A93C-621D71A5097F} {69B3A343-3883-4F35-8B8A-2A126A9B0762} = {F4006304-5C88-478E-A93C-621D71A5097F} diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln index 9c550cb81b04f4..48bb9d27f01b6d 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln @@ -1,6 +1,4 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{6E609137-B1A4-44D7-B733-611FB5FD228E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{C68DD6AF-7125-4FD6-A90D-25A82824780D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D158597C-16FF-4911-A214-C265C09F4AE4}" @@ -35,10 +33,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", "{C4BCAFFB-8697-47CA-9BAF-7834E4785C56}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DE5517CB-9721-49A0-9ECB-BC08460946AC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DE5517CB-9721-49A0-9ECB-BC08460946AC}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5B543880-D43D-48B8-9C46-CEE391D03B73}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{237F45C3-B835-4C47-A298-604D5BFC60DC}" @@ -55,10 +53,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E609137-B1A4-44D7-B733-611FB5FD228E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E609137-B1A4-44D7-B733-611FB5FD228E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E609137-B1A4-44D7-B733-611FB5FD228E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E609137-B1A4-44D7-B733-611FB5FD228E}.Release|Any CPU.Build.0 = Release|Any CPU {C68DD6AF-7125-4FD6-A90D-25A82824780D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C68DD6AF-7125-4FD6-A90D-25A82824780D}.Debug|Any CPU.Build.0 = Debug|Any CPU {C68DD6AF-7125-4FD6-A90D-25A82824780D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -132,16 +126,15 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {6E609137-B1A4-44D7-B733-611FB5FD228E} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} - {D158597C-16FF-4911-A214-C265C09F4AE4} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} - {D1140557-6F25-44E9-9497-E354DC2576A1} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} - {8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} - {0E60E743-56C9-466D-A428-232FEAEEF41E} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} {C68DD6AF-7125-4FD6-A90D-25A82824780D} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6} {2DB8E45F-D3EF-47A7-847E-0311AE734314} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6} {9022313F-BEEA-426E-8185-096E0516D1B6} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6} {72D4F48A-A93B-471F-B9C7-64BC9BF22A09} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6} {065B4B16-B618-41D8-B1DE-F31AFC9E6C84} = {A3B06CF1-069F-41FF-89BB-9BAEEC5B0FF6} + {D158597C-16FF-4911-A214-C265C09F4AE4} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} + {D1140557-6F25-44E9-9497-E354DC2576A1} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} + {8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} + {0E60E743-56C9-466D-A428-232FEAEEF41E} = {DE5517CB-9721-49A0-9ECB-BC08460946AC} {AE2D1BFD-FD06-4227-98A7-14604F9D0EFC} = {5B543880-D43D-48B8-9C46-CEE391D03B73} {47E4AB7D-BC64-4323-B723-CD2B7DA9BB88} = {5B543880-D43D-48B8-9C46-CEE391D03B73} {BBFDDC90-8F98-4DD7-8A18-8E2345C18904} = {5B543880-D43D-48B8-9C46-CEE391D03B73} diff --git a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln index 73a0bf73d9c2eb..8af8aa064f8e36 100644 --- a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln +++ b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{201C7D67-FB1D-4259-9DB4-BF188007F9EA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{F656E22F-D8D2-4C8A-A435-01F821A1EA07}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830}" @@ -205,10 +203,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7C1317AA-5F4C-42A4-80F3-856BA5E204AF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{72A090A3-FE14-4F4E-B266-EFFB5C736462}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7028EE0A-D314-4F48-91CA-51A1633BC3F4}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{72A090A3-FE14-4F4E-B266-EFFB5C736462}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{EEA4A938-C9F5-45E5-BF34-AA10FFC34377}" @@ -229,10 +227,6 @@ Global {F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Release|Any CPU.ActiveCfg = Release|Any CPU {F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Release|Any CPU.Build.0 = Release|Any CPU - {201C7D67-FB1D-4259-9DB4-BF188007F9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {201C7D67-FB1D-4259-9DB4-BF188007F9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {201C7D67-FB1D-4259-9DB4-BF188007F9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {201C7D67-FB1D-4259-9DB4-BF188007F9EA}.Release|Any CPU.Build.0 = Release|Any CPU {F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Debug|Any CPU.Build.0 = Debug|Any CPU {F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -642,7 +636,42 @@ Global {94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF} {D3B6805B-F10E-4A19-99FC-55506892BC18} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF} {D7C2C4C7-CF28-4E2B-8749-31D7E6072588} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF} - {201C7D67-FB1D-4259-9DB4-BF188007F9EA} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} + {F656E22F-D8D2-4C8A-A435-01F821A1EA07} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {66E30CB1-ADA8-4000-9CEE-56AF40323D23} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {3975BEAC-6DB6-4CF7-B788-AA5B07D6CAC1} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {DAD9293C-DB4F-45DE-A1BB-D857B02A0764} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {0C4F3A7F-AAED-49A0-B8A3-B63CC83B345D} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {355E3E07-8273-4660-AE2C-8603A0757C4B} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {D4256787-48E0-473F-8C06-359C1BCFC8AB} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {0F2B84D6-6C2E-4216-A8CD-DF91908F4194} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {8E120FF0-27B9-4DE0-85FA-B0BE18867898} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {5E97D652-E1A3-46CF-B577-C1216A9FD079} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {6A4A1183-A0CF-4270-8EF9-12018D9DADB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {3C56A02F-4DD8-4253-99E7-34E088A6A9D7} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {36D778AF-5EC3-433F-B03D-EB244DB3C227} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {D0932BA0-70BF-4A98-9A30-ED563AB2BFB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {6AD51705-102E-4E9D-B62E-6BF19025F3A7} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {56D37CB2-68A3-42D3-AA0E-416813ABAD8B} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {9EBA168F-239A-46C4-8614-E1D3DB25DD0E} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {47B5D904-4787-49E3-9894-31F8B7BE6755} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {3E400E69-1699-412B-A202-764A967A6E51} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {7F2C68B0-A922-4455-BAF3-335E44DF6BB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {A9E52F82-6B9C-4E07-919B-2B1BFFB21DBB} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {DA91110F-C553-45E4-93E7-948A93AD09AF} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {6AF79D67-4D64-40B4-9276-BCC06B8BAF58} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {3A6E2FA4-B745-4E4B-A82E-98CAD1177E77} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {9BA945E7-0970-4CA2-A54B-F8D9B3E69917} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {AAB5D437-EFB2-4BAC-BA0F-7323BA691B89} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {90548F7B-C673-42C9-BD88-A6E6550ECE1C} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {429C9D71-4BBD-489D-9C86-EC240F652008} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {99007CDD-4840-4B94-8A8A-FECF72BCEE3F} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {9175023F-6982-45CD-B360-C4FC1E145B25} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {090BC7F8-AC7F-498E-825D-BF02367B2AD1} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {59D31D62-3BF9-4F4A-9FF7-3A61F297F714} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} + {D7CEC738-5D2D-4FCB-9268-9650EB01BF31} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {5EA013FF-FCA7-4F0B-8EB7-14D8472A0830} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {5E90DFC5-7D40-42E4-ADF6-7090015B7211} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {732B0524-C9F0-4752-AD19-5275E863C6E0} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} @@ -687,42 +716,6 @@ Global {B0249028-C048-40B8-B102-BCE7928965C3} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {9F1389B4-A9A5-422F-89F5-A2D431292F0C} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} {6E2398EA-A64A-4493-A79B-63D2F072A690} = {72A090A3-FE14-4F4E-B266-EFFB5C736462} - {F656E22F-D8D2-4C8A-A435-01F821A1EA07} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {66E30CB1-ADA8-4000-9CEE-56AF40323D23} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {3975BEAC-6DB6-4CF7-B788-AA5B07D6CAC1} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {DAD9293C-DB4F-45DE-A1BB-D857B02A0764} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {0C4F3A7F-AAED-49A0-B8A3-B63CC83B345D} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {355E3E07-8273-4660-AE2C-8603A0757C4B} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {D4256787-48E0-473F-8C06-359C1BCFC8AB} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {0F2B84D6-6C2E-4216-A8CD-DF91908F4194} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {8E120FF0-27B9-4DE0-85FA-B0BE18867898} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {5E97D652-E1A3-46CF-B577-C1216A9FD079} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {6A4A1183-A0CF-4270-8EF9-12018D9DADB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {3C56A02F-4DD8-4253-99E7-34E088A6A9D7} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {36D778AF-5EC3-433F-B03D-EB244DB3C227} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {D0932BA0-70BF-4A98-9A30-ED563AB2BFB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {6AD51705-102E-4E9D-B62E-6BF19025F3A7} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {56D37CB2-68A3-42D3-AA0E-416813ABAD8B} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {9EBA168F-239A-46C4-8614-E1D3DB25DD0E} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {47B5D904-4787-49E3-9894-31F8B7BE6755} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {3E400E69-1699-412B-A202-764A967A6E51} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {7F2C68B0-A922-4455-BAF3-335E44DF6BB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {A9E52F82-6B9C-4E07-919B-2B1BFFB21DBB} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {DA91110F-C553-45E4-93E7-948A93AD09AF} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {6AF79D67-4D64-40B4-9276-BCC06B8BAF58} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {3A6E2FA4-B745-4E4B-A82E-98CAD1177E77} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {9BA945E7-0970-4CA2-A54B-F8D9B3E69917} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {AAB5D437-EFB2-4BAC-BA0F-7323BA691B89} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {90548F7B-C673-42C9-BD88-A6E6550ECE1C} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {429C9D71-4BBD-489D-9C86-EC240F652008} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {99007CDD-4840-4B94-8A8A-FECF72BCEE3F} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {9175023F-6982-45CD-B360-C4FC1E145B25} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {090BC7F8-AC7F-498E-825D-BF02367B2AD1} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {59D31D62-3BF9-4F4A-9FF7-3A61F297F714} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} - {D7CEC738-5D2D-4FCB-9268-9650EB01BF31} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4} {4F936B46-60DA-4EE3-831A-06DC62E1E155} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1} {39EE5D71-77C5-4633-A47F-1062172FD121} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1} {8A4E7CB4-9983-4B7F-BED9-7A94BAC7CA07} = {C25891DB-FBAC-4B92-9BB9-A8181B5A0EF1} diff --git a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln index 892db07514e3c4..fffd05baa7b5ac 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln +++ b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln @@ -3,8 +3,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{05604AC6-E1DA-460E-9A38-57EB19BE3327}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\ref\Microsoft.Bcl.Cryptography.csproj", "{5646CD27-27B4-41FA-BD72-EAC5A54F24BB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\src\Microsoft.Bcl.Cryptography.csproj", "{F8D69F47-487B-49DD-8AE7-4F911E2E5DD0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{516999D7-BFBD-41D1-A96C-69EBCDB6CF64}" @@ -165,27 +163,6 @@ Global {05604AC6-E1DA-460E-9A38-57EB19BE3327}.Checked|arm64.ActiveCfg = Debug|Any CPU {05604AC6-E1DA-460E-9A38-57EB19BE3327}.Checked|x64.ActiveCfg = Debug|Any CPU {05604AC6-E1DA-460E-9A38-57EB19BE3327}.Checked|x86.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Debug|arm.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Debug|arm64.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Debug|x64.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Debug|x64.Build.0 = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Debug|x86.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Debug|x86.Build.0 = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Release|Any CPU.Build.0 = Release|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Release|arm.ActiveCfg = Release|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Release|arm64.ActiveCfg = Release|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Release|x64.ActiveCfg = Release|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Release|x64.Build.0 = Release|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Release|x86.ActiveCfg = Release|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Release|x86.Build.0 = Release|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Checked|arm.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Checked|arm64.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Checked|x64.ActiveCfg = Debug|Any CPU - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB}.Checked|x86.ActiveCfg = Debug|Any CPU {F8D69F47-487B-49DD-8AE7-4F911E2E5DD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F8D69F47-487B-49DD-8AE7-4F911E2E5DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU {F8D69F47-487B-49DD-8AE7-4F911E2E5DD0}.Debug|arm.ActiveCfg = Debug|Any CPU @@ -985,7 +962,6 @@ Global {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} - {5646CD27-27B4-41FA-BD72-EAC5A54F24BB} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {4D95D10F-4421-4DA7-B866-B5715AA03AE2} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {33637A81-A335-474A-814D-648881BB403B} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} {8710F08A-F3C3-4E92-B0ED-E787C4523EC0} = {51C4F716-E3A7-4DBC-BC81-CAC8D2D33F14} diff --git a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln index ae48d8b33b2462..ec2bb79cff898e 100644 --- a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln +++ b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln @@ -5,8 +5,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\ref\Microsoft.Bcl.Cryptography.csproj", "{31D63888-C868-475E-9648-60F944DE3F48}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\src\Microsoft.Bcl.Cryptography.csproj", "{A5FBDBCB-7281-4D2F-938B-BCBED5BC52B6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{8D254FBD-C46E-4701-B2B5-238CABBE81F8}" @@ -192,27 +190,6 @@ Global {7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Checked|arm64.ActiveCfg = Debug|Any CPU {7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Checked|x64.ActiveCfg = Debug|Any CPU {7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Checked|x86.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Debug|arm.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Debug|arm64.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Debug|x64.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Debug|x64.Build.0 = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Debug|x86.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Debug|x86.Build.0 = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Release|Any CPU.Build.0 = Release|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Release|arm.ActiveCfg = Release|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Release|arm64.ActiveCfg = Release|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Release|x64.ActiveCfg = Release|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Release|x64.Build.0 = Release|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Release|x86.ActiveCfg = Release|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Release|x86.Build.0 = Release|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Checked|arm.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Checked|arm64.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Checked|x64.ActiveCfg = Debug|Any CPU - {31D63888-C868-475E-9648-60F944DE3F48}.Checked|x86.ActiveCfg = Debug|Any CPU {A5FBDBCB-7281-4D2F-938B-BCBED5BC52B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A5FBDBCB-7281-4D2F-938B-BCBED5BC52B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {A5FBDBCB-7281-4D2F-938B-BCBED5BC52B6}.Debug|arm.ActiveCfg = Debug|Any CPU @@ -1056,7 +1033,6 @@ Global {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} - {31D63888-C868-475E-9648-60F944DE3F48} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {180BEB2D-7AA7-4E0D-B228-B93B13D3B85E} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2} = {B64B7581-6925-4823-B7AF-97FBC53A4146} {616A1164-8B49-42C1-BD86-F416B47F7543} = {B64B7581-6925-4823-B7AF-97FBC53A4146} diff --git a/src/libraries/System.Memory.Data/System.Memory.Data.sln b/src/libraries/System.Memory.Data/System.Memory.Data.sln index 5ab77a638eb2e2..9cb35fe7088bf6 100644 --- a/src/libraries/System.Memory.Data/System.Memory.Data.sln +++ b/src/libraries/System.Memory.Data/System.Memory.Data.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{73EE06DD-772E-44E9-9B91-A9AF081C2BEB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\ref\System.Collections.Concurrent.csproj", "{9CFA766E-448C-46B5-BDF4-69E57276163A}" @@ -57,10 +55,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2BD73108-47D7-40E6-BFCB-169E6AD42A81}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6AF8CEE-6550-4190-97D4-D51C5B114919}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6AF8CEE-6550-4190-97D4-D51C5B114919}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{9A2475E4-53E1-4CF3-800C-8A52E56E9AA8}" @@ -81,10 +79,6 @@ Global {73EE06DD-772E-44E9-9B91-A9AF081C2BEB}.Debug|Any CPU.Build.0 = Debug|Any CPU {73EE06DD-772E-44E9-9B91-A9AF081C2BEB}.Release|Any CPU.ActiveCfg = Release|Any CPU {73EE06DD-772E-44E9-9B91-A9AF081C2BEB}.Release|Any CPU.Build.0 = Release|Any CPU - {B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Release|Any CPU.Build.0 = Release|Any CPU {1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -196,7 +190,11 @@ Global GlobalSection(NestedProjects) = preSolution {73EE06DD-772E-44E9-9B91-A9AF081C2BEB} = {2BD73108-47D7-40E6-BFCB-169E6AD42A81} {804B5D44-05A3-491E-A6AB-35C592E6703E} = {2BD73108-47D7-40E6-BFCB-169E6AD42A81} - {B9162F6C-4CD1-4D33-BA4A-42830A1B1C66} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} + {1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} + {F24F2CFD-3884-4C94-A950-2A1195F2CCE6} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} + {ACDB56AF-7B9F-4762-9764-D6FF09118D09} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} + {0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} + {6A2B5C68-14C3-4989-8530-D51A138C72AE} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} {9CFA766E-448C-46B5-BDF4-69E57276163A} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {C98534B9-FB9B-49A4-83FD-D139B9DFBF1D} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {3EA8C98A-0B80-425A-B0A7-35AC408E7D00} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} @@ -205,11 +203,6 @@ Global {21F4999E-EC35-456A-AB99-92C65DD24CC5} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {B137F36F-56CB-46B0-ABDD-B80C82494696} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {1D93DCD8-BF67-4FB5-A25A-7837F230B173} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} - {1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} - {F24F2CFD-3884-4C94-A950-2A1195F2CCE6} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} - {ACDB56AF-7B9F-4762-9764-D6FF09118D09} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} - {0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} - {6A2B5C68-14C3-4989-8530-D51A138C72AE} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} {372BA3FC-446E-4AD2-9125-1BE0890C1D43} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76} {D42EA0B4-9775-46FD-BAEC-FCE96172FCF4} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76} {3B738A97-60C4-40EC-B38B-E41C38C18616} = {839FCC67-5EA8-4A07-B5D4-9E1DF0B3BE76} diff --git a/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln b/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln index 06db8a41f7350b..33cdd49b0a4824 100644 --- a/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln +++ b/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{6E75F701-4A14-4372-894E-F61B75026A96}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj", "{C2CA73DE-D557-40C1-9979-055E36518E3C}" @@ -81,10 +79,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A75027EA-199E-4C86-A636-AE9AE0F0756C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{945B0700-C720-4775-B9E4-6A27DAA90190}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A66925D-3658-46BE-A730-5BF70D8D5B90}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{945B0700-C720-4775-B9E4-6A27DAA90190}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{5A418E02-B18A-41F1-9D4F-1BD6CB51F63C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{0C6EA345-353C-4E9E-8983-7EA339ED3F62}" @@ -105,10 +103,6 @@ Global {3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Debug|Any CPU.Build.0 = Debug|Any CPU {3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Release|Any CPU.Build.0 = Release|Any CPU - {6E75F701-4A14-4372-894E-F61B75026A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E75F701-4A14-4372-894E-F61B75026A96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E75F701-4A14-4372-894E-F61B75026A96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E75F701-4A14-4372-894E-F61B75026A96}.Release|Any CPU.Build.0 = Release|Any CPU {4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Debug|Any CPU.Build.0 = Debug|Any CPU {4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -269,7 +263,11 @@ Global {3AD3D600-C391-492D-B3D6-0F6C03DA5C27} = {A75027EA-199E-4C86-A636-AE9AE0F0756C} {1D6F4698-E7FA-4AE3-A7A4-98939E40D08D} = {A75027EA-199E-4C86-A636-AE9AE0F0756C} {E5F445FD-335C-418D-A46F-D62AE59333FC} = {A75027EA-199E-4C86-A636-AE9AE0F0756C} - {6E75F701-4A14-4372-894E-F61B75026A96} = {945B0700-C720-4775-B9E4-6A27DAA90190} + {4FB629CD-5FFC-47AC-9670-A2A8AFEE8926} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} + {3C57AF51-E308-4C13-8190-DF0468B01E49} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} + {7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} + {FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} + {BC7D3412-DBCB-4863-8BF8-41899E32608C} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} {C2CA73DE-D557-40C1-9979-055E36518E3C} = {945B0700-C720-4775-B9E4-6A27DAA90190} {74365908-C526-4638-B719-84448B21180B} = {945B0700-C720-4775-B9E4-6A27DAA90190} {EDC59866-9577-4E5C-BF0C-6EEF68A137DD} = {945B0700-C720-4775-B9E4-6A27DAA90190} @@ -289,11 +287,6 @@ Global {3CB5F995-E5F8-4AF8-A4FD-2AD69A4DC43C} = {945B0700-C720-4775-B9E4-6A27DAA90190} {1A9E7E5D-B340-4677-8745-2811F07148C6} = {945B0700-C720-4775-B9E4-6A27DAA90190} {EA992513-9CA4-4DEB-B0EE-A8FD0252B451} = {945B0700-C720-4775-B9E4-6A27DAA90190} - {4FB629CD-5FFC-47AC-9670-A2A8AFEE8926} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} - {3C57AF51-E308-4C13-8190-DF0468B01E49} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} - {7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} - {FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} - {BC7D3412-DBCB-4863-8BF8-41899E32608C} = {2A66925D-3658-46BE-A730-5BF70D8D5B90} {760BA8DB-B9A0-4B6D-AF5D-EE3FF92B1A70} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C} {4AED92A2-8DEB-41B4-862D-8B779FA1CFCE} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C} {E1A1EC7C-3257-46EB-8DBC-DE8DAB3F4F4F} = {5A418E02-B18A-41F1-9D4F-1BD6CB51F63C} diff --git a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln index 059a131eea9786..8b01f9677290f5 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln +++ b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{49FC63FA-3E81-4335-91CF-B5056E007343}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{D18082CB-C337-473B-8AC3-5FCC312F90C6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj", "{A58BF142-31B9-41AF-9DFF-EBF9CB62CF34}" @@ -89,10 +87,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6C66589E-2DB3-4635-BADA-9B6452327239}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F9A243D-B060-4BB2-A9E1-A9CB861328D9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49E09973-383D-4AD6-9D88-B93A02031607}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F9A243D-B060-4BB2-A9E1-A9CB861328D9}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{B8C52E24-376F-4E8D-AA8A-62E25C161863}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{AB5A3276-13E4-47A4-9793-A3C70FB9C27A}" @@ -113,10 +111,6 @@ Global {49FC63FA-3E81-4335-91CF-B5056E007343}.Debug|Any CPU.Build.0 = Debug|Any CPU {49FC63FA-3E81-4335-91CF-B5056E007343}.Release|Any CPU.ActiveCfg = Release|Any CPU {49FC63FA-3E81-4335-91CF-B5056E007343}.Release|Any CPU.Build.0 = Release|Any CPU - {D18082CB-C337-473B-8AC3-5FCC312F90C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D18082CB-C337-473B-8AC3-5FCC312F90C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D18082CB-C337-473B-8AC3-5FCC312F90C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D18082CB-C337-473B-8AC3-5FCC312F90C6}.Release|Any CPU.Build.0 = Release|Any CPU {4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Debug|Any CPU.Build.0 = Debug|Any CPU {4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -293,7 +287,13 @@ Global {49FC63FA-3E81-4335-91CF-B5056E007343} = {6C66589E-2DB3-4635-BADA-9B6452327239} {E9D5AB56-2597-42E0-BE81-C00CC63D1FB3} = {6C66589E-2DB3-4635-BADA-9B6452327239} {090BA6CA-F661-4BDE-9663-65F8231DDB1D} = {6C66589E-2DB3-4635-BADA-9B6452327239} - {D18082CB-C337-473B-8AC3-5FCC312F90C6} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} + {4BA25EC1-B76B-4410-AF2D-A54B90FAB404} = {49E09973-383D-4AD6-9D88-B93A02031607} + {7EF13CC5-C714-4C0F-990F-C0884B92A9A1} = {49E09973-383D-4AD6-9D88-B93A02031607} + {8A28E0FF-F2E5-44C8-A840-B8C77AAB1C9A} = {49E09973-383D-4AD6-9D88-B93A02031607} + {E6A8B90B-69CD-4B0D-8A33-F208A3169674} = {49E09973-383D-4AD6-9D88-B93A02031607} + {DE2A69CC-4962-4BF6-A714-41A87A6C045B} = {49E09973-383D-4AD6-9D88-B93A02031607} + {BACC5257-6CA8-45C7-970F-C8D501DA59AB} = {49E09973-383D-4AD6-9D88-B93A02031607} + {E470810A-BAF2-4B3C-92CB-72007B7F1B6A} = {49E09973-383D-4AD6-9D88-B93A02031607} {A58BF142-31B9-41AF-9DFF-EBF9CB62CF34} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {CB18AE99-D547-4F9A-AD10-884DD5935EE7} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {32C2A9F2-E78C-4B86-BE28-EA63E9A78284} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} @@ -315,13 +315,6 @@ Global {7B5074DE-11B9-4564-B6DC-9BFEFB58C1CA} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {2C7E9759-DB91-46DD-AE83-446973893D48} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} {8ABBBDC5-48A1-43BA-A629-AE58C35318AA} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9} - {4BA25EC1-B76B-4410-AF2D-A54B90FAB404} = {49E09973-383D-4AD6-9D88-B93A02031607} - {7EF13CC5-C714-4C0F-990F-C0884B92A9A1} = {49E09973-383D-4AD6-9D88-B93A02031607} - {8A28E0FF-F2E5-44C8-A840-B8C77AAB1C9A} = {49E09973-383D-4AD6-9D88-B93A02031607} - {E6A8B90B-69CD-4B0D-8A33-F208A3169674} = {49E09973-383D-4AD6-9D88-B93A02031607} - {DE2A69CC-4962-4BF6-A714-41A87A6C045B} = {49E09973-383D-4AD6-9D88-B93A02031607} - {BACC5257-6CA8-45C7-970F-C8D501DA59AB} = {49E09973-383D-4AD6-9D88-B93A02031607} - {E470810A-BAF2-4B3C-92CB-72007B7F1B6A} = {49E09973-383D-4AD6-9D88-B93A02031607} {24F441D1-9CF5-4A92-AC7D-BDC05C6CCB57} = {B8C52E24-376F-4E8D-AA8A-62E25C161863} {8B4CF65D-B325-4ED8-B853-C22F12997836} = {B8C52E24-376F-4E8D-AA8A-62E25C161863} {834ECDE7-4B5D-4DBD-8BCA-98343A99179F} = {B8C52E24-376F-4E8D-AA8A-62E25C161863} diff --git a/src/libraries/System.Net.Http/System.Net.Http.sln b/src/libraries/System.Net.Http/System.Net.Http.sln index bf26e6272a9436..e367915f11f8b1 100644 --- a/src/libraries/System.Net.Http/System.Net.Http.sln +++ b/src/libraries/System.Net.Http/System.Net.Http.sln @@ -5,8 +5,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{838E1FB6-0CEB-46DE-9C8D-A9C2E0389891}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj", "{B0566430-0E17-4368-9B8C-711E187B2F3D}" @@ -204,27 +202,6 @@ Global {2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}.Checked|arm64.ActiveCfg = Debug|Any CPU {2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}.Checked|x64.ActiveCfg = Debug|Any CPU {2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}.Checked|x86.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Debug|arm.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Debug|arm64.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Debug|x64.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Debug|x64.Build.0 = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Debug|x86.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Debug|x86.Build.0 = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Release|Any CPU.Build.0 = Release|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Release|arm.ActiveCfg = Release|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Release|arm64.ActiveCfg = Release|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Release|x64.ActiveCfg = Release|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Release|x64.Build.0 = Release|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Release|x86.ActiveCfg = Release|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Release|x86.Build.0 = Release|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Checked|arm.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Checked|arm64.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Checked|x64.ActiveCfg = Debug|Any CPU - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56}.Checked|x86.ActiveCfg = Debug|Any CPU {838E1FB6-0CEB-46DE-9C8D-A9C2E0389891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {838E1FB6-0CEB-46DE-9C8D-A9C2E0389891}.Debug|Any CPU.Build.0 = Debug|Any CPU {838E1FB6-0CEB-46DE-9C8D-A9C2E0389891}.Debug|arm.ActiveCfg = Debug|Any CPU @@ -1192,7 +1169,6 @@ Global {51412712-224A-4F69-9964-3EFBEB2AA3E0} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10} {AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10} {FC7EE3FF-B352-442D-AB17-E0055121B918} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10} - {114DC038-0CE0-4DF3-8DA9-8D9F5019DD56} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} {B0566430-0E17-4368-9B8C-711E187B2F3D} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} {EB5C6EE4-DCEF-4866-9045-A108F29CEC2B} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} {844895E3-EDA5-453A-ACDE-E9DE1D5D8FC7} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD} diff --git a/src/libraries/System.Net.ServerSentEvents/System.Net.ServerSentEvents.sln b/src/libraries/System.Net.ServerSentEvents/System.Net.ServerSentEvents.sln index d3274955958df6..2886ac6101c61d 100644 --- a/src/libraries/System.Net.ServerSentEvents/System.Net.ServerSentEvents.sln +++ b/src/libraries/System.Net.ServerSentEvents/System.Net.ServerSentEvents.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1B5910A4-B73A-4253-8962-BA51DCE0367D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{40DD9B24-AD7F-4B97-A90A-B08FD91A5547}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{6805DD08-6B8B-410D-B1D7-B89D5AB74249}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServerSentEvents", "ref\System.Net.ServerSentEvents.csproj", "{ACB7E0BF-015F-43DC-A2F5-85506173B223}" @@ -27,10 +25,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2BD73108-47D7-40E6-BFCB-169E6AD42A81}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6AF8CEE-6550-4190-97D4-D51C5B114919}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6AF8CEE-6550-4190-97D4-D51C5B114919}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{704CC916-D4A9-48AF-99ED-9A155CD6E799}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C83F4479-3081-4407-B7F9-20EE839BB75C}" @@ -51,10 +49,6 @@ Global {1B5910A4-B73A-4253-8962-BA51DCE0367D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B5910A4-B73A-4253-8962-BA51DCE0367D}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B5910A4-B73A-4253-8962-BA51DCE0367D}.Release|Any CPU.Build.0 = Release|Any CPU - {40DD9B24-AD7F-4B97-A90A-B08FD91A5547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40DD9B24-AD7F-4B97-A90A-B08FD91A5547}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40DD9B24-AD7F-4B97-A90A-B08FD91A5547}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40DD9B24-AD7F-4B97-A90A-B08FD91A5547}.Release|Any CPU.Build.0 = Release|Any CPU {6805DD08-6B8B-410D-B1D7-B89D5AB74249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6805DD08-6B8B-410D-B1D7-B89D5AB74249}.Debug|Any CPU.Build.0 = Debug|Any CPU {6805DD08-6B8B-410D-B1D7-B89D5AB74249}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -106,10 +100,9 @@ Global GlobalSection(NestedProjects) = preSolution {1B5910A4-B73A-4253-8962-BA51DCE0367D} = {2BD73108-47D7-40E6-BFCB-169E6AD42A81} {804B5D44-05A3-491E-A6AB-35C592E6703E} = {2BD73108-47D7-40E6-BFCB-169E6AD42A81} - {40DD9B24-AD7F-4B97-A90A-B08FD91A5547} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} - {ACB7E0BF-015F-43DC-A2F5-85506173B223} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {6805DD08-6B8B-410D-B1D7-B89D5AB74249} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} {ACDB56AF-7B9F-4762-9764-D6FF09118D09} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504} + {ACB7E0BF-015F-43DC-A2F5-85506173B223} = {E6AF8CEE-6550-4190-97D4-D51C5B114919} {33029DED-2918-452F-833E-F506330D9E72} = {704CC916-D4A9-48AF-99ED-9A155CD6E799} {CD89F5C5-432A-47EC-AF48-B9F87B7D19DA} = {704CC916-D4A9-48AF-99ED-9A155CD6E799} {53CEE09C-60EC-40E9-BB8C-C2C1223A1FD0} = {C83F4479-3081-4407-B7F9-20EE839BB75C} diff --git a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln index 7a23af9d2524b4..46a6ff8b22046d 100644 --- a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln +++ b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln @@ -3,8 +3,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B615DEB1-354C-4357-987A-BBA921E5A712}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{50C5EAD6-A525-40E1-B634-F5EEAFF7E736}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{09C4ABB6-301C-44E5-9972-6BAE4B4A2A9D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj", "{B3609723-41C3-435B-938F-9AFABB78BFD3}" @@ -175,27 +173,6 @@ Global {B615DEB1-354C-4357-987A-BBA921E5A712}.Checked|arm64.ActiveCfg = Debug|Any CPU {B615DEB1-354C-4357-987A-BBA921E5A712}.Checked|x64.ActiveCfg = Debug|Any CPU {B615DEB1-354C-4357-987A-BBA921E5A712}.Checked|x86.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Debug|arm.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Debug|arm64.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Debug|x64.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Debug|x64.Build.0 = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Debug|x86.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Debug|x86.Build.0 = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Release|Any CPU.Build.0 = Release|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Release|arm.ActiveCfg = Release|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Release|arm64.ActiveCfg = Release|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Release|x64.ActiveCfg = Release|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Release|x64.Build.0 = Release|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Release|x86.ActiveCfg = Release|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Release|x86.Build.0 = Release|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Checked|arm.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Checked|arm64.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Checked|x64.ActiveCfg = Debug|Any CPU - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736}.Checked|x86.ActiveCfg = Debug|Any CPU {09C4ABB6-301C-44E5-9972-6BAE4B4A2A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09C4ABB6-301C-44E5-9972-6BAE4B4A2A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU {09C4ABB6-301C-44E5-9972-6BAE4B4A2A9D}.Debug|arm.ActiveCfg = Debug|Any CPU @@ -1094,7 +1071,6 @@ Global {B615DEB1-354C-4357-987A-BBA921E5A712} = {BEE2F256-0489-4809-AB20-27ADB2D0E10C} {90E8DA45-66F3-491E-B408-82AB85EEAB76} = {BEE2F256-0489-4809-AB20-27ADB2D0E10C} {CA20532A-33B3-4DC0-92D2-EA6D7987D59F} = {BEE2F256-0489-4809-AB20-27ADB2D0E10C} - {50C5EAD6-A525-40E1-B634-F5EEAFF7E736} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05} {B3609723-41C3-435B-938F-9AFABB78BFD3} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05} {9FE423E7-F6BE-4DB2-A3D0-E5DDAE1DB6B4} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05} {68BAD4CC-08BA-4158-8CEA-5C7F648B5C01} = {A0314AC5-E490-4A6A-B946-8B9A21A2FA05} diff --git a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln index 959740a6408ae8..0afa9da9f3c074 100644 --- a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln +++ b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9F20CEA1-2216-4432-BBBD-F01E05D17F23}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "..\Microsoft.Bcl.Numerics\ref\Microsoft.Bcl.Numerics.csproj", "{D311ABE4-10A9-4BB1-89CE-6358C55501A8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Numerics", "..\Microsoft.Bcl.Numerics\src\Microsoft.Bcl.Numerics.csproj", "{1578185F-C4FA-4866-936B-E62AAEDD03B7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors", "ref\System.Numerics.Tensors.csproj", "{21CB448A-3882-4337-B416-D1A3E0BCFFC5}" @@ -29,10 +27,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DE94CA7D-BB10-4865-85A6-6B694631247F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7AC4B2C7-A55C-4C4F-9B02-77F5CBFFF4AB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DF0561A1-3AB8-4B51-AFB4-392EE1DD6247}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7AC4B2C7-A55C-4C4F-9B02-77F5CBFFF4AB}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{841A2FA4-A95F-4612-A8B9-AD2EF769BC71}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{A21C99E7-E22B-470E-BF48-56B00AFE3D34}" @@ -53,10 +51,6 @@ Global {9F20CEA1-2216-4432-BBBD-F01E05D17F23}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F20CEA1-2216-4432-BBBD-F01E05D17F23}.Release|Any CPU.ActiveCfg = Release|Any CPU {9F20CEA1-2216-4432-BBBD-F01E05D17F23}.Release|Any CPU.Build.0 = Release|Any CPU - {D311ABE4-10A9-4BB1-89CE-6358C55501A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D311ABE4-10A9-4BB1-89CE-6358C55501A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D311ABE4-10A9-4BB1-89CE-6358C55501A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D311ABE4-10A9-4BB1-89CE-6358C55501A8}.Release|Any CPU.Build.0 = Release|Any CPU {1578185F-C4FA-4866-936B-E62AAEDD03B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1578185F-C4FA-4866-936B-E62AAEDD03B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {1578185F-C4FA-4866-936B-E62AAEDD03B7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,10 +107,9 @@ Global {9F20CEA1-2216-4432-BBBD-F01E05D17F23} = {DE94CA7D-BB10-4865-85A6-6B694631247F} {46AD9423-D8C3-44BB-A201-1CCCAB4C6DAF} = {DE94CA7D-BB10-4865-85A6-6B694631247F} {4AF6A02D-82C8-4898-9EDF-01F107C25061} = {DE94CA7D-BB10-4865-85A6-6B694631247F} - {D311ABE4-10A9-4BB1-89CE-6358C55501A8} = {7AC4B2C7-A55C-4C4F-9B02-77F5CBFFF4AB} - {21CB448A-3882-4337-B416-D1A3E0BCFFC5} = {7AC4B2C7-A55C-4C4F-9B02-77F5CBFFF4AB} {1578185F-C4FA-4866-936B-E62AAEDD03B7} = {DF0561A1-3AB8-4B51-AFB4-392EE1DD6247} {848DD000-3D22-4A25-A9D9-05AFF857A116} = {DF0561A1-3AB8-4B51-AFB4-392EE1DD6247} + {21CB448A-3882-4337-B416-D1A3E0BCFFC5} = {7AC4B2C7-A55C-4C4F-9B02-77F5CBFFF4AB} {4588351F-4233-4957-B84C-7F8E22B8888A} = {841A2FA4-A95F-4612-A8B9-AD2EF769BC71} {DB954E01-898A-4FE2-A3AA-180D041AB08F} = {841A2FA4-A95F-4612-A8B9-AD2EF769BC71} {04FC0651-B9D0-448A-A28B-11B1D4A897F4} = {A21C99E7-E22B-470E-BF48-56B00AFE3D34} diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln b/src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln index 3218f456d73fec..4c19df1d78c4c5 100644 --- a/src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln +++ b/src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln @@ -3,8 +3,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{ED86AB26-1CFB-457D-BF87-B7A0D8FAF272}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{FC1007CC-9E52-49B7-A47B-A8AE76E75986}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\ref\System.Collections.csproj", "{8B1D80E9-AE0D-4E3C-9F91-E6862B49AEF3}" @@ -151,27 +149,6 @@ Global {ED86AB26-1CFB-457D-BF87-B7A0D8FAF272}.Checked|arm64.ActiveCfg = Debug|Any CPU {ED86AB26-1CFB-457D-BF87-B7A0D8FAF272}.Checked|x64.ActiveCfg = Debug|Any CPU {ED86AB26-1CFB-457D-BF87-B7A0D8FAF272}.Checked|x86.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Debug|arm.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Debug|arm64.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Debug|x64.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Debug|x64.Build.0 = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Debug|x86.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Debug|x86.Build.0 = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Release|Any CPU.Build.0 = Release|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Release|arm.ActiveCfg = Release|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Release|arm64.ActiveCfg = Release|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Release|x64.ActiveCfg = Release|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Release|x64.Build.0 = Release|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Release|x86.ActiveCfg = Release|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Release|x86.Build.0 = Release|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Checked|arm.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Checked|arm64.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Checked|x64.ActiveCfg = Debug|Any CPU - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2}.Checked|x86.ActiveCfg = Debug|Any CPU {FC1007CC-9E52-49B7-A47B-A8AE76E75986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FC1007CC-9E52-49B7-A47B-A8AE76E75986}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC1007CC-9E52-49B7-A47B-A8AE76E75986}.Debug|arm.ActiveCfg = Debug|Any CPU @@ -822,7 +799,6 @@ Global {BFED925C-18F2-4C98-833E-66F205234598} = {26A72FFB-871A-4F2F-A513-B2F6E09F358C} {765B4AA5-723A-44FF-BC4E-EB0F03103F6D} = {26A72FFB-871A-4F2F-A513-B2F6E09F358C} {EC3ADEFA-1FF3-482C-8CCB-FE4C77292532} = {26A72FFB-871A-4F2F-A513-B2F6E09F358C} - {BC2F0477-9A34-48D3-B66F-AE97AEA29CD2} = {32CDDDCD-5319-494C-AB41-42B87C467F04} {8B1D80E9-AE0D-4E3C-9F91-E6862B49AEF3} = {32CDDDCD-5319-494C-AB41-42B87C467F04} {E00AE8BB-7C7F-4D07-949D-EDCC815AC8C8} = {32CDDDCD-5319-494C-AB41-42B87C467F04} {D549C13B-FC0D-4B5A-B50D-8F74CB5A3D08} = {32CDDDCD-5319-494C-AB41-42B87C467F04} 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 312d1da388f6bb..868141ca7b35a0 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 @@ -3,12 +3,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{017D3513-69E2-4634-B7F6-884003237EB8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{66F62B70-2BCB-400D-A32E-095847CB8272}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\ref\Microsoft.Bcl.Cryptography.csproj", "{98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\src\Microsoft.Bcl.Cryptography.csproj", "{853AF96D-3600-440C-9B75-BFF87B805DEE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\shims\stubs\System.Drawing.Common.csproj", "{1388F142-B5C8-4AC7-ABEA-07391751511C}" @@ -223,27 +219,6 @@ Global {25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|arm64.ActiveCfg = Debug|Any CPU {25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|x64.ActiveCfg = Debug|Any CPU {25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|x86.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Debug|arm.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Debug|arm64.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Debug|x64.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Debug|x64.Build.0 = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Debug|x86.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Debug|x86.Build.0 = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Release|Any CPU.Build.0 = Release|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Release|arm.ActiveCfg = Release|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Release|arm64.ActiveCfg = Release|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Release|x64.ActiveCfg = Release|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Release|x64.Build.0 = Release|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Release|x86.ActiveCfg = Release|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Release|x86.Build.0 = Release|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Checked|arm.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Checked|arm64.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Checked|x64.ActiveCfg = Debug|Any CPU - {017D3513-69E2-4634-B7F6-884003237EB8}.Checked|x86.ActiveCfg = Debug|Any CPU {66F62B70-2BCB-400D-A32E-095847CB8272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66F62B70-2BCB-400D-A32E-095847CB8272}.Debug|Any CPU.Build.0 = Debug|Any CPU {66F62B70-2BCB-400D-A32E-095847CB8272}.Debug|arm.ActiveCfg = Debug|Any CPU @@ -265,27 +240,6 @@ Global {66F62B70-2BCB-400D-A32E-095847CB8272}.Checked|arm64.ActiveCfg = Debug|Any CPU {66F62B70-2BCB-400D-A32E-095847CB8272}.Checked|x64.ActiveCfg = Debug|Any CPU {66F62B70-2BCB-400D-A32E-095847CB8272}.Checked|x86.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Debug|arm.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Debug|arm64.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Debug|x64.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Debug|x64.Build.0 = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Debug|x86.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Debug|x86.Build.0 = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Release|Any CPU.Build.0 = Release|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Release|arm.ActiveCfg = Release|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Release|arm64.ActiveCfg = Release|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Release|x64.ActiveCfg = Release|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Release|x64.Build.0 = Release|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Release|x86.ActiveCfg = Release|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Release|x86.Build.0 = Release|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Checked|arm.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Checked|arm64.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Checked|x64.ActiveCfg = Debug|Any CPU - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B}.Checked|x86.ActiveCfg = Debug|Any CPU {853AF96D-3600-440C-9B75-BFF87B805DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {853AF96D-3600-440C-9B75-BFF87B805DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU {853AF96D-3600-440C-9B75-BFF87B805DEE}.Debug|arm.ActiveCfg = Debug|Any CPU @@ -1667,8 +1621,6 @@ Global {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} - {017D3513-69E2-4634-B7F6-884003237EB8} = {56502718-F82A-46E2-9AD0-532C437EC51E} - {98C2ED20-E5B9-4086-A1B3-9DF6A8968C5B} = {56502718-F82A-46E2-9AD0-532C437EC51E} {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.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln b/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln index 599e69e5ef0912..4b9e37d8e3ea3b 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln +++ b/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6F930741-A5ED-401E-ABEE-77BEA461D9A5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\ref\Microsoft.Bcl.Cryptography.csproj", "{04406A8C-579E-4F7D-8885-8EA335974C07}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\src\Microsoft.Bcl.Cryptography.csproj", "{5FDFC6B9-B169-469B-92C6-E9160362C5FB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\ref\System.Collections.csproj", "{68E36127-5612-4845-9920-20A348EDC022}" @@ -39,10 +37,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{893263F9-1E6A-4C9A-808D-539C399848CF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FD768C8B-9BF1-4F02-A2C4-335B22615763}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5B768A4-9BA9-4E78-B735-60052C68035C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FD768C8B-9BF1-4F02-A2C4-335B22615763}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{94B59232-B99C-4224-B3E3-0F3385F06B64}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C291910F-A44F-4EB0-BFFD-972D92FA632E}" @@ -63,10 +61,6 @@ Global {6F930741-A5ED-401E-ABEE-77BEA461D9A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F930741-A5ED-401E-ABEE-77BEA461D9A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F930741-A5ED-401E-ABEE-77BEA461D9A5}.Release|Any CPU.Build.0 = Release|Any CPU - {04406A8C-579E-4F7D-8885-8EA335974C07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {04406A8C-579E-4F7D-8885-8EA335974C07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {04406A8C-579E-4F7D-8885-8EA335974C07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {04406A8C-579E-4F7D-8885-8EA335974C07}.Release|Any CPU.Build.0 = Release|Any CPU {5FDFC6B9-B169-469B-92C6-E9160362C5FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5FDFC6B9-B169-469B-92C6-E9160362C5FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {5FDFC6B9-B169-469B-92C6-E9160362C5FB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -142,15 +136,14 @@ Global GlobalSection(NestedProjects) = preSolution {6F930741-A5ED-401E-ABEE-77BEA461D9A5} = {893263F9-1E6A-4C9A-808D-539C399848CF} {2C8C1360-AC50-4493-BC0B-950149A875A3} = {893263F9-1E6A-4C9A-808D-539C399848CF} - {04406A8C-579E-4F7D-8885-8EA335974C07} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} + {5FDFC6B9-B169-469B-92C6-E9160362C5FB} = {D5B768A4-9BA9-4E78-B735-60052C68035C} + {A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD} = {D5B768A4-9BA9-4E78-B735-60052C68035C} + {DDD75646-C8BD-4B16-8E59-E6A3668FD9A2} = {D5B768A4-9BA9-4E78-B735-60052C68035C} {68E36127-5612-4845-9920-20A348EDC022} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} {9DE9A470-64CF-426A-8D72-3CF871C4F73A} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} {C05BE5C1-1BE3-4B95-976A-81EF55EA1E48} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} {484170AD-D47A-4B56-B13C-93F387958510} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} {1AFD2D0A-B962-449B-AC3B-12ED1F439E91} = {FD768C8B-9BF1-4F02-A2C4-335B22615763} - {5FDFC6B9-B169-469B-92C6-E9160362C5FB} = {D5B768A4-9BA9-4E78-B735-60052C68035C} - {A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD} = {D5B768A4-9BA9-4E78-B735-60052C68035C} - {DDD75646-C8BD-4B16-8E59-E6A3668FD9A2} = {D5B768A4-9BA9-4E78-B735-60052C68035C} {E44D1459-E2A0-4AF7-A392-1E8F86F64DB5} = {94B59232-B99C-4224-B3E3-0F3385F06B64} {97CE28DB-B4AC-400B-A40D-C55789FCA0AB} = {94B59232-B99C-4224-B3E3-0F3385F06B64} {E44D1E0E-5F76-41B8-AF5F-6112BCC6A39B} = {94B59232-B99C-4224-B3E3-0F3385F06B64} diff --git a/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln b/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln index 1b66eb8de08dc1..2fba2d615faf86 100644 --- a/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln +++ b/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\ref\Microsoft.Bcl.Cryptography.csproj", "{6BCDA28A-0769-420B-8505-5386B895D771}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\src\Microsoft.Bcl.Cryptography.csproj", "{88B5E148-BE56-4F4E-96E4-B36F908B8729}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\ref\System.Collections.csproj", "{48C04D3E-A36D-488A-8FA5-3724AB15B453}" @@ -43,10 +41,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F25E8B4D-D7E9-4086-A263-CB9D3B41074B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B8C68464-1D28-4889-90BC-BC80B036B90B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BA579BFF-D4D9-455A-A8AC-589361391420}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B8C68464-1D28-4889-90BC-BC80B036B90B}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{39704A56-DFD6-4CC6-A7E4-229E639D9611}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{782D1E7D-9D5B-48B7-A839-D67A69ADD10F}" @@ -67,10 +65,6 @@ Global {B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}.Debug|Any CPU.Build.0 = Debug|Any CPU {B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}.Release|Any CPU.ActiveCfg = Release|Any CPU {B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}.Release|Any CPU.Build.0 = Release|Any CPU - {6BCDA28A-0769-420B-8505-5386B895D771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BCDA28A-0769-420B-8505-5386B895D771}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BCDA28A-0769-420B-8505-5386B895D771}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BCDA28A-0769-420B-8505-5386B895D771}.Release|Any CPU.Build.0 = Release|Any CPU {88B5E148-BE56-4F4E-96E4-B36F908B8729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {88B5E148-BE56-4F4E-96E4-B36F908B8729}.Debug|Any CPU.Build.0 = Debug|Any CPU {88B5E148-BE56-4F4E-96E4-B36F908B8729}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -154,17 +148,16 @@ Global GlobalSection(NestedProjects) = preSolution {B3180E55-B9B3-4B71-8A52-DDDCB3E39F77} = {F25E8B4D-D7E9-4086-A263-CB9D3B41074B} {675D4EE3-1F0E-4445-A9CD-635ED3351751} = {F25E8B4D-D7E9-4086-A263-CB9D3B41074B} - {6BCDA28A-0769-420B-8505-5386B895D771} = {B8C68464-1D28-4889-90BC-BC80B036B90B} + {88B5E148-BE56-4F4E-96E4-B36F908B8729} = {BA579BFF-D4D9-455A-A8AC-589361391420} + {4412A97C-77C7-4C89-8F78-E26AEEDE8CA8} = {BA579BFF-D4D9-455A-A8AC-589361391420} + {474CEFD4-533F-4A2E-8CF9-860F388BC332} = {BA579BFF-D4D9-455A-A8AC-589361391420} + {848640EF-9F7D-4D01-AA87-E16617FDEE0B} = {BA579BFF-D4D9-455A-A8AC-589361391420} {48C04D3E-A36D-488A-8FA5-3724AB15B453} = {B8C68464-1D28-4889-90BC-BC80B036B90B} {69CF4D3A-5F10-4BCA-B975-0D6239447EDE} = {B8C68464-1D28-4889-90BC-BC80B036B90B} {6F41C68F-366B-4E61-9B18-70312397B54B} = {B8C68464-1D28-4889-90BC-BC80B036B90B} {15422C7C-74EC-4A8F-A9B4-F40E0308991D} = {B8C68464-1D28-4889-90BC-BC80B036B90B} {18882345-4F75-42DB-8DC9-A38AD5C4785E} = {B8C68464-1D28-4889-90BC-BC80B036B90B} {2BB35F95-AD1A-45D3-B8E2-84CC690073A8} = {B8C68464-1D28-4889-90BC-BC80B036B90B} - {88B5E148-BE56-4F4E-96E4-B36F908B8729} = {BA579BFF-D4D9-455A-A8AC-589361391420} - {4412A97C-77C7-4C89-8F78-E26AEEDE8CA8} = {BA579BFF-D4D9-455A-A8AC-589361391420} - {474CEFD4-533F-4A2E-8CF9-860F388BC332} = {BA579BFF-D4D9-455A-A8AC-589361391420} - {848640EF-9F7D-4D01-AA87-E16617FDEE0B} = {BA579BFF-D4D9-455A-A8AC-589361391420} {D75C8817-337C-4DDA-B164-F8822787EE19} = {39704A56-DFD6-4CC6-A7E4-229E639D9611} {2CE79894-A115-4C92-86E2-7B392EBCBD83} = {39704A56-DFD6-4CC6-A7E4-229E639D9611} {B15E7AF8-B446-425F-B22A-619A01DEDA16} = {39704A56-DFD6-4CC6-A7E4-229E639D9611} diff --git a/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln b/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln index 4e0747798c79d0..88248a2d01ab07 100644 --- a/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln +++ b/src/libraries/System.Security.Cryptography/System.Security.Cryptography.sln @@ -3,8 +3,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0C78AEB2-80BD-4B1B-B5CD-F038522D065D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\ref\Microsoft.Bcl.Cryptography.csproj", "{564AF4BE-82FD-42EF-A345-C185CDC25E38}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.Cryptography", "..\Microsoft.Bcl.Cryptography\src\Microsoft.Bcl.Cryptography.csproj", "{7F8D8D59-B2CC-4803-9B0D-FF392CAF9688}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "..\Microsoft.Win32.Primitives\ref\Microsoft.Win32.Primitives.csproj", "{BEE9B8AD-4BB4-43F9-B718-AC967E1DA092}" @@ -53,10 +51,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B3BB2DA0-53B8-4B49-999F-CD650EB61040}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F591FB6D-6957-46DB-BF9B-C00772BC11E3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A16B11D7-6732-45E2-894B-D5AFA879B68A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F591FB6D-6957-46DB-BF9B-C00772BC11E3}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{2B165D96-356D-409E-88BE-0CA0F407303E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CC457FED-75A7-450C-91C9-F0F4AC6FF4A9}" @@ -81,10 +79,6 @@ Global {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Release|Any CPU.Build.0 = Release|Any CPU - {564AF4BE-82FD-42EF-A345-C185CDC25E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {564AF4BE-82FD-42EF-A345-C185CDC25E38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {564AF4BE-82FD-42EF-A345-C185CDC25E38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {564AF4BE-82FD-42EF-A345-C185CDC25E38}.Release|Any CPU.Build.0 = Release|Any CPU {7F8D8D59-B2CC-4803-9B0D-FF392CAF9688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7F8D8D59-B2CC-4803-9B0D-FF392CAF9688}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F8D8D59-B2CC-4803-9B0D-FF392CAF9688}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -185,7 +179,10 @@ Global {66FE8701-0F3C-4524-ACB6-404E13221733} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} {0C78AEB2-80BD-4B1B-B5CD-F038522D065D} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} {A242B3AB-EE45-4C95-9550-DB970BA23CD5} = {B3BB2DA0-53B8-4B49-999F-CD650EB61040} - {564AF4BE-82FD-42EF-A345-C185CDC25E38} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} + {7F8D8D59-B2CC-4803-9B0D-FF392CAF9688} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} + {3B1486E4-DCDE-4629-AACC-D1A6FF8A1993} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} + {E72C02D0-CC28-4FE2-8A2F-D91ABD990065} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} + {AF227727-11A6-4E5F-98DE-C362FC829633} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} {BEE9B8AD-4BB4-43F9-B718-AC967E1DA092} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} {EE43BF44-3757-4401-86E9-CCC789BA89E4} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} {B1EA9B57-3B9F-47FD-BE76-01D3D672C88C} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} @@ -196,10 +193,6 @@ Global {24FAFCA3-8747-4E8A-BA2B-996A8F411C80} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} {258B22AA-ECA6-412E-9F29-6BB6063CD036} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} {E9BF1F4D-7D5C-4539-B426-2FCCB2585138} = {F591FB6D-6957-46DB-BF9B-C00772BC11E3} - {7F8D8D59-B2CC-4803-9B0D-FF392CAF9688} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} - {3B1486E4-DCDE-4629-AACC-D1A6FF8A1993} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} - {E72C02D0-CC28-4FE2-8A2F-D91ABD990065} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} - {AF227727-11A6-4E5F-98DE-C362FC829633} = {A16B11D7-6732-45E2-894B-D5AFA879B68A} {0EA41D6A-87A2-42B7-8171-78E167570993} = {2B165D96-356D-409E-88BE-0CA0F407303E} {9E7AD0F4-0D4D-4E42-8C6C-513C006E0590} = {2B165D96-356D-409E-88BE-0CA0F407303E} {1B999BF7-657A-4342-A97E-B5CC5916AFB4} = {2B165D96-356D-409E-88BE-0CA0F407303E} diff --git a/src/libraries/System.Text.Json/System.Text.Json.sln b/src/libraries/System.Text.Json/System.Text.Json.sln index 11d7c5d4944b0f..489928dd62f913 100644 --- a/src/libraries/System.Text.Json/System.Text.Json.sln +++ b/src/libraries/System.Text.Json/System.Text.Json.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{102945CA-3736-4B2C-8E68-242A0B247F2B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{73D5739C-E382-4E22-A7D3-B82705C58C74}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{282400DF-F3D8-4419-90F1-1E2F2D8B760C}" @@ -75,10 +73,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E07C6980-EB71-4D19-A80A-7BEB80B635B1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0371C5D8-D5F5-4747-9810-D91D71D8C0E4}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E49881A9-09F6-442F-9E1D-6D87F5F837F1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0371C5D8-D5F5-4747-9810-D91D71D8C0E4}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F254F143-4704-4432-9995-20D87FA8BF8D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{10E5D5FA-09FE-4E7A-A8E0-377BC228ACCB}" @@ -99,10 +97,6 @@ Global {102945CA-3736-4B2C-8E68-242A0B247F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU {102945CA-3736-4B2C-8E68-242A0B247F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU {102945CA-3736-4B2C-8E68-242A0B247F2B}.Release|Any CPU.Build.0 = Release|Any CPU - {73D5739C-E382-4E22-A7D3-B82705C58C74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73D5739C-E382-4E22-A7D3-B82705C58C74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73D5739C-E382-4E22-A7D3-B82705C58C74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73D5739C-E382-4E22-A7D3-B82705C58C74}.Release|Any CPU.Build.0 = Release|Any CPU {E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -257,7 +251,12 @@ Global {256A4653-4287-44B3-BDEF-67FC1522ED2F} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} {F6A18EB5-A8CC-4A39-9E85-5FA226019C3D} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} {A0178BAA-A1AF-4C69-8E4A-A700A2723DDC} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1} - {73D5739C-E382-4E22-A7D3-B82705C58C74} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} + {E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} + {6E9E4359-44F8-45AA-AEC5-D0F9FFBB13D6} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} + {1C8262DB-7355-40A8-A2EC-4EED7363134A} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} + {D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} + {9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} + {1285FF43-F491-4BE0-B92C-37DA689CBD4B} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} {282400DF-F3D8-4419-90F1-1E2F2D8B760C} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {09F77672-101E-4495-9D88-29376919C121} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {BE27618A-2916-4269-9AD5-6BC5EDC32B30} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} @@ -267,12 +266,6 @@ Global {FAB4FFF2-964D-45FF-89CC-8BB9CE618ED1} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {C56337BB-8CBC-4EE5-AB4D-8BB0A922813E} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} {7015E94D-D20D-48C8-86D7-6A996BE99E0E} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4} - {E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} - {6E9E4359-44F8-45AA-AEC5-D0F9FFBB13D6} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} - {1C8262DB-7355-40A8-A2EC-4EED7363134A} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} - {D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} - {9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} - {1285FF43-F491-4BE0-B92C-37DA689CBD4B} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1} {715327DF-D6D6-4043-AC78-FA58F0C0E9E3} = {F254F143-4704-4432-9995-20D87FA8BF8D} {B815304D-502E-402C-ACE1-878DB4985CCC} = {F254F143-4704-4432-9995-20D87FA8BF8D} {E4B72517-C694-486A-950E-6AB03C651FDC} = {F254F143-4704-4432-9995-20D87FA8BF8D} diff --git a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln index 8dced5f96d21f1..ea146c751fff37 100644 --- a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln +++ b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{63551298-BFD4-43FC-8465-AC454228B83C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{401537CC-AF2E-48C5-A82A-5079C68FE837}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\ref\System.Collections.Concurrent.csproj", "{9E0438E1-8DD1-42CB-9C83-F88BBD3BC051}" @@ -67,10 +65,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2ACCCAAB-F0CE-4839-82BD-F174861DEA78}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{15319A22-BC91-407B-A795-334DD05C82A0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8FD137E-6961-4629-A71A-53394897FE6B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{15319A22-BC91-407B-A795-334DD05C82A0}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{0D20E771-24BD-4F9E-BBD0-60156E8C44FC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{89EBAAA4-CC3B-4915-AF3C-1747A72A0417}" @@ -91,10 +89,6 @@ Global {63551298-BFD4-43FC-8465-AC454228B83C}.Debug|Any CPU.Build.0 = Debug|Any CPU {63551298-BFD4-43FC-8465-AC454228B83C}.Release|Any CPU.ActiveCfg = Release|Any CPU {63551298-BFD4-43FC-8465-AC454228B83C}.Release|Any CPU.Build.0 = Release|Any CPU - {401537CC-AF2E-48C5-A82A-5079C68FE837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {401537CC-AF2E-48C5-A82A-5079C68FE837}.Debug|Any CPU.Build.0 = Debug|Any CPU - {401537CC-AF2E-48C5-A82A-5079C68FE837}.Release|Any CPU.ActiveCfg = Release|Any CPU - {401537CC-AF2E-48C5-A82A-5079C68FE837}.Release|Any CPU.Build.0 = Release|Any CPU {5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}.Debug|Any CPU.Build.0 = Debug|Any CPU {5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -227,7 +221,11 @@ Global {63551298-BFD4-43FC-8465-AC454228B83C} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78} {8EE1A7C4-3630-4900-8976-9B3ADAFF10DC} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78} {A86931EC-34DC-40A8-BD8C-F5E13BDBA903} = {2ACCCAAB-F0CE-4839-82BD-F174861DEA78} - {401537CC-AF2E-48C5-A82A-5079C68FE837} = {15319A22-BC91-407B-A795-334DD05C82A0} + {5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04} = {D8FD137E-6961-4629-A71A-53394897FE6B} + {6C0F9D02-1E73-4D2B-B344-48A8EB627A1B} = {D8FD137E-6961-4629-A71A-53394897FE6B} + {3C8AEE20-AEF0-45D1-9B57-CAE16EA5A5B0} = {D8FD137E-6961-4629-A71A-53394897FE6B} + {4661A8AE-3760-4EEA-81B5-D90D076057F7} = {D8FD137E-6961-4629-A71A-53394897FE6B} + {0409C086-D7CC-43F8-9762-C94FB1E47F5B} = {D8FD137E-6961-4629-A71A-53394897FE6B} {9E0438E1-8DD1-42CB-9C83-F88BBD3BC051} = {15319A22-BC91-407B-A795-334DD05C82A0} {2297998A-8E7C-48C9-8331-7755D80EEF09} = {15319A22-BC91-407B-A795-334DD05C82A0} {5AF27DA1-B58A-4F30-AD8C-2F0E7E1AB93A} = {15319A22-BC91-407B-A795-334DD05C82A0} @@ -240,11 +238,6 @@ Global {8B81F45D-3001-48B5-B296-5152E8BAAA9F} = {15319A22-BC91-407B-A795-334DD05C82A0} {5BEC4932-AA8C-4FA1-B2E2-0DC34CCA3986} = {15319A22-BC91-407B-A795-334DD05C82A0} {C043B00D-8662-43E4-9E87-8BB317059111} = {15319A22-BC91-407B-A795-334DD05C82A0} - {5BBB128E-BA8A-4ABD-9F73-1B5AD48B0A04} = {D8FD137E-6961-4629-A71A-53394897FE6B} - {6C0F9D02-1E73-4D2B-B344-48A8EB627A1B} = {D8FD137E-6961-4629-A71A-53394897FE6B} - {3C8AEE20-AEF0-45D1-9B57-CAE16EA5A5B0} = {D8FD137E-6961-4629-A71A-53394897FE6B} - {4661A8AE-3760-4EEA-81B5-D90D076057F7} = {D8FD137E-6961-4629-A71A-53394897FE6B} - {0409C086-D7CC-43F8-9762-C94FB1E47F5B} = {D8FD137E-6961-4629-A71A-53394897FE6B} {C5B9BDED-632F-4698-B0D7-FD12A1918170} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC} {19F5ED62-25AE-462C-B168-CA72F078FFA4} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC} {77CDA838-6489-4816-8847-DE2C7F5E1DCE} = {0D20E771-24BD-4F9E-BBD0-60156E8C44FC} diff --git a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln index 631f545d82a12c..6568b7f555b81c 100644 --- a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln +++ b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C1F10802-5F76-472B-B164-C1D181DB5EBC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{A8B4C520-00C7-47CF-BCC9-2F892DAA2B87}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{EDFAAA9A-0A17-4FB7-85C8-B1DBF72DD049}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60}" @@ -29,12 +27,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{07CE01C8-BDC8-4CED-AA33-6F3B35935CB6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F69B62DE-61AD-4978-81C4-C095B62B5B04}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D3FF5D0E-208E-408F-97AD-C81EB31BB115}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{42E20B4D-6489-4096-8DC3-A0C20D19B1D6}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F69B62DE-61AD-4978-81C4-C095B62B5B04}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E719C436-7E71-4A0D-A76D-90CC13B5A5E7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{0863620E-F072-401C-B6CD-C8867C53CDFF}" @@ -53,10 +51,6 @@ Global {C1F10802-5F76-472B-B164-C1D181DB5EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {C1F10802-5F76-472B-B164-C1D181DB5EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU {C1F10802-5F76-472B-B164-C1D181DB5EBC}.Release|Any CPU.Build.0 = Release|Any CPU - {A8B4C520-00C7-47CF-BCC9-2F892DAA2B87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8B4C520-00C7-47CF-BCC9-2F892DAA2B87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8B4C520-00C7-47CF-BCC9-2F892DAA2B87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8B4C520-00C7-47CF-BCC9-2F892DAA2B87}.Release|Any CPU.Build.0 = Release|Any CPU {EDFAAA9A-0A17-4FB7-85C8-B1DBF72DD049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EDFAAA9A-0A17-4FB7-85C8-B1DBF72DD049}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDFAAA9A-0A17-4FB7-85C8-B1DBF72DD049}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -112,13 +106,12 @@ Global GlobalSection(NestedProjects) = preSolution {C1F10802-5F76-472B-B164-C1D181DB5EBC} = {07CE01C8-BDC8-4CED-AA33-6F3B35935CB6} {845BFFC3-14F2-402E-81E5-B487D41B7CD9} = {07CE01C8-BDC8-4CED-AA33-6F3B35935CB6} - {A8B4C520-00C7-47CF-BCC9-2F892DAA2B87} = {F69B62DE-61AD-4978-81C4-C095B62B5B04} - {3D984937-E378-411E-8943-5B5DB23944F5} = {F69B62DE-61AD-4978-81C4-C095B62B5B04} - {E427C88B-655E-43F9-A0C0-AA54D01BDBDF} = {F69B62DE-61AD-4978-81C4-C095B62B5B04} {EDFAAA9A-0A17-4FB7-85C8-B1DBF72DD049} = {D3FF5D0E-208E-408F-97AD-C81EB31BB115} {4CFA1610-00D7-4651-82C8-A7504C475837} = {D3FF5D0E-208E-408F-97AD-C81EB31BB115} {6B242CF0-6FFA-46D4-A31A-8A1EDCFDAB60} = {42E20B4D-6489-4096-8DC3-A0C20D19B1D6} {9158C7E3-284E-4D6F-BA23-B7534683E265} = {42E20B4D-6489-4096-8DC3-A0C20D19B1D6} + {3D984937-E378-411E-8943-5B5DB23944F5} = {F69B62DE-61AD-4978-81C4-C095B62B5B04} + {E427C88B-655E-43F9-A0C0-AA54D01BDBDF} = {F69B62DE-61AD-4978-81C4-C095B62B5B04} {2AD46684-8EC5-4ABB-894E-E5D737225B45} = {E719C436-7E71-4A0D-A76D-90CC13B5A5E7} {67F35676-A50A-4509-A338-901BCC63FED4} = {E719C436-7E71-4A0D-A76D-90CC13B5A5E7} {E719C436-7E71-4A0D-A76D-90CC13B5A5E7} = {20BF5207-0ECC-4975-A26E-29E2340EF131} diff --git a/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln b/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln index 2778a3fb6a644a..8f2fb73ec3cf60 100644 --- a/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln +++ b/src/libraries/System.Threading.RateLimiting/System.Threading.RateLimiting.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{39DA5B84-ECA2-42A2-BEBD-C056BDB8AD53}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{394FA814-CF72-447D-AAE1-1B92CD63205D}" @@ -27,12 +25,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Linker", "..\..\tools\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6614EF7F-23FC-4809-AFF5-1ADBF1B6422C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A004-4C05-9A8C-E0931DADA5FB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85204CF5-0C88-4BBB-9E70-D8CCED82ED3D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{399BE36D-F2D9-420A-AA09-455D4BF52057}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{111B1B5B-A004-4C05-9A8C-E0931DADA5FB}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{C28129A1-6D6F-4B06-B1FA-ADD0A6DFA7C2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{5B944921-2830-43CF-92C2-11D6FDAD14B9}" @@ -51,10 +49,6 @@ Global {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Debug|Any CPU.Build.0 = Debug|Any CPU {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.ActiveCfg = Release|Any CPU {CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.Build.0 = Release|Any CPU - {39DA5B84-ECA2-42A2-BEBD-C056BDB8AD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39DA5B84-ECA2-42A2-BEBD-C056BDB8AD53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39DA5B84-ECA2-42A2-BEBD-C056BDB8AD53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39DA5B84-ECA2-42A2-BEBD-C056BDB8AD53}.Release|Any CPU.Build.0 = Release|Any CPU {F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Debug|Any CPU.Build.0 = Debug|Any CPU {F59F4FD7-EA00-47EA-A09A-6F76CB079F9B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -106,12 +100,11 @@ Global GlobalSection(NestedProjects) = preSolution {CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} {AE81EE9F-1240-4AF1-BF21-7F451B7859E5} = {6614EF7F-23FC-4809-AFF5-1ADBF1B6422C} - {39DA5B84-ECA2-42A2-BEBD-C056BDB8AD53} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} - {FD274A80-0D68-48A0-9AC7-279C9E69BC63} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} {F59F4FD7-EA00-47EA-A09A-6F76CB079F9B} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} {CD96AFE9-0F7F-42FA-BBDA-F57EDCBB4609} = {85204CF5-0C88-4BBB-9E70-D8CCED82ED3D} {394FA814-CF72-447D-AAE1-1B92CD63205D} = {399BE36D-F2D9-420A-AA09-455D4BF52057} {25495BDC-0614-4FAC-B6EA-DF3F0E35A871} = {399BE36D-F2D9-420A-AA09-455D4BF52057} + {FD274A80-0D68-48A0-9AC7-279C9E69BC63} = {111B1B5B-A004-4C05-9A8C-E0931DADA5FB} {2074D793-BE72-4128-BD17-6EF83FD69DD1} = {C28129A1-6D6F-4B06-B1FA-ADD0A6DFA7C2} {305658CF-339B-486F-B58E-C85A31831527} = {C28129A1-6D6F-4B06-B1FA-ADD0A6DFA7C2} {C28129A1-6D6F-4B06-B1FA-ADD0A6DFA7C2} = {C57F8858-D3FE-4C08-8D13-DDFCD82350EC} From a47eeecf12361751b494e83fd49adc9a28969687 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 24 Jul 2024 10:25:47 +0200 Subject: [PATCH 08/27] Don't overbuild source generator when root building for net48 (#105347) --- src/libraries/oob-gen.proj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libraries/oob-gen.proj b/src/libraries/oob-gen.proj index d565a1592a6aec..15cdbb9a9bf4c5 100644 --- a/src/libraries/oob-gen.proj +++ b/src/libraries/oob-gen.proj @@ -1,5 +1,11 @@ + + $(BuildTargetFramework) + + true + + Date: Wed, 24 Jul 2024 10:00:29 +0100 Subject: [PATCH 09/27] Fix DeepEquals_DeepJsonDocument stack overflow that manifests in xunit.console and netfx. (#105309) * Fix DeepEquals_DeepJsonDocument stack overflow that manifests in xunit.console and netfx. * Guard DeepEquals calls with EnsureSufficientExecutionStack(). --- .../src/Resources/Strings.resx | 3 ++ .../src/System.Text.Json.csproj | 1 + .../System/Text/Json/Document/JsonElement.cs | 5 ++++ .../src/System/Text/Json/StackHelper.cs | 29 +++++++++++++++++++ .../src/System/Text/Json/ThrowHelper.cs | 6 ++++ .../Serialization/JsonElementTests.cs | 24 +++++++++++---- 6 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 src/libraries/System.Text.Json/src/System/Text/Json/StackHelper.cs diff --git a/src/libraries/System.Text.Json/src/Resources/Strings.resx b/src/libraries/System.Text.Json/src/Resources/Strings.resx index e5dda53afde83b..8b2b0e0ad0419d 100644 --- a/src/libraries/System.Text.Json/src/Resources/Strings.resx +++ b/src/libraries/System.Text.Json/src/Resources/Strings.resx @@ -246,6 +246,9 @@ The requested operation requires an element of type '{0}', but the target element has type '{1}'. + + Insufficient stack to continue executing 'JsonElement.DeepEquals'. This can happen either because the 'JsonElement' values are too deep or 'DeepEquals' is being called too deep in the stack. + The exponent value in the specified JSON number is too large. diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj index 071f91c5aafee4..c4b931191e3aae 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -161,6 +161,7 @@ The System.Text.Json library is built-in as part of the shared framework in .NET + diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonElement.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonElement.cs index 5dca9969e1510d..da72d147abd350 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonElement.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonElement.cs @@ -1262,6 +1262,11 @@ internal ReadOnlySpan ValueSpan /// public static bool DeepEquals(JsonElement element1, JsonElement element2) { + if (!StackHelper.TryEnsureSufficientExecutionStack()) + { + ThrowHelper.ThrowInsufficientExecutionStackException_JsonElementDeepEqualsInsufficientExecutionStack(); + } + element1.CheckValidInstance(); element2.CheckValidInstance(); diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/StackHelper.cs b/src/libraries/System.Text.Json/src/System/Text/Json/StackHelper.cs new file mode 100644 index 00000000000000..b3c6530dec0700 --- /dev/null +++ b/src/libraries/System.Text.Json/src/System/Text/Json/StackHelper.cs @@ -0,0 +1,29 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Runtime.CompilerServices; + +namespace System.Text.Json +{ + /// Provides tools for avoiding stack overflows. + internal static class StackHelper + { + /// Tries to ensure there is sufficient stack to execute the average .NET function. + public static bool TryEnsureSufficientExecutionStack() + { +#if NET + return RuntimeHelpers.TryEnsureSufficientExecutionStack(); +#else + try + { + RuntimeHelpers.EnsureSufficientExecutionStack(); + return true; + } + catch + { + return false; + } +#endif + } + } +} diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/ThrowHelper.cs b/src/libraries/System.Text.Json/src/System/Text/Json/ThrowHelper.cs index fb1786be551dae..81cb32b2fd116d 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/ThrowHelper.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/ThrowHelper.cs @@ -719,6 +719,12 @@ public static void ThrowObjectDisposedException_JsonDocument() { throw new ObjectDisposedException(nameof(JsonDocument)); } + + [DoesNotReturn] + public static void ThrowInsufficientExecutionStackException_JsonElementDeepEqualsInsufficientExecutionStack() + { + throw new InsufficientExecutionStackException(SR.JsonElementDeepEqualsInsufficientExecutionStack); + } } internal enum ExceptionResource diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/JsonElementTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/JsonElementTests.cs index c0be88d4cc5d41..2a72b17d4d25ea 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/JsonElementTests.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/JsonElementTests.cs @@ -221,11 +221,26 @@ public static void DeepEquals_NotEqualValuesReturnFalse(string value1, string va [Theory] [InlineData(10)] [InlineData(100)] - [InlineData(1000)] + [InlineData(500)] public static void DeepEquals_DeepJsonDocument(int depth) + { + using JsonDocument jDoc = CreateDeepJsonDocument(depth); + JsonElement element = jDoc.RootElement; + Assert.True(JsonElement.DeepEquals(element, element)); + } + + [Fact] + public static void DeepEquals_TooDeepJsonDocument_ThrowsInsufficientExecutionStackException() + { + using JsonDocument jDoc = CreateDeepJsonDocument(10_000); + JsonElement element = jDoc.RootElement; + Assert.Throws(() => JsonElement.DeepEquals(element, element)); + } + + private static JsonDocument CreateDeepJsonDocument(int depth) { ArrayBufferWriter bufferWriter = new(); - using Utf8JsonWriter writer = new(bufferWriter); + using Utf8JsonWriter writer = new(bufferWriter, new() { MaxDepth = depth + 1 }); for (int i = 0; i < depth; i++) { @@ -257,10 +272,7 @@ public static void DeepEquals_DeepJsonDocument(int depth) writer.Flush(); JsonDocumentOptions options = new JsonDocumentOptions { MaxDepth = depth }; - using JsonDocument jDoc = JsonDocument.Parse(bufferWriter.WrittenSpan.ToArray(), options); - JsonElement element = jDoc.RootElement; - - Assert.True(JsonElement.DeepEquals(element, element)); + return JsonDocument.Parse(bufferWriter.WrittenSpan.ToArray(), options); } } } From d91d9a116faee7cdf1b15f54e1db0d1f3a7487e9 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:20:32 +0200 Subject: [PATCH 10/27] Fix codespaces build by bumping clang llvm (#105385) * Replace system clang. * Unify dockerfiles. * Update docs. * Feedback: typo --- .devcontainer/Dockerfile | 11 +++++++++-- .devcontainer/wasm-multiThreaded/Dockerfile | 11 +++++++++-- .devcontainer/wasm/Dockerfile | 10 ++++++++-- docs/workflow/requirements/linux-requirements.md | 3 ++- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d76e325e8b6cae..1dfc556cd6b423 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,12 +5,19 @@ ARG VARIANT="6.0-jammy" FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT} +# Set up machine requirements to build the repo and the gh CLI +# Clang-16 up is required but Ubuntu 22.04 comes with clang-14 highest, so add clang-18 sources +RUN apt-get update \ + && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - \ + && apt-get install software-properties-common -y \ + && add-apt-repository "deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main" -y \ + && apt-get update \ + && apt-get install clang-18 -y + # Set up machine requirements to build the repo and the gh CLI RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ cmake \ - llvm \ - clang \ build-essential \ python3 \ curl \ diff --git a/.devcontainer/wasm-multiThreaded/Dockerfile b/.devcontainer/wasm-multiThreaded/Dockerfile index 75f2465b391b3c..9062a8b8570725 100644 --- a/.devcontainer/wasm-multiThreaded/Dockerfile +++ b/.devcontainer/wasm-multiThreaded/Dockerfile @@ -5,12 +5,19 @@ ARG VARIANT="6.0-jammy" FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT} +# Set up machine requirements to build the repo and the gh CLI +# Clang-16 up is required but Ubuntu 22.04 comes with clang-14 highest, so add clang-18 sources +RUN apt-get update \ + && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - \ + && apt-get install software-properties-common -y \ + && add-apt-repository "deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main" -y \ + && apt-get update \ + && apt-get install clang-18 -y + # Set up machine requirements to build the repo and the gh CLI RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ cmake \ - llvm \ - clang \ build-essential \ python3 \ curl \ diff --git a/.devcontainer/wasm/Dockerfile b/.devcontainer/wasm/Dockerfile index 75f2465b391b3c..1dcab2652c6db5 100644 --- a/.devcontainer/wasm/Dockerfile +++ b/.devcontainer/wasm/Dockerfile @@ -6,11 +6,17 @@ ARG VARIANT="6.0-jammy" FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT} # Set up machine requirements to build the repo and the gh CLI +# Clang-16 up is required but Ubuntu 22.04 comes with clang-14 highest, so add clang-18 sources +RUN apt-get update \ + && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - \ + && apt-get install software-properties-common -y \ + && add-apt-repository "deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main" -y \ + && apt-get update \ + && apt-get install clang-18 -y + RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ cmake \ - llvm \ - clang \ build-essential \ python3 \ curl \ diff --git a/docs/workflow/requirements/linux-requirements.md b/docs/workflow/requirements/linux-requirements.md index 6b4aa1ee65ec3f..053b2d98616358 100644 --- a/docs/workflow/requirements/linux-requirements.md +++ b/docs/workflow/requirements/linux-requirements.md @@ -37,7 +37,7 @@ Install the following packages for the toolchain: * CMake 3.20 or newer * llvm * lld -* clang +* clang 16 or newer * build-essential * python-is-python3 * curl @@ -59,6 +59,7 @@ sudo apt install -y cmake llvm lld clang build-essential \ ``` **NOTE**: As of now, Ubuntu's `apt` only has until CMake version 3.16.3 if you're using Ubuntu 20.04 LTS (less in older Ubuntu versions), and version 3.18.4 in Debian 11 (less in older Debian versions). This is lower than the required 3.20, which in turn makes it incompatible with the repo. For this case, we can use the `snap` package manager or the _Kitware APT feed_ to get a new enough version of CMake. +**NOTE**: If you have Ubuntu 22.04 LTS and older and your `apt` does not have clang version 16, you can add `"deb http://apt.llvm.org/$(lsb_release -s -c)/ llvm-toolchain-$(lsb_release -s -c)-18 main"` repository to your `apt`. See how we do it for linux-based containers [here](./../../../.devcontainer/Dockerfile). For snap: From f6994c7807376430c96011fc527dfc4363348d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 24 Jul 2024 12:54:38 +0200 Subject: [PATCH 11/27] [mono] Improve iOS sample Makefile (#105316) Fixes an issue where we were still harcoding the Debug config for tasks even though that changed with https://github.com/dotnet/runtime/pull/84931. Also align the Makfile to make it more similar to the iOS-NativeAOT one. --- .../templates/build-perf-sample-apps.yml | 8 +-- src/mono/sample/iOS/Makefile | 53 +++++++++++-------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml index fd55342e1a0552..901078393fab8e 100644 --- a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml @@ -38,7 +38,7 @@ steps: displayName: clean bindir - ${{ if and(eq(parameters.osGroup, 'ios'), eq(parameters.nameSuffix, 'iOSMono')) }}: - - script: make build-appbundle TARGET=ios MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=False DEPLOY_AND_RUN=false STRIP_DEBUG_SYMBOLS=false HYBRID_GLOBALIZATION=${{ parameters.hybridGlobalization }} + - script: make build-appbundle TARGET_OS=ios TARGET_ARCH=arm64 BUILD_CONFIG=Release AOT=True USE_LLVM=False DEPLOY_AND_RUN=false STRIP_DEBUG_SYMBOLS=false HYBRID_GLOBALIZATION=${{ parameters.hybridGlobalization }} env: DevTeamProvisioning: '-' workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS @@ -60,7 +60,7 @@ steps: - script: rm -r -f $(Build.SourcesDirectory)/src/mono/sample/iOS/bin workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS displayName: Clean bindir - - script: make build-appbundle TARGET=ios MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=False DEPLOY_AND_RUN=false STRIP_DEBUG_SYMBOLS=true HYBRID_GLOBALIZATION=${{ parameters.hybridGlobalization }} + - script: make build-appbundle TARGET_OS=ios TARGET_ARCH=arm64 BUILD_CONFIG=Release AOT=True USE_LLVM=False DEPLOY_AND_RUN=false STRIP_DEBUG_SYMBOLS=true HYBRID_GLOBALIZATION=${{ parameters.hybridGlobalization }} env: DevTeamProvisioning: '-' workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS @@ -82,7 +82,7 @@ steps: - script: rm -r -f $(Build.SourcesDirectory)/src/mono/sample/iOS/bin workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS displayName: Clean bindir - - script: make build-appbundle TARGET=ios MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=True DEPLOY_AND_RUN=false STRIP_DEBUG_SYMBOLS=false HYBRID_GLOBALIZATION=${{ parameters.hybridGlobalization }} + - script: make build-appbundle TARGET_OS=ios TARGET_ARCH=arm64 BUILD_CONFIG=Release AOT=True USE_LLVM=True DEPLOY_AND_RUN=false STRIP_DEBUG_SYMBOLS=false HYBRID_GLOBALIZATION=${{ parameters.hybridGlobalization }} env: DevTeamProvisioning: '-' workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS @@ -104,7 +104,7 @@ steps: - script: rm -r -f $(Build.SourcesDirectory)/src/mono/sample/iOS/bin workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS displayName: Clean bindir - - script: make build-appbundle TARGET=ios MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=True DEPLOY_AND_RUN=false STRIP_DEBUG_SYMBOLS=true HYBRID_GLOBALIZATION=${{ parameters.hybridGlobalization }} + - script: make build-appbundle TARGET_OS=ios TARGET_ARCH=arm64 BUILD_CONFIG=Release AOT=True USE_LLVM=True DEPLOY_AND_RUN=false STRIP_DEBUG_SYMBOLS=true HYBRID_GLOBALIZATION=${{ parameters.hybridGlobalization }} env: DevTeamProvisioning: '-' workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS diff --git a/src/mono/sample/iOS/Makefile b/src/mono/sample/iOS/Makefile index a7579772a79770..b7e85dce7a26f2 100644 --- a/src/mono/sample/iOS/Makefile +++ b/src/mono/sample/iOS/Makefile @@ -1,8 +1,11 @@ -MONO_CONFIG?=Debug -MONO_ARCH?=x64 -DOTNET := ../../../../dotnet.sh +.DEFAULT_GOAL := all + +TOP=../../../../ + +BUILD_CONFIG?=Debug +TARGET_ARCH?=$(shell . $(TOP)eng/common/native/init-os-and-arch.sh && echo $${arch}) +TARGET_OS?=iossimulator USE_LLVM=true -TARGET?=iossimulator DEPLOY_AND_RUN?=true APP_SANDBOX?=false STRIP_DEBUG_SYMBOLS?=false # only used when measuring SOD via build-appbundle make target @@ -15,22 +18,26 @@ HYBRID_GLOBALIZATION?=true #DIAGNOSTIC_PORTS=127.0.0.1:9000,suspend #DIAGNOSTIC_PORTS=$(DOTNET_DiagnosticPorts) +REPO_DIR=$(realpath $(TOP)) +TASKS_DIR=$(REPO_DIR)/src/tasks +DOTNET=$(REPO_DIR)/dotnet.sh +BUILD_SCRIPT=$(REPO_DIR)/build.sh + all: runtimepack run -TOOLS_DIR=../../../tasks appbuilder: - $(DOTNET) build -c Debug $(TOOLS_DIR)/AotCompilerTask/MonoAOTCompiler.csproj - $(DOTNET) build -c Debug $(TOOLS_DIR)/MonoTargetsTasks/MonoTargetsTasks.csproj - $(DOTNET) build -c Debug $(TOOLS_DIR)/AppleAppBuilder/AppleAppBuilder.csproj + $(DOTNET) build -c $(BUILD_CONFIG) $(TASKS_DIR)/AotCompilerTask/MonoAOTCompiler.csproj + $(DOTNET) build -c $(BUILD_CONFIG) $(TASKS_DIR)/MonoTargetsTasks/MonoTargetsTasks.csproj + $(DOTNET) build -c $(BUILD_CONFIG) $(TASKS_DIR)/AppleAppBuilder/AppleAppBuilder.csproj runtimepack: - ../../../../build.sh mono+libs -os $(TARGET) -arch $(MONO_ARCH) -c $(MONO_CONFIG) + $(BUILD_SCRIPT) mono+libs -os $(TARGET_OS) -arch $(TARGET_ARCH) -c $(BUILD_CONFIG) build-appbundle: clean appbuilder $(DOTNET) publish \ - -c $(MONO_CONFIG) \ - /p:TargetOS=$(TARGET) \ - /p:TargetArchitecture=$(MONO_ARCH) \ + -c $(BUILD_CONFIG) \ + /p:TargetOS=$(TARGET_OS) \ + /p:TargetArchitecture=$(TARGET_ARCH) \ /p:MonoEnableLLVM=$(USE_LLVM) \ /p:StripDebugSymbols=$(STRIP_DEBUG_SYMBOLS) \ /p:DeployAndRun=false \ @@ -39,9 +46,9 @@ build-appbundle: clean appbuilder run: clean appbuilder $(DOTNET) publish \ - -c $(MONO_CONFIG) \ + -c $(BUILD_CONFIG) \ /p:TargetOS=ios \ - /p:TargetArchitecture=$(MONO_ARCH) \ + /p:TargetArchitecture=$(TARGET_ARCH) \ /p:MonoEnableLLVM=$(USE_LLVM) \ /p:DeployAndRun=$(DEPLOY_AND_RUN) \ '/p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)"' \ @@ -49,9 +56,9 @@ run: clean appbuilder run-sim: clean appbuilder $(DOTNET) publish \ - -c $(MONO_CONFIG) \ + -c $(BUILD_CONFIG) \ /p:TargetOS=iossimulator \ - /p:TargetArchitecture=$(MONO_ARCH) \ + /p:TargetArchitecture=$(TARGET_ARCH) \ /p:MonoEnableLLVM=$(USE_LLVM) \ /p:MonoForceInterpreter=false \ /p:DeployAndRun=$(DEPLOY_AND_RUN) \ @@ -60,9 +67,9 @@ run-sim: clean appbuilder run-sim-interp: clean appbuilder $(DOTNET) publish \ - -c $(MONO_CONFIG) \ + -c $(BUILD_CONFIG) \ /p:TargetOS=iossimulator \ - /p:TargetArchitecture=$(MONO_ARCH) \ + /p:TargetArchitecture=$(TARGET_ARCH) \ /p:MonoEnableLLVM=$(USE_LLVM) \ /p:MonoForceInterpreter=true \ /p:DeployAndRun=$(DEPLOY_AND_RUN) \ @@ -71,9 +78,9 @@ run-sim-interp: clean appbuilder run-catalyst: clean appbuilder $(DOTNET) publish \ - -c $(MONO_CONFIG) \ + -c $(BUILD_CONFIG) \ /p:TargetOS=maccatalyst \ - /p:TargetArchitecture=$(MONO_ARCH) \ + /p:TargetArchitecture=$(TARGET_ARCH) \ /p:MonoEnableLLVM=false \ /p:MonoForceInterpreter=false \ /p:DeployAndRun=$(DEPLOY_AND_RUN) \ @@ -82,9 +89,9 @@ run-catalyst: clean appbuilder run-catalyst-interp: clean appbuilder $(DOTNET) publish \ - -c $(MONO_CONFIG) \ + -c $(BUILD_CONFIG) \ /p:TargetOS=maccatalyst \ - /p:TargetArchitecture=$(MONO_ARCH) \ + /p:TargetArchitecture=$(TARGET_ARCH) \ /p:MonoEnableLLVM=false \ /p:MonoForceInterpreter=true \ /p:DeployAndRun=$(DEPLOY_AND_RUN) \ @@ -92,4 +99,4 @@ run-catalyst-interp: clean appbuilder /bl clean: - rm -rf bin + rm -rf obj bin *.binlog From 5e1081f6a0c86489e7fda575735ef49ff2ca3efa Mon Sep 17 00:00:00 2001 From: Egor Bogatov Date: Wed, 24 Jul 2024 13:51:51 +0200 Subject: [PATCH 12/27] Improve MinOpts JIT TP (#105250) --- src/coreclr/jit/compiler.cpp | 2 +- src/coreclr/jit/compiler.h | 19 ++- src/coreclr/jit/gentree.cpp | 256 ++++++++++++++++++++++++------ src/coreclr/jit/importercalls.cpp | 8 +- src/coreclr/jit/morph.cpp | 10 +- src/coreclr/jit/vartype.h | 2 +- 6 files changed, 239 insertions(+), 58 deletions(-) diff --git a/src/coreclr/jit/compiler.cpp b/src/coreclr/jit/compiler.cpp index e11d3cd30bbc17..b091a2efbbec5d 100644 --- a/src/coreclr/jit/compiler.cpp +++ b/src/coreclr/jit/compiler.cpp @@ -5273,7 +5273,7 @@ void Compiler::compCompile(void** methodCodePtr, uint32_t* methodCodeSize, JitFl #ifdef DEBUG // Stash the current estimate of the function's size if necessary. - if (verbose) + if (verbose && opts.OptimizationEnabled()) { compSizeEstimate = 0; compCycleEstimate = 0; diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h index ce8cfe9f57f0d6..ee1dcdd0b9a20b 100644 --- a/src/coreclr/jit/compiler.h +++ b/src/coreclr/jit/compiler.h @@ -3655,6 +3655,7 @@ class Compiler bool gtMarkAddrMode(GenTree* addr, int* costEx, int* costSz, var_types type); unsigned gtSetEvalOrder(GenTree* tree); + unsigned gtSetEvalOrderMinOpts(GenTree* tree); bool gtMayHaveStoreInterference(GenTree* treeWithStores, GenTree* tree); bool gtTreeHasLocalRead(GenTree* tree, unsigned lclNum); @@ -9985,6 +9986,8 @@ class Compiler // Maximum number of locals before turning off the inlining #define MAX_LV_NUM_COUNT_FOR_INLINING 512 + bool canUseTier0Opts; + bool canUseAllOpts; bool compMinOpts; bool compMinOptsIsSet; #ifdef DEBUG @@ -10011,13 +10014,22 @@ class Compiler } #endif // !DEBUG + // TODO: we should convert these into a single OptimizationLevel + bool OptimizationDisabled() const { - return MinOpts() || compDbgCode; + assert(compMinOptsIsSet); + return !canUseAllOpts; } bool OptimizationEnabled() const { - return !OptimizationDisabled(); + assert(compMinOptsIsSet); + return canUseAllOpts; + } + bool Tier0OptimizationEnabled() const + { + assert(compMinOptsIsSet); + return canUseTier0Opts; } void SetMinOpts(bool val) @@ -10026,6 +10038,9 @@ class Compiler assert(!compMinOptsIsSet || (compMinOpts == val)); compMinOpts = val; compMinOptsIsSet = true; + + canUseTier0Opts = !compDbgCode && !jitFlags->IsSet(JitFlags::JIT_FLAG_MIN_OPT); + canUseAllOpts = canUseTier0Opts && !val; } // true if the CLFLG_* for an optimization is set. diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp index 8ba61fe3a1121c..88d087797a2595 100644 --- a/src/coreclr/jit/gentree.cpp +++ b/src/coreclr/jit/gentree.cpp @@ -3931,8 +3931,10 @@ unsigned Compiler::gtSetMultiOpOrder(GenTreeMultiOp* multiOp) int costSz = 1; unsigned level = 0; + bool optsEnabled = opts.OptimizationEnabled(); + #if defined(FEATURE_HW_INTRINSICS) - if (multiOp->OperIs(GT_HWINTRINSIC)) + if (multiOp->OperIs(GT_HWINTRINSIC) && optsEnabled) { GenTreeHWIntrinsic* hwTree = multiOp->AsHWIntrinsic(); #if defined(TARGET_XARCH) @@ -4052,8 +4054,12 @@ unsigned Compiler::gtSetMultiOpOrder(GenTreeMultiOp* multiOp) level += 1; } - costEx += (multiOp->Op(1)->GetCostEx() + multiOp->Op(2)->GetCostEx()); - costSz += (multiOp->Op(1)->GetCostSz() + multiOp->Op(2)->GetCostSz()); + if (optsEnabled) + { + // We don't need/have costs in MinOpts + costEx += (multiOp->Op(1)->GetCostEx() + multiOp->Op(2)->GetCostEx()); + costSz += (multiOp->Op(1)->GetCostSz() + multiOp->Op(2)->GetCostSz()); + } } else { @@ -4064,12 +4070,19 @@ unsigned Compiler::gtSetMultiOpOrder(GenTreeMultiOp* multiOp) level = max(lvl, level + 1); - costEx += op->GetCostEx(); - costSz += op->GetCostSz(); + if (optsEnabled) + { + // We don't need/have costs in MinOpts + costEx += op->GetCostEx(); + costSz += op->GetCostSz(); + } } } - multiOp->SetCosts(costEx, costSz); + if (optsEnabled) + { + multiOp->SetCosts(costEx, costSz); + } return level; } #endif @@ -4823,6 +4836,44 @@ bool Compiler::gtMarkAddrMode(GenTree* addr, int* pCostEx, int* pCostSz, var_typ return false; } +static void SetIndirectStoreEvalOrder(Compiler* comp, GenTreeIndir* store, bool* allowReversal) +{ + assert(store->OperIs(GT_STORE_BLK, GT_STOREIND)); + + GenTree* addr = store->Addr(); + GenTree* data = store->Data(); + *allowReversal = true; + + if (addr->IsInvariant()) + { + *allowReversal = false; + store->SetReverseOp(); + return; + } + + if ((addr->gtFlags & GTF_ALL_EFFECT) != 0) + { + return; + } + + // In case op2 assigns to a local var that is used in op1, we have to evaluate op1 first. + if (comp->gtMayHaveStoreInterference(data, addr)) + { + // TODO-ASG-Cleanup: move this guard to "gtCanSwapOrder". + *allowReversal = false; + return; + } + + // If op2 is simple then evaluate op1 first + if (data->OperIsLeaf()) + { + return; + } + + *allowReversal = false; + store->SetReverseOp(); +} + /***************************************************************************** * * Given a tree, figure out the order in which its sub-operands should be @@ -4848,6 +4899,11 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree) { assert(tree); + if (opts.OptimizationDisabled()) + { + return gtSetEvalOrderMinOpts(tree); + } + #ifdef DEBUG /* Clear the GTF_DEBUG_NODE_MORPHED flag as well */ tree->gtDebugFlags &= ~GTF_DEBUG_NODE_MORPHED; @@ -5838,33 +5894,7 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree) // TODO-ASG-Cleanup: this logic emulated the ASG case below. See how of much of it can be deleted. if (!optValnumCSE_phase || optCSE_canSwap(op1, op2)) { - if (op1->IsInvariant()) - { - allowReversal = false; - tree->SetReverseOp(); - break; - } - if ((op1->gtFlags & GTF_ALL_EFFECT) != 0) - { - break; - } - - // In case op2 assigns to a local var that is used in op1, we have to evaluate op1 first. - if (gtMayHaveStoreInterference(op2, op1)) - { - // TODO-ASG-Cleanup: move this guard to "gtCanSwapOrder". - allowReversal = false; - break; - } - - // If op2 is simple then evaluate op1 first - if (op2->OperIsLeaf()) - { - break; - } - - allowReversal = false; - tree->SetReverseOp(); + SetIndirectStoreEvalOrder(this, tree->AsIndir(), &allowReversal); } break; @@ -6212,6 +6242,149 @@ unsigned Compiler::gtSetEvalOrder(GenTree* tree) #pragma warning(pop) #endif +//------------------------------------------------------------------------ +// gtSetEvalOrderMinOpts: A MinOpts specific version of gtSetEvalOrder. We don't +// need to set costs, but we're looking for opportunities to swap operands. +// +// Arguments: +// tree - The tree for which we are setting the evaluation order. +// +// Return Value: +// the Sethi 'complexity' estimate for this tree (the higher +// the number, the higher is the tree's resources requirement) +// +unsigned Compiler::gtSetEvalOrderMinOpts(GenTree* tree) +{ + assert(tree); + if (fgOrder == FGOrderLinear) + { + // We don't re-order operands in LIR anyway. + return 0; + } + + if (tree->OperIsLeaf()) + { + // Nothing to do for leaves, report as having Sethi 'complexity' of 0 + return 0; + } + + unsigned level = 1; + if (tree->OperIsSimple()) + { + GenTree* op1 = tree->AsOp()->gtOp1; + GenTree* op2 = tree->gtGetOp2IfPresent(); + + // Only GT_LEA may have a nullptr op1 and a non-nullptr op2 + if (tree->OperIs(GT_LEA) && (op1 == nullptr)) + { + std::swap(op1, op2); + } + + // Check for a nilary operator + if (op1 == nullptr) + { + // E.g. void GT_RETURN, GT_RETFIT + assert(op2 == nullptr); + return 0; + } + + if (op2 == nullptr) + { + gtSetEvalOrderMinOpts(op1); + return 1; + } + + level = gtSetEvalOrderMinOpts(op1); + unsigned levelOp2 = gtSetEvalOrderMinOpts(op2); + + bool allowSwap = true; + // TODO: Introduce a function to check whether we can swap the order of its operands or not. + switch (tree->OperGet()) + { + case GT_COMMA: + case GT_BOUNDS_CHECK: + case GT_INTRINSIC: + case GT_QMARK: + case GT_COLON: + // We're not going to swap operands in these + allowSwap = false; + break; + + case GT_STORE_BLK: + case GT_STOREIND: + SetIndirectStoreEvalOrder(this, tree->AsIndir(), &allowSwap); + break; + + default: + break; + } + + const bool shouldSwap = tree->IsReverseOp() ? level > levelOp2 : level < levelOp2; + if (shouldSwap && allowSwap) + { + // Can we swap the order by commuting the operands? + const bool canSwap = tree->IsReverseOp() ? gtCanSwapOrder(op2, op1) : gtCanSwapOrder(op1, op2); + if (canSwap) + { + if (tree->OperIsCmpCompare()) + { + genTreeOps oper = tree->OperGet(); + if (GenTree::SwapRelop(oper) != oper) + { + tree->SetOper(GenTree::SwapRelop(oper)); + } + std::swap(tree->AsOp()->gtOp1, tree->AsOp()->gtOp2); + } + else if (tree->OperIsCommutative()) + { + std::swap(tree->AsOp()->gtOp1, tree->AsOp()->gtOp2); + } + else + { + // Mark the operand's evaluation order to be swapped. + tree->gtFlags ^= GTF_REVERSE_OPS; + } + } + } + + // Swap the level counts + if (tree->IsReverseOp()) + { + std::swap(level, levelOp2); + } + + // Compute the sethi number for this binary operator + if (level < 1) + { + level = levelOp2; + } + else if (level == levelOp2) + { + level++; + } + } + else if (tree->IsCall()) + { + // We ignore late args - they don't bring any noticeable benefits + // according to asmdiffs/tpdiff + for (CallArg& arg : tree->AsCall()->gtArgs.EarlyArgs()) + { + gtSetEvalOrderMinOpts(arg.GetEarlyNode()); + } + level = 3; + } +#if defined(FEATURE_HW_INTRINSICS) + else if (tree->OperIsHWIntrinsic()) + { + return gtSetMultiOpOrder(tree->AsMultiOp()); + } +#endif // FEATURE_HW_INTRINSICS + + // NOTE: we skip many operators here in order to maintain a good trade-off between CQ and TP. + + return level; +} + //------------------------------------------------------------------------ // gtMayHaveStoreInterference: Check if two trees may interfere because of a // store in one of the trees. @@ -13340,10 +13513,7 @@ GenTree* Compiler::gtFoldExpr(GenTree* tree) return tree; } - // NOTE: MinOpts() is always true for Tier0 so we have to check explicit flags instead. - // To be fixed in https://github.com/dotnet/runtime/pull/77465 - const bool tier0opts = !opts.compDbgCode && !opts.jitFlags->IsSet(JitFlags::JIT_FLAG_MIN_OPT); - if (!tier0opts) + if (!opts.Tier0OptimizationEnabled()) { return tree; } @@ -13406,7 +13576,7 @@ GenTree* Compiler::gtFoldExpr(GenTree* tree) // special operator that can use only one constant // to fold - e.g. booleans - if (tier0opts && opts.OptimizationDisabled()) + if (opts.OptimizationDisabled()) { // Too heavy for tier0 return tree; @@ -15197,10 +15367,7 @@ GenTree* Compiler::gtFoldExprConst(GenTree* tree) GenTree* op1 = tree->gtGetOp1(); GenTree* op2 = tree->gtGetOp2IfPresent(); - // NOTE: MinOpts() is always true for Tier0 so we have to check explicit flags instead. - // To be fixed in https://github.com/dotnet/runtime/pull/77465 - const bool tier0opts = !opts.compDbgCode && !opts.jitFlags->IsSet(JitFlags::JIT_FLAG_MIN_OPT); - if (!tier0opts) + if (!opts.Tier0OptimizationEnabled()) { return tree; } @@ -30267,10 +30434,7 @@ GenTree* Compiler::gtFoldExprHWIntrinsic(GenTreeHWIntrinsic* tree) { assert(tree->OperIsHWIntrinsic()); - // NOTE: MinOpts() is always true for Tier0 so we have to check explicit flags instead. - // To be fixed in https://github.com/dotnet/runtime/pull/77465 - const bool tier0opts = !opts.compDbgCode && !opts.jitFlags->IsSet(JitFlags::JIT_FLAG_MIN_OPT); - if (!tier0opts) + if (!opts.Tier0OptimizationEnabled()) { return tree; } diff --git a/src/coreclr/jit/importercalls.cpp b/src/coreclr/jit/importercalls.cpp index e8de998ebed2c4..566fdceb8fdf8c 100644 --- a/src/coreclr/jit/importercalls.cpp +++ b/src/coreclr/jit/importercalls.cpp @@ -1553,7 +1553,7 @@ GenTree* Compiler::impThrowIfNull(GenTreeCall* call) assert(call->gtArgs.CountUserArgs() == 2); assert(call->TypeIs(TYP_VOID)); - if (opts.compDbgCode || opts.jitFlags->IsSet(JitFlags::JIT_FLAG_MIN_OPT)) + if (!opts.Tier0OptimizationEnabled()) { // Don't fold it for debug code or forced MinOpts return call; @@ -3302,11 +3302,7 @@ GenTree* Compiler::impIntrinsic(CORINFO_CLASS_HANDLE clsHnd, // Allow some lighweight intrinsics in Tier0 which can improve throughput // we're fine if intrinsic decides to not expand itself in this case unlike mustExpand. - // NOTE: MinOpts() is always true for Tier0 so we have to check explicit flags instead. - // To be fixed in https://github.com/dotnet/runtime/pull/77465 - const bool tier0opts = !opts.compDbgCode && !opts.jitFlags->IsSet(JitFlags::JIT_FLAG_MIN_OPT); - - if (!mustExpand && tier0opts) + if (!mustExpand && opts.Tier0OptimizationEnabled()) { switch (ni) { diff --git a/src/coreclr/jit/morph.cpp b/src/coreclr/jit/morph.cpp index 0d922459acdc40..0f0753598f7862 100644 --- a/src/coreclr/jit/morph.cpp +++ b/src/coreclr/jit/morph.cpp @@ -1103,7 +1103,7 @@ void CallArgs::ArgsComplete(Compiler* comp, GenTreeCall* call) // TODO-CQ: handle HWI/SIMD/COMMA nodes in multi-reg morphing. SetNeedsTemp(&arg); } - else + else if (comp->opts.OptimizationEnabled()) { // Finally, we call gtPrepareCost to measure the cost of evaluating this tree. comp->gtPrepareCost(argx); @@ -1476,7 +1476,7 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs) assert(begTab == endTab); break; } - else + else if (comp->opts.OptimizationEnabled()) { if (!costsPrepared) { @@ -1492,6 +1492,12 @@ void CallArgs::SortArgs(Compiler* comp, GenTreeCall* call, CallArg** sortedArgs) expensiveArg = arg; } } + else + { + // We don't have cost information in MinOpts + expensiveArgIndex = curInx; + expensiveArg = arg; + } } } diff --git a/src/coreclr/jit/vartype.h b/src/coreclr/jit/vartype.h index 34668fd545b713..c0cfa87775dab6 100644 --- a/src/coreclr/jit/vartype.h +++ b/src/coreclr/jit/vartype.h @@ -185,7 +185,7 @@ inline bool varTypeIsArithmetic(T vt) template inline bool varTypeIsGC(T vt) { - return ((varTypeClassification[TypeGet(vt)] & (VTF_GCR | VTF_BYR)) != 0); + return (TypeGet(vt) == TYP_REF) || (TypeGet(vt) == TYP_BYREF); } template From 367e064314175eb3c6dff461b2b15428299546d7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 24 Jul 2024 15:38:16 +0200 Subject: [PATCH 13/27] Remove unnecessary UseCompilerGeneratedDocXmlFile property (#105327) UseCompilerGeneratedDocXmlFile already defaults to true. Remove the two hits to avoid confusion. --- src/libraries/System.Formats.Nrbf/src/System.Formats.Nrbf.csproj | 1 - .../src/System.Net.ServerSentEvents.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/src/libraries/System.Formats.Nrbf/src/System.Formats.Nrbf.csproj b/src/libraries/System.Formats.Nrbf/src/System.Formats.Nrbf.csproj index b0f7d4390c9a03..c6fa4c07adf2c0 100644 --- a/src/libraries/System.Formats.Nrbf/src/System.Formats.Nrbf.csproj +++ b/src/libraries/System.Formats.Nrbf/src/System.Formats.Nrbf.csproj @@ -4,7 +4,6 @@ $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true false - true true Provides a safe reader for .NET Remoting Binary Format (NRBF) payloads. diff --git a/src/libraries/System.Net.ServerSentEvents/src/System.Net.ServerSentEvents.csproj b/src/libraries/System.Net.ServerSentEvents/src/System.Net.ServerSentEvents.csproj index b57f9e5c50739a..7efaab418309fa 100644 --- a/src/libraries/System.Net.ServerSentEvents/src/System.Net.ServerSentEvents.csproj +++ b/src/libraries/System.Net.ServerSentEvents/src/System.Net.ServerSentEvents.csproj @@ -3,7 +3,6 @@ $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true - true true Provides a simple parser for server-sent events (SSE). From 951ed61216c959e843baa26a2a8f134f622b85a4 Mon Sep 17 00:00:00 2001 From: Ivan Povazan <55002338+ivanpovazan@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:41:51 +0200 Subject: [PATCH 14/27] Build Mono build tasks packs only when targeting mobile (#105153) --- src/mono/nuget/mono-packages.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/nuget/mono-packages.proj b/src/mono/nuget/mono-packages.proj index 69f52d4234017d..4e119edcafa1d7 100644 --- a/src/mono/nuget/mono-packages.proj +++ b/src/mono/nuget/mono-packages.proj @@ -31,7 +31,7 @@ - + From fcc916c480c071cd2fca7bfe42e561fa6e777c1e Mon Sep 17 00:00:00 2001 From: yurai007 Date: Wed, 24 Jul 2024 15:54:34 +0200 Subject: [PATCH 15/27] [RISC-V] Fix System.Net.Sockets.Tests on Qemu (#104094) * [RISC-V] Fix System.Net.Sockets.Tests on Qemu Before this change there are 8 failures from System.Net.Sockets.Tests with following reports: root@69fa7050f168:/runtime/artifacts/bin/System.Net.Sockets.Tests/Release/net9.0-unix# /runtime/artifacts/bin/testhost/net9.0-linux-Release-riscv64/dotnet exec --runtimeconfig System.Net.Sockets.Tests.runtimeconfig.json --depsfile System.Net.Sockets.Tests.deps.json xunit.console.dll System.Net.Sockets.Tests.dll -xml testResults.xml -nologo -notrait category=nonnetcoreapptests -notrait category=nonlinuxtests -notrait category=failing -maxthreads 32 Discovering: System.Net.Sockets.Tests (method display = ClassAndMethod, method display options = None) Discovered: System.Net.Sockets.Tests (found 1672 of 1820 test cases) Starting: System.Net.Sockets.Tests (parallel test collections = on [32 threads], stop on fail = off) System.Net.Sockets.Tests.CreateSocket.Ctor_Raw_NotSupported_ExpectedError [SKIP] Condition(s) not met: "NotSupportsRawSockets" System.Net.Sockets.Tests.KeepAliveTest.Socket_Get_KeepAlive_Time_AsByteArray_OptionLengthZero_Failure [FAIL] System.Net.Sockets.SocketException : Bad address Stack Trace: /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3737,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketErrorAndThrowException(SocketError error, Boolean disconnectOnFailure, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3728,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketOptionErrorAndThrowException(SocketError error, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(2145,0): at System.Net.Sockets.Socket.GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Int32 optionLength) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/KeepAliveTest.cs(136,0): at System.Net.Sockets.Tests.KeepAliveTest.Socket_Get_KeepAlive_Time_AsByteArray_OptionLengthZero_Failure() at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor) /runtime/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr) System.Net.Sockets.Tests.ArgumentValidation.Connect_ConnectTwice_NotSupported(invalidatingAction: 1) [FAIL] System.Net.Sockets.SocketException : Protocol not available Stack Trace: /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3737,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketErrorAndThrowException(SocketError error, Boolean disconnectOnFailure, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3728,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketOptionErrorAndThrowException(SocketError error, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3466,0): at System.Net.Sockets.Socket.SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Int32 optionValue, Boolean silent) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(1966,0): at System.Net.Sockets.Socket.SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Int32 optionValue) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/ArgumentValidationTests.cs(809,0): at System.Net.Sockets.Tests.ArgumentValidation.Connect_ConnectTwice_NotSupported(Int32 invalidatingAction) at InvokeStub_ArgumentValidation.Connect_ConnectTwice_NotSupported(Object, Span`1) at System.Reflection.MethodBaseInvoker.InvokeWithOneArg(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds [FAIL] System.Net.Sockets.SocketException : Unknown socket error Stack Trace: /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3737,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketErrorAndThrowException(SocketError error, Boolean disconnectOnFailure, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3728,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketOptionErrorAndThrowException(SocketError error, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3479,0): at System.Net.Sockets.Socket.SetMulticastOption(SocketOptionName optionName, MulticastOption MR) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(2021,0): at System.Net.Sockets.Socket.SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Object optionValue) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs(96,0): at System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_Helper(Int32 interfaceIndex) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs(71,0): at System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_AnyInterface_Succeeds() --- End of stack trace from previous location --- System.Net.Sockets.Tests.KeepAliveTest.Socket_Get_KeepAlive_Time_AsByteArray_BufferNullOrTooSmall_Failure(buffer: null) [FAIL] System.Net.Sockets.SocketException : Bad address Stack Trace: /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3737,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketErrorAndThrowException(SocketError error, Boolean disconnectOnFailure, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3728,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketOptionErrorAndThrowException(SocketError error, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(2121,0): at System.Net.Sockets.Socket.GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Byte[] optionValue) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/KeepAliveTest.cs(156,0): at System.Net.Sockets.Tests.KeepAliveTest.Socket_Get_KeepAlive_Time_AsByteArray_BufferNullOrTooSmall_Failure(Byte[] buffer) at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor) /runtime/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(178,0): at System.Reflection.MethodBaseInvoker.InvokeDirectByRefWithFewArgs(Object obj, Span`1 copyOfArgs, BindingFlags invokeAttr) System.Net.Sockets.Tests.KeepAliveTest.Socket_Get_KeepAlive_Time_AsByteArray_BufferNullOrTooSmall_Failure(buffer: []) [FAIL] System.Net.Sockets.SocketException : Bad address Stack Trace: /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3737,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketErrorAndThrowException(SocketError error, Boolean disconnectOnFailure, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3728,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketOptionErrorAndThrowException(SocketError error, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(2121,0): at System.Net.Sockets.Socket.GetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Byte[] optionValue) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/KeepAliveTest.cs(156,0): at System.Net.Sockets.Tests.KeepAliveTest.Socket_Get_KeepAlive_Time_AsByteArray_BufferNullOrTooSmall_Failure(Byte[] buffer) at InvokeStub_KeepAliveTest.Socket_Get_KeepAlive_Time_AsByteArray_BufferNullOrTooSmall_Failure(Object, Span`1) at System.Reflection.MethodBaseInvoker.InvokeWithOneArg(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) System.Net.Sockets.Tests.SocketOptionNameTest.MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetSucceeds_GetThrows [FAIL] System.Net.Sockets.SocketException : Unknown socket error Stack Trace: /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3737,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketErrorAndThrowException(SocketError error, Boolean disconnectOnFailure, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3728,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketOptionErrorAndThrowException(SocketError error, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3479,0): at System.Net.Sockets.Socket.SetMulticastOption(SocketOptionName optionName, MulticastOption MR) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(2021,0): at System.Net.Sockets.Socket.SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Object optionValue) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs(61,0): at System.Net.Sockets.Tests.SocketOptionNameTest.MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetSucceeds_GetThrows() at System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor) /runtime/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr) System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_IPv6_AnyInterface_Succeeds [FAIL] System.Net.Sockets.SocketException : Protocol not available Stack Trace: /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3737,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketErrorAndThrowException(SocketError error, Boolean disconnectOnFailure, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3728,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketOptionErrorAndThrowException(SocketError error, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3466,0): at System.Net.Sockets.Socket.SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Int32 optionValue, Boolean silent) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(1966,0): at System.Net.Sockets.Socket.SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Int32 optionValue) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs(199,0): at System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_IPv6_Helper(Int32 interfaceIndex) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs(129,0): at System.Net.Sockets.Tests.SocketOptionNameTest.MulticastInterface_Set_IPv6_AnyInterface_Succeeds() --- End of stack trace from previous location --- System.Net.Sockets.Tests.ArgumentValidation.ConnectAsync_ConnectTwice_NotSupported(invalidatingAction: 1) [FAIL] System.Net.Sockets.SocketException : Protocol not available Stack Trace: /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3737,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketErrorAndThrowException(SocketError error, Boolean disconnectOnFailure, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3728,0): at System.Net.Sockets.Socket.UpdateStatusAfterSocketOptionErrorAndThrowException(SocketError error, String callerName) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(3466,0): at System.Net.Sockets.Socket.SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Int32 optionValue, Boolean silent) /runtime/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs(1966,0): at System.Net.Sockets.Socket.SetSocketOption(SocketOptionLevel optionLevel, SocketOptionName optionName, Int32 optionValue) /home/d.jurczak2/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/ArgumentValidationTests.cs(842,0): at System.Net.Sockets.Tests.ArgumentValidation.ConnectAsync_ConnectTwice_NotSupported(Int32 invalidatingAction) at InvokeStub_ArgumentValidation.ConnectAsync_ConnectTwice_NotSupported(Object, Span`1) at System.Reflection.MethodBaseInvoker.InvokeWithOneArg(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) Finished: System.Net.Sockets.Tests === TEST EXECUTION SUMMARY === System.Net.Sockets.Tests Total: 2874, Errors: 0, Failed: 8, Skipped: 1, Time: 139.280s Those failures are caused by Qemu's buggy and/or implementation defined behavior like: https://gitlab.com/qemu-project/qemu/-/issues/2410 https://gitlab.com/qemu-project/qemu/-/issues/2390 https://gitlab.com/qemu-project/qemu/-/issues/1837 In this patch we add couple of workarounds to make all System.Net.Sockets.Tests passing. --------- Co-authored-by: Jan Kotas --- .../System/PlatformDetection.Unix.cs | 3 +++ .../FunctionalTests/ArgumentValidationTests.cs | 16 +++++++++++++--- .../tests/FunctionalTests/KeepAliveTest.cs | 9 ++++++++- .../FunctionalTests/SocketOptionNameTest.cs | 3 +++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs index 1b4e6e3e0d184e..6b087a82e56ae3 100644 --- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs +++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.IO; using System.Runtime.InteropServices; @@ -30,6 +31,8 @@ public static partial class PlatformDetection public static bool IsMonoLinuxArm64 => IsMonoRuntime && IsLinux && IsArm64Process; public static bool IsNotMonoLinuxArm64 => !IsMonoLinuxArm64; + public static bool IsQemuLinux => IsLinux && Environment.GetEnvironmentVariable("DOTNET_RUNNING_UNDER_QEMU") != null; + public static bool IsNotQemuLinux => !IsQemuLinux; // OSX family public static bool IsApplePlatform => IsOSX || IsiOS || IstvOS || IsMacCatalyst; diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/ArgumentValidationTests.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/ArgumentValidationTests.cs index 3c81a04cedd3db..deac6c8f2814d9 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/ArgumentValidationTests.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/ArgumentValidationTests.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; - +using Microsoft.DotNet.XUnitExtensions; using Xunit; namespace System.Net.Sockets.Tests @@ -792,7 +792,7 @@ await Task.WhenAll( } } - [Theory] + [ConditionalTheory] [PlatformSpecific(TestPlatforms.AnyUnix)] // API throws PNSE on Unix [InlineData(0)] [InlineData(1)] @@ -800,6 +800,11 @@ public void Connect_ConnectTwice_NotSupported(int invalidatingAction) { using (Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { + if (PlatformDetection.IsQemuLinux && invalidatingAction == 1) + { + throw new SkipTestException("Skip on Qemu due to [ActiveIssue(https://github.com/dotnet/runtime/issues/104542)]"); + } + switch (invalidatingAction) { case 0: @@ -823,7 +828,7 @@ public void Connect_ConnectTwice_NotSupported(int invalidatingAction) } } - [Theory] + [ConditionalTheory] [PlatformSpecific(TestPlatforms.AnyUnix)] // API throws PNSE on Unix [InlineData(0)] [InlineData(1)] @@ -833,6 +838,11 @@ public void ConnectAsync_ConnectTwice_NotSupported(int invalidatingAction) using (Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { + if (PlatformDetection.IsQemuLinux && invalidatingAction == 1) + { + throw new SkipTestException("Skip on Qemu due to [ActiveIssue(https://github.com/dotnet/runtime/issues/104542)]"); + } + switch (invalidatingAction) { case 0: diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/KeepAliveTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/KeepAliveTest.cs index c7d119d00dbdf9..572bd77ea77fa9 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/KeepAliveTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/KeepAliveTest.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Runtime.InteropServices; +using Microsoft.DotNet.XUnitExtensions; using Xunit; namespace System.Net.Sockets.Tests @@ -122,6 +123,7 @@ public void Socket_KeepAlive_Interval_And_Time() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/104545", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))] public void Socket_Get_KeepAlive_Time_AsByteArray_OptionLengthZero_Failure() { using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) @@ -138,12 +140,17 @@ public void Socket_Get_KeepAlive_Time_AsByteArray_OptionLengthZero_Failure() } } - [Theory] + [ConditionalTheory] [InlineData(null)] [InlineData(new byte[0])] [InlineData(new byte[3] { 0, 0, 0 })] public void Socket_Get_KeepAlive_Time_AsByteArray_BufferNullOrTooSmall_Failure(byte[] buffer) { + if (PlatformDetection.IsQemuLinux && (buffer == null || buffer.Length == 0)) + { + throw new SkipTestException("Skip on Qemu due to [ActiveIssue(https://github.com/dotnet/runtime/issues/104545)]"); + } + using (Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { if (PlatformDetection.IsWindows) diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs index 8692ecd2329547..a62ccc405b42c0 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs @@ -51,6 +51,7 @@ public void ReuseUnicastPort_CreateSocketSetOption() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))] public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetSucceeds_GetThrows() { int interfaceIndex = 0; @@ -65,6 +66,7 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286 + [ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))] public async Task MulticastInterface_Set_AnyInterface_Succeeds() { // On all platforms, index 0 means "any interface" @@ -123,6 +125,7 @@ public void MulticastInterface_Set_InvalidIndex_Throws() [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286 [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD, "Expected behavior is different on OSX or FreeBSD")] [ActiveIssue("https://github.com/dotnet/runtime/issues/52124", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))] public async Task MulticastInterface_Set_IPv6_AnyInterface_Succeeds() { // On all platforms, index 0 means "any interface" From 7847b75f6534936f7a6376d25c60c056ae976b2f Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Wed, 24 Jul 2024 16:57:05 +0300 Subject: [PATCH 16/27] Convert Perl scripts to C# in coreclr (#104867) * Convert Perl scripts to C# in coreclr * Delete obsolete IL script * Add license header and regenerate * Add a README * Mention generator in ilasm readme and cleanups --- src/coreclr/dlls/mscordac/update.pl | 34 -- .../GrammarExtractor/GrammarExtractor.csproj | 9 + src/coreclr/ilasm/GrammarExtractor/Program.cs | 98 ++++ src/coreclr/ilasm/GrammarExtractor/README.md | 10 + src/coreclr/ilasm/README.md | 1 + src/coreclr/ilasm/extractGrammar.pl | 59 --- src/coreclr/ilasm/prebuilt/asmparse.grammar | 6 +- src/coreclr/inc/OpCodeGen.pl | 481 ------------------ src/coreclr/inc/genrops.pl | 90 ---- 9 files changed, 121 insertions(+), 667 deletions(-) delete mode 100644 src/coreclr/dlls/mscordac/update.pl create mode 100644 src/coreclr/ilasm/GrammarExtractor/GrammarExtractor.csproj create mode 100644 src/coreclr/ilasm/GrammarExtractor/Program.cs create mode 100644 src/coreclr/ilasm/GrammarExtractor/README.md delete mode 100644 src/coreclr/ilasm/extractGrammar.pl delete mode 100644 src/coreclr/inc/OpCodeGen.pl delete mode 100644 src/coreclr/inc/genrops.pl diff --git a/src/coreclr/dlls/mscordac/update.pl b/src/coreclr/dlls/mscordac/update.pl deleted file mode 100644 index 353e1a177d8720..00000000000000 --- a/src/coreclr/dlls/mscordac/update.pl +++ /dev/null @@ -1,34 +0,0 @@ -#!perl -w - -# -# Renames the DAC to a long name form that windbg looks for -# - -my $sSrcFile = shift or &Usage(); -my $sDestName = shift or &Usage(); -my $sHostMach = shift or &Usage(); -my $sTargMach = shift or &Usage(); -my $sVersion = shift or &Usage(); -my $sDestDir = shift or &Usage(); - -my $sName = "$sDestDir\\${sDestName}_${sHostMach}_${sTargMach}_" . - "$sVersion"; - -if ($ENV{'_BuildType'} eq "dbg" || - $ENV{'_BuildType'} eq "chk") { - $sName .= "." . $ENV{'_BuildType'}; -} - -$sName .= ".dll"; - -if (system("copy $sSrcFile $sName") / 256) { - die("$0: Unable to copy $sSrcFile to $sName\n"); -} - -exit 0; - -sub Usage -{ - die("usage: $0 " . - " \n"); -} diff --git a/src/coreclr/ilasm/GrammarExtractor/GrammarExtractor.csproj b/src/coreclr/ilasm/GrammarExtractor/GrammarExtractor.csproj new file mode 100644 index 00000000000000..f36d5e8fc38f5d --- /dev/null +++ b/src/coreclr/ilasm/GrammarExtractor/GrammarExtractor.csproj @@ -0,0 +1,9 @@ + + + + Exe + $(NetCoreAppToolCurrent) + enable + + + diff --git a/src/coreclr/ilasm/GrammarExtractor/Program.cs b/src/coreclr/ilasm/GrammarExtractor/Program.cs new file mode 100644 index 00000000000000..a993e32fcda00a --- /dev/null +++ b/src/coreclr/ilasm/GrammarExtractor/Program.cs @@ -0,0 +1,98 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.IO; +using System.Text.RegularExpressions; +using static Patterns; + +if (args.Length != 1) +{ + Console.Error.WriteLine("Usage: "); + return 1; +} + +string filePath = args[0]; + +string fileContent = File.ReadAllText(filePath); + +var match = GetRegexExtractMarkers().Match(fileContent); +if (!match.Success) +{ + Console.Error.WriteLine("Could not find %% markers"); + return 1; +} + +//string prefix = match.Groups[1].Value; +string grammar = match.Groups[2].Value; + +// Remove any text in {} +var regexRemoveTextInBraces = GetRegexRemoveTextInBraces(); +string previousGrammar; + +do +{ + previousGrammar = grammar; + grammar = regexRemoveTextInBraces.Replace(grammar, "$1"); +} while (grammar != previousGrammar); + +// Change keyword identifiers into the string they represent (lowercase) +grammar = GetRegexKeywordIdentifiers().Replace(grammar, m => $"'{m.Groups[1].Value.ToLowerInvariant()}'"); + +// Change assembler directives into their string (lowercase with a period) +grammar = GetRegexAssemblerDirectives().Replace(grammar, m => $"'.{m.Groups[1].Value.ToLowerInvariant()}'"); + +// Handle special punctuation +grammar = GetRegexEllipsis().Replace(grammar, "'...'"); +grammar = GetRegexDcolon().Replace(grammar, "'::'"); + +// Print the output header +Console.Write(@"// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +Lexical tokens + ID - C style alphaNumeric identifier (e.g. Hello_There2) + DOTTEDNAME - Sequence of dot-separated IDs (e.g. System.Object) + QSTRING - C style quoted string (e.g. ""hi\n"") + SQSTRING - C style singlely quoted string(e.g. 'hi') + INT32 - C style 32 bit integer (e.g. 235, 03423, 0x34FFF) + INT64 - C style 64 bit integer (e.g. -2353453636235234, 0x34FFFFFFFFFF) + FLOAT64 - C style floating point number (e.g. -0.2323, 354.3423, 3435.34E-5) + INSTR_* - IL instructions of a particular class (see opcode.def). + HEXBYTE - 1- or 2-digit hexadecimal number (e.g., A2, F0). +Auxiliary lexical tokens + TYPEDEF_T - Aliased class (TypeDef or TypeRef). + TYPEDEF_M - Aliased method. + TYPEDEF_F - Aliased field. + TYPEDEF_TS - Aliased type specification (TypeSpec). + TYPEDEF_MR - Aliased field/method reference (MemberRef). + TYPEDEF_CA - Aliased Custom Attribute. +---------------------------------------------------------------------------------- +START : decls + ;"); + +// Print the output +Console.Write(grammar); + +return 0; + +internal static partial class Patterns +{ + [GeneratedRegex(@"^(.*)%%(.*)%%", RegexOptions.Singleline)] + internal static partial Regex GetRegexExtractMarkers(); + + [GeneratedRegex(@"\s*([^'])\{[^{}]*\}", RegexOptions.Singleline)] + internal static partial Regex GetRegexRemoveTextInBraces(); + + [GeneratedRegex(@"\b([A-Z0-9_]+)_\b", RegexOptions.Singleline)] + internal static partial Regex GetRegexKeywordIdentifiers(); + + [GeneratedRegex(@"\b_([A-Z0-9]+)\b", RegexOptions.Singleline)] + internal static partial Regex GetRegexAssemblerDirectives(); + + [GeneratedRegex(@"\bELLIPSIS\b", RegexOptions.Singleline)] + internal static partial Regex GetRegexEllipsis(); + + [GeneratedRegex(@"\bDCOLON\b", RegexOptions.Singleline)] + internal static partial Regex GetRegexDcolon(); +} diff --git a/src/coreclr/ilasm/GrammarExtractor/README.md b/src/coreclr/ilasm/GrammarExtractor/README.md new file mode 100644 index 00000000000000..caba704369262e --- /dev/null +++ b/src/coreclr/ilasm/GrammarExtractor/README.md @@ -0,0 +1,10 @@ +# Grammar extractor for IL tools + +Tool to extract IL grammar in `Backus-Naur Form (BNF)` from `Yet Another Compiler-Compiler (Yacc)`. + +Usage: + +```sh +cd runtime +./dotnet.sh run --project src/coreclr/ilasm/GrammarExtractor src/coreclr/ilasm/asmparse.y > src/coreclr/ilasm/prebuilt/asmparse.grammar +``` diff --git a/src/coreclr/ilasm/README.md b/src/coreclr/ilasm/README.md index 35f621b6df9a1b..759eef939e59ae 100644 --- a/src/coreclr/ilasm/README.md +++ b/src/coreclr/ilasm/README.md @@ -16,3 +16,4 @@ $ docker run --rm -v$(pwd):/runtime -w /runtime/src/coreclr/ilasm alpine \ sh -c 'apk add bison && yacc asmparse.y -o prebuilt/asmparse.cpp' ``` +To generate grammar, see [GrammarExtractor README](GrammarExtractor/README.md). diff --git a/src/coreclr/ilasm/extractGrammar.pl b/src/coreclr/ilasm/extractGrammar.pl deleted file mode 100644 index 0e1c80e9f90104..00000000000000 --- a/src/coreclr/ilasm/extractGrammar.pl +++ /dev/null @@ -1,59 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# -# a simple script that extracts the grammar from a yacc file - -undef $/; # read in the whole file -my $file = <>; -$file =~ /^(.*)%%(.*)%%/s || die "Could not find %% markers"; -my $prefix = $1; -my $grammar = $2; - -#my $line; -#foreach $line (split /\n/s, $prefix) { -# if ($line =~ /^\s*%token/) { -# $line =~ s/\s*<.*>//g; -# print "$line\n" -# } -#} - - # remove any text in {} -while ($grammar =~ s/\s*([^']){[^{}]*}/$1/sg) {} - - # change keyword identifiers into the string they represent -$grammar =~ s/\b([A-Z0-9_]+)_\b/'\L$1\E'/sg; - - # change assembler directives into their string -$grammar =~ s/\b_([A-Z0-9]+)\b/'\L.$1\E'/sg; - - # do the special punctuation by hand -$grammar =~ s/\bELLIPSIS\b/'...'/sg; -$grammar =~ s/\bDCOLON\b/'::'/sg; - -# - # remove TODO comments -$grammar =~ s/\n\s*\/\*[^\n]*TODO[^\n]*\*\/\s*\n/\n/sg; -# - -print "Lexical tokens\n"; -print " ID - C style alphaNumeric identifier (e.g. Hello_There2)\n"; -print " DOTTEDNAME - Sequence of dot-separated IDs (e.g. System.Object)\n"; -print " QSTRING - C style quoted string (e.g. \"hi\\n\")\n"; -print " SQSTRING - C style singlely quoted string(e.g. 'hi')\n"; -print " INT32 - C style 32 bit integer (e.g. 235, 03423, 0x34FFF)\n"; -print " INT64 - C style 64 bit integer (e.g. -2353453636235234, 0x34FFFFFFFFFF)\n"; -print " FLOAT64 - C style floating point number (e.g. -0.2323, 354.3423, 3435.34E-5)\n"; -print " INSTR_* - IL instructions of a particular class (see opcode.def).\n"; -print " HEXBYTE - 1- or 2-digit hexadecimal number (e.g., A2, F0).\n"; -print "Auxiliary lexical tokens\n"; -print " TYPEDEF_T - Aliased class (TypeDef or TypeRef).\n"; -print " TYPEDEF_M - Aliased method.\n"; -print " TYPEDEF_F - Aliased field.\n"; -print " TYPEDEF_TS - Aliased type specification (TypeSpec).\n"; -print " TYPEDEF_MR - Aliased field/method reference (MemberRef).\n"; -print " TYPEDEF_CA - Aliased Custom Attribute.\n"; -print "----------------------------------------------------------------------------------\n"; -print "START : decls\n"; -print " ;"; - -print $grammar; diff --git a/src/coreclr/ilasm/prebuilt/asmparse.grammar b/src/coreclr/ilasm/prebuilt/asmparse.grammar index 6d90815f8d28b3..544a442ed5605b 100644 --- a/src/coreclr/ilasm/prebuilt/asmparse.grammar +++ b/src/coreclr/ilasm/prebuilt/asmparse.grammar @@ -76,11 +76,11 @@ dottedName : id | dottedName '.' dottedName ; -int32 : INT32 +int32 : INT32_V ; -int64 : INT64 - | INT32 +int64 : INT64_V + | INT32_V ; float64 : FLOAT64 diff --git a/src/coreclr/inc/OpCodeGen.pl b/src/coreclr/inc/OpCodeGen.pl deleted file mode 100644 index 952dd477ef681e..00000000000000 --- a/src/coreclr/inc/OpCodeGen.pl +++ /dev/null @@ -1,481 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# -# OpCodeGen.pl -# -# PERL script used to generate the numbering of the reference opcodes -# -#use strict 'vars'; -#use strict 'subs'; -#use strict 'refs'; - - -my $ret = 0; -my %opcodeEnum; -my %oneByte; -my %twoByte; -my %controlFlow; -my @singleByteArg; -my %stackbehav; -my %opcodetype; -my %operandtype; -my %opcodes; -my $popstate; -my $pushstate; - -$ctrlflowcount = 0; - -$count = 0; - -my @lowercaseAlphabet = ('a'..'z','0'..'9'); -my %upcaseAlphabet = (); - -foreach $letter (@lowercaseAlphabet) { - $j = $letter; - $j=~tr/a-z/A-Z/; - $upcaseAlphabet{$letter}=$j; -} - -$license = "// Licensed to the .NET Foundation under one or more agreements.\n"; -$license .= "// The .NET Foundation licenses this file to you under the MIT license.\n"; - -$startHeaderComment = "/*============================================================\n**\n"; -$endHeaderComment = "**\n** THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT BY HAND!\n"; -$endHeaderComment .= "** See \$(RepoRoot)\\src\\inc\\OpCodeGen.pl for more information.**\n"; -$endHeaderComment .= "==============================================================*/\n\n"; - -$usingAndRefEmitNmsp = "namespace System.Reflection.Emit\n{\n\n"; -$obsoleteAttr = " [Obsolete(\"This API has been deprecated. https://go.microsoft.com/fwlink/?linkid=14202\")]\n"; - -# Open source file and target files - -open (OPCODE, "opcode.def") or die "Couldn't open opcode.def: $!\n"; -open (OUTPUT, ">OpCodes.cs") or die "Couldn't open OpCodes.cs: $!\n"; -open (FCOUTPUT, ">FlowControl.cs") or die "Couldn't open FlowControl.cs: $!\n"; -open (SOUTPUT, ">StackBehaviour.cs") or die "Couldn't open StackBehaviour.cs: $!\n"; -open (OCOUTPUT, ">OpCodeType.cs") or die "Couldn't open OpCodeType.cs: $!\n"; -open (OPOUTPUT, ">OperandType.cs") or die "Couldn't open OperandType.cs: $!\n"; - -print OUTPUT $license; -print OUTPUT $startHeaderComment; -print OUTPUT "** Class: OpCodes\n"; -print OUTPUT "**\n"; -print OUTPUT "** Purpose: Exposes all of the IL instructions supported by the runtime.\n"; -print OUTPUT $endHeaderComment; - -print OUTPUT $usingAndRefEmitNmsp; - -print FCOUTPUT $license; -print FCOUTPUT $startHeaderComment; -print FCOUTPUT "** Enumeration: FlowControl\n"; -print FCOUTPUT "**\n"; -print FCOUTPUT "** Purpose: Exposes FlowControl Attribute of IL.\n"; -print FCOUTPUT $endHeaderComment; - -print FCOUTPUT $usingAndRefEmitNmsp; -print FCOUTPUT " public enum FlowControl\n {\n"; - -print SOUTPUT $license; -print SOUTPUT $startHeaderComment; -print SOUTPUT "** Enumeration: StackBehaviour\n"; -print SOUTPUT "**\n"; -print SOUTPUT "** Purpose: Exposes StackBehaviour Attribute of IL.\n"; -print SOUTPUT $endHeaderComment; - -print SOUTPUT $usingAndRefEmitNmsp; -print SOUTPUT " public enum StackBehaviour\n {\n"; - -print OCOUTPUT $license; -print OCOUTPUT $startHeaderComment; -print OCOUTPUT "** Enumeration: OpCodeType\n"; -print OCOUTPUT "**\n"; -print OCOUTPUT "** Purpose: Exposes OpCodeType Attribute of IL.\n"; -print OCOUTPUT $endHeaderComment; - -print OCOUTPUT $usingAndRefEmitNmsp; -print OCOUTPUT " public enum OpCodeType\n {\n"; - -print OPOUTPUT $license; -print OPOUTPUT $startHeaderComment; -print OPOUTPUT "** Enumeration: OperandType\n"; -print OPOUTPUT "**\n"; -print OPOUTPUT "** Purpose: Exposes OperandType Attribute of IL.\n"; -print OPOUTPUT $endHeaderComment; - -print OPOUTPUT $usingAndRefEmitNmsp; -print OPOUTPUT " public enum OperandType\n {\n"; - -while () -{ - # Process only OPDEF(....) lines - if (/OPDEF\(\s*/) - { - chop; # Strip off trailing CR - s/^OPDEF\(\s*//; # Strip off "OP(" - s/,\s*/,/g; # Remove whitespace - s/\).*$//; # Strip off ")" and everything behind it at end - - # Split the line up into its basic parts - ($enumname, $stringname, $pop, $push, $operand, $type, $size, $s1, $s2, $ctrl) = split(/,/); - $s1 =~ s/0x//; - $s1 = hex($s1); - $s2 =~ s/0x//; - $s2 = hex($s2); - - if ($size == 0) - { - next; - } - - next if ($enumname =~ /UNUSED/); - - #Remove the prefix - $enumname=~s/CEE_//g; - - #Convert name to our casing convention - $enumname=~tr/A-Z/a-z/; - $enumname=~s/^(.)/\u$1/g; - $enumname=~s/_(.)/_\u$1/g; - - #Convert pop to our casing convention - $pop=~tr/A-Z/a-z/; - $pop=~s/^(.)/\u$1/g; - $pop=~s/_(.)/_\u$1/g; - - #Convert push to our casing convention - $push=~tr/A-Z/a-z/; - $push=~s/^(.)/\u$1/g; - $push=~s/_(.)/_\u$1/g; - - #Convert operand to our casing convention - #$operand=~tr/A-Z/a-z/; - #$operand=~s/^(.)/\u$1/g; - #$operand=~s/_(.)/_\u$1/g; - - #Remove the I prefix on type - $type=~s/I//g; - - #Convert Type to our casing convention - $type=~tr/A-Z/a-z/; - $type=~s/^(.)/\u$1/g; - $type=~s/_(.)/_\u$1/g; - - #Convert ctrl to our casing convention - $ctrl=~tr/A-Z/a-z/; - $ctrl=~s/^(.)/\u$1/g; - $ctrl=~s/_(.)/_\u$1/g; - - # Make a list of the flow Control type - - # Make a list of the opcodes and their values - if ($opcodes{$enumname}) - { - } - elsif ($size == 1) - { - $opcodes{$enumname} = $s2; - } - elsif ($size == 2) - { - $opcodes{$enumname} = ($s2 + 256 * $s1); - } - - #Make a list of the instructions which only take one-byte arguments - if ($enumname =~ /^.*_S$/) { - #but exclude the deprecated expressions (sometimes spelled "depricated") - if (!($enumname=~/^Depr.cated.*/)) { - my $caseStatement = sprintf(" case %-20s: \n", $enumname); - push(@singleByteArg, $caseStatement); - } - } - - #make a list of the control Flow Types - if ($controlFlow{$ctrl}) - { - #printf("DUPE Control Flow\n"); - } - else - { - $controlFlow{$ctrl} = $ctrlflowcount; - $ctrlflowcount++; - } - - $ctrlflowcount = 0; - #make a list of the StackBehaviour Types - $pop=~s/\+/_/g; - if ($stackbehav{$pop}) - { - #printf("DUPE stack behaviour pop\n"); - } - else - { - $stackbehav{$pop} = $ctrlflowcount; - $ctrlflowcount++; - } - - #make a list of the StackBehaviour Types - $push=~s/\+/_/g; - if ($stackbehav{$push}) - { - #printf("DUPE stack behaviour push\n"); - } - else - { - $stackbehav{$push} = $ctrlflowcount; - $ctrlflowcount++; - } - #make a list of operand types - if ($operandtype{$operand}) - { - #printf("DUPE operand type\n"); - } - else - { - $operandtype{$operand} = $ctrlflowcount; - $ctrlflowcount++; - } - - - #make a list of opcode types - if ($opcodetype{$type}) - { - #printf("DUPE opcode type\n"); - } - else - { - $opcodetype{$type} = $ctrlflowcount; - $ctrlflowcount++; - } - - my $opcodeName = $enumname; - - # Tailcall OpCode enum name does not comply with convention - # that all enum names are exactly the same as names in opcode.def - # file less leading CEE_ and changed casing convention - $enumname = substr $enumname, 0, 4 unless $enumname !~ m/Tailcall$/; - - # If string name ends with dot OpCode enum name ends with underscore - $enumname .= "_" unless $stringname !~ m/\."$/; - - printf(" OpCode name:%20s,\t\tEnum label:%20s,\t\tString name:%20s\n", $opcodeName, $enumname, $stringname); - if ($stringname eq "arglist") - { - print "This is arglist----------\n"; - } - - my $lineEnum; - if ($size == 1) - { - $lineEnum = sprintf(" %s = 0x%.2x,\n", $enumname, $s2); - $opcodeEnum{$s2} = $lineEnum; - } - elsif ($size == 2) - { - $lineEnum = sprintf(" %s = 0x%.4x,\n", $enumname, $s2 + 256 * $s1); - $opcodeEnum{$s2 + 256 * $s1} = $lineEnum; - } - - my $line; - $line = sprintf(" public static readonly OpCode %s = new OpCode(OpCodeValues.%s,\n", $opcodeName, $enumname); - $line .= sprintf(" ((int)OperandType.%s) |\n", $operand); - $line .= sprintf(" ((int)FlowControl.%s << OpCode.FlowControlShift) |\n", $ctrl); - $line .= sprintf(" ((int)OpCodeType.%s << OpCode.OpCodeTypeShift) |\n", $type); - $line .= sprintf(" ((int)StackBehaviour.%s << OpCode.StackBehaviourPopShift) |\n", $pop); - $line .= sprintf(" ((int)StackBehaviour.%s << OpCode.StackBehaviourPushShift) |\n", $push); - - $popstate = 0; - if($pop eq "Pop0" || $pop eq "Varpop") - { - $popstate = 0; - } - elsif ($pop eq "Pop1" || $pop eq "Popi" || $pop eq "Popref") - { - $popstate = $popstate -1; - } - elsif ($pop eq "Pop1_pop1" || $pop eq "Popi_pop1" || $pop eq "Popi_popi" || $pop eq "Popi_popi8" || $pop eq "Popi_popr4" || $pop eq "Popi_popr8" || $pop eq "Popref_pop1" || $pop eq "Popref_popi") - { - $popstate = $popstate -2; - } - elsif ($pop eq "Popi_popi_popi" || $pop eq "Popref_popi_popi" || $pop eq "Popref_popi_popi8" || $pop eq "Popref_popi_popr4" || $pop eq "Popref_popi_popr8" || $pop eq "Popref_popi_popref" || $pop eq "Popref_popi_pop1") - { - $popstate = $popstate -3; - } - - if ($push eq "Push1" || $push eq "Pushi" ||$push eq "Pushi8" ||$push eq "Pushr4" ||$push eq "Pushr8" ||$push eq "Pushref") - { - $popstate = $popstate + 1; - } - elsif($push eq "Push1_push1") - { - $popstate = $popstate + 2; - } - - $line .= sprintf(" (%s << OpCode.SizeShift) |\n", $size); - if ($ctrl =~ m/Return/ || $ctrl =~ m/^Branch/ || $ctrl =~ m/^Throw/ || $enumname =~ m/Jmp/){ - $line .= sprintf(" OpCode.EndsUncondJmpBlkFlag |\n", $size); - } - $line .= sprintf(" (%d << OpCode.StackChangeShift)\n", $popstate); - $line .= sprintf(" );\n\n"); - - if ($size == 1) - { - if ($oneByte{$s2}) - { - printf("Error opcode 0x%x already defined!\n", $s2); - print " Old = $oneByte{$s2}"; - print " New = $line"; - $ret = -1; - } - $oneByte{$s2} = $line; - } - elsif ($size == 2) - { - if ($twoByte{$s2}) - { - printf("Error opcode 0x%x%x already defined!\n", $s1, $s2); - print " Old = $oneByte{$s2}"; - print " New = $line"; - $ret = -1; - } - - $twoByte{$s2 + 256 * $s1} = $line; - } - else - { - $line .= "\n"; - push(@deprecated, $line); - printf("deprecated code!\n"); - } - $count++; - } -} - -# Generate the Flow Control enum -$ctrlflowcount = 0; -foreach $key (sort {$a cmp $b} keys (%controlFlow)) -{ - print FCOUTPUT " $key"; - print FCOUTPUT " = $ctrlflowcount,\n"; - $ctrlflowcount++; - if ($key =~ m/Next/){ - print FCOUTPUT $obsoleteAttr; - print FCOUTPUT " Phi"; - print FCOUTPUT " = $ctrlflowcount,\n"; - $ctrlflowcount++; - } -} -#end the flowcontrol enum -print FCOUTPUT " }\n}\n"; - -# Generate the StackBehaviour enum -$ctrlflowcount = 0; -foreach $key (sort {$a cmp $b} keys (%stackbehav)) -{ - if ($key !~ m/Popref_popi_pop1/){ - print SOUTPUT " $key"; - print SOUTPUT " = $ctrlflowcount,\n"; - $ctrlflowcount++; - } -} -print SOUTPUT " Popref_popi_pop1 = $ctrlflowcount,\n"; -#end the StackBehaviour enum -print SOUTPUT " }\n}\n"; - -# Generate OpCodeType enum -$ctrlflowcount = 0; -foreach $key (sort {$a cmp $b} keys (%opcodetype)) -{ - if ($ctrlflowcount == 0){ - print OCOUTPUT $obsoleteAttr; - print OCOUTPUT " Annotation = 0,\n"; - $ctrlflowcount++; - } - print OCOUTPUT " $key"; - print OCOUTPUT " = $ctrlflowcount,\n"; - $ctrlflowcount++; -} -# end the OpCodeType enum -print OCOUTPUT " }\n}\n"; - -# Generate OperandType enum -$ctrlflowcount = 0; -foreach $key (sort {$a cmp $b} keys (%operandtype)) -{ - print OPOUTPUT " $key"; - print OPOUTPUT " = $ctrlflowcount,\n"; - $ctrlflowcount++; - if ($key =~ m/InlineNone/){ - print OPOUTPUT $obsoleteAttr; - print OPOUTPUT " InlinePhi = 6,\n"; - $ctrlflowcount++; - } - if ($key =~ m/^InlineR$/){ - $ctrlflowcount++; - } -} -#end the OperandType enum -print OPOUTPUT " }\n}\n"; - -# Generate OpCodeValues internal enum -print OUTPUT " ///\n"; -print OUTPUT " /// Internal enum OpCodeValues for opcode values.\n"; -print OUTPUT " ///\n"; -print OUTPUT " ///\n"; -print OUTPUT " /// Note that the value names are used to construct publicly visible\n"; -print OUTPUT " /// ilasm-compatible opcode names, so their exact form is important!\n"; -print OUTPUT " ///\n"; -print OUTPUT " internal enum OpCodeValues\n"; -print OUTPUT " {\n"; - -foreach $opcodeValue (sort {$a <=> $b} keys(%opcodeEnum)) { - print OUTPUT $opcodeEnum{$opcodeValue}; -} - -# End generating OpCodeValues internal enum -print OUTPUT " }\n\n"; - - -# Generate public OpCodes class -print OUTPUT " /// \n"; -print OUTPUT " /// \n"; -print OUTPUT " /// The IL instruction opcodes supported by the runtime.\n"; -print OUTPUT " /// The Specification of IL Instruction describes each Opcode.\n"; -print OUTPUT " /// \n"; -print OUTPUT " /// \n"; -print OUTPUT " /// \n"; -print OUTPUT " public class OpCodes\n"; -print OUTPUT " {\n\n";; -print OUTPUT " private OpCodes()\n {\n }\n\n"; - -my $opcode; -my $lastOp = -1; -foreach $opcode (sort {$a <=> $b} keys(%oneByte)) { - printf("***** GAP %d instrs ****\n", $opcode - $lastOp) if ($lastOp + 1 != $opcode && $lastOp > 0); - print OUTPUT $oneByte{$opcode}; - $lastOp = $opcode; -} - -$lastOp = -1; -foreach $opcode (sort {$a <=> $b} keys(%twoByte)) { - printf("***** GAP %d instrs ****\n", $opcode - $lastOp) if ($lastOp + 1 != $opcode && $lastOp > 0); - print OUTPUT $twoByte{$opcode}; - $lastOp = $opcode; -} - -print OUTPUT "\n";; -print OUTPUT " public static bool TakesSingleByteArgument(OpCode inst)\n"; -print OUTPUT " {\n"; -print OUTPUT " switch (inst.OperandType)\n"; -print OUTPUT " {\n"; -print OUTPUT " case OperandType.ShortInlineBrTarget:\n"; -print OUTPUT " case OperandType.ShortInlineI:\n"; -print OUTPUT " case OperandType.ShortInlineVar:\n"; -print OUTPUT " return true;\n"; -print OUTPUT " }\n"; -print OUTPUT " return false;\n"; -print OUTPUT " }\n"; - -# End Generate public OpCodes class and close namespace -print OUTPUT " }\n}\n"; - -exit($ret); diff --git a/src/coreclr/inc/genrops.pl b/src/coreclr/inc/genrops.pl deleted file mode 100644 index f90aee2817f3b6..00000000000000 --- a/src/coreclr/inc/genrops.pl +++ /dev/null @@ -1,90 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# -# GENREFOPS.PL -# -# PERL script used to generate the numbering of the reference opcodes -# -#use strict 'vars'; -#use strict 'subs'; -#use strict 'refs'; - -print "Reference opcodes\n"; -print "This file is presently only for human consumption\n"; -print "This file is generated from opcode.def using the genrops.pl script\n\n"; -print "Name String Name refop encode\n"; -print "-----------------------------------------------------------------\n"; - -my $ret = 0; -my %oneByte; -my %twoByte; -$count = 0; -while (<>) -{ - # Process only OPDEF(....) lines - if (/OPDEF\(\s*/) - { - chop; # Strip off trailing CR - s/^OPDEF\(\s*//; # Strip off "OP(" - s/\)$//; # Strip off ")" at end - s/,\s*/,/g; # Remove whitespace - - # Split the line up into its basic parts - ($enumname, $stringname, $pop, $push, $operand, $type, $size, $s1, $s2, $ctrl) = split(/,/); - $s1 =~ s/0x//; - $s1 = hex($s1); - $s2 =~ s/0x//; - $s2 = hex($s2); - - - my $line = sprintf("%-24s %-24s 0x%03x", - $enumname, $stringname, $count); - if ($size == 1) { - $line .= sprintf(" 0x%02x\n", $s2); - if ($oneByte{$s2}) { - printf("Error opcode 0x%x already defined!\n", $s2); - print " Old = $oneByte{$s2}"; - print " New = $line"; - $ret = -1; - } - $oneByte{$s2} = $line; - } - elsif ($size == 2) { - if ($twoByte{$s2}) { - printf("Error opcode 0x%x 0x%x already defined!\n", $s1, $s2); - print " Old = $twoByte{$s2}"; - print " New = $line"; - $ret = -1; - } - $line .= sprintf(" 0x%02x 0x%02x\n", $s1, $s2); - $twoByte{$s2 + 256 * $s1} = $line; - } - else { - $line .= "\n"; - push(@deprecated, $line); - } - $count++; - } -} - -my $opcode; -my $lastOp = -1; -foreach $opcode (sort {$a <=> $b} keys(%oneByte)) { - printf("***** GAP %d instrs ****\n", $opcode - $lastOp) if ($lastOp + 1 != $opcode && $lastOp > 0); - print $oneByte{$opcode}; - $lastOp = $opcode; -} - -$lastOp = -1; -foreach $opcode (sort {$a <=> $b} keys(%twoByte)) { - printf("***** GAP %d instrs ****\n", $opcode - $lastOp) if ($lastOp + 1 != $opcode && $lastOp > 0); - print $twoByte{$opcode}; - $lastOp = $opcode; -} - -print @deprecated; - -exit($ret); - - - From 5acfa2c589844f912f8511730a53c206f073301f Mon Sep 17 00:00:00 2001 From: Gleb Balykov Date: Wed, 24 Jul 2024 17:19:09 +0300 Subject: [PATCH 17/27] [RISC-V] Increase timeout for tracing/eventcounter/runtimecounters (#104461) * Increase timeout for tracing/eventcounter/runtimecounters This test expects that all runtime counters are already prepared when timeout has passed, however, it might be untrue for debug/checked builds and for VisionFive2 (riscv64). * Check if event are already prepared each second (60 seconds max) --- .../tracing/eventcounter/runtimecounters.cs | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/tests/tracing/eventcounter/runtimecounters.cs b/src/tests/tracing/eventcounter/runtimecounters.cs index 1de0b8b4e2cf5d..35ed40ad588170 100644 --- a/src/tests/tracing/eventcounter/runtimecounters.cs +++ b/src/tests/tracing/eventcounter/runtimecounters.cs @@ -100,17 +100,19 @@ public static int TestEntryPoint() // Create an EventListener. using (RuntimeCounterListener myListener = new RuntimeCounterListener()) { - Thread.Sleep(3000); - if (myListener.Verify()) + // Wait max 60 seconds + for (int i = 0; i < 60; i++) { - Console.WriteLine("Test passed"); - return 100; - } - else - { - Console.WriteLine($"Test Failed - did not see one or more of the expected runtime counters."); - return 1; + Thread.Sleep(1000); + if (myListener.Verify()) + { + Console.WriteLine("Test passed"); + return 100; + } } + + Console.WriteLine($"Test Failed - did not see one or more of the expected runtime counters."); + return 1; } } } From 6ce4666cfb8fa505716545f7f0138e1b35e6f586 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Wed, 24 Jul 2024 10:22:08 -0400 Subject: [PATCH 18/27] Fix LINQ Aggregate/CountBy tests for Native AOT (#105357) --- .../System.Linq/tests/AggregateByTests.cs | 48 +++++++------------ .../System.Linq/tests/CountByTests.cs | 48 +++++++------------ 2 files changed, 36 insertions(+), 60 deletions(-) diff --git a/src/libraries/System.Linq/tests/AggregateByTests.cs b/src/libraries/System.Linq/tests/AggregateByTests.cs index 6232ce24a6df49..b574660c9e5ac8 100644 --- a/src/libraries/System.Linq/tests/AggregateByTests.cs +++ b/src/libraries/System.Linq/tests/AggregateByTests.cs @@ -93,25 +93,10 @@ public void AggregateBy_SourceThrowsOnCurrent() Assert.Throws(() => enumerator.MoveNext()); } - [Theory] - [ActiveIssue("https://github.com/dotnet/runtime/issues/92387", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))] - [MemberData(nameof(AggregateBy_TestData))] - public static void AggregateBy_HasExpectedOutput(IEnumerable source, Func keySelector, Func seedSelector, Func func, IEqualityComparer? comparer, IEnumerable> expected) - { - Assert.Equal(expected, source.AggregateBy(keySelector, seedSelector, func, comparer)); - } - - [Theory] - [ActiveIssue("https://github.com/dotnet/runtime/issues/92387", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))] - [MemberData(nameof(AggregateBy_TestData))] - public static void AggregateBy_RunOnce_HasExpectedOutput(IEnumerable source, Func keySelector, Func seedSelector, Func func, IEqualityComparer? comparer, IEnumerable> expected) - { - Assert.Equal(expected, source.RunOnce().AggregateBy(keySelector, seedSelector, func, comparer)); - } - - public static IEnumerable AggregateBy_TestData() + [Fact] + public void AggregateBy_HasExpectedOutput() { - yield return WrapArgs( + Validate( source: Enumerable.Empty(), keySelector: x => x, seedSelector: x => 0, @@ -119,7 +104,7 @@ public static IEnumerable AggregateBy_TestData() comparer: null, expected: Enumerable.Empty>()); - yield return WrapArgs( + Validate( source: Enumerable.Range(0, 10), keySelector: x => x, seedSelector: x => 0, @@ -127,7 +112,7 @@ public static IEnumerable AggregateBy_TestData() comparer: null, expected: Enumerable.Range(0, 10).Select(x => new KeyValuePair(x, x))); - yield return WrapArgs( + Validate( source: Enumerable.Range(5, 10), keySelector: x => true, seedSelector: x => 0, @@ -135,7 +120,7 @@ public static IEnumerable AggregateBy_TestData() comparer: null, expected: Enumerable.Repeat(true, 1).Select(x => new KeyValuePair(x, 95))); - yield return WrapArgs( + Validate( source: Enumerable.Range(0, 20), keySelector: x => x % 5, seedSelector: x => 0, @@ -143,7 +128,7 @@ public static IEnumerable AggregateBy_TestData() comparer: null, expected: Enumerable.Range(0, 5).Select(x => new KeyValuePair(x, 30 + 4 * x))); - yield return WrapArgs( + Validate( source: Enumerable.Repeat(5, 20), keySelector: x => x, seedSelector: x => 0, @@ -151,7 +136,7 @@ public static IEnumerable AggregateBy_TestData() comparer: null, expected: Enumerable.Repeat(5, 1).Select(x => new KeyValuePair(x, 100))); - yield return WrapArgs( + Validate( source: new string[] { "Bob", "bob", "tim", "Bob", "Tim" }, keySelector: x => x, seedSelector: x => string.Empty, @@ -165,7 +150,7 @@ public static IEnumerable AggregateBy_TestData() new("Tim", "Tim"), ]); - yield return WrapArgs( + Validate( source: new string[] { "Bob", "bob", "tim", "Bob", "Tim" }, keySelector: x => x, seedSelector: x => string.Empty, @@ -177,7 +162,7 @@ public static IEnumerable AggregateBy_TestData() new("tim", "timTim") ]); - yield return WrapArgs( + Validate( source: new (string Name, int Age)[] { ("Tom", 20), ("Dick", 30), ("Harry", 40) }, keySelector: x => x.Age, seedSelector: x => $"I am {x} and my name is ", @@ -190,7 +175,7 @@ public static IEnumerable AggregateBy_TestData() new(40, "I am 40 and my name is Harry") ]); - yield return WrapArgs( + Validate( source: new (string Name, int Age)[] { ("Tom", 20), ("Dick", 20), ("Harry", 40) }, keySelector: x => x.Age, seedSelector: x => $"I am {x} and my name is", @@ -202,7 +187,7 @@ public static IEnumerable AggregateBy_TestData() new(40, "I am 40 and my name is maybe Harry") ]); - yield return WrapArgs( + Validate( source: new (string Name, int Age)[] { ("Bob", 20), ("bob", 20), ("Harry", 20) }, keySelector: x => x.Name, seedSelector: x => 0, @@ -210,7 +195,7 @@ public static IEnumerable AggregateBy_TestData() comparer: null, expected: new string[] { "Bob", "bob", "Harry" }.Select(x => new KeyValuePair(x, 20))); - yield return WrapArgs( + Validate( source: new (string Name, int Age)[] { ("Bob", 20), ("bob", 30), ("Harry", 40) }, keySelector: x => x.Name, seedSelector: x => 0, @@ -222,8 +207,11 @@ public static IEnumerable AggregateBy_TestData() new("Harry", 40) ]); - object[] WrapArgs(IEnumerable source, Func keySelector, Func seedSelector, Func func, IEqualityComparer? comparer, IEnumerable> expected) - => new object[] { source, keySelector, seedSelector, func, comparer, expected }; + static void Validate(IEnumerable source, Func keySelector, Func seedSelector, Func func, IEqualityComparer? comparer, IEnumerable> expected) + { + Assert.Equal(expected, source.AggregateBy(keySelector, seedSelector, func, comparer)); + Assert.Equal(expected, source.RunOnce().AggregateBy(keySelector, seedSelector, func, comparer)); + } } [Fact] diff --git a/src/libraries/System.Linq/tests/CountByTests.cs b/src/libraries/System.Linq/tests/CountByTests.cs index 258a067ece5050..cd041051d80984 100644 --- a/src/libraries/System.Linq/tests/CountByTests.cs +++ b/src/libraries/System.Linq/tests/CountByTests.cs @@ -57,55 +57,40 @@ public void CountBy_SourceThrowsOnCurrent() Assert.Throws(() => enumerator.MoveNext()); } - [Theory] - [ActiveIssue("https://github.com/dotnet/runtime/issues/92387", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))] - [MemberData(nameof(CountBy_TestData))] - public static void CountBy_HasExpectedOutput(IEnumerable source, Func keySelector, IEqualityComparer? comparer, IEnumerable> expected) - { - Assert.Equal(expected, source.CountBy(keySelector, comparer)); - } - - [Theory] - [ActiveIssue("https://github.com/dotnet/runtime/issues/92387", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))] - [MemberData(nameof(CountBy_TestData))] - public static void CountBy_RunOnce_HasExpectedOutput(IEnumerable source, Func keySelector, IEqualityComparer? comparer, IEnumerable> expected) - { - Assert.Equal(expected, source.RunOnce().CountBy(keySelector, comparer)); - } - - public static IEnumerable CountBy_TestData() + [Fact] + public void CountBy_HasExpectedOutput() { - yield return WrapArgs( + Validate( source: Enumerable.Empty(), keySelector: x => x, comparer: null, expected: Enumerable.Empty>()); - yield return WrapArgs( + Validate( source: Enumerable.Range(0, 10), keySelector: x => x, comparer: null, expected: Enumerable.Range(0, 10).Select(x => new KeyValuePair(x, 1))); - yield return WrapArgs( + Validate( source: Enumerable.Range(5, 10), keySelector: x => true, comparer: null, expected: Enumerable.Repeat(true, 1).Select(x => new KeyValuePair(x, 10))); - yield return WrapArgs( + Validate( source: Enumerable.Range(0, 20), keySelector: x => x % 5, comparer: null, expected: Enumerable.Range(0, 5).Select(x => new KeyValuePair(x, 4))); - yield return WrapArgs( + Validate( source: Enumerable.Repeat(5, 20), keySelector: x => x, comparer: null, expected: Enumerable.Repeat(5, 1).Select(x => new KeyValuePair(x, 20))); - yield return WrapArgs( + Validate( source: new string[] { "Bob", "bob", "tim", "Bob", "Tim" }, keySelector: x => x, null, @@ -117,7 +102,7 @@ public static IEnumerable CountBy_TestData() new("Tim", 1) ]); - yield return WrapArgs( + Validate( source: new string[] { "Bob", "bob", "tim", "Bob", "Tim" }, keySelector: x => x, StringComparer.OrdinalIgnoreCase, @@ -127,13 +112,13 @@ public static IEnumerable CountBy_TestData() new("tim", 2) ]); - yield return WrapArgs( + Validate( source: new (string Name, int Age)[] { ("Tom", 20), ("Dick", 30), ("Harry", 40) }, keySelector: x => x.Age, comparer: null, expected: new int[] { 20, 30, 40 }.Select(x => new KeyValuePair(x, 1))); - yield return WrapArgs( + Validate( source: new (string Name, int Age)[] { ("Tom", 20), ("Dick", 20), ("Harry", 40) }, keySelector: x => x.Age, comparer: null, @@ -143,13 +128,13 @@ public static IEnumerable CountBy_TestData() new(40, 1) ]); - yield return WrapArgs( + Validate( source: new (string Name, int Age)[] { ("Bob", 20), ("bob", 30), ("Harry", 40) }, keySelector: x => x.Name, comparer: null, expected: new string[] { "Bob", "bob", "Harry" }.Select(x => new KeyValuePair(x, 1))); - yield return WrapArgs( + Validate( source: new (string Name, int Age)[] { ("Bob", 20), ("bob", 30), ("Harry", 40) }, keySelector: x => x.Name, comparer: StringComparer.OrdinalIgnoreCase, @@ -159,8 +144,11 @@ public static IEnumerable CountBy_TestData() new("Harry", 1) ]); - object[] WrapArgs(IEnumerable source, Func keySelector, IEqualityComparer? comparer, IEnumerable> expected) - => new object[] { source, keySelector, comparer, expected }; + static void Validate(IEnumerable source, Func keySelector, IEqualityComparer? comparer, IEnumerable> expected) + { + Assert.Equal(expected, source.CountBy(keySelector, comparer)); + Assert.Equal(expected, source.RunOnce().CountBy(keySelector, comparer)); + } } } } From 59efb31d431808fe1332134af20ab937e30edfa5 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Wed, 24 Jul 2024 16:36:48 +0200 Subject: [PATCH 19/27] Bumping clang and llvm - make docs less ambiguous. (#105401) --- docs/workflow/requirements/linux-requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/workflow/requirements/linux-requirements.md b/docs/workflow/requirements/linux-requirements.md index 053b2d98616358..2aa1794ef1ac81 100644 --- a/docs/workflow/requirements/linux-requirements.md +++ b/docs/workflow/requirements/linux-requirements.md @@ -37,7 +37,7 @@ Install the following packages for the toolchain: * CMake 3.20 or newer * llvm * lld -* clang 16 or newer +* clang (for WASM 16 or newer) * build-essential * python-is-python3 * curl From dff1d8467845fd93c517f89dc81598e5fd17c270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Wed, 24 Jul 2024 07:56:52 -0700 Subject: [PATCH 20/27] Bump main to RC1 (#105338) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d70101a928ed76..35580c0b17afeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,8 +10,8 @@ 8.0.7 7.0.20 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet8)').Build),25)) - preview - 7 + rc + 1 false release From 4a8aca8bc748888423686beeccd233ee2f6a9f76 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:55:38 +0300 Subject: [PATCH 21/27] Update SDK to preview 6 (#104696) * Update SDK to preview 6 * Update Shared.csproj Fix `error NU1903: Package 'System.Text.Json' 8.0.0 has a known high severity vulnerability` * Fix with existing version. --------- Co-authored-by: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Co-authored-by: Viktor Hofer --- global.json | 4 ++-- src/mono/sample/wasm/blazor-frame/blazor.csproj | 4 ++-- .../WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj | 2 +- .../WasmOnAspNetCore/BlazorClient/BlazorClient.csproj | 4 ++-- .../wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/global.json b/global.json index f1e49149b2178d..510f47b5aed98c 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.100-preview.5.24307.3", + "version": "9.0.100-preview.6.24328.19", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.100-preview.5.24307.3" + "dotnet": "9.0.100-preview.6.24328.19" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24372.7", diff --git a/src/mono/sample/wasm/blazor-frame/blazor.csproj b/src/mono/sample/wasm/blazor-frame/blazor.csproj index 278a2107e6e356..1de3023c4e481d 100644 --- a/src/mono/sample/wasm/blazor-frame/blazor.csproj +++ b/src/mono/sample/wasm/blazor-frame/blazor.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj index 5606622f348ea5..3d0fa0a57f9a73 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj index 40518a0b4345d8..b3535d0b965abc 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj index 458fcffbabb786..968e48496a1e8a 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj @@ -10,7 +10,7 @@ - - + + From e75fc2775a2c844ffd45e64b9a1b67b7e088959f Mon Sep 17 00:00:00 2001 From: Ahmet Ibrahim Aksoy Date: Wed, 24 Jul 2024 20:39:08 +0200 Subject: [PATCH 22/27] Change DefaultMaximumErrorResponseLength to KB from Byte (#105396) * Change DefaultMaximumErrorResponseLength to KB from Byte * Handle overflow * Review feedback --- .../src/System/Net/HttpWebResponse.cs | 13 ++-- .../tests/HttpWebRequestTest.cs | 63 +++++++++++++++---- 2 files changed, 57 insertions(+), 19 deletions(-) diff --git a/src/libraries/System.Net.Requests/src/System/Net/HttpWebResponse.cs b/src/libraries/System.Net.Requests/src/System/Net/HttpWebResponse.cs index 7b0e9b90681fc9..96bdffff721763 100644 --- a/src/libraries/System.Net.Requests/src/System/Net/HttpWebResponse.cs +++ b/src/libraries/System.Net.Requests/src/System/Net/HttpWebResponse.cs @@ -346,7 +346,7 @@ public override Stream GetResponseStream() return contentStream; } - return new TruncatedReadStream(contentStream, maxErrorResponseLength); + return new TruncatedReadStream(contentStream, (long)maxErrorResponseLength * 1024); } return Stream.Null; @@ -381,8 +381,9 @@ private void CheckDisposed() private static string GetHeaderValueAsString(IEnumerable values) => string.Join(", ", values); - internal sealed class TruncatedReadStream(Stream innerStream, int maxSize) : Stream + internal sealed class TruncatedReadStream(Stream innerStream, long maxSize) : Stream { + private long _maxRemainingLength = maxSize; public override bool CanRead => true; public override bool CanSeek => false; public override bool CanWrite => false; @@ -399,8 +400,8 @@ public override int Read(byte[] buffer, int offset, int count) public override int Read(Span buffer) { - int readBytes = innerStream.Read(buffer.Slice(0, Math.Min(buffer.Length, maxSize))); - maxSize -= readBytes; + int readBytes = innerStream.Read(buffer.Slice(0, (int)Math.Min(buffer.Length, _maxRemainingLength))); + _maxRemainingLength -= readBytes; return readBytes; } @@ -411,9 +412,9 @@ public override Task ReadAsync(byte[] buffer, int offset, int count, Cancel public override async ValueTask ReadAsync(Memory buffer, CancellationToken cancellationToken = default) { - int readBytes = await innerStream.ReadAsync(buffer.Slice(0, Math.Min(buffer.Length, maxSize)), cancellationToken) + int readBytes = await innerStream.ReadAsync(buffer.Slice(0, (int)Math.Min(buffer.Length, _maxRemainingLength)), cancellationToken) .ConfigureAwait(false); - maxSize -= readBytes; + _maxRemainingLength -= readBytes; return readBytes; } diff --git a/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs b/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs index 5e91ba7f732efd..2dcbc910bff4bc 100644 --- a/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs +++ b/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs @@ -2318,33 +2318,70 @@ await server.AcceptConnectionAsync( [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] public async Task SendHttpRequest_WhenDefaultMaximumErrorResponseLengthSet_Success() { - await RemoteExecutor.Invoke(async (async) => + await RemoteExecutor.Invoke(async isAsync => { TaskCompletionSource tcs = new TaskCompletionSource(); await LoopbackServer.CreateClientAndServerAsync( - async (uri) => + async uri => { HttpWebRequest request = WebRequest.CreateHttp(uri); - HttpWebRequest.DefaultMaximumErrorResponseLength = 5; - var exception = - await Assert.ThrowsAsync(() => bool.Parse(async) ? request.GetResponseAsync() : Task.Run(() => request.GetResponse())); + HttpWebRequest.DefaultMaximumErrorResponseLength = 1; // 1 KB + WebException exception = + await Assert.ThrowsAsync(() => bool.Parse(isAsync) ? request.GetResponseAsync() : Task.Run(() => request.GetResponse())); tcs.SetResult(); Assert.NotNull(exception.Response); - using (var responseStream = exception.Response.GetResponseStream()) + using (Stream responseStream = exception.Response.GetResponseStream()) { - var buffer = new byte[10]; - int readLen = responseStream.Read(buffer, 0, buffer.Length); - Assert.Equal(5, readLen); - Assert.Equal(new string('a', 5), Encoding.UTF8.GetString(buffer[0..readLen])); - Assert.Equal(0, responseStream.Read(buffer)); + byte[] buffer = new byte[10 * 1024]; + int totalReadLen = 0; + int readLen = 0; + while ((readLen = responseStream.Read(buffer, readLen, buffer.Length - readLen)) > 0) + { + totalReadLen += readLen; + } + + Assert.Equal(1024, totalReadLen); + Assert.Equal(new string('a', 1024), Encoding.UTF8.GetString(buffer[0..totalReadLen])); } }, - async (server) => + async server => + { + await server.AcceptConnectionAsync( + async connection => + { + await connection.SendResponseAsync(statusCode: HttpStatusCode.BadRequest, content: new string('a', 10 * 1024)); + await tcs.Task; + }); + }); + }, IsAsync.ToString()).DisposeAsync(); + } + + [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] + public async Task SendHttpRequest_WhenDefaultMaximumErrorResponseLengthSetToIntMax_DoesNotThrow() + { + await RemoteExecutor.Invoke(async isAsync => + { + TaskCompletionSource tcs = new TaskCompletionSource(); + await LoopbackServer.CreateClientAndServerAsync( + async uri => + { + HttpWebRequest request = WebRequest.CreateHttp(uri); + HttpWebRequest.DefaultMaximumErrorResponseLength = int.MaxValue; // KB + WebException exception = + await Assert.ThrowsAsync(() => bool.Parse(isAsync) ? request.GetResponseAsync() : Task.Run(() => request.GetResponse())); + tcs.SetResult(); + Assert.NotNull(exception.Response); + using (Stream responseStream = exception.Response.GetResponseStream()) + { + Assert.Equal(1, await responseStream.ReadAsync(new byte[1])); + } + }, + async server => { await server.AcceptConnectionAsync( async connection => { - await connection.SendResponseAsync(statusCode: HttpStatusCode.BadRequest, content: new string('a', 10)); + await connection.SendResponseAsync(statusCode: HttpStatusCode.BadRequest, content: new string('a', 10 * 1024)); await tcs.Task; }); }); From efb09a57ddebfe213f43eea4289608031fe7795a Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Wed, 24 Jul 2024 13:14:07 -0700 Subject: [PATCH 23/27] Fix warning for MakeGenericType annotation mismatch (#104921) Fixes warning code when a generic type whose type parameters have DAM annotations is used with MakeGenericType, over a type that doesn't have matching annotations. The code IL2070 used to mention the 'this' argument. Instead it should have been IL2071 which mentions the generic argument as the cause of the mismatch. Similar for MakeGenericMethod with IL2090 and IL2091. --- .../Compiler/Dataflow/FlowAnnotations.cs | 17 ++++---- .../Compiler/Dataflow/MethodParameterValue.cs | 3 +- .../src/System/Data/DataRowExtensions.cs | 2 +- .../Converters/Value/EnumConverterFactory.cs | 2 +- .../Value/NullableConverterFactory.cs | 2 +- .../TrimAnalysis/FlowAnnotations.cs | 11 ++--- .../TrimAnalysis/GenericParameterValue.cs | 13 +++++- .../TrimAnalysis/MethodParameterValue.cs | 3 +- .../TrimAnalysis/FlowAnnotations.cs | 2 + .../TrimAnalysis/HandleCallAction.cs | 11 ++--- .../TrimAnalysis/MethodParameterValue.cs | 5 +-- .../linker/Linker.Dataflow/FlowAnnotations.cs | 15 +++---- .../Linker.Dataflow/MethodParameterValue.cs | 3 +- .../AnnotatedMembersAccessedViaReflection.cs | 3 +- .../DataFlow/ExponentialDataFlow.cs | 42 +++++++++---------- .../DataFlow/MakeGenericDataFlow.cs | 30 +++++++------ 16 files changed, 80 insertions(+), 84 deletions(-) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/FlowAnnotations.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/FlowAnnotations.cs index e7682e267b3446..70c856f7ca283f 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/FlowAnnotations.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/FlowAnnotations.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System; @@ -958,6 +958,11 @@ internal partial MethodReturnValue GetMethodReturnValue(MethodProxy method, bool internal partial MethodReturnValue GetMethodReturnValue(MethodProxy method, bool isNewObj) => GetMethodReturnValue(method, isNewObj, GetReturnParameterAnnotation(method.Method)); +#pragma warning disable CA1822 // Other partial implementations are not in the ilc project + internal partial GenericParameterValue GetGenericParameterValue(GenericParameterProxy genericParameter, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) +#pragma warning restore CA1822 // Mark members as static + => new GenericParameterValue(genericParameter.GenericParameter, dynamicallyAccessedMemberTypes); + internal partial GenericParameterValue GetGenericParameterValue(GenericParameterProxy genericParameter) => new GenericParameterValue(genericParameter.GenericParameter, GetGenericParameterAnnotation(genericParameter.GenericParameter)); @@ -970,18 +975,14 @@ internal partial MethodParameterValue GetMethodParameterValue(ParameterProxy par => GetMethodParameterValue(param, GetParameterAnnotation(param)); #pragma warning disable CA1822 // Mark members as static - Should be an instance method for consistency - // overrideIsThis is needed for backwards compatibility with MakeGenericType/Method https://github.com/dotnet/linker/issues/2428 - internal MethodParameterValue GetMethodThisParameterValue(MethodProxy method, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes, bool overrideIsThis = false) + internal partial MethodParameterValue GetMethodThisParameterValue(MethodProxy method, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) { - if (!method.HasImplicitThis() && !overrideIsThis) + if (!method.HasImplicitThis()) throw new InvalidOperationException($"Cannot get 'this' parameter of method {method.GetDisplayName()} with no 'this' parameter."); - return new MethodParameterValue(new ParameterProxy(method, (ParameterIndex)0), dynamicallyAccessedMemberTypes, overrideIsThis); + return new MethodParameterValue(new ParameterProxy(method, (ParameterIndex)0), dynamicallyAccessedMemberTypes); } #pragma warning restore CA1822 // Mark members as static - internal partial MethodParameterValue GetMethodThisParameterValue(MethodProxy method, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) - => GetMethodThisParameterValue(method, dynamicallyAccessedMemberTypes, false); - internal partial MethodParameterValue GetMethodThisParameterValue(MethodProxy method) { if (!method.HasImplicitThis()) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/MethodParameterValue.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/MethodParameterValue.cs index 0b6c0c11d9f2fe..492c81ead56431 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/MethodParameterValue.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/MethodParameterValue.cs @@ -14,12 +14,11 @@ namespace ILLink.Shared.TrimAnalysis /// internal partial record MethodParameterValue { - public MethodParameterValue(ParameterProxy param, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes, bool overrideIsThis = false) + public MethodParameterValue(ParameterProxy param, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) { StaticType = param.ParameterType; Parameter = param; DynamicallyAccessedMemberTypes = dynamicallyAccessedMemberTypes; - _overrideIsThis = overrideIsThis; } public override DynamicallyAccessedMemberTypes DynamicallyAccessedMemberTypes { get; } diff --git a/src/libraries/System.Data.Common/src/System/Data/DataRowExtensions.cs b/src/libraries/System.Data.Common/src/System/Data/DataRowExtensions.cs index bb5c624f0abf6b..5899d1cfd10b2c 100644 --- a/src/libraries/System.Data.Common/src/System/Data/DataRowExtensions.cs +++ b/src/libraries/System.Data.Common/src/System/Data/DataRowExtensions.cs @@ -155,7 +155,7 @@ private static class UnboxT } return NonNullableField; - [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2090:MakeGenericMethod", + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2091:MakeGenericMethod", Justification = "'NullableField where TElem : struct' implies 'TElem : new()'. Nullable does not make use of new() so it is safe." + "The warning is only issued when IsDynamicCodeSupported is true.")] static Func CreateWhenDynamicCodeSupported() diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs index 26b4979f4633d0..84ff53a2462696 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs @@ -46,7 +46,7 @@ public static JsonConverter Create(EnumConverterOptions converterOptions, } [RequiresDynamicCode(JsonSerializer.SerializationRequiresDynamicCodeMessage)] - [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern", + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2071:UnrecognizedReflectionPattern", Justification = "'EnumConverter where T : struct' implies 'T : new()', so the trimmer is warning calling MakeGenericType here because enumType's constructors are not annotated. " + "But EnumConverter doesn't call new T(), so this is safe.")] public static JsonConverter Create(Type enumType, EnumConverterOptions converterOptions, JsonNamingPolicy? namingPolicy, JsonSerializerOptions options) diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs index f64544379b3df6..2d93b693340361 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs @@ -43,7 +43,7 @@ public static JsonConverter CreateValueConverter(Type valueTypeToConvert, JsonCo culture: null)!; } - [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern", + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2071:UnrecognizedReflectionPattern", Justification = "'NullableConverter where T : struct' implies 'T : new()', so the trimmer is warning calling MakeGenericType here because valueTypeToConvert's constructors are not annotated. " + "But NullableConverter doesn't call new T(), so this is safe.")] [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] diff --git a/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/FlowAnnotations.cs b/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/FlowAnnotations.cs index 2fa967fdc9405d..8e5f60179dcd71 100644 --- a/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/FlowAnnotations.cs +++ b/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/FlowAnnotations.cs @@ -109,6 +109,9 @@ internal partial MethodReturnValue GetMethodReturnValue (MethodProxy method, boo internal partial MethodReturnValue GetMethodReturnValue (MethodProxy method, bool isNewObj) => GetMethodReturnValue (method, isNewObj, GetMethodReturnValueAnnotation (method.Method)); + internal partial GenericParameterValue GetGenericParameterValue (GenericParameterProxy genericParameter, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) + => new GenericParameterValue (genericParameter.TypeParameterSymbol, dynamicallyAccessedMemberTypes); + internal partial GenericParameterValue GetGenericParameterValue (GenericParameterProxy genericParameter) => new GenericParameterValue (genericParameter.TypeParameterSymbol); @@ -119,14 +122,6 @@ internal partial MethodParameterValue GetMethodThisParameterValue (MethodProxy m return GetMethodParameterValue (new ParameterProxy (method, (ParameterIndex) 0), dynamicallyAccessedMemberTypes); } - // overrideIsThis is needed for backwards compatibility with MakeGenericType/Method https://github.com/dotnet/linker/issues/2428 - internal MethodParameterValue GetMethodThisParameterValue (MethodProxy method, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes, bool overrideIsThis = false) - { - if (!method.HasImplicitThis () && !overrideIsThis) - throw new InvalidOperationException ($"Cannot get 'this' parameter of method {method.GetDisplayName ()} with no 'this' parameter."); - return new MethodParameterValue (new ParameterProxy (method, (ParameterIndex) 0), dynamicallyAccessedMemberTypes, overrideIsThis); - } - internal partial MethodParameterValue GetMethodThisParameterValue (MethodProxy method) { if (!method.HasImplicitThis ()) diff --git a/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/GenericParameterValue.cs b/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/GenericParameterValue.cs index 2156d7176a25ba..ec7fd155bd3c81 100644 --- a/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/GenericParameterValue.cs +++ b/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/GenericParameterValue.cs @@ -15,9 +15,18 @@ namespace ILLink.Shared.TrimAnalysis /// internal partial record GenericParameterValue { - public GenericParameterValue (ITypeParameterSymbol typeParameterSymbol) => GenericParameter = new (typeParameterSymbol); + public GenericParameterValue (ITypeParameterSymbol typeParameterSymbol, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) + { + GenericParameter = new (typeParameterSymbol); + DynamicallyAccessedMemberTypes = dynamicallyAccessedMemberTypes; + } - public override DynamicallyAccessedMemberTypes DynamicallyAccessedMemberTypes => GenericParameter.TypeParameterSymbol.GetDynamicallyAccessedMemberTypes (); + public GenericParameterValue (ITypeParameterSymbol typeParameterSymbol) + : this (typeParameterSymbol, typeParameterSymbol.GetDynamicallyAccessedMemberTypes ()) + { + } + + public override DynamicallyAccessedMemberTypes DynamicallyAccessedMemberTypes { get; } public override IEnumerable GetDiagnosticArgumentsForAnnotationMismatch () => new string[] { GenericParameter.TypeParameterSymbol.Name, GenericParameter.TypeParameterSymbol.ContainingSymbol.GetDisplayName () }; diff --git a/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/MethodParameterValue.cs b/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/MethodParameterValue.cs index 051fa54302369f..4e9ebe5aa6a2d2 100644 --- a/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/MethodParameterValue.cs +++ b/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/MethodParameterValue.cs @@ -17,12 +17,11 @@ public MethodParameterValue (IMethodSymbol methodSymbol, ParameterIndex paramete public MethodParameterValue (ParameterProxy parameter) : this (parameter, FlowAnnotations.GetMethodParameterAnnotation (parameter)) { } - public MethodParameterValue (ParameterProxy parameter, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes, bool overrideIsThis = false) + public MethodParameterValue (ParameterProxy parameter, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) { Parameter = parameter; DynamicallyAccessedMemberTypes = dynamicallyAccessedMemberTypes; StaticType = parameter.ParameterType; - _overrideIsThis = overrideIsThis; } public override DynamicallyAccessedMemberTypes DynamicallyAccessedMemberTypes { get; } diff --git a/src/tools/illink/src/ILLink.Shared/TrimAnalysis/FlowAnnotations.cs b/src/tools/illink/src/ILLink.Shared/TrimAnalysis/FlowAnnotations.cs index 4ef9a9ce61a41f..2a9b4fdd6904c3 100644 --- a/src/tools/illink/src/ILLink.Shared/TrimAnalysis/FlowAnnotations.cs +++ b/src/tools/illink/src/ILLink.Shared/TrimAnalysis/FlowAnnotations.cs @@ -25,6 +25,8 @@ partial class FlowAnnotations internal partial GenericParameterValue GetGenericParameterValue (GenericParameterProxy genericParameter); + internal partial GenericParameterValue GetGenericParameterValue (GenericParameterProxy genericParameter, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes); + internal partial MethodParameterValue GetMethodThisParameterValue (MethodProxy method, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes); internal partial MethodParameterValue GetMethodThisParameterValue (MethodProxy method); diff --git a/src/tools/illink/src/ILLink.Shared/TrimAnalysis/HandleCallAction.cs b/src/tools/illink/src/ILLink.Shared/TrimAnalysis/HandleCallAction.cs index 31d01fa7d4a288..902103f4af9444 100644 --- a/src/tools/illink/src/ILLink.Shared/TrimAnalysis/HandleCallAction.cs +++ b/src/tools/illink/src/ILLink.Shared/TrimAnalysis/HandleCallAction.cs @@ -909,7 +909,7 @@ ValueWithDynamicallyAccessedMembers valueWithDynamicallyAccessedMembers } else { // Any other type - perform generic parameter validation var genericParameterValues = GetGenericParameterValues (typeValue.RepresentedType.GetGenericParameters ()); - if (!AnalyzeGenericInstantiationTypeArray (argumentValues[0], calledMethod, genericParameterValues)) { + if (!AnalyzeGenericInstantiationTypeArray (argumentValues[0], genericParameterValues)) { _diagnosticContext.AddDiagnostic (DiagnosticId.MakeGenericType, calledMethod.GetDisplayName ()); } } @@ -1242,7 +1242,7 @@ private IEnumerable ProcessGetMethodByName (TypeProxy type, string m yield return NullValue.Instance; } - private bool AnalyzeGenericInstantiationTypeArray (in MultiValue arrayParam, in MethodProxy calledMethod, ImmutableArray genericParameters) + private bool AnalyzeGenericInstantiationTypeArray (in MultiValue arrayParam, ImmutableArray genericParameters) { bool hasRequirements = false; foreach (var genericParameter in genericParameters) { @@ -1280,10 +1280,7 @@ private bool AnalyzeGenericInstantiationTypeArray (in MultiValue arrayParam, in for (int i = 0; i < size.Value; i++) { if (array.TryGetValueByIndex (i, out MultiValue value)) { - // https://github.com/dotnet/linker/issues/2428 - // We need to report the target as "this" - as that was the previous behavior - // but with the annotation from the generic parameter. - var targetValue = _annotations.GetMethodThisParameterValue (calledMethod, GetGenericParameterEffectiveMemberTypes (genericParameters[i]), overrideIsThis: true); + var targetValue = _annotations.GetGenericParameterValue (genericParameters[i].GenericParameter, GetGenericParameterEffectiveMemberTypes (genericParameters[i])); _requireDynamicallyAccessedMembersAction.Invoke (value, targetValue); } } @@ -1315,7 +1312,7 @@ private void ValidateGenericMethodInstantiation ( } var genericParameterValues = GetGenericParameterValues (genericMethod.GetGenericParameters ()); - if (!AnalyzeGenericInstantiationTypeArray (genericParametersArray, reflectionMethod, genericParameterValues)) { + if (!AnalyzeGenericInstantiationTypeArray (genericParametersArray, genericParameterValues)) { _diagnosticContext.AddDiagnostic (DiagnosticId.MakeGenericMethod, reflectionMethod.GetDisplayName ()); } } diff --git a/src/tools/illink/src/ILLink.Shared/TrimAnalysis/MethodParameterValue.cs b/src/tools/illink/src/ILLink.Shared/TrimAnalysis/MethodParameterValue.cs index acc42b376f74b6..8528bfc7b1022f 100644 --- a/src/tools/illink/src/ILLink.Shared/TrimAnalysis/MethodParameterValue.cs +++ b/src/tools/illink/src/ILLink.Shared/TrimAnalysis/MethodParameterValue.cs @@ -13,9 +13,6 @@ namespace ILLink.Shared.TrimAnalysis { internal sealed partial record MethodParameterValue : ValueWithDynamicallyAccessedMembers, IValueWithStaticType { - // _overrideIsThis is needed for backwards compatibility with MakeGenericType/Method https://github.com/dotnet/linker/issues/2428 - private readonly bool _overrideIsThis; - public TypeProxy? StaticType { get; } public ParameterProxy Parameter { get; } @@ -26,7 +23,7 @@ public override IEnumerable GetDiagnosticArgumentsForAnnotationMismatch public override string ToString () => this.ValueToString (Parameter.Method.Method, Parameter.Index, DynamicallyAccessedMemberTypes); - public bool IsThisParameter () => _overrideIsThis || Parameter.IsImplicitThis; + public bool IsThisParameter () => Parameter.IsImplicitThis; public override SingleValue DeepCopy () => this; // This value is immutable diff --git a/src/tools/illink/src/linker/Linker.Dataflow/FlowAnnotations.cs b/src/tools/illink/src/linker/Linker.Dataflow/FlowAnnotations.cs index 14617b0de9ca16..c74ede7ae6e8b7 100644 --- a/src/tools/illink/src/linker/Linker.Dataflow/FlowAnnotations.cs +++ b/src/tools/illink/src/linker/Linker.Dataflow/FlowAnnotations.cs @@ -693,6 +693,11 @@ internal partial MethodReturnValue GetMethodReturnValue (MethodProxy method, boo internal partial MethodReturnValue GetMethodReturnValue (MethodProxy method, bool isNewObj) => GetMethodReturnValue (method, isNewObj, GetReturnParameterAnnotation (method.Method)); +#pragma warning disable CA1822 // Mark members as static - Should be an instance method for consistency + internal partial GenericParameterValue GetGenericParameterValue (GenericParameterProxy genericParameter, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) + => new GenericParameterValue (genericParameter.GenericParameter, dynamicallyAccessedMemberTypes); +#pragma warning restore CA1822 // Mark members as static + internal partial GenericParameterValue GetGenericParameterValue (GenericParameterProxy genericParameter) => new GenericParameterValue (genericParameter.GenericParameter, GetGenericParameterAnnotation (genericParameter.GenericParameter)); @@ -703,18 +708,14 @@ internal partial MethodParameterValue GetMethodParameterValue (ParameterProxy pa => GetMethodParameterValue (param, GetParameterAnnotation (param)); #pragma warning disable CA1822 // Mark members as static - Should be an instance method for consistency - // overrideIsThis is needed for backwards compatibility with MakeGenericType/Method https://github.com/dotnet/linker/issues/2428 - internal MethodParameterValue GetMethodThisParameterValue (MethodProxy method, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes, bool overrideIsThis = false) + internal partial MethodParameterValue GetMethodThisParameterValue (MethodProxy method, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) { - if (!method.HasImplicitThis () && !overrideIsThis) + if (!method.HasImplicitThis ()) throw new InvalidOperationException ($"Cannot get 'this' parameter of method {method.GetDisplayName ()} with no 'this' parameter."); - return new MethodParameterValue (method.Method.DeclaringType, new ParameterProxy (method, (ParameterIndex) 0), dynamicallyAccessedMemberTypes, overrideIsThis); + return new MethodParameterValue (method.Method.DeclaringType, new ParameterProxy (method, (ParameterIndex) 0), dynamicallyAccessedMemberTypes); } #pragma warning restore CA1822 // Mark members as static - internal partial MethodParameterValue GetMethodThisParameterValue (MethodProxy method, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) - => GetMethodThisParameterValue (method, dynamicallyAccessedMemberTypes, false); - internal partial MethodParameterValue GetMethodThisParameterValue (MethodProxy method) { if (!method.HasImplicitThis ()) diff --git a/src/tools/illink/src/linker/Linker.Dataflow/MethodParameterValue.cs b/src/tools/illink/src/linker/Linker.Dataflow/MethodParameterValue.cs index 5bc43b2a153ca0..0c9599aaf3c7e0 100644 --- a/src/tools/illink/src/linker/Linker.Dataflow/MethodParameterValue.cs +++ b/src/tools/illink/src/linker/Linker.Dataflow/MethodParameterValue.cs @@ -15,12 +15,11 @@ namespace ILLink.Shared.TrimAnalysis /// internal partial record MethodParameterValue { - public MethodParameterValue (TypeDefinition? staticType, ParameterProxy param, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes, bool overrideIsThis = false) + public MethodParameterValue (TypeDefinition? staticType, ParameterProxy param, DynamicallyAccessedMemberTypes dynamicallyAccessedMemberTypes) { StaticType = staticType == null ? null : new (staticType); DynamicallyAccessedMemberTypes = dynamicallyAccessedMemberTypes; Parameter = param; - _overrideIsThis = overrideIsThis; } public override DynamicallyAccessedMemberTypes DynamicallyAccessedMemberTypes { get; } diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/AnnotatedMembersAccessedViaReflection.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/AnnotatedMembersAccessedViaReflection.cs index bb37b1c9b31da5..2e943bea1fc9ce 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/AnnotatedMembersAccessedViaReflection.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/AnnotatedMembersAccessedViaReflection.cs @@ -739,8 +739,7 @@ static void DynamicallyAccessedMembers () typeof (AnnotatedGenerics).RequiresPublicMethods (); } - // This should produce IL2071 https://github.com/dotnet/linker/issues/2144 - [ExpectedWarning ("IL2070", "MakeGenericMethod")] + [ExpectedWarning ("IL2071", "'T'")] static void InstantiateGeneric (Type type = null) { // This should warn due to MakeGenericMethod - in this case the generic parameter is unannotated type diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/ExponentialDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/ExponentialDataFlow.cs index ae3ffecd1aea93..dcd3ab55297158 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/ExponentialDataFlow.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/ExponentialDataFlow.cs @@ -59,7 +59,7 @@ class GenericTypeWithRequires<[DynamicallyAccessedMembers (DynamicallyAccessedMe } [ExpectedWarning ("IL3050", Tool.Analyzer, "")] - [ExpectedWarning ("IL2090", "'T'")] + [ExpectedWarning ("IL2091", "'T'")] public static void Test () { Type[] types = new Type[1] { typeof (int) }; @@ -100,26 +100,26 @@ class GenericTypeWithRequires< // When this happens, we replace the ValueSet with an unknown value, producing // this warning. [ExpectedWarning ("IL2055", Tool.Analyzer, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] - [ExpectedWarning ("IL2090", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] + [ExpectedWarning ("IL2091", "'T'", Tool.Trimmer | Tool.NativeAot, "")] public static void Test () { Type[] types = new Type[20] { diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MakeGenericDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MakeGenericDataFlow.cs index 34ae3994f667c7..94713ad5af7e46 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MakeGenericDataFlow.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MakeGenericDataFlow.cs @@ -125,8 +125,7 @@ static void TestWithRequirementsFromParam ( typeof (GenericWithPublicFieldsArgument<>).MakeGenericType (type); } - [ExpectedWarning ("IL2071", "'T'", Tool.None, "https://github.com/dotnet/linker/issues/2428")] - [ExpectedWarning ("IL2070", "'this'")] + [ExpectedWarning ("IL2071", "'T'")] static void TestWithRequirementsFromParamWithMismatch ( [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type type) { @@ -139,8 +138,7 @@ static void TestWithRequirementsFromGenericParam< typeof (GenericWithPublicFieldsArgument<>).MakeGenericType (typeof (T)); } - [ExpectedWarning ("IL2091", "'T'", Tool.None,"https://github.com/dotnet/linker/issues/2428")] - [ExpectedWarning ("IL2090", "'this'")] // Note that this actually produces a warning which should not be possible to produce right now + [ExpectedWarning ("IL2091", "'T'")] static void TestWithRequirementsFromGenericParamWithMismatch< [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] TInput> () { @@ -191,7 +189,7 @@ static void SpecificType () typeof (GenericWithNewConstraint<>).MakeGenericType (typeof (TestType)); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void UnknownType (Type unknownType = null) { typeof (GenericWithNewConstraint<>).MakeGenericType (unknownType); @@ -202,7 +200,7 @@ static void AnnotationMatch ([DynamicallyAccessedMembers (DynamicallyAccessedMem typeof (GenericWithNewConstraint<>).MakeGenericType (withCtor); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void AnnotationMismatch ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type withPublicMethods = null) { typeof (GenericWithNewConstraint<>).MakeGenericType (withPublicMethods); @@ -213,7 +211,7 @@ static void AnnotationAndConstraintMatch ([DynamicallyAccessedMembers (Dynamical typeof (GenericWithNewConstraintAndAnnotations<>).MakeGenericType (withMethodsAndCtors); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void AnnotationAndConstraintMismatch ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type withMethods = null) { typeof (GenericWithNewConstraintAndAnnotations<>).MakeGenericType (withMethods); @@ -246,7 +244,7 @@ static void AnnotationMatch ([DynamicallyAccessedMembers (DynamicallyAccessedMem typeof (GenericWithStructConstraint<>).MakeGenericType (withCtor); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void AnnotationMismatch ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type withPublicMethods = null) { typeof (GenericWithStructConstraint<>).MakeGenericType (withPublicMethods); @@ -276,7 +274,7 @@ static void AnnotationMatch ([DynamicallyAccessedMembers (DynamicallyAccessedMem typeof (GenericWithUnmanagedConstraint<>).MakeGenericType (withCtor); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void AnnotationMismatch ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type withPublicMethods = null) { typeof (GenericWithUnmanagedConstraint<>).MakeGenericType (withPublicMethods); @@ -753,7 +751,7 @@ static MethodInfo KnownType () => typeof (IFoo).GetMethod ("Method") .MakeGenericMethod (new Type[] { typeof (int) }); - [ExpectedWarning ("IL2090", "T", "PublicMethods")] + [ExpectedWarning ("IL2091", "T", "PublicMethods")] static MethodInfo UnannotatedGenericParam () => typeof (IFoo).GetMethod ("Method") .MakeGenericMethod (new Type[] { typeof (T) }); @@ -787,7 +785,7 @@ static void SpecificType () .MakeGenericMethod (typeof (TestType)); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void UnknownType (Type unknownType = null) { typeof (NewConstraint).GetMethod (nameof (GenericWithNewConstraint), BindingFlags.Static | BindingFlags.NonPublic) @@ -800,7 +798,7 @@ static void AnnotationMatch ([DynamicallyAccessedMembers (DynamicallyAccessedMem .MakeGenericMethod (withCtor); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void AnnotationMismatch ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type withPublicMethods = null) { typeof (NewConstraint).GetMethod (nameof (GenericWithNewConstraint), BindingFlags.Static | BindingFlags.NonPublic) @@ -813,7 +811,7 @@ static void AnnotationAndConstraintMatch ([DynamicallyAccessedMembers (Dynamical .MakeGenericMethod (withMethodsAndCtors); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void AnnotationAndConstraintMismatch ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type withMethods = null) { typeof (NewConstraint).GetMethod (nameof (GenericWithNewConstraintAndAnnotations), BindingFlags.Static | BindingFlags.NonPublic) @@ -850,7 +848,7 @@ static void AnnotationMatch ([DynamicallyAccessedMembers (DynamicallyAccessedMem .MakeGenericMethod (withCtor); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void AnnotationMismatch ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type withPublicMethods = null) { typeof (StructConstraint).GetMethod (nameof (GenericWithStructConstraint), BindingFlags.Static | BindingFlags.NonPublic) @@ -884,7 +882,7 @@ static void AnnotationMatch ([DynamicallyAccessedMembers (DynamicallyAccessedMem .MakeGenericMethod (withCtor); } - [ExpectedWarning ("IL2070")] + [ExpectedWarning ("IL2071")] static void AnnotationMismatch ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type withPublicMethods = null) { typeof (UnmanagedConstraint).GetMethod (nameof (GenericWithUnmanagedConstraint), BindingFlags.Static | BindingFlags.NonPublic) @@ -906,7 +904,7 @@ static void TestGetMethodFromHandle (Type unknownType = null) m.MakeGenericMethod (unknownType); } - [ExpectedWarning ("IL2070", nameof (MethodInfo.MakeGenericMethod))] + [ExpectedWarning ("IL2071", nameof (MethodInfo.MakeGenericMethod))] static void TestGetMethodFromHandleWithWarning ([DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] Type publicMethodsType = null) { MethodInfo m = (MethodInfo) MethodInfo.GetMethodFromHandle (typeof (MakeGenericMethod).GetMethod (nameof (GenericWithRequirements)).MethodHandle); From f76b387c6b7b715e0b4e38ac5e8af3b0d8229494 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 24 Jul 2024 16:41:28 -0400 Subject: [PATCH 24/27] Set GCStressIncompatible on GenericContext tests (#104686) Co-authored-by: Vladimir Sadov --- .../StaticVirtualMethods/GenericContext/Generator/Program.cs | 5 +++++ .../GenericContext/GenericContextTest/GenericContextTest.il | 5 +++++ .../GenericContextTestDICallDI/GenericContextTestDICallDI.il | 5 +++++ .../GenericContextTestDefaultImp.il | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/Program.cs b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/Program.cs index 88d718a3432b4e..2e99997b9f4715 100644 --- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/Program.cs +++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/Generator/Program.cs @@ -801,6 +801,11 @@ void EmitConstrainedPrefix() twOutputTest.WriteLine(" .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ("); twOutputTest.WriteLine(" 01 00 00 00"); twOutputTest.WriteLine(" )"); + twOutputTest.WriteLine(" // [SkipOnCoreClr(\"GC Stress Incompatible\", RuntimeTestModes.AnyGCStress)]"); + twOutputTest.WriteLine(" .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.SkipOnCoreClrAttribute::.ctor(string, valuetype [Microsoft.DotNet.XUnitExtensions]Xunit.RuntimeTestModes) = ("); + twOutputTest.WriteLine(" 01 00 16 47 43 20 53 74 72 65 73 73 20 49 6e 63"); + twOutputTest.WriteLine(" 6f 6d 70 61 74 69 62 6c 65 c0 00 00 00 00 00"); + twOutputTest.WriteLine(" )"); twOutputTest.WriteLine(" .entrypoint"); twOutputTest.WriteLine(" .locals init (class [System.Runtime]System.Exception V_0)"); twOutputTest.Write(swMainMethodBody.ToString()); diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/GenericContextTest.il b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/GenericContextTest.il index 4deeb6fd9a0985..ec33ac4344a03f 100644 --- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/GenericContextTest.il +++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/GenericContextTest.il @@ -19969,6 +19969,11 @@ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) + // [SkipOnCoreClr("GC Stress Incompatible", RuntimeTestModes.AnyGCStress)] + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.SkipOnCoreClrAttribute::.ctor(string, valuetype [Microsoft.DotNet.XUnitExtensions]Xunit.RuntimeTestModes) = ( + 01 00 16 47 43 20 53 74 72 65 73 73 20 49 6e 63 + 6f 6d 70 61 74 69 62 6c 65 c0 00 00 00 00 00 + ) .entrypoint .locals init (class [System.Runtime]System.Exception V_0) .try { diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextTestDICallDI.il b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextTestDICallDI.il index f96ebcdf8106be..08b8e2413575af 100644 --- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextTestDICallDI.il +++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDICallDI/GenericContextTestDICallDI.il @@ -19969,6 +19969,11 @@ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) + // [SkipOnCoreClr("GC Stress Incompatible", RuntimeTestModes.AnyGCStress)] + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.SkipOnCoreClrAttribute::.ctor(string, valuetype [Microsoft.DotNet.XUnitExtensions]Xunit.RuntimeTestModes) = ( + 01 00 16 47 43 20 53 74 72 65 73 73 20 49 6e 63 + 6f 6d 70 61 74 69 62 6c 65 c0 00 00 00 00 00 + ) .entrypoint .locals init (class [System.Runtime]System.Exception V_0) .try { diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImp/GenericContextTestDefaultImp.il b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImp/GenericContextTestDefaultImp.il index 302a79d8e980dc..a2e04bb18d958a 100644 --- a/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImp/GenericContextTestDefaultImp.il +++ b/src/tests/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImp/GenericContextTestDefaultImp.il @@ -19969,6 +19969,11 @@ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = ( 01 00 00 00 ) + // [SkipOnCoreClr("GC Stress Incompatible", RuntimeTestModes.AnyGCStress)] + .custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.SkipOnCoreClrAttribute::.ctor(string, valuetype [Microsoft.DotNet.XUnitExtensions]Xunit.RuntimeTestModes) = ( + 01 00 16 47 43 20 53 74 72 65 73 73 20 49 6e 63 + 6f 6d 70 61 74 69 62 6c 65 c0 00 00 00 00 00 + ) .entrypoint .locals init (class [System.Runtime]System.Exception V_0) .try { From 676189ad5e60ce6ed3337120f29470bff38bad8d Mon Sep 17 00:00:00 2001 From: Mike Oliphant Date: Wed, 24 Jul 2024 13:44:18 -0700 Subject: [PATCH 25/27] Add runtime config parameter to force ijwhost to load assemblies in an isolated context (#105337) * Add support for isolated load context in LoadInMemoryAssemblyInContext by passing -1 as loadContext * Have ijwhost check a runtime config parameter to determine if it should run in an isolated load context * Added test for ijwhost isolated load context runtime config option --- .../InteropServices/InMemoryAssemblyLoader.cs | 9 +++-- .../NativeHosting/Ijwhost.cs | 37 +++++++++++++++++++ src/native/corehost/ijwhost/ijwhost.cpp | 14 ++++++- src/native/corehost/ijwhost/ijwhost.h | 4 +- src/native/corehost/ijwhost/ijwthunk.cpp | 6 ++- 5 files changed, 62 insertions(+), 8 deletions(-) diff --git a/src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/InMemoryAssemblyLoader.cs b/src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/InMemoryAssemblyLoader.cs index dc8d8ccb4c7cca..55e42274817245 100644 --- a/src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/InMemoryAssemblyLoader.cs +++ b/src/coreclr/System.Private.CoreLib/src/Internal/Runtime/InteropServices/InMemoryAssemblyLoader.cs @@ -49,7 +49,7 @@ private static unsafe void LoadInMemoryAssemblyInContextWhenSupported(IntPtr mod /// /// The native module handle for the assembly. /// The path to the assembly (as a pointer to a UTF-16 C string). - /// Load context (currently must be IntPtr.Zero) + /// Load context (currently must be either IntPtr.Zero for default ALC or -1 for isolated ALC) [UnmanagedCallersOnly] [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "The same C++/CLI feature switch applies to LoadInMemoryAssembly and this function. We rely on the warning from LoadInMemoryAssembly.")] @@ -58,9 +58,12 @@ public static unsafe void LoadInMemoryAssemblyInContext(IntPtr moduleHandle, Int if (!IsSupported) throw new NotSupportedException(SR.NotSupported_CppCli); - ArgumentOutOfRangeException.ThrowIfNotEqual(loadContext, IntPtr.Zero); + if ((loadContext != IntPtr.Zero) && (loadContext != -1)) + { + throw new ArgumentOutOfRangeException(nameof(loadContext)); + } - LoadInMemoryAssemblyInContextImpl(moduleHandle, assemblyPath, AssemblyLoadContext.Default); + LoadInMemoryAssemblyInContextImpl(moduleHandle, assemblyPath, (loadContext == IntPtr.Zero) ? AssemblyLoadContext.Default : null); } [RequiresUnreferencedCode("C++/CLI is not trim-compatible", Url = "https://aka.ms/dotnet-illink/nativehost")] diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/Ijwhost.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/Ijwhost.cs index 44d04bafb7777a..fa00b0419a85ef 100644 --- a/src/installer/tests/HostActivation.Tests/NativeHosting/Ijwhost.cs +++ b/src/installer/tests/HostActivation.Tests/NativeHosting/Ijwhost.cs @@ -31,6 +31,7 @@ public void LoadLibrary(bool no_runtimeconfig) app.AppDll, "NativeEntryPoint" }; + if (no_runtimeconfig) { File.Delete(app.RuntimeConfigJson); @@ -53,6 +54,42 @@ public void LoadLibrary(bool no_runtimeconfig) } } + [Theory] + [InlineData(true)] + [InlineData(false)] + public void LoadLibrary_ContextConfig(bool load_isolated) + { + // make a copy of a portion of the shared state because we will modify it + using (var app = sharedState.IjwApp.Copy()) + { + string[] args = { + "ijwhost", + app.AppDll, + "NativeEntryPoint" + }; + + RuntimeConfig.FromFile(app.RuntimeConfigJson) + .WithProperty("System.Runtime.InteropServices.CppCLI.LoadComponentInIsolatedContext", load_isolated.ToString()) + .Save(); + + CommandResult result = sharedState.CreateNativeHostCommand(args, TestContext.BuiltDotNet.BinPath) + .Execute(); + + result.Should().Pass() + .And.HaveStdOutContaining("[C++/CLI] NativeEntryPoint: calling managed class"); + + if (load_isolated) // Assembly should be loaded in an isolated context + { + result.Should().HaveStdOutContaining("[C++/CLI] ManagedClass: AssemblyLoadContext = \"IsolatedComponentLoadContext"); + } + else // Assembly should be loaded in the default context + { + result.Should().HaveStdOutContaining("[C++/CLI] ManagedClass: AssemblyLoadContext = \"Default\" System.Runtime.Loader.DefaultAssemblyLoadContext"); + } + } + } + + [Fact] public void LoadLibraryWithoutRuntimeConfigButActiveRuntime() { diff --git a/src/native/corehost/ijwhost/ijwhost.cpp b/src/native/corehost/ijwhost/ijwhost.cpp index 4d9925366e6b97..e64e01a56580f8 100644 --- a/src/native/corehost/ijwhost/ijwhost.cpp +++ b/src/native/corehost/ijwhost/ijwhost.cpp @@ -20,7 +20,7 @@ #define IJW_API SHARED_API #endif // _WIN32 -pal::hresult_t get_load_in_memory_assembly_delegate(pal::dll_t handle, load_in_memory_assembly_fn* delegate) +pal::hresult_t get_load_in_memory_assembly_delegate(pal::dll_t handle, load_in_memory_assembly_fn* delegate, void **load_context) { get_function_pointer_fn get_function_pointer; int status = load_fxr_and_get_delegate( @@ -40,7 +40,17 @@ pal::hresult_t get_load_in_memory_assembly_delegate(pal::dll_t handle, load_in_m return StatusCode::Success; }, - [](pal::dll_t fxr, hostfxr_handle context){ }, + [load_context](pal::dll_t fxr, hostfxr_handle context) + { + *load_context = nullptr; // default load context + auto get_runtime_property_value = reinterpret_cast(pal::get_symbol(fxr, "hostfxr_get_runtime_property_value")); + const pal::char_t* value; + if (get_runtime_property_value(context, _X("System.Runtime.InteropServices.CppCLI.LoadComponentInIsolatedContext"), &value) == StatusCode::Success + && pal::strcasecmp(value, _X("true")) == 0) + { + *load_context = ISOLATED_CONTEXT; // Isolated load context + } + }, reinterpret_cast(&get_function_pointer), true // ignore missing config file if there's an active context ); diff --git a/src/native/corehost/ijwhost/ijwhost.h b/src/native/corehost/ijwhost/ijwhost.h index c3698a4d4acb65..adfd52f71a99c9 100644 --- a/src/native/corehost/ijwhost/ijwhost.h +++ b/src/native/corehost/ijwhost/ijwhost.h @@ -15,8 +15,10 @@ bool are_thunks_installed_for_module(HMODULE instance); using load_in_memory_assembly_fn = void(STDMETHODCALLTYPE*)(pal::dll_t handle, const pal::char_t* path, void* load_context); -pal::hresult_t get_load_in_memory_assembly_delegate(pal::dll_t handle, load_in_memory_assembly_fn* delegate); +pal::hresult_t get_load_in_memory_assembly_delegate(pal::dll_t handle, load_in_memory_assembly_fn* delegate, void **load_context); extern HANDLE g_heapHandle; +#define ISOLATED_CONTEXT (void*)-1 + #endif diff --git a/src/native/corehost/ijwhost/ijwthunk.cpp b/src/native/corehost/ijwhost/ijwthunk.cpp index eeddf10fd931c1..2c24f4d6f92078 100644 --- a/src/native/corehost/ijwhost/ijwthunk.cpp +++ b/src/native/corehost/ijwhost/ijwthunk.cpp @@ -119,7 +119,9 @@ extern "C" std::uintptr_t __stdcall start_runtime_and_get_target_address(std::ui bootstrap_thunk *pThunk = bootstrap_thunk::get_thunk_from_cookie(cookie); load_in_memory_assembly_fn loadInMemoryAssembly; pal::dll_t moduleHandle = pThunk->get_dll_handle(); - pal::hresult_t status = get_load_in_memory_assembly_delegate(moduleHandle, &loadInMemoryAssembly); + + void* load_context = nullptr; + pal::hresult_t status = get_load_in_memory_assembly_delegate(moduleHandle, &loadInMemoryAssembly, &load_context); if (status != StatusCode::Success) { @@ -145,7 +147,7 @@ extern "C" std::uintptr_t __stdcall start_runtime_and_get_target_address(std::ui #pragma warning (pop) } - loadInMemoryAssembly(moduleHandle, app_path.c_str(), nullptr); + loadInMemoryAssembly(moduleHandle, app_path.c_str(), load_context); std::uintptr_t thunkAddress = *(pThunk->get_slot_address()); From d3eeb0ea697fe9f3e6ff362cd944fe3883a451f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Sowi=C5=84ski?= Date: Wed, 24 Jul 2024 23:18:09 +0200 Subject: [PATCH 26/27] [RISC-V] Fix passing float and uint arguments in VM (#105021) * Add tests * Fix passing float and uint arguments in VM * Change test lib name so it doesn't clash with managed DLL on Windows --- src/coreclr/vm/argdestination.h | 20 ++ src/coreclr/vm/callhelpers.cpp | 5 + src/coreclr/vm/invokeutil.cpp | 13 +- .../JIT/Directed/PrimitiveABI/CMakeLists.txt | 12 ++ .../JIT/Directed/PrimitiveABI/PrimitiveABI.c | 41 ++++ .../JIT/Directed/PrimitiveABI/PrimitiveABI.cs | 182 ++++++++++++++++++ .../Directed/PrimitiveABI/PrimitiveABI.csproj | 16 ++ 7 files changed, 281 insertions(+), 8 deletions(-) create mode 100644 src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt create mode 100644 src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.c create mode 100644 src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.cs create mode 100644 src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.csproj diff --git a/src/coreclr/vm/argdestination.h b/src/coreclr/vm/argdestination.h index 57df0326648167..15f3e120ca1d30 100644 --- a/src/coreclr/vm/argdestination.h +++ b/src/coreclr/vm/argdestination.h @@ -173,6 +173,26 @@ class ArgDestination _ASSERTE(!"---------UNReachable-------LoongArch64/RISC-V64!!!"); } } + +#ifdef TARGET_RISCV64 + void CopySingleFloatToRegister(void* src) + { + void* dest = GetDestinationAddress(); + UINT32 value = *(UINT32*)src; + if (TransitionBlock::IsFloatArgumentRegisterOffset(m_offset)) + { + // NaN-box the floating register value or single-float instructions will treat it as NaN + *(UINT64*)dest = 0xffffffff00000000L | value; + } + else + { + // When a single float is passed according to integer calling convention + // (in integer register or on stack), the upper bits are not specified. + *(UINT32*)dest = value; + } + } +#endif // TARGET_RISCV64 + #endif // !DACCESS_COMPILE PTR_VOID GetStructGenRegDestinationAddress() diff --git a/src/coreclr/vm/callhelpers.cpp b/src/coreclr/vm/callhelpers.cpp index 3125c21ea3d13d..25388ed1640465 100644 --- a/src/coreclr/vm/callhelpers.cpp +++ b/src/coreclr/vm/callhelpers.cpp @@ -474,10 +474,15 @@ void MethodDescCallSite::CallTargetWorker(const ARG_SLOT *pArguments, ARG_SLOT * *((INT64*)pDest) = (INT16)pArguments[arg]; break; case 4: +#ifdef TARGET_RISCV64 + // RISC-V integer calling convention requires to sign-extend `uint` arguments as well + *((INT64*)pDest) = (INT32)pArguments[arg]; +#else // TARGET_LOONGARCH64 if (m_argIt.GetArgType() == ELEMENT_TYPE_U4) *((INT64*)pDest) = (UINT32)pArguments[arg]; else *((INT64*)pDest) = (INT32)pArguments[arg]; +#endif // TARGET_RISCV64 break; #else case 1: diff --git a/src/coreclr/vm/invokeutil.cpp b/src/coreclr/vm/invokeutil.cpp index cfec2c5259a5f1..44f51dae7c7cf3 100644 --- a/src/coreclr/vm/invokeutil.cpp +++ b/src/coreclr/vm/invokeutil.cpp @@ -139,7 +139,9 @@ void InvokeUtil::CopyArg(TypeHandle th, PVOID argRef, ArgDestination *argDest) { switch (type) { #ifdef TARGET_RISCV64 - // RISC-V call convention requires signed ints sign-extended (unsigned -- zero-extended) to register width + // RISC-V call convention requires integer scalars narrower than XLEN bits to be widened according to the sign + // of their type up to 32 bits, then sign-extended to XLEN bits. In practice it means type-extending all ints + // except `uint` which is sign-extended regardless. case ELEMENT_TYPE_BOOLEAN: case ELEMENT_TYPE_U1: _ASSERTE(argRef != NULL); @@ -164,18 +166,13 @@ void InvokeUtil::CopyArg(TypeHandle th, PVOID argRef, ArgDestination *argDest) { case ELEMENT_TYPE_R4: _ASSERTE(argRef != NULL); - // NaN-box the register value or single-float instructions will treat it as NaN - *(UINT64 *)pArgDst = 0xffffffff00000000L | *(UINT32 *)argRef; + argDest->CopySingleFloatToRegister(argRef); break; case ELEMENT_TYPE_I4: - _ASSERTE(argRef != NULL); - *(INT64 *)pArgDst = *(INT32 *)argRef; - break; - case ELEMENT_TYPE_U4: _ASSERTE(argRef != NULL); - *(UINT64 *)pArgDst = *(UINT32 *)argRef; + *(INT64 *)pArgDst = *(INT32 *)argRef; break; #else // !TARGET_RISCV64 diff --git a/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt b/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt new file mode 100644 index 00000000000000..20cb7991ed09ad --- /dev/null +++ b/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt @@ -0,0 +1,12 @@ +project (PrimitiveABINative) +include_directories(${INC_PLATFORM_DIR}) + +if(CLR_CMAKE_HOST_WIN32) + set_source_files_properties(PrimitiveABI.c PROPERTIES COMPILE_OPTIONS /TC) # compile as C +else() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -Oz") +endif() + +add_library (PrimitiveABINative SHARED PrimitiveABI.c) + +install (TARGETS PrimitiveABINative DESTINATION bin) diff --git a/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.c b/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.c new file mode 100644 index 00000000000000..0bfc2a3aa5f55c --- /dev/null +++ b/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.c @@ -0,0 +1,41 @@ +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#include +#include +#include + +#ifdef _MSC_VER +#define DLLEXPORT __declspec(dllexport) +#else +#define DLLEXPORT __attribute__((visibility("default"))) +#endif // _MSC_VER + +DLLEXPORT int64_t Echo_ExtendedUint_RiscV(int a0, uint32_t a1) +{ + return (int32_t)a1; +} + +DLLEXPORT int64_t Echo_ExtendedUint_OnStack_RiscV( + int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, uint32_t stack0) +{ + return (int32_t)stack0; +} + +DLLEXPORT double Echo_Float_RiscV(float fa0, float fa1) +{ + return fa1 + fa0; +} + +DLLEXPORT double Echo_Float_InIntegerReg_RiscV( + float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7, + float a0) +{ + return a0 + fa7; +} + +DLLEXPORT double Echo_Float_OnStack_RiscV( + float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7, + int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, float stack0) +{ + return stack0 + fa7; +} diff --git a/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.cs b/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.cs new file mode 100644 index 00000000000000..8bcc34996d7444 --- /dev/null +++ b/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.cs @@ -0,0 +1,182 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; +using Xunit; + +public static class Program +{ +#region ExtendedUint_RiscVTests + [DllImport("PrimitiveABINative")] + public static extern long Echo_ExtendedUint_RiscV(int a0, uint a1); + + [MethodImpl(MethodImplOptions.NoInlining)] + public static long Echo_ExtendedUint_RiscV_Managed(int a0, uint a1) => unchecked((int)a1); + + [Fact] + public static void Test_ExtendedUint_RiscV() + { + const uint arg = 0xB1ED0C1Eu; + const long ret = unchecked((int)arg); + long managed = Echo_ExtendedUint_RiscV_Managed(0, arg); + long native = Echo_ExtendedUint_RiscV(0, arg); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } + + [Fact] + public static void Test_ExtendedUint_ByReflection_RiscV() + { + const uint arg = 0xB1ED0C1Eu; + const long ret = unchecked((int)arg); + long managed = (long)typeof(Program).GetMethod("Echo_ExtendedUint_RiscV_Managed").Invoke( + null, new object[] {0, arg}); + long native = (long)typeof(Program).GetMethod("Echo_ExtendedUint_RiscV").Invoke( + null, new object[] {0, arg}); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } + + [DllImport("PrimitiveABINative")] + public static extern long Echo_ExtendedUint_OnStack_RiscV( + int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, uint stack0); + + [MethodImpl(MethodImplOptions.NoInlining)] + public static long Echo_ExtendedUint_OnStack_RiscV_Managed( + int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, uint stack0) => unchecked((int)stack0); + + [Fact] + public static void Test_ExtendedUint_OnStack_RiscV() + { + const uint arg = 0xB1ED0C1Eu; + const long ret = unchecked((int)arg); + long managed = Echo_ExtendedUint_OnStack_RiscV_Managed(0, 0, 0, 0, 0, 0, 0, 0, arg); + long native = Echo_ExtendedUint_OnStack_RiscV(0, 0, 0, 0, 0, 0, 0, 0, arg); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } + + [Fact] + public static void Test_ExtendedUint_OnStack_ByReflection_RiscV() + { + const uint arg = 0xB1ED0C1Eu; + const long ret = unchecked((int)arg); + long managed = (long)typeof(Program).GetMethod("Echo_ExtendedUint_OnStack_RiscV_Managed").Invoke( + null, new object[] {0, 0, 0, 0, 0, 0, 0, 0, arg}); + long native = (long)typeof(Program).GetMethod("Echo_ExtendedUint_OnStack_RiscV").Invoke( + null, new object[] {0, 0, 0, 0, 0, 0, 0, 0, arg}); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } +#endregion + +#region Float_RiscVTests + [DllImport("PrimitiveABINative")] + public static extern double Echo_Float_RiscV(float fa0, float fa1); + + [MethodImpl(MethodImplOptions.NoInlining)] + public static double Echo_Float_RiscV_Managed(float fa0, float fa1) => fa1; + + [Fact] + public static void Test_Float_RiscV() + { + const float arg = 3.14159f; + const double ret = 3.14159f; + double managed = Echo_Float_RiscV_Managed(0f, arg); + double native = Echo_Float_RiscV(0f, arg); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } + + [Fact] + public static void Test_Float_ByReflection_RiscV() + { + const float arg = 3.14159f; + const double ret = 3.14159f; + double managed = (double)typeof(Program).GetMethod("Echo_Float_RiscV_Managed").Invoke( + null, new object[] {0f, arg}); + double native = (double)typeof(Program).GetMethod("Echo_Float_RiscV").Invoke( + null, new object[] {0f, arg}); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } + + [DllImport("PrimitiveABINative")] + public static extern double Echo_Float_InIntegerReg_RiscV( + float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7, float a0); + + [MethodImpl(MethodImplOptions.NoInlining)] + public static double Echo_Float_InIntegerReg_RiscV_Managed( + float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7, float a0) => a0; + + [Fact] + public static void Test_Float_InIntegerReg_RiscV() + { + const float arg = 3.14159f; + const double ret = 3.14159f; + double managed = Echo_Float_InIntegerReg_RiscV_Managed(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, arg); + double native = Echo_Float_InIntegerReg_RiscV(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, arg); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } + + [Fact] + public static void Test_Float_InIntegerReg_ByReflection_RiscV() + { + const float arg = 3.14159f; + const double ret = 3.14159f; + double managed = (double)typeof(Program).GetMethod("Echo_Float_InIntegerReg_RiscV_Managed").Invoke( + null, new object[] {0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, arg}); + double native = (double)typeof(Program).GetMethod("Echo_Float_InIntegerReg_RiscV").Invoke( + null, new object[] {0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, arg}); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } + + [DllImport("PrimitiveABINative")] + public static extern double Echo_Float_OnStack_RiscV( + float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7, + int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, float stack0); + + [MethodImpl(MethodImplOptions.NoInlining)] + public static double Echo_Float_OnStack_RiscV_Managed( + float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7, + int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, float stack0) => stack0; + + [Fact] + public static void Test_Float_OnStack_RiscV() + { + const float arg = 3.14159f; + const double ret = 3.14159f; + double managed = Echo_Float_OnStack_RiscV_Managed(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0, 0, 0, 0, 0, 0, 0, 0, arg); + double native = Echo_Float_OnStack_RiscV(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0, 0, 0, 0, 0, 0, 0, 0, arg); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } + + [Fact] + public static void Test_Float_OnStack_ByReflection_RiscV() + { + const float arg = 3.14159f; + const double ret = 3.14159f; + double managed = (double)typeof(Program).GetMethod("Echo_Float_OnStack_RiscV_Managed").Invoke( + null, new object[] {0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0, 0, 0, 0, 0, 0, 0, 0, arg}); + double native = (double)typeof(Program).GetMethod("Echo_Float_OnStack_RiscV").Invoke( + null, new object[] {0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0, 0, 0, 0, 0, 0, 0, 0, arg}); + + Assert.Equal(ret, managed); + Assert.Equal(ret, native); + } +#endregion +} \ No newline at end of file diff --git a/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.csproj b/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.csproj new file mode 100644 index 00000000000000..a38b585f8185ee --- /dev/null +++ b/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.csproj @@ -0,0 +1,16 @@ + + + + true + + + PdbOnly + True + + + + + + + + From 5aa49453665fd8a7d8a9904cb81b463da648dba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 25 Jul 2024 02:31:13 +0200 Subject: [PATCH 27/27] Fix platform analyzer attribute order for MacCatalyst (#105409) We need to make sure the attribute for MacCatalyst comes _after_ the iOS one due to how MacCatalyst is a superset of iOS: https://learn.microsoft.com/en-us/dotnet/standard/analyzers/platform-compat-analyzer#platform-inclusion This caused an error in aspnetcore in the latest dependency flow because the analyzer thought AesGcm is _only_ supported on MacCatalyst: > error CA1416: (NETCORE_ENGINEERING_TELEMETRY=Build) This call site is reachable on all platforms. 'AesGcm.Decrypt(ReadOnlySpan, ReadOnlySpan, ReadOnlySpan, Span, ReadOnlySpan)' is only supported on: 'maccatalyst' 13.0 and later. --- .../Interop.Aead.cs | 8 ++++---- .../src/System/Diagnostics/Metrics/RuntimeMetrics.cs | 2 +- .../src/System/Environment.UnixOrBrowser.cs | 2 +- .../src/System/Environment.Windows.cs | 2 +- .../ref/System.Security.Cryptography.cs | 4 ++-- .../src/System/Security/Cryptography/AesGcm.cs | 2 +- .../src/System/Security/Cryptography/ChaCha20Poly1305.cs | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Aead.cs b/src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Aead.cs index 2216415d618731..29d8877142c5ef 100644 --- a/src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Aead.cs +++ b/src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Aead.cs @@ -30,9 +30,9 @@ private static ref readonly byte GetSwiftRef(ReadOnlySpan b) [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] - [SupportedOSPlatform("maccatalyst")] [SupportedOSPlatform("ios13.0")] [SupportedOSPlatform("tvos13.0")] + [SupportedOSPlatform("maccatalyst")] internal static unsafe void ChaCha20Poly1305Encrypt( ReadOnlySpan key, ReadOnlySpan nonce, @@ -68,9 +68,9 @@ internal static unsafe void ChaCha20Poly1305Encrypt( [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] - [SupportedOSPlatform("maccatalyst")] [SupportedOSPlatform("ios13.0")] [SupportedOSPlatform("tvos13.0")] + [SupportedOSPlatform("maccatalyst")] internal static unsafe void ChaCha20Poly1305Decrypt( ReadOnlySpan key, ReadOnlySpan nonce, @@ -113,9 +113,9 @@ internal static unsafe void ChaCha20Poly1305Decrypt( [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] - [SupportedOSPlatform("maccatalyst")] [SupportedOSPlatform("ios13.0")] [SupportedOSPlatform("tvos13.0")] + [SupportedOSPlatform("maccatalyst")] internal static unsafe void AesGcmEncrypt( ReadOnlySpan key, ReadOnlySpan nonce, @@ -151,9 +151,9 @@ internal static unsafe void AesGcmEncrypt( [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] - [SupportedOSPlatform("maccatalyst")] [SupportedOSPlatform("ios13.0")] [SupportedOSPlatform("tvos13.0")] + [SupportedOSPlatform("maccatalyst")] internal static unsafe void AesGcmDecrypt( ReadOnlySpan key, ReadOnlySpan nonce, diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/RuntimeMetrics.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/RuntimeMetrics.cs index 2857c9538ed04f..4af7755b21266a 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/RuntimeMetrics.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/RuntimeMetrics.cs @@ -191,10 +191,10 @@ private static IEnumerable> GetGarbageCollectionCounts() } } - [SupportedOSPlatform("maccatalyst")] [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] [UnsupportedOSPlatform("browser")] + [SupportedOSPlatform("maccatalyst")] private static IEnumerable> GetCpuTime() { Debug.Assert(s_processCpuTime is not null); diff --git a/src/libraries/System.Private.CoreLib/src/System/Environment.UnixOrBrowser.cs b/src/libraries/System.Private.CoreLib/src/System/Environment.UnixOrBrowser.cs index eefd1120cb5710..6dbbfe272b25b6 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Environment.UnixOrBrowser.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Environment.UnixOrBrowser.cs @@ -75,10 +75,10 @@ private static int CheckedSysConf(Interop.Sys.SysConfName name) /// Get the CPU usage, including the process time spent running the application code, the process time spent running the operating system code, /// and the total time spent running both the application and operating system code. /// - [SupportedOSPlatform("maccatalyst")] [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] [UnsupportedOSPlatform("browser")] + [SupportedOSPlatform("maccatalyst")] public static ProcessCpuUsage CpuUsage { get diff --git a/src/libraries/System.Private.CoreLib/src/System/Environment.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/Environment.Windows.cs index 2d4e82dca88748..bd2cb5b10ff3f8 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Environment.Windows.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Environment.Windows.cs @@ -364,10 +364,10 @@ private static unsafe string[] SegmentCommandLine(char* cmdLine) /// Get the CPU usage, including the process time spent running the application code, the process time spent running the operating system code, /// and the total time spent running both the application and operating system code. /// - [SupportedOSPlatform("maccatalyst")] [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] [UnsupportedOSPlatform("browser")] + [SupportedOSPlatform("maccatalyst")] public static ProcessCpuUsage CpuUsage { get => Interop.Kernel32.GetProcessTimes(Interop.Kernel32.GetCurrentProcess(), out _, out _, out long procKernelTime, out long procUserTime) ? diff --git a/src/libraries/System.Security.Cryptography/ref/System.Security.Cryptography.cs b/src/libraries/System.Security.Cryptography/ref/System.Security.Cryptography.cs index b38f79b645052f..1442fb8fca3561 100644 --- a/src/libraries/System.Security.Cryptography/ref/System.Security.Cryptography.cs +++ b/src/libraries/System.Security.Cryptography/ref/System.Security.Cryptography.cs @@ -121,9 +121,9 @@ public override void GenerateKey() { } [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")] [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")] [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")] - [System.Runtime.Versioning.SupportedOSPlatform("maccatalyst")] [System.Runtime.Versioning.SupportedOSPlatform("ios13.0")] [System.Runtime.Versioning.SupportedOSPlatform("tvos13.0")] + [System.Runtime.Versioning.SupportedOSPlatform("maccatalyst")] public sealed partial class AesGcm : System.IDisposable { [System.ObsoleteAttribute("AesGcm should indicate the required tag size for encryption and decryption. Use a constructor that accepts the tag size.", DiagnosticId="SYSLIB0053", UrlFormat="https://aka.ms/dotnet-warnings/{0}")] @@ -287,9 +287,9 @@ public AuthenticationTagMismatchException(string? message, System.Exception? inn [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")] [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")] [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")] - [System.Runtime.Versioning.SupportedOSPlatform("maccatalyst")] [System.Runtime.Versioning.SupportedOSPlatform("ios13.0")] [System.Runtime.Versioning.SupportedOSPlatform("tvos13.0")] + [System.Runtime.Versioning.SupportedOSPlatform("maccatalyst")] public sealed partial class ChaCha20Poly1305 : System.IDisposable { public ChaCha20Poly1305(byte[] key) { } diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/AesGcm.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/AesGcm.cs index 0a17baea87156b..52aa45ebb6d1e9 100644 --- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/AesGcm.cs +++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/AesGcm.cs @@ -10,9 +10,9 @@ namespace System.Security.Cryptography [UnsupportedOSPlatform("browser")] [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] - [SupportedOSPlatform("maccatalyst")] [SupportedOSPlatform("ios13.0")] [SupportedOSPlatform("tvos13.0")] + [SupportedOSPlatform("maccatalyst")] public sealed partial class AesGcm : IDisposable { private const int NonceSize = 12; diff --git a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ChaCha20Poly1305.cs b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ChaCha20Poly1305.cs index 7e16d9a7aeebb7..8cbf36bd73b543 100644 --- a/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ChaCha20Poly1305.cs +++ b/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/ChaCha20Poly1305.cs @@ -9,9 +9,9 @@ namespace System.Security.Cryptography [UnsupportedOSPlatform("browser")] [UnsupportedOSPlatform("ios")] [UnsupportedOSPlatform("tvos")] - [SupportedOSPlatform("maccatalyst")] [SupportedOSPlatform("ios13.0")] [SupportedOSPlatform("tvos13.0")] + [SupportedOSPlatform("maccatalyst")] public sealed partial class ChaCha20Poly1305 : IDisposable { // Per https://tools.ietf.org/html/rfc7539, ChaCha20Poly1305 AEAD requires a 256-bit key and 96-bit nonce,