From d23e7419d5ad203fd2061b8750f742ca48eb2fda Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 13 Aug 2024 15:19:02 +0200 Subject: [PATCH] Use ProjectReference items in inbox src projects There are numerous benefits in using ProjectReferences consistently in all libraries: 1. An upfront "libs" build isn't required anymore and sfx libraries can now directly be built from a fresh clone (with dotnet build or inside VS). I.e. `dotnet.cmd pack src/libraries/System.Text.Json/src/` is now possible from a fresh clone. 2. Because of 1), we can now add a solution file for the whole sfx that can directly be opened and worked with from a fresh clone. 3. The overall root build is faster. Without this change, the build order was sfx-ref -> (sfx-src & sfx-gen) so the shared framework reference projects first had to be built and only then the sfx src and gen projects could be built. Now with this change, everything gets built in parallel. 4. Using P2Ps means that we now follow the common and well supported msbuild and SDK path instead of repo customization. The downside of doing this is that the dependency graph gets bigger, meaning that more projects get incrementally built when doing a "dotnet build". This is nothing new and the SDK team recommends to pass the "--no-dependencies" flag to "dotnet build" if incrementally (no-op) building the additional dependency nodes is noticeable. This is less of a concern inside VS as that has a "fast up-to-date check" feature that doesn't even attempt to build projects that didn't change. For VS, really the only noticeable change is that the solution explorer now lists more projects and that when opening a solution, more projects need to be evaluated. But, that should be fast enough when using an up-to-date version of VS. - A few observations that make the change more involved: There's a NuGet client bug that requires a few workarounds: https://github.com/NuGet/Home/issues/10368 Because of that, direct package refs to System.Numerics.Vectors and in a few cases to System.Memory are required. We should fix the NuGet tooling issue to eventually get rid of the workarounds introduced with this commit. There was already a PR in NuGet.Client open but it was closed because of staleness. - System.Data.Common.csproj is a weird project as it references CoreLib and reference assemblies. I had to disable transitive project references in order for type universes to not clash and explicitly set CompileUsingReferenceAssemblies=true as that gets set to false when the library explicitly references CoreLib. --- eng/Versions.props | 1 + eng/generators.targets | 6 +- eng/resolveContract.targets | 5 +- eng/targetingpacks.targets | 20 ------- src/libraries/Directory.Build.targets | 7 +++ .../src/Microsoft.CSharp.csproj | 30 +++++----- ...osoft.Extensions.Configuration.Json.csproj | 5 ++ ...xtensions.Configuration.UserSecrets.csproj | 5 ++ ...icrosoft.Extensions.DependencyModel.csproj | 2 + ....Extensions.Hosting.WindowsServices.csproj | 5 ++ .../src/Microsoft.Extensions.Hosting.csproj | 5 ++ ...icrosoft.Extensions.Logging.Console.csproj | 5 +- ...soft.Extensions.Logging.EventSource.csproj | 5 +- .../src/Microsoft.VisualBasic.Core.vbproj | 48 ++++++++------- .../src/Microsoft/VisualBasic/Strings.vb | 6 +- .../src/Microsoft.Win32.Registry.csproj | 13 ++-- .../src/System.Collections.Immutable.csproj | 14 +++-- .../src/System.Collections.NonGeneric.csproj | 6 +- .../src/System.Collections.Specialized.csproj | 6 +- .../System.ComponentModel.Annotations.csproj | 20 +++---- ...stem.ComponentModel.EventBasedAsync.csproj | 10 ++-- .../System.ComponentModel.Primitives.csproj | 12 ++-- ...System.ComponentModel.TypeConverter.csproj | 43 +++++++------- .../src/System.ComponentModel.csproj | 2 +- .../System.Console/src/System.Console.csproj | 14 ++--- .../src/System.Data.Common.csproj | 47 ++++++++------- ...System.Diagnostics.DiagnosticSource.csproj | 18 +++--- .../System.Diagnostics.FileVersionInfo.csproj | 11 ++-- .../src/System.Diagnostics.Process.csproj | 34 +++++------ ...Diagnostics.TextWriterTraceListener.csproj | 26 ++++---- .../src/System.Diagnostics.TraceSource.csproj | 2 +- .../src/System.Drawing.Primitives.csproj | 14 ++--- .../src/System.Formats.Asn1.csproj | 12 ++-- .../src/System.Formats.Tar.csproj | 10 ++-- .../src/System.IO.Compression.Brotli.csproj | 12 ++-- .../src/System.IO.Compression.ZipFile.csproj | 8 +-- .../src/System.IO.Compression.csproj | 10 ++-- .../System.IO.FileSystem.AccessControl.csproj | 17 +++--- .../src/System.IO.FileSystem.DriveInfo.csproj | 8 +-- .../src/System.IO.FileSystem.Watcher.csproj | 20 +++---- .../src/System.IO.IsolatedStorage.csproj | 16 ++--- .../src/System.IO.MemoryMappedFiles.csproj | 10 ++-- .../src/System.IO.Pipelines.csproj | 10 ++-- .../src/System.IO.Pipes.AccessControl.csproj | 16 +++-- .../src/System.IO.Pipes.csproj | 28 ++++----- .../src/System.Linq.Expressions.csproj | 20 +++---- .../src/System.Linq.Parallel.csproj | 17 +++--- .../src/System.Linq.Queryable.csproj | 10 ++-- .../System.Linq/src/System.Linq.csproj | 12 ++-- .../src/System.Memory.Data.csproj | 2 + .../src/System.Net.Http.Json.csproj | 15 ++--- .../src/System.Net.Http.csproj | 59 ++++++++++--------- .../src/System.Net.HttpListener.csproj | 55 ++++++++--------- .../src/System.Net.Mail.csproj | 37 ++++++------ .../src/System.Net.NameResolution.csproj | 26 ++++---- .../src/System.Net.NetworkInformation.csproj | 24 ++++---- .../src/System.Net.Ping.csproj | 30 +++++----- .../src/System.Net.Primitives.csproj | 18 +++--- .../src/System.Net.Quic.csproj | 42 +++++++------ .../src/System.Net.Requests.csproj | 40 ++++++------- .../src/System.Net.Security.csproj | 42 ++++++------- .../src/System.Net.Sockets.csproj | 29 +++++---- .../src/System.Net.WebClient.csproj | 28 +++++---- .../src/System.Net.WebHeaderCollection.csproj | 10 ++-- .../src/System.Net.WebProxy.csproj | 19 +++--- .../src/System.Net.WebSockets.Client.csproj | 30 +++++----- .../src/System.Net.WebSockets.csproj | 25 ++++---- .../src/System.ObjectModel.csproj | 8 +-- ...m.Private.DataContractSerialization.csproj | 42 ++++++------- .../src/System.Private.Xml.Linq.csproj | 14 ++--- .../src/System.Private.Xml.csproj | 53 +++++++++-------- .../System.Reflection.DispatchProxy.csproj | 18 +++--- .../src/System.Reflection.Metadata.csproj | 26 ++++---- .../System.Reflection.Metadata.Tests.csproj | 1 - ...stem.Reflection.MetadataLoadContext.csproj | 2 + .../src/System.Resources.Extensions.csproj | 4 +- .../src/System.Resources.Writer.csproj | 6 +- ...em.Runtime.CompilerServices.VisualC.csproj | 2 +- .../src/System.Runtime.Numerics.csproj | 6 +- ...em.Runtime.Serialization.Formatters.csproj | 4 +- .../System.Runtime.Serialization.Json.csproj | 2 +- ...em.Runtime.Serialization.Primitives.csproj | 4 +- .../System.Runtime.Serialization.Xml.csproj | 4 +- .../src/System.Security.AccessControl.csproj | 18 +++--- .../src/System.Security.Claims.csproj | 8 +-- .../src/System.Security.Cryptography.csproj | 35 +++++------ .../System.Security.Principal.Windows.csproj | 14 ++--- .../src/System.Text.Encoding.CodePages.csproj | 10 ++-- .../src/System.Text.Encodings.Web.csproj | 12 ++-- .../src/System.Text.Json.csproj | 39 ++++++------ .../src/System.Text.RegularExpressions.csproj | 20 +++---- .../src/System.Threading.Channels.csproj | 12 ++-- .../System.Threading.Tasks.Dataflow.csproj | 18 +++--- .../System.Threading.Tasks.Parallel.csproj | 16 ++--- .../src/System.Transactions.Local.csproj | 28 ++++----- .../src/System.Web.HttpUtility.csproj | 6 +- .../src/System.Xml.ReaderWriter.csproj | 2 +- .../src/System.Xml.XDocument.csproj | 2 +- .../src/System.Xml.XPath.XDocument.csproj | 2 +- .../src/System.Xml.XPath.csproj | 2 +- .../src/System.Xml.XmlSerializer.csproj | 2 +- src/libraries/oob-ref.proj | 17 ------ src/libraries/sfx-ref.proj | 20 ------- src/libraries/sfx.proj | 4 -- 104 files changed, 860 insertions(+), 837 deletions(-) delete mode 100644 src/libraries/oob-ref.proj delete mode 100644 src/libraries/sfx-ref.proj diff --git a/eng/Versions.props b/eng/Versions.props index da76908e6fd0b6..b597db7bcbd8c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -119,6 +119,7 @@ 8.0.0 5.0.0 4.5.5 + 4.5.0 9.0.0-rc.1.24410.5 9.0.0-rc.1.24410.5 6.0.0 diff --git a/eng/generators.targets b/eng/generators.targets index b5ca3ca89ee42a..500ee549b35be6 100644 --- a/eng/generators.targets +++ b/eng/generators.targets @@ -27,6 +27,7 @@ '$(DisableImplicitFrameworkReferences)' == 'true' and ( '@(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.InteropServices'))' == 'true' or + '@(ProjectReference->AnyHaveMetadataValue('Filename', 'System.Runtime.InteropServices'))' == 'true' or '@(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))' == 'true' ) ) @@ -39,7 +40,10 @@ '$(MSBuildProjectExtension)' == '.csproj' and ( '$(DisableImplicitFrameworkReferences)' == 'true' and - '@(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.InteropServices'))' == 'true' + ( + '@(Reference->AnyHaveMetadataValue('Identity', 'System.Runtime.InteropServices'))' == 'true' or + '@(ProjectReference->AnyHaveMetadataValue('Filename', 'System.Runtime.InteropServices'))' == 'true' + ) )" /> diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets index fb93fcd09e9a67..e50757b52ef57f 100644 --- a/eng/resolveContract.targets +++ b/eng/resolveContract.targets @@ -39,8 +39,8 @@ + DependsOnTargets="ResolveProjectReferences;GetTargetPathWithTargetPlatformMoniker" + BeforeTargets="GetTargetPath"> @@ -119,6 +119,7 @@ true + ReferencePathWithRefAssemblies diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 837ec7601fded5..b08c5abdc0af30 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -89,26 +89,6 @@ Condition="'$(UseLocalAppHostPack)' == 'true' and '@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))' != 'true'" /> - - - - false - - - - - - - $(AssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\')) - $(DesignTimeAssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\')) - - - + + + + + diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj index d286f621f43c1e..3f2d01ff6d3047 100644 --- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -238,23 +238,25 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj index 3e217a0a5cfaa4..75497eaaa4e203 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -21,4 +21,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index 4b200df893380c..f226f211d6f72f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -16,6 +16,11 @@ Link="Common\System\ThrowHelper.cs" /> + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj index 8a6564c371c173..44f388c0eb2614 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj @@ -31,6 +31,11 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index aac48bc7861490..c4c243465fdf38 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -54,6 +54,11 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index bb9145aaab774d..d4b40d8e849f90 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -55,8 +55,11 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index 93f6eb01c75a1d..a10be9a48ed519 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -40,8 +40,11 @@ - + + + + diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj index 596f1e13926d7c..a9db73cfa3ebde 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj +++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj @@ -1,5 +1,7 @@ + + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent) true None On @@ -7,17 +9,17 @@ Off Empty Binary - 42025 + $(WarningsNotAsErrors),42025 $(DefineConstants),LATEBINDING=True $(NoWarn),CA1052,CA1510,CA1810,CA1822,CA2200 Microsoft.VisualBasic.Core false - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows disable false + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) @@ -25,12 +27,14 @@ $(DefineConstants),TARGET_WINDOWS=True $(NoWarn);CA1823 + + @@ -100,25 +104,27 @@ + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Strings.vb b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Strings.vb index 1357ed33959668..ab3e423fe637c9 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Strings.vb +++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft/VisualBasic/Strings.vb @@ -732,19 +732,19 @@ EmptyFindString: While Start < ExpressionLength If Replacements = Count Then 'We've made all the replacements the caller wanted so append the remaining string - Builder.Append(Expression.Substring(Start)) + Builder.Append(Expression.AsSpan(Start)) Exit While End If FindLocation = Comparer.IndexOf(Expression, Find, Start, CompareFlags) If FindLocation < 0 Then 'We didn't find the Find string append the rest of the string - Builder.Append(Expression.Substring(Start)) + Builder.Append(Expression.AsSpan(Start)) Exit While Else 'Append to our string builder everything up to the found string, then 'append the replacement - Builder.Append(Expression.Substring(Start, FindLocation - Start)) + Builder.Append(Expression.AsSpan(Start, FindLocation - Start)) Builder.Append(Replacement) Replacements += 1 diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 6e0aae853be85b..8644e048d92603 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -14,6 +14,7 @@ SR.PlatformNotSupported_Registry $(NoWarn);IDE0280 + @@ -70,12 +71,12 @@ - - - - - - + + + + + + diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 47c5898a66c102..c6ad12a27d9528 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -168,16 +168,18 @@ The System.Collections.Immutable library is built-in as part of the shared frame - - - - - - + + + + + + + + diff --git a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj index 1bc456cd13ba3a..36301e8d8578ed 100644 --- a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj +++ b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj index 4301d885411c68..cd7438399e8b23 100644 --- a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj +++ b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj @@ -22,9 +22,9 @@ - - - + + + diff --git a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj index 3cbb94253c8e1f..cb998febaaab08 100644 --- a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj +++ b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj @@ -67,16 +67,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj b/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj index a5d9913733b441..914718269b1f28 100644 --- a/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj +++ b/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj @@ -16,11 +16,11 @@ - - - - - + + + + + diff --git a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj index 2938d1e641264e..e7a68cd247695c 100644 --- a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj +++ b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj @@ -45,12 +45,12 @@ - - - - - - + + + + + + diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index 6979742610c466..638d400a68c6a8 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -248,26 +248,29 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj b/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj index acb8cab74e4f87..7a19841b027734 100644 --- a/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj +++ b/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj index e3c681be986a95..71d30e678caab6 100644 --- a/src/libraries/System.Console/src/System.Console.csproj +++ b/src/libraries/System.Console/src/System.Console.csproj @@ -272,13 +272,13 @@ - - - - - - - + + + + + + + diff --git a/src/libraries/System.Data.Common/src/System.Data.Common.csproj b/src/libraries/System.Data.Common/src/System.Data.Common.csproj index f1970f717be2ee..10a3e7da51a75e 100644 --- a/src/libraries/System.Data.Common/src/System.Data.Common.csproj +++ b/src/libraries/System.Data.Common/src/System.Data.Common.csproj @@ -5,6 +5,9 @@ true $(NoWarn);SYSLIB0038 false + + true + true @@ -312,28 +315,28 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index 3db1dbd5a06efc..0a408e13c9c236 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -135,18 +135,18 @@ System.Diagnostics.DiagnosticSource - + - - - - - - - - + + + + + + + + diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj index 230451074f3e08..fd1336ab9e5bd3 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj @@ -18,6 +18,7 @@ + - - - + + + - - + + diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index 97e289045e324a..1489d26679fbde 100644 --- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -370,23 +370,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj index 38b5ab697c6f9a..1e651f1220c6e0 100644 --- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj +++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj @@ -13,19 +13,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index 144e0c812e4255..2e6a2cd904c7bd 100644 --- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -36,9 +36,9 @@ - + diff --git a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj index 58b5852c2c916f..bc4df268ea446f 100644 --- a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj +++ b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj @@ -46,13 +46,13 @@ - - - - - - - + + + + + + + diff --git a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj index f8e68ec8d9a302..b1633ce60c4cca 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -55,12 +55,12 @@ - - - - - - + + + + + + diff --git a/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj b/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj index 6f34a34cc6e7de..dd05dfd76e8373 100644 --- a/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj +++ b/src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj @@ -74,11 +74,11 @@ - - - - - + + + + + diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj index 8e642e75833c55..f29342d8250503 100644 --- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj +++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj @@ -42,12 +42,12 @@ - - - - - - + + + + + + diff --git a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj index 0613ab5e4848a0..7a200825bd45f8 100644 --- a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj +++ b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj @@ -45,10 +45,10 @@ - - - - + + + + diff --git a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj index 208844b5d67aae..92e01e2adbc99e 100644 --- a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj +++ b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj @@ -69,11 +69,11 @@ - - - - - + + + + + diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 03cbd816a2ff71..4a1fe879429dcc 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -93,13 +93,16 @@ - - - - - - - + + + + + + + + + + diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj index 92ed7282104429..95482f3ad14b27 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj +++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj @@ -80,10 +80,10 @@ - - - - + + + + diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj index 8544de48d095d5..7aff37dc2cdb5b 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj @@ -120,19 +120,19 @@ - - - - - - - - + + + + + + + + - - + + diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index a11a0d7077cc65..169514e7c11026 100644 --- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj @@ -44,14 +44,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index 8c7cd9cfdda07b..84b6b3ab215ed8 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -124,11 +124,11 @@ - - - - - + + + + + diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj index a4517443d1832b..d28707c27ee25a 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -66,11 +66,11 @@ System.IO.Pipelines.PipeReader - - - - - + + + + + diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index 6e48d964b2744e..eeca2658e6870a 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -14,15 +14,13 @@ - - - - - - + + true + + + + + diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj index b36765a036839e..11ab8e1916ec8e 100644 --- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -174,26 +174,26 @@ - - - - - - - - + + + + + + + + - - - + + + - - - + + + diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 66a070211ddca4..4c65b68c965cd8 100644 --- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -217,16 +217,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj index 15ff9887505a59..cfabe47d016ede 100644 --- a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj +++ b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj @@ -6,12 +6,13 @@ true false + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true $(DefineConstants);FEATURE_WASM_MANAGED_THREADS - + @@ -153,13 +154,13 @@ - - - - - - - + + + + + + + diff --git a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj index 343028ced1ad2a..fab4833b074442 100644 --- a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj +++ b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj @@ -16,11 +16,11 @@ - - - - - + + + + + diff --git a/src/libraries/System.Linq/src/System.Linq.csproj b/src/libraries/System.Linq/src/System.Linq.csproj index 68b88631587ace..5c367052e193da 100644 --- a/src/libraries/System.Linq/src/System.Linq.csproj +++ b/src/libraries/System.Linq/src/System.Linq.csproj @@ -95,12 +95,12 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj index e221d3ef351dfc..43385452748e54 100644 --- a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj +++ b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj @@ -29,6 +29,8 @@ System.BinaryData + + diff --git a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj index b8908f4fde1c7d..e6bc907afc69b1 100644 --- a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj @@ -53,22 +53,23 @@ System.Net.Http.Json.JsonContent - - - - - - + + + + + + + + - diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj index c6af468c253228..410574fb189029 100644 --- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj +++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj @@ -457,7 +457,6 @@ - @@ -473,39 +472,43 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + - - + + diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj index b00428cd035a3b..5f7c136659e1bf 100644 --- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj @@ -14,31 +14,6 @@ $(DefineConstants);TARGET_WINDOWS - - - - - - - - - - - - - - - - - - - - - - - - - @@ -190,8 +165,34 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj index db37efc40b0495..06fcafededd86f 100644 --- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj +++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj @@ -135,25 +135,26 @@ + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj index 5d97e2d711f31b..98edf0b81ae8a8 100644 --- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -101,19 +101,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 20e6095db84303..701fbb84f7e72a 100644 --- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -220,21 +220,21 @@ - - - - - - - - - - - + + + + + + + + + + + - + diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj index 0cfd246889fa19..aeda0dbf08c90f 100644 --- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj @@ -112,24 +112,24 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj index e71aaa8222e300..d793d29fcef2fc 100644 --- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -163,15 +163,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj index f09a5d14dd08b0..55ff106de57965 100644 --- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj +++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj @@ -120,31 +120,31 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + @@ -157,14 +157,11 @@ '$(TargetOS)' == 'windows' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm64') and '$(DotNetBuildSourceOnly)' != 'true'"> - - - + diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj index 46bda299d9a644..3209937569a703 100644 --- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj +++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj @@ -104,26 +104,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj index 37d2d52b4f47b4..793f51265492b0 100644 --- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj +++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj @@ -451,31 +451,31 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj index e7a4cfbcce3c9f..b22e2cf6b800b1 100644 --- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -290,24 +290,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj index 8e615f49072629..16b5031f0a1f62 100644 --- a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj +++ b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj @@ -11,6 +11,11 @@ SR.SystemNetWebClient_PlatformNotSupported + + + + - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj index 459f088ee975a9..f5fd062b5d6cae 100644 --- a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj +++ b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj @@ -21,11 +21,11 @@ - - - - - + + + + + diff --git a/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj b/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj index ef670932cb9143..351992e4ece3d9 100644 --- a/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj +++ b/src/libraries/System.Net.WebProxy/src/System.Net.WebProxy.csproj @@ -9,19 +9,20 @@ + + + - - - - - - - - - + + + + + + + diff --git a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj index 8265edd7e9369a..920fea25d22420 100644 --- a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj +++ b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj @@ -38,24 +38,24 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + diff --git a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj index 177e95dacee0a7..591f0788275aba 100644 --- a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj +++ b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj @@ -56,24 +56,23 @@ - + - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj b/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj index 0ef93fda9ecd4b..2d5f1c0367de38 100644 --- a/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj +++ b/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj @@ -32,10 +32,10 @@ - - - - + + + + diff --git a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj index a828163c5921a5..d676c9b7aa90d8 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj +++ b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj @@ -150,31 +150,31 @@ + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj index 604a04488e3cd7..0cee28f3bee39b 100644 --- a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj +++ b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj @@ -44,14 +44,14 @@ + + + + - - - - - - - + + + diff --git a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj index a78f7c666e030b..d260c5e388ebc1 100644 --- a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj +++ b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj @@ -763,31 +763,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj index 17c279ab521382..0b5cee65b56e9b 100644 --- a/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj +++ b/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj @@ -14,15 +14,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index caa954d459a576..360080b1dbdcdd 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -268,20 +268,22 @@ The System.Reflection.Metadata library is built-in as part of the shared framewo - - + + + + + + + + + + - - - - - - - - - - + + + + diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj index a985caddfff1b6..e1ccbfa4def74e 100644 --- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -2,7 +2,6 @@ true - false $(NoWarn);436;SYSLIB0037 diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index 96856f89263093..0ce11ca34222f4 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -166,6 +166,8 @@ + + diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj index 03f9bc0c11d585..80ddc5bc0441b4 100644 --- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -66,7 +66,7 @@ System.Resources.Extensions.PreserializedResourceWriter - + @@ -86,6 +86,8 @@ System.Resources.Extensions.PreserializedResourceWriter + + - - - + + + diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj index a727319f7cf837..ba6f67bf757deb 100644 --- a/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj +++ b/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj index 6526656921c343..0a92f607d2c737 100644 --- a/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj +++ b/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj @@ -42,9 +42,9 @@ - - - + + + diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj index ff0f8cab28fdf6..ede50200aae70a 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj +++ b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj @@ -92,10 +92,10 @@ - - + + diff --git a/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj b/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj index 53fc3732f892f8..9b4597500919bf 100644 --- a/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj +++ b/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index ca2ed33befc50b..05444a78a2dfca 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj b/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj index 23e761675c05c8..edff77b935753a 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj @@ -8,8 +8,8 @@ - - + + \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 7d87c658a3b1c5..8d9c2f0a0f3ad9 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -88,15 +88,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj b/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj index 4376906dbbc4bf..81fefd4bf4bc39 100644 --- a/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj +++ b/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj @@ -17,10 +17,10 @@ - - - - + + + + diff --git a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj index 0854abbbe06868..2200e152f08fdf 100644 --- a/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj +++ b/src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj @@ -1,9 +1,9 @@ + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-android;$(NetCoreAppCurrent)-osx;$(NetCoreAppCurrent)-ios;$(NetCoreAppCurrent)-tvos;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent) true $(DefineConstants);INTERNAL_ASYMMETRIC_IMPLEMENTATIONS - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-android;$(NetCoreAppCurrent)-osx;$(NetCoreAppCurrent)-ios;$(NetCoreAppCurrent)-tvos;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent) $(NoWarn);CA5350;CA5351;CA5379;CA5384;SYSLIB0026 $(NoWarn);CS0809 @@ -922,6 +922,7 @@ + @@ -1787,25 +1788,25 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index 2441afcdf6bdd0..e130d401ad113e 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -143,13 +143,13 @@ - - - - - - - + + + + + + + diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index cb37cd0945f5e2..72b9ca3cbe3239 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -81,11 +81,11 @@ System.Text.CodePagesEncodingProvider - - - - - + + + + + diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index 4f10f6e625453d..66b0ed8710231d 100644 --- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -65,16 +65,18 @@ System.Text.Encodings.Web.JavaScriptEncoder - - - - - + + + + + + + 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 8d0da4abcfc9ab..037010b0dfab3f 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -401,24 +401,24 @@ The System.Text.Json library is built-in as part of the shared framework in .NET - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -426,9 +426,12 @@ The System.Text.Json library is built-in as part of the shared framework in .NET + + + + - diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index 86353b31b5d7b7..c666e4b99edb8a 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -104,17 +104,17 @@ - - - - - - + + + + + + - - - - + + + + diff --git a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj index c058b0b216b17a..1847f619c0ddf8 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -48,12 +48,12 @@ System.Threading.Channel<T> - - - - - - + + + + + + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index 21e1af10705020..ad18684359d988 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -76,15 +76,15 @@ System.Threading.Tasks.Dataflow.WriteOnceBlock<T> - - - - - - - - - + + + + + + + + + diff --git a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj index 32d0f7c8cf6a3f..ec479f8055b9d1 100644 --- a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj +++ b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj @@ -6,11 +6,13 @@ true false + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) true $(DefineConstants);FEATURE_WASM_MANAGED_THREADS + @@ -21,13 +23,13 @@ - - - - - - - + + + + + + + diff --git a/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj b/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj index 60b30c5328717c..77070105fd630b 100644 --- a/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj +++ b/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj @@ -109,20 +109,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj index 73aa6d15930f72..592c9c51025290 100644 --- a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj +++ b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj @@ -21,9 +21,9 @@ - - - + + + diff --git a/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj b/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj index 51b5b60bb9bfc9..1990b06702f3cc 100644 --- a/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj +++ b/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj b/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj index 97942db9d60ef6..5bf5796e98d390 100644 --- a/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj +++ b/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj b/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj index 3b58b100a3a4ae..b039d4c5820b17 100644 --- a/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj +++ b/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj @@ -14,7 +14,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj b/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj index 629bfd44ac5a2c..2557c3f4536ab2 100644 --- a/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj +++ b/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj index ed03ce357ec17b..03254ed44344b1 100644 --- a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj +++ b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/src/libraries/oob-ref.proj b/src/libraries/oob-ref.proj deleted file mode 100644 index 33f580285a5fc6..00000000000000 --- a/src/libraries/oob-ref.proj +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(NetCoreAppCurrent) - - true - - - - - - - - diff --git a/src/libraries/sfx-ref.proj b/src/libraries/sfx-ref.proj deleted file mode 100644 index b1a3916acf4e18..00000000000000 --- a/src/libraries/sfx-ref.proj +++ /dev/null @@ -1,20 +0,0 @@ - - - - $(NetCoreAppCurrent)-$(TargetOS) - - true - - - - - - - - - - diff --git a/src/libraries/sfx.proj b/src/libraries/sfx.proj index 4a09c525dfae47..6cb639b5abb060 100644 --- a/src/libraries/sfx.proj +++ b/src/libraries/sfx.proj @@ -4,7 +4,6 @@ $(NetCoreAppCurrent)-$(TargetOS) - false false $(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml @@ -12,9 +11,6 @@ - -