From 055e7861c16ae675790c9ca9e57be60cfab0c5e6 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 28 Feb 2025 20:10:36 +0100 Subject: [PATCH 1/8] Update SBRP infra to allow for P2Ps and build with them --- Directory.Build.props | 6 -- eng/Build.props | 66 ------------------- eng/DotNetBuild.props | 24 ------- eng/NoOp.csproj | 16 ----- eng/SourceBuildPrebuiltBaseline.xml | 5 -- eng/Tools.props | 10 --- .../PackageSourceGenerator.proj | 1 + .../GenerateProject.cs | 27 ++++++-- src/referencePackages/Directory.Build.props | 3 + src/referencePackages/Directory.Build.targets | 14 +++- 10 files changed, 38 insertions(+), 134 deletions(-) delete mode 100644 eng/NoOp.csproj delete mode 100644 eng/Tools.props diff --git a/Directory.Build.props b/Directory.Build.props index bca70c36d9..a1fe1d8fe7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,12 +2,6 @@ - - - true - - $(CopyrightNetFoundation) MIT diff --git a/eng/Build.props b/eng/Build.props index 0ad4b07716..52da50388e 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -9,72 +9,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index df9e5d7719..a00827dfc8 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -7,28 +7,4 @@ true - - - $(CurrentRepoSourceBuiltNupkgCacheDir) - <_AdditionalDependencyProjectsBuildArgs /> - <_AdditionalDependencyProjectsBuildArgs Condition="'$(RestoreConfigFile)' != ''" >$(_AdditionalDependencyProjectsBuildArgs) /p:RestoreConfigFile=$(RestoreConfigFile) - - - - - - - - - - diff --git a/eng/NoOp.csproj b/eng/NoOp.csproj deleted file mode 100644 index 659aa00a48..0000000000 --- a/eng/NoOp.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - $(NetCurrent) - - - - - - - - diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 0564e28a1e..87962c7784 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -6,11 +6,6 @@ - - - - diff --git a/eng/Tools.props b/eng/Tools.props deleted file mode 100644 index 4cdc20e2aa..0000000000 --- a/eng/Tools.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - $(RestoreSources); - $(AdditionalRestoreSources) - - - - diff --git a/src/packageSourceGenerator/PackageSourceGenerator.proj b/src/packageSourceGenerator/PackageSourceGenerator.proj index 39ffb32834..a5bb3c1fdb 100644 --- a/src/packageSourceGenerator/PackageSourceGenerator.proj +++ b/src/packageSourceGenerator/PackageSourceGenerator.proj @@ -344,6 +344,7 @@ + /// The root directory that the projects are written into. + /// + [Required] + public required string ProjectRoot { get; set; } + /// /// The package's compile items, including target framework metadata. /// @@ -77,18 +83,31 @@ public override bool Execute() foreach (string targetFramework in targetFrameworks) { - string references = string.Empty; + string packageReferences = string.Empty; + string projectReferences = string.Empty; // Add package dependencies foreach (ITaskItem packageDependency in PackageDependencies.Where(packageDependency => packageDependency.GetMetadata(SharedMetadata.TargetFrameworkMetadataName) == targetFramework)) { - references += $" {Environment.NewLine}"; + string dependencyVersion = packageDependency.GetMetadata("Version"); + string dependencyProjectRelativePath = Path.Combine(packageDependency.ItemSpec.ToLowerInvariant(), dependencyVersion, $"{packageDependency.ItemSpec}.{dependencyVersion}.csproj"); + + // If the dependency doesn't exist, emit a package reference (i.e. for source-build-externals packages like Newtonsoft.Json). Otherwise, emit a project reference. + if (!File.Exists(Path.Combine(ProjectRoot, dependencyProjectRelativePath))) + { + packageReferences += $" {Environment.NewLine}"; + } + else + { + // Make sure that the path always uses forward slashes, even on Windows. + projectReferences += $" {Environment.NewLine}"; + } } - if (references != string.Empty) + if (packageReferences != string.Empty || projectReferences != string.Empty) { referenceIncludes += $" {Environment.NewLine}"; - referenceIncludes += references; + referenceIncludes += packageReferences + projectReferences; referenceIncludes += $" {Environment.NewLine}{Environment.NewLine}"; } diff --git a/src/referencePackages/Directory.Build.props b/src/referencePackages/Directory.Build.props index d123b83953..06f416f777 100644 --- a/src/referencePackages/Directory.Build.props +++ b/src/referencePackages/Directory.Build.props @@ -34,6 +34,9 @@ latest $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'common')) + + + <_FindDependencies>false diff --git a/src/referencePackages/Directory.Build.targets b/src/referencePackages/Directory.Build.targets index cd0828f60e..0a0e4cea62 100644 --- a/src/referencePackages/Directory.Build.targets +++ b/src/referencePackages/Directory.Build.targets @@ -18,7 +18,7 @@ - + + + + + <_ResolvedProjectReferencePaths Remove="@(_ResolvedProjectReferencePaths)" /> + + + <_targetingPackReferenceExclusion Include="$(TargetName)" /> - <_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->Metadata('Filename'))" /> <_targetingPackReferenceWithProjectName Include="@(Reference->WithMetadataValue('ExternallyResolved', 'true')->Metadata('Filename'))" From 47b78aa9d9fe2b939de48d1649b8d1c0f66b8097 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 3 Mar 2025 12:11:00 +0100 Subject: [PATCH 2/8] Update projects to use P2Ps and add Customizations.props --- ...Microsoft.Bcl.AsyncInterfaces.6.0.0.csproj | 2 +- ...Microsoft.Bcl.AsyncInterfaces.7.0.0.csproj | 2 +- ...Microsoft.Bcl.AsyncInterfaces.8.0.0.csproj | 2 +- .../Microsoft.Build.Framework.17.12.6.csproj | 8 +-- .../Microsoft.Build.Framework.17.3.4.csproj | 4 +- .../Microsoft.Build.Framework.17.4.0.csproj | 6 +-- .../Microsoft.Build.Framework.17.8.3.csproj | 8 +-- .../Microsoft.Build.Tasks.Core.17.12.6.csproj | 54 +++++++++---------- .../Microsoft.Build.Tasks.Core.17.3.4.csproj | 46 ++++++++-------- .../Microsoft.Build.Tasks.Core.17.4.0.csproj | 46 ++++++++-------- .../Microsoft.Build.Tasks.Core.17.8.3.csproj | 50 ++++++++--------- ...rosoft.Build.Utilities.Core.17.12.6.csproj | 26 ++++----- ...crosoft.Build.Utilities.Core.17.3.4.csproj | 22 ++++---- ...crosoft.Build.Utilities.Core.17.4.0.csproj | 22 ++++---- ...crosoft.Build.Utilities.Core.17.8.3.csproj | 26 ++++----- .../17.12.6/Microsoft.Build.17.12.6.csproj | 12 ++--- .../17.3.4/Microsoft.Build.17.3.4.csproj | 20 +++---- .../17.8.3/Microsoft.Build.17.8.3.csproj | 16 +++--- ...Microsoft.CodeAnalysis.Common.4.1.0.csproj | 12 ++--- ...ft.Extensions.DependencyModel.6.0.0.csproj | 10 ++-- ...ns.FileProviders.Abstractions.6.0.0.csproj | 4 +- ...tensions.Logging.Abstractions.6.0.4.csproj | 4 +- ...crosoft.Extensions.Primitives.6.0.0.csproj | 6 +-- .../Microsoft.NET.StringTools.17.12.6.csproj | 4 +- .../Microsoft.NET.StringTools.17.3.4.csproj | 8 +-- .../Microsoft.NET.StringTools.17.4.0.csproj | 8 +-- .../Microsoft.NET.StringTools.17.8.3.csproj | 4 +- .../Microsoft.Win32.Registry.5.0.0.csproj | 8 +-- .../6.11.0/NuGet.Commands.6.11.0.csproj | 16 +++--- .../6.11.0/NuGet.Common.6.11.0.csproj | 2 +- .../6.12.1/NuGet.Common.6.12.1.csproj | 2 +- .../6.8.1/NuGet.Common.6.8.1.csproj | 2 +- .../6.11.0/NuGet.Configuration.6.11.0.csproj | 4 +- .../6.12.1/NuGet.Configuration.6.12.1.csproj | 4 +- .../6.8.1/NuGet.Configuration.6.8.1.csproj | 4 +- .../6.11.0/NuGet.Credentials.6.11.0.csproj | 4 +- .../6.8.1/NuGet.Credentials.6.8.1.csproj | 4 +- ...uGet.DependencyResolver.Core.6.11.0.csproj | 12 ++--- ...uGet.DependencyResolver.Core.6.12.1.csproj | 12 ++--- .../6.11.0/NuGet.LibraryModel.6.11.0.csproj | 4 +- .../6.12.1/NuGet.LibraryModel.6.12.1.csproj | 4 +- .../6.11.0/NuGet.Packaging.6.11.0.csproj | 12 ++--- .../6.12.1/NuGet.Packaging.6.12.1.csproj | 16 +++--- .../6.8.1/NuGet.Packaging.6.8.1.csproj | 12 ++--- .../6.11.0/NuGet.ProjectModel.6.11.0.csproj | 4 +- .../6.12.1/NuGet.ProjectModel.6.12.1.csproj | 4 +- .../6.11.0/NuGet.Protocol.6.11.0.csproj | 6 +-- .../6.12.1/NuGet.Protocol.6.12.1.csproj | 6 +-- .../6.8.1/NuGet.Protocol.6.8.1.csproj | 6 +-- .../System.Collections.Immutable.5.0.0.csproj | 2 +- .../System.Collections.Immutable.6.0.0.csproj | 6 +-- .../System.Collections.Immutable.7.0.0.csproj | 6 +-- .../System.Collections.Immutable.8.0.0.csproj | 6 +-- ...guration.ConfigurationManager.6.0.0.csproj | 8 +-- ...guration.ConfigurationManager.7.0.0.csproj | 14 ++--- ...guration.ConfigurationManager.8.0.0.csproj | 12 ++--- ....Diagnostics.DiagnosticSource.8.0.0.csproj | 6 +-- .../System.Diagnostics.EventLog.7.0.0.csproj | 2 +- .../System.Diagnostics.EventLog.8.0.0.csproj | 2 +- .../6.0.0/System.Drawing.Common.6.0.0.csproj | 2 +- .../7.0.0/System.Drawing.Common.7.0.0.csproj | 4 +- .../5.0.0/System.Formats.Asn1.5.0.0.csproj | 4 +- .../6.0.0/System.Formats.Asn1.6.0.0.csproj | 4 +- .../7.0.0/System.Formats.Asn1.7.0.0.csproj | 4 +- .../8.0.0/System.Formats.Asn1.8.0.0.csproj | 4 +- .../8.0.1/System.Formats.Asn1.8.0.1.csproj | 4 +- ...m.IO.FileSystem.AccessControl.5.0.0.csproj | 8 +-- .../4.5.4/System.Memory.4.5.4.csproj | 6 +-- .../4.5.5/System.Memory.4.5.5.csproj | 6 +-- .../4.6.0/System.Memory.4.6.0.csproj | 6 +-- ...stem.Reflection.DispatchProxy.4.8.1.csproj | 2 +- .../4.7.0/System.Reflection.Emit.4.7.0.csproj | 2 +- .../System.Reflection.Metadata.5.0.0.csproj | 2 +- .../System.Reflection.Metadata.6.0.0.csproj | 4 +- .../System.Reflection.Metadata.7.0.0.csproj | 8 +-- .../System.Reflection.Metadata.8.0.0.csproj | 10 ++-- ...eflection.MetadataLoadContext.6.0.0.csproj | 10 ++-- ...eflection.MetadataLoadContext.7.0.0.csproj | 14 ++--- ...eflection.MetadataLoadContext.8.0.0.csproj | 18 +++---- .../System.Resources.Extensions.6.0.0.csproj | 2 +- .../System.Resources.Extensions.7.0.0.csproj | 2 +- .../System.Resources.Extensions.8.0.0.csproj | 2 +- ...System.Security.AccessControl.5.0.0.csproj | 2 +- ...System.Security.AccessControl.6.0.0.csproj | 2 +- ...tem.Security.Cryptography.Cng.5.0.0.csproj | 2 +- ...em.Security.Cryptography.Pkcs.6.0.0.csproj | 14 ++--- ...em.Security.Cryptography.Pkcs.6.0.1.csproj | 14 ++--- ...em.Security.Cryptography.Pkcs.6.0.4.csproj | 14 ++--- ...em.Security.Cryptography.Pkcs.7.0.0.csproj | 16 +++--- ...em.Security.Cryptography.Pkcs.7.0.2.csproj | 16 +++--- ...em.Security.Cryptography.Pkcs.8.0.0.csproj | 18 +++---- ...ty.Cryptography.ProtectedData.6.0.0.csproj | 2 +- ...ty.Cryptography.ProtectedData.8.0.0.csproj | 2 +- ...tem.Security.Cryptography.Xml.6.0.0.csproj | 10 ++-- ...tem.Security.Cryptography.Xml.6.0.1.csproj | 10 ++-- ...tem.Security.Cryptography.Xml.7.0.1.csproj | 10 ++-- ...tem.Security.Cryptography.Xml.8.0.0.csproj | 12 ++--- .../System.Security.Permissions.6.0.0.csproj | 6 +-- .../System.Security.Permissions.7.0.0.csproj | 6 +-- ...ystem.Text.Encoding.CodePages.4.5.1.csproj | 2 +- ...ystem.Text.Encoding.CodePages.6.0.0.csproj | 6 +-- ...ystem.Text.Encoding.CodePages.7.0.0.csproj | 6 +-- .../System.Text.Encodings.Web.6.0.0.csproj | 8 +-- .../System.Text.Encodings.Web.7.0.0.csproj | 8 +-- .../System.Text.Encodings.Web.8.0.0.csproj | 8 +-- .../6.0.0/System.Text.Json.6.0.0.csproj | 18 +++---- .../7.0.3/System.Text.Json.7.0.3.csproj | 20 +++---- .../8.0.4/System.Text.Json.8.0.4.csproj | 20 +++---- .../8.0.5/System.Text.Json.8.0.5.csproj | 18 +++---- .../System.Threading.Channels.7.0.0.csproj | 2 +- ...em.Threading.Tasks.Extensions.4.5.4.csproj | 2 +- ...em.Threading.Tasks.Extensions.4.6.0.csproj | 2 +- .../System.Windows.Extensions.6.0.0.csproj | 2 +- .../System.Windows.Extensions.7.0.0.csproj | 4 +- 114 files changed, 527 insertions(+), 527 deletions(-) diff --git a/src/referencePackages/src/microsoft.bcl.asyncinterfaces/6.0.0/Microsoft.Bcl.AsyncInterfaces.6.0.0.csproj b/src/referencePackages/src/microsoft.bcl.asyncinterfaces/6.0.0/Microsoft.Bcl.AsyncInterfaces.6.0.0.csproj index 47f17efd29..fbee928ff7 100644 --- a/src/referencePackages/src/microsoft.bcl.asyncinterfaces/6.0.0/Microsoft.Bcl.AsyncInterfaces.6.0.0.csproj +++ b/src/referencePackages/src/microsoft.bcl.asyncinterfaces/6.0.0/Microsoft.Bcl.AsyncInterfaces.6.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/microsoft.bcl.asyncinterfaces/7.0.0/Microsoft.Bcl.AsyncInterfaces.7.0.0.csproj b/src/referencePackages/src/microsoft.bcl.asyncinterfaces/7.0.0/Microsoft.Bcl.AsyncInterfaces.7.0.0.csproj index d838526f9e..f0fbff4897 100644 --- a/src/referencePackages/src/microsoft.bcl.asyncinterfaces/7.0.0/Microsoft.Bcl.AsyncInterfaces.7.0.0.csproj +++ b/src/referencePackages/src/microsoft.bcl.asyncinterfaces/7.0.0/Microsoft.Bcl.AsyncInterfaces.7.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/microsoft.bcl.asyncinterfaces/8.0.0/Microsoft.Bcl.AsyncInterfaces.8.0.0.csproj b/src/referencePackages/src/microsoft.bcl.asyncinterfaces/8.0.0/Microsoft.Bcl.AsyncInterfaces.8.0.0.csproj index 63c54f3572..d8f9be265b 100644 --- a/src/referencePackages/src/microsoft.bcl.asyncinterfaces/8.0.0/Microsoft.Bcl.AsyncInterfaces.8.0.0.csproj +++ b/src/referencePackages/src/microsoft.bcl.asyncinterfaces/8.0.0/Microsoft.Bcl.AsyncInterfaces.8.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/microsoft.build.framework/17.12.6/Microsoft.Build.Framework.17.12.6.csproj b/src/referencePackages/src/microsoft.build.framework/17.12.6/Microsoft.Build.Framework.17.12.6.csproj index 8ad482e31a..9e866a1032 100644 --- a/src/referencePackages/src/microsoft.build.framework/17.12.6/Microsoft.Build.Framework.17.12.6.csproj +++ b/src/referencePackages/src/microsoft.build.framework/17.12.6/Microsoft.Build.Framework.17.12.6.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/referencePackages/src/microsoft.build.framework/17.3.4/Microsoft.Build.Framework.17.3.4.csproj b/src/referencePackages/src/microsoft.build.framework/17.3.4/Microsoft.Build.Framework.17.3.4.csproj index 9b5ea7097e..4aff07bb62 100644 --- a/src/referencePackages/src/microsoft.build.framework/17.3.4/Microsoft.Build.Framework.17.3.4.csproj +++ b/src/referencePackages/src/microsoft.build.framework/17.3.4/Microsoft.Build.Framework.17.3.4.csproj @@ -7,11 +7,11 @@ - + - + diff --git a/src/referencePackages/src/microsoft.build.framework/17.4.0/Microsoft.Build.Framework.17.4.0.csproj b/src/referencePackages/src/microsoft.build.framework/17.4.0/Microsoft.Build.Framework.17.4.0.csproj index ce4351a02c..0e7233c3f8 100644 --- a/src/referencePackages/src/microsoft.build.framework/17.4.0/Microsoft.Build.Framework.17.4.0.csproj +++ b/src/referencePackages/src/microsoft.build.framework/17.4.0/Microsoft.Build.Framework.17.4.0.csproj @@ -7,12 +7,12 @@ - + - - + + diff --git a/src/referencePackages/src/microsoft.build.framework/17.8.3/Microsoft.Build.Framework.17.8.3.csproj b/src/referencePackages/src/microsoft.build.framework/17.8.3/Microsoft.Build.Framework.17.8.3.csproj index a2e0631865..2c5255a9b7 100644 --- a/src/referencePackages/src/microsoft.build.framework/17.8.3/Microsoft.Build.Framework.17.8.3.csproj +++ b/src/referencePackages/src/microsoft.build.framework/17.8.3/Microsoft.Build.Framework.17.8.3.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/referencePackages/src/microsoft.build.tasks.core/17.12.6/Microsoft.Build.Tasks.Core.17.12.6.csproj b/src/referencePackages/src/microsoft.build.tasks.core/17.12.6/Microsoft.Build.Tasks.Core.17.12.6.csproj index e84474f045..89638a14ac 100644 --- a/src/referencePackages/src/microsoft.build.tasks.core/17.12.6/Microsoft.Build.Tasks.Core.17.12.6.csproj +++ b/src/referencePackages/src/microsoft.build.tasks.core/17.12.6/Microsoft.Build.Tasks.Core.17.12.6.csproj @@ -7,36 +7,36 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/referencePackages/src/microsoft.build.tasks.core/17.3.4/Microsoft.Build.Tasks.Core.17.3.4.csproj b/src/referencePackages/src/microsoft.build.tasks.core/17.3.4/Microsoft.Build.Tasks.Core.17.3.4.csproj index 515bfd06c2..91901b956e 100644 --- a/src/referencePackages/src/microsoft.build.tasks.core/17.3.4/Microsoft.Build.Tasks.Core.17.3.4.csproj +++ b/src/referencePackages/src/microsoft.build.tasks.core/17.3.4/Microsoft.Build.Tasks.Core.17.3.4.csproj @@ -7,32 +7,32 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/referencePackages/src/microsoft.build.tasks.core/17.4.0/Microsoft.Build.Tasks.Core.17.4.0.csproj b/src/referencePackages/src/microsoft.build.tasks.core/17.4.0/Microsoft.Build.Tasks.Core.17.4.0.csproj index af87f3f701..a4a130525d 100644 --- a/src/referencePackages/src/microsoft.build.tasks.core/17.4.0/Microsoft.Build.Tasks.Core.17.4.0.csproj +++ b/src/referencePackages/src/microsoft.build.tasks.core/17.4.0/Microsoft.Build.Tasks.Core.17.4.0.csproj @@ -7,32 +7,32 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj b/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj index d2014c06ce..12ece3489b 100644 --- a/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj +++ b/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj @@ -7,35 +7,35 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/referencePackages/src/microsoft.build.utilities.core/17.12.6/Microsoft.Build.Utilities.Core.17.12.6.csproj b/src/referencePackages/src/microsoft.build.utilities.core/17.12.6/Microsoft.Build.Utilities.Core.17.12.6.csproj index 15e7616f1f..467fe7a1f0 100644 --- a/src/referencePackages/src/microsoft.build.utilities.core/17.12.6/Microsoft.Build.Utilities.Core.17.12.6.csproj +++ b/src/referencePackages/src/microsoft.build.utilities.core/17.12.6/Microsoft.Build.Utilities.Core.17.12.6.csproj @@ -7,22 +7,22 @@ - - - - + + + + - - - - - - - - - + + + + + + + + + diff --git a/src/referencePackages/src/microsoft.build.utilities.core/17.3.4/Microsoft.Build.Utilities.Core.17.3.4.csproj b/src/referencePackages/src/microsoft.build.utilities.core/17.3.4/Microsoft.Build.Utilities.Core.17.3.4.csproj index a7bb2a6c89..adaa427f83 100644 --- a/src/referencePackages/src/microsoft.build.utilities.core/17.3.4/Microsoft.Build.Utilities.Core.17.3.4.csproj +++ b/src/referencePackages/src/microsoft.build.utilities.core/17.3.4/Microsoft.Build.Utilities.Core.17.3.4.csproj @@ -7,20 +7,20 @@ - - - - + + + + - - - - - - - + + + + + + + diff --git a/src/referencePackages/src/microsoft.build.utilities.core/17.4.0/Microsoft.Build.Utilities.Core.17.4.0.csproj b/src/referencePackages/src/microsoft.build.utilities.core/17.4.0/Microsoft.Build.Utilities.Core.17.4.0.csproj index bd1b16bb3a..0930724055 100644 --- a/src/referencePackages/src/microsoft.build.utilities.core/17.4.0/Microsoft.Build.Utilities.Core.17.4.0.csproj +++ b/src/referencePackages/src/microsoft.build.utilities.core/17.4.0/Microsoft.Build.Utilities.Core.17.4.0.csproj @@ -7,20 +7,20 @@ - - - - + + + + - - - - - - - + + + + + + + diff --git a/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj b/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj index feeba0ef46..c0fc5e0525 100644 --- a/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj +++ b/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj @@ -7,23 +7,23 @@ - - - - + + + + - - - - - - - - - + + + + + + + + + diff --git a/src/referencePackages/src/microsoft.build/17.12.6/Microsoft.Build.17.12.6.csproj b/src/referencePackages/src/microsoft.build/17.12.6/Microsoft.Build.17.12.6.csproj index d7c2a0a03a..67852f17f9 100644 --- a/src/referencePackages/src/microsoft.build/17.12.6/Microsoft.Build.17.12.6.csproj +++ b/src/referencePackages/src/microsoft.build/17.12.6/Microsoft.Build.17.12.6.csproj @@ -7,12 +7,12 @@ - - - - - - + + + + + + diff --git a/src/referencePackages/src/microsoft.build/17.3.4/Microsoft.Build.17.3.4.csproj b/src/referencePackages/src/microsoft.build/17.3.4/Microsoft.Build.17.3.4.csproj index 4c45771415..6952bfc13b 100644 --- a/src/referencePackages/src/microsoft.build/17.3.4/Microsoft.Build.17.3.4.csproj +++ b/src/referencePackages/src/microsoft.build/17.3.4/Microsoft.Build.17.3.4.csproj @@ -7,16 +7,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/referencePackages/src/microsoft.build/17.8.3/Microsoft.Build.17.8.3.csproj b/src/referencePackages/src/microsoft.build/17.8.3/Microsoft.Build.17.8.3.csproj index 4dbd0d5603..abc723d8d7 100644 --- a/src/referencePackages/src/microsoft.build/17.8.3/Microsoft.Build.17.8.3.csproj +++ b/src/referencePackages/src/microsoft.build/17.8.3/Microsoft.Build.17.8.3.csproj @@ -7,14 +7,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj b/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj index cae3c3d022..0de18f1ae0 100644 --- a/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj +++ b/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj @@ -9,12 +9,12 @@ - - - - - - + + + + + + diff --git a/src/referencePackages/src/microsoft.extensions.dependencymodel/6.0.0/Microsoft.Extensions.DependencyModel.6.0.0.csproj b/src/referencePackages/src/microsoft.extensions.dependencymodel/6.0.0/Microsoft.Extensions.DependencyModel.6.0.0.csproj index 2fe7a8b66c..464f816f00 100644 --- a/src/referencePackages/src/microsoft.extensions.dependencymodel/6.0.0/Microsoft.Extensions.DependencyModel.6.0.0.csproj +++ b/src/referencePackages/src/microsoft.extensions.dependencymodel/6.0.0/Microsoft.Extensions.DependencyModel.6.0.0.csproj @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/src/referencePackages/src/microsoft.extensions.fileproviders.abstractions/6.0.0/Microsoft.Extensions.FileProviders.Abstractions.6.0.0.csproj b/src/referencePackages/src/microsoft.extensions.fileproviders.abstractions/6.0.0/Microsoft.Extensions.FileProviders.Abstractions.6.0.0.csproj index ef95aeae2b..7c29752319 100644 --- a/src/referencePackages/src/microsoft.extensions.fileproviders.abstractions/6.0.0/Microsoft.Extensions.FileProviders.Abstractions.6.0.0.csproj +++ b/src/referencePackages/src/microsoft.extensions.fileproviders.abstractions/6.0.0/Microsoft.Extensions.FileProviders.Abstractions.6.0.0.csproj @@ -8,11 +8,11 @@ - + - + diff --git a/src/referencePackages/src/microsoft.extensions.logging.abstractions/6.0.4/Microsoft.Extensions.Logging.Abstractions.6.0.4.csproj b/src/referencePackages/src/microsoft.extensions.logging.abstractions/6.0.4/Microsoft.Extensions.Logging.Abstractions.6.0.4.csproj index 0b543bdd31..45b9d501d5 100644 --- a/src/referencePackages/src/microsoft.extensions.logging.abstractions/6.0.4/Microsoft.Extensions.Logging.Abstractions.6.0.4.csproj +++ b/src/referencePackages/src/microsoft.extensions.logging.abstractions/6.0.4/Microsoft.Extensions.Logging.Abstractions.6.0.4.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/microsoft.extensions.primitives/6.0.0/Microsoft.Extensions.Primitives.6.0.0.csproj b/src/referencePackages/src/microsoft.extensions.primitives/6.0.0/Microsoft.Extensions.Primitives.6.0.0.csproj index 368252b377..5bf7971b7c 100644 --- a/src/referencePackages/src/microsoft.extensions.primitives/6.0.0/Microsoft.Extensions.Primitives.6.0.0.csproj +++ b/src/referencePackages/src/microsoft.extensions.primitives/6.0.0/Microsoft.Extensions.Primitives.6.0.0.csproj @@ -8,12 +8,12 @@ - + - - + + diff --git a/src/referencePackages/src/microsoft.net.stringtools/17.12.6/Microsoft.NET.StringTools.17.12.6.csproj b/src/referencePackages/src/microsoft.net.stringtools/17.12.6/Microsoft.NET.StringTools.17.12.6.csproj index e1bd7f3eaa..539a8cb9ae 100644 --- a/src/referencePackages/src/microsoft.net.stringtools/17.12.6/Microsoft.NET.StringTools.17.12.6.csproj +++ b/src/referencePackages/src/microsoft.net.stringtools/17.12.6/Microsoft.NET.StringTools.17.12.6.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/referencePackages/src/microsoft.net.stringtools/17.3.4/Microsoft.NET.StringTools.17.3.4.csproj b/src/referencePackages/src/microsoft.net.stringtools/17.3.4/Microsoft.NET.StringTools.17.3.4.csproj index d51d77a67c..39dc6f85d3 100644 --- a/src/referencePackages/src/microsoft.net.stringtools/17.3.4/Microsoft.NET.StringTools.17.3.4.csproj +++ b/src/referencePackages/src/microsoft.net.stringtools/17.3.4/Microsoft.NET.StringTools.17.3.4.csproj @@ -7,13 +7,13 @@ - - + + - - + + diff --git a/src/referencePackages/src/microsoft.net.stringtools/17.4.0/Microsoft.NET.StringTools.17.4.0.csproj b/src/referencePackages/src/microsoft.net.stringtools/17.4.0/Microsoft.NET.StringTools.17.4.0.csproj index 06ad3ad40f..2062c8b9bc 100644 --- a/src/referencePackages/src/microsoft.net.stringtools/17.4.0/Microsoft.NET.StringTools.17.4.0.csproj +++ b/src/referencePackages/src/microsoft.net.stringtools/17.4.0/Microsoft.NET.StringTools.17.4.0.csproj @@ -7,13 +7,13 @@ - - + + - - + + diff --git a/src/referencePackages/src/microsoft.net.stringtools/17.8.3/Microsoft.NET.StringTools.17.8.3.csproj b/src/referencePackages/src/microsoft.net.stringtools/17.8.3/Microsoft.NET.StringTools.17.8.3.csproj index 615cab4c88..8426d55a9e 100644 --- a/src/referencePackages/src/microsoft.net.stringtools/17.8.3/Microsoft.NET.StringTools.17.8.3.csproj +++ b/src/referencePackages/src/microsoft.net.stringtools/17.8.3/Microsoft.NET.StringTools.17.8.3.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/referencePackages/src/microsoft.win32.registry/5.0.0/Microsoft.Win32.Registry.5.0.0.csproj b/src/referencePackages/src/microsoft.win32.registry/5.0.0/Microsoft.Win32.Registry.5.0.0.csproj index c880e183b5..718450a0ed 100644 --- a/src/referencePackages/src/microsoft.win32.registry/5.0.0/Microsoft.Win32.Registry.5.0.0.csproj +++ b/src/referencePackages/src/microsoft.win32.registry/5.0.0/Microsoft.Win32.Registry.5.0.0.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/referencePackages/src/nuget.commands/6.11.0/NuGet.Commands.6.11.0.csproj b/src/referencePackages/src/nuget.commands/6.11.0/NuGet.Commands.6.11.0.csproj index 7931d4d68e..4ee7328ced 100644 --- a/src/referencePackages/src/nuget.commands/6.11.0/NuGet.Commands.6.11.0.csproj +++ b/src/referencePackages/src/nuget.commands/6.11.0/NuGet.Commands.6.11.0.csproj @@ -8,17 +8,17 @@ - - - - + + + + - - - - + + + + diff --git a/src/referencePackages/src/nuget.common/6.11.0/NuGet.Common.6.11.0.csproj b/src/referencePackages/src/nuget.common/6.11.0/NuGet.Common.6.11.0.csproj index 6a4533d709..cf19e33165 100644 --- a/src/referencePackages/src/nuget.common/6.11.0/NuGet.Common.6.11.0.csproj +++ b/src/referencePackages/src/nuget.common/6.11.0/NuGet.Common.6.11.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/nuget.common/6.12.1/NuGet.Common.6.12.1.csproj b/src/referencePackages/src/nuget.common/6.12.1/NuGet.Common.6.12.1.csproj index 5b5343905a..a3acffcd45 100644 --- a/src/referencePackages/src/nuget.common/6.12.1/NuGet.Common.6.12.1.csproj +++ b/src/referencePackages/src/nuget.common/6.12.1/NuGet.Common.6.12.1.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/nuget.common/6.8.1/NuGet.Common.6.8.1.csproj b/src/referencePackages/src/nuget.common/6.8.1/NuGet.Common.6.8.1.csproj index 67a8b754ef..d45e0deb51 100644 --- a/src/referencePackages/src/nuget.common/6.8.1/NuGet.Common.6.8.1.csproj +++ b/src/referencePackages/src/nuget.common/6.8.1/NuGet.Common.6.8.1.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/nuget.configuration/6.11.0/NuGet.Configuration.6.11.0.csproj b/src/referencePackages/src/nuget.configuration/6.11.0/NuGet.Configuration.6.11.0.csproj index f51a69517c..5850a36a9d 100644 --- a/src/referencePackages/src/nuget.configuration/6.11.0/NuGet.Configuration.6.11.0.csproj +++ b/src/referencePackages/src/nuget.configuration/6.11.0/NuGet.Configuration.6.11.0.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/nuget.configuration/6.12.1/NuGet.Configuration.6.12.1.csproj b/src/referencePackages/src/nuget.configuration/6.12.1/NuGet.Configuration.6.12.1.csproj index 3e38acf33b..b6cfa54d3d 100644 --- a/src/referencePackages/src/nuget.configuration/6.12.1/NuGet.Configuration.6.12.1.csproj +++ b/src/referencePackages/src/nuget.configuration/6.12.1/NuGet.Configuration.6.12.1.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/nuget.configuration/6.8.1/NuGet.Configuration.6.8.1.csproj b/src/referencePackages/src/nuget.configuration/6.8.1/NuGet.Configuration.6.8.1.csproj index 9abd8b0760..969077da45 100644 --- a/src/referencePackages/src/nuget.configuration/6.8.1/NuGet.Configuration.6.8.1.csproj +++ b/src/referencePackages/src/nuget.configuration/6.8.1/NuGet.Configuration.6.8.1.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/nuget.credentials/6.11.0/NuGet.Credentials.6.11.0.csproj b/src/referencePackages/src/nuget.credentials/6.11.0/NuGet.Credentials.6.11.0.csproj index 3c374f6a27..2e826742d3 100644 --- a/src/referencePackages/src/nuget.credentials/6.11.0/NuGet.Credentials.6.11.0.csproj +++ b/src/referencePackages/src/nuget.credentials/6.11.0/NuGet.Credentials.6.11.0.csproj @@ -8,11 +8,11 @@ - + - + diff --git a/src/referencePackages/src/nuget.credentials/6.8.1/NuGet.Credentials.6.8.1.csproj b/src/referencePackages/src/nuget.credentials/6.8.1/NuGet.Credentials.6.8.1.csproj index 64b1d9d787..859250c50f 100644 --- a/src/referencePackages/src/nuget.credentials/6.8.1/NuGet.Credentials.6.8.1.csproj +++ b/src/referencePackages/src/nuget.credentials/6.8.1/NuGet.Credentials.6.8.1.csproj @@ -8,11 +8,11 @@ - + - + diff --git a/src/referencePackages/src/nuget.dependencyresolver.core/6.11.0/NuGet.DependencyResolver.Core.6.11.0.csproj b/src/referencePackages/src/nuget.dependencyresolver.core/6.11.0/NuGet.DependencyResolver.Core.6.11.0.csproj index 3cf652d948..255b3aabeb 100644 --- a/src/referencePackages/src/nuget.dependencyresolver.core/6.11.0/NuGet.DependencyResolver.Core.6.11.0.csproj +++ b/src/referencePackages/src/nuget.dependencyresolver.core/6.11.0/NuGet.DependencyResolver.Core.6.11.0.csproj @@ -8,15 +8,15 @@ - - - + + + - - - + + + diff --git a/src/referencePackages/src/nuget.dependencyresolver.core/6.12.1/NuGet.DependencyResolver.Core.6.12.1.csproj b/src/referencePackages/src/nuget.dependencyresolver.core/6.12.1/NuGet.DependencyResolver.Core.6.12.1.csproj index ad4c58d865..2945cd330e 100644 --- a/src/referencePackages/src/nuget.dependencyresolver.core/6.12.1/NuGet.DependencyResolver.Core.6.12.1.csproj +++ b/src/referencePackages/src/nuget.dependencyresolver.core/6.12.1/NuGet.DependencyResolver.Core.6.12.1.csproj @@ -8,15 +8,15 @@ - - - + + + - - - + + + diff --git a/src/referencePackages/src/nuget.librarymodel/6.11.0/NuGet.LibraryModel.6.11.0.csproj b/src/referencePackages/src/nuget.librarymodel/6.11.0/NuGet.LibraryModel.6.11.0.csproj index 982d532284..43f949ffb3 100644 --- a/src/referencePackages/src/nuget.librarymodel/6.11.0/NuGet.LibraryModel.6.11.0.csproj +++ b/src/referencePackages/src/nuget.librarymodel/6.11.0/NuGet.LibraryModel.6.11.0.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/nuget.librarymodel/6.12.1/NuGet.LibraryModel.6.12.1.csproj b/src/referencePackages/src/nuget.librarymodel/6.12.1/NuGet.LibraryModel.6.12.1.csproj index 093ba31333..4a638b4409 100644 --- a/src/referencePackages/src/nuget.librarymodel/6.12.1/NuGet.LibraryModel.6.12.1.csproj +++ b/src/referencePackages/src/nuget.librarymodel/6.12.1/NuGet.LibraryModel.6.12.1.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/nuget.packaging/6.11.0/NuGet.Packaging.6.11.0.csproj b/src/referencePackages/src/nuget.packaging/6.11.0/NuGet.Packaging.6.11.0.csproj index 403e120a1f..544cbd3443 100644 --- a/src/referencePackages/src/nuget.packaging/6.11.0/NuGet.Packaging.6.11.0.csproj +++ b/src/referencePackages/src/nuget.packaging/6.11.0/NuGet.Packaging.6.11.0.csproj @@ -8,17 +8,17 @@ - - - + + + - - - + + + diff --git a/src/referencePackages/src/nuget.packaging/6.12.1/NuGet.Packaging.6.12.1.csproj b/src/referencePackages/src/nuget.packaging/6.12.1/NuGet.Packaging.6.12.1.csproj index 379239db68..f49c6bbdec 100644 --- a/src/referencePackages/src/nuget.packaging/6.12.1/NuGet.Packaging.6.12.1.csproj +++ b/src/referencePackages/src/nuget.packaging/6.12.1/NuGet.Packaging.6.12.1.csproj @@ -8,19 +8,19 @@ - - - - + + + + - - - - + + + + diff --git a/src/referencePackages/src/nuget.packaging/6.8.1/NuGet.Packaging.6.8.1.csproj b/src/referencePackages/src/nuget.packaging/6.8.1/NuGet.Packaging.6.8.1.csproj index 934ffb1866..ebf7de20b2 100644 --- a/src/referencePackages/src/nuget.packaging/6.8.1/NuGet.Packaging.6.8.1.csproj +++ b/src/referencePackages/src/nuget.packaging/6.8.1/NuGet.Packaging.6.8.1.csproj @@ -8,17 +8,17 @@ - - - + + + - - - + + + diff --git a/src/referencePackages/src/nuget.projectmodel/6.11.0/NuGet.ProjectModel.6.11.0.csproj b/src/referencePackages/src/nuget.projectmodel/6.11.0/NuGet.ProjectModel.6.11.0.csproj index fe9f0671c2..39a9448e9d 100644 --- a/src/referencePackages/src/nuget.projectmodel/6.11.0/NuGet.ProjectModel.6.11.0.csproj +++ b/src/referencePackages/src/nuget.projectmodel/6.11.0/NuGet.ProjectModel.6.11.0.csproj @@ -8,11 +8,11 @@ - + - + diff --git a/src/referencePackages/src/nuget.projectmodel/6.12.1/NuGet.ProjectModel.6.12.1.csproj b/src/referencePackages/src/nuget.projectmodel/6.12.1/NuGet.ProjectModel.6.12.1.csproj index c1f8e68e09..d91826add5 100644 --- a/src/referencePackages/src/nuget.projectmodel/6.12.1/NuGet.ProjectModel.6.12.1.csproj +++ b/src/referencePackages/src/nuget.projectmodel/6.12.1/NuGet.ProjectModel.6.12.1.csproj @@ -8,11 +8,11 @@ - + - + diff --git a/src/referencePackages/src/nuget.protocol/6.11.0/NuGet.Protocol.6.11.0.csproj b/src/referencePackages/src/nuget.protocol/6.11.0/NuGet.Protocol.6.11.0.csproj index efe3b02527..43061465c0 100644 --- a/src/referencePackages/src/nuget.protocol/6.11.0/NuGet.Protocol.6.11.0.csproj +++ b/src/referencePackages/src/nuget.protocol/6.11.0/NuGet.Protocol.6.11.0.csproj @@ -8,12 +8,12 @@ - + - - + + diff --git a/src/referencePackages/src/nuget.protocol/6.12.1/NuGet.Protocol.6.12.1.csproj b/src/referencePackages/src/nuget.protocol/6.12.1/NuGet.Protocol.6.12.1.csproj index a12875c1dd..2464d03d64 100644 --- a/src/referencePackages/src/nuget.protocol/6.12.1/NuGet.Protocol.6.12.1.csproj +++ b/src/referencePackages/src/nuget.protocol/6.12.1/NuGet.Protocol.6.12.1.csproj @@ -8,12 +8,12 @@ - + - - + + diff --git a/src/referencePackages/src/nuget.protocol/6.8.1/NuGet.Protocol.6.8.1.csproj b/src/referencePackages/src/nuget.protocol/6.8.1/NuGet.Protocol.6.8.1.csproj index 11711e308e..0e6324c1a3 100644 --- a/src/referencePackages/src/nuget.protocol/6.8.1/NuGet.Protocol.6.8.1.csproj +++ b/src/referencePackages/src/nuget.protocol/6.8.1/NuGet.Protocol.6.8.1.csproj @@ -8,12 +8,12 @@ - + - - + + diff --git a/src/referencePackages/src/system.collections.immutable/5.0.0/System.Collections.Immutable.5.0.0.csproj b/src/referencePackages/src/system.collections.immutable/5.0.0/System.Collections.Immutable.5.0.0.csproj index 2ee607c59e..81df15da43 100644 --- a/src/referencePackages/src/system.collections.immutable/5.0.0/System.Collections.Immutable.5.0.0.csproj +++ b/src/referencePackages/src/system.collections.immutable/5.0.0/System.Collections.Immutable.5.0.0.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.collections.immutable/6.0.0/System.Collections.Immutable.6.0.0.csproj b/src/referencePackages/src/system.collections.immutable/6.0.0/System.Collections.Immutable.6.0.0.csproj index 4a04718d58..6a2a65e2b0 100644 --- a/src/referencePackages/src/system.collections.immutable/6.0.0/System.Collections.Immutable.6.0.0.csproj +++ b/src/referencePackages/src/system.collections.immutable/6.0.0/System.Collections.Immutable.6.0.0.csproj @@ -7,12 +7,12 @@ - + - - + + diff --git a/src/referencePackages/src/system.collections.immutable/7.0.0/System.Collections.Immutable.7.0.0.csproj b/src/referencePackages/src/system.collections.immutable/7.0.0/System.Collections.Immutable.7.0.0.csproj index d13b5be96d..4d32957b75 100644 --- a/src/referencePackages/src/system.collections.immutable/7.0.0/System.Collections.Immutable.7.0.0.csproj +++ b/src/referencePackages/src/system.collections.immutable/7.0.0/System.Collections.Immutable.7.0.0.csproj @@ -7,12 +7,12 @@ - + - - + + diff --git a/src/referencePackages/src/system.collections.immutable/8.0.0/System.Collections.Immutable.8.0.0.csproj b/src/referencePackages/src/system.collections.immutable/8.0.0/System.Collections.Immutable.8.0.0.csproj index 1cec49fc05..2f83f884ec 100644 --- a/src/referencePackages/src/system.collections.immutable/8.0.0/System.Collections.Immutable.8.0.0.csproj +++ b/src/referencePackages/src/system.collections.immutable/8.0.0/System.Collections.Immutable.8.0.0.csproj @@ -7,12 +7,12 @@ - + - - + + diff --git a/src/referencePackages/src/system.configuration.configurationmanager/6.0.0/System.Configuration.ConfigurationManager.6.0.0.csproj b/src/referencePackages/src/system.configuration.configurationmanager/6.0.0/System.Configuration.ConfigurationManager.6.0.0.csproj index 326198a22f..b8152b1e20 100644 --- a/src/referencePackages/src/system.configuration.configurationmanager/6.0.0/System.Configuration.ConfigurationManager.6.0.0.csproj +++ b/src/referencePackages/src/system.configuration.configurationmanager/6.0.0/System.Configuration.ConfigurationManager.6.0.0.csproj @@ -8,13 +8,13 @@ - - + + - - + + diff --git a/src/referencePackages/src/system.configuration.configurationmanager/7.0.0/System.Configuration.ConfigurationManager.7.0.0.csproj b/src/referencePackages/src/system.configuration.configurationmanager/7.0.0/System.Configuration.ConfigurationManager.7.0.0.csproj index f24c0581b4..d612d5a55f 100644 --- a/src/referencePackages/src/system.configuration.configurationmanager/7.0.0/System.Configuration.ConfigurationManager.7.0.0.csproj +++ b/src/referencePackages/src/system.configuration.configurationmanager/7.0.0/System.Configuration.ConfigurationManager.7.0.0.csproj @@ -8,19 +8,19 @@ - - + + - - - + + + - - + + diff --git a/src/referencePackages/src/system.configuration.configurationmanager/8.0.0/System.Configuration.ConfigurationManager.8.0.0.csproj b/src/referencePackages/src/system.configuration.configurationmanager/8.0.0/System.Configuration.ConfigurationManager.8.0.0.csproj index 1ae20055c8..554b1e3b51 100644 --- a/src/referencePackages/src/system.configuration.configurationmanager/8.0.0/System.Configuration.ConfigurationManager.8.0.0.csproj +++ b/src/referencePackages/src/system.configuration.configurationmanager/8.0.0/System.Configuration.ConfigurationManager.8.0.0.csproj @@ -8,21 +8,21 @@ - + - - + + - - + + - + diff --git a/src/referencePackages/src/system.diagnostics.diagnosticsource/8.0.0/System.Diagnostics.DiagnosticSource.8.0.0.csproj b/src/referencePackages/src/system.diagnostics.diagnosticsource/8.0.0/System.Diagnostics.DiagnosticSource.8.0.0.csproj index 2e7084616c..f14cb989f1 100644 --- a/src/referencePackages/src/system.diagnostics.diagnosticsource/8.0.0/System.Diagnostics.DiagnosticSource.8.0.0.csproj +++ b/src/referencePackages/src/system.diagnostics.diagnosticsource/8.0.0/System.Diagnostics.DiagnosticSource.8.0.0.csproj @@ -8,12 +8,12 @@ - + - - + + diff --git a/src/referencePackages/src/system.diagnostics.eventlog/7.0.0/System.Diagnostics.EventLog.7.0.0.csproj b/src/referencePackages/src/system.diagnostics.eventlog/7.0.0/System.Diagnostics.EventLog.7.0.0.csproj index 5f9b824914..c672918ebf 100644 --- a/src/referencePackages/src/system.diagnostics.eventlog/7.0.0/System.Diagnostics.EventLog.7.0.0.csproj +++ b/src/referencePackages/src/system.diagnostics.eventlog/7.0.0/System.Diagnostics.EventLog.7.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.diagnostics.eventlog/8.0.0/System.Diagnostics.EventLog.8.0.0.csproj b/src/referencePackages/src/system.diagnostics.eventlog/8.0.0/System.Diagnostics.EventLog.8.0.0.csproj index 871c4fcce6..026d794f79 100644 --- a/src/referencePackages/src/system.diagnostics.eventlog/8.0.0/System.Diagnostics.EventLog.8.0.0.csproj +++ b/src/referencePackages/src/system.diagnostics.eventlog/8.0.0/System.Diagnostics.EventLog.8.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.drawing.common/6.0.0/System.Drawing.Common.6.0.0.csproj b/src/referencePackages/src/system.drawing.common/6.0.0/System.Drawing.Common.6.0.0.csproj index f33fab90a7..70fe9163e0 100644 --- a/src/referencePackages/src/system.drawing.common/6.0.0/System.Drawing.Common.6.0.0.csproj +++ b/src/referencePackages/src/system.drawing.common/6.0.0/System.Drawing.Common.6.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.drawing.common/7.0.0/System.Drawing.Common.7.0.0.csproj b/src/referencePackages/src/system.drawing.common/7.0.0/System.Drawing.Common.7.0.0.csproj index 3af7f4cccb..a5d5342d11 100644 --- a/src/referencePackages/src/system.drawing.common/7.0.0/System.Drawing.Common.7.0.0.csproj +++ b/src/referencePackages/src/system.drawing.common/7.0.0/System.Drawing.Common.7.0.0.csproj @@ -8,11 +8,11 @@ - + - + diff --git a/src/referencePackages/src/system.formats.asn1/5.0.0/System.Formats.Asn1.5.0.0.csproj b/src/referencePackages/src/system.formats.asn1/5.0.0/System.Formats.Asn1.5.0.0.csproj index 0680688459..15d9bac415 100644 --- a/src/referencePackages/src/system.formats.asn1/5.0.0/System.Formats.Asn1.5.0.0.csproj +++ b/src/referencePackages/src/system.formats.asn1/5.0.0/System.Formats.Asn1.5.0.0.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/system.formats.asn1/6.0.0/System.Formats.Asn1.6.0.0.csproj b/src/referencePackages/src/system.formats.asn1/6.0.0/System.Formats.Asn1.6.0.0.csproj index 3d2003b780..df82c7659b 100644 --- a/src/referencePackages/src/system.formats.asn1/6.0.0/System.Formats.Asn1.6.0.0.csproj +++ b/src/referencePackages/src/system.formats.asn1/6.0.0/System.Formats.Asn1.6.0.0.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/system.formats.asn1/7.0.0/System.Formats.Asn1.7.0.0.csproj b/src/referencePackages/src/system.formats.asn1/7.0.0/System.Formats.Asn1.7.0.0.csproj index 1af3f21536..0066aad8db 100644 --- a/src/referencePackages/src/system.formats.asn1/7.0.0/System.Formats.Asn1.7.0.0.csproj +++ b/src/referencePackages/src/system.formats.asn1/7.0.0/System.Formats.Asn1.7.0.0.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/system.formats.asn1/8.0.0/System.Formats.Asn1.8.0.0.csproj b/src/referencePackages/src/system.formats.asn1/8.0.0/System.Formats.Asn1.8.0.0.csproj index 775660cfa2..e9c6a77391 100644 --- a/src/referencePackages/src/system.formats.asn1/8.0.0/System.Formats.Asn1.8.0.0.csproj +++ b/src/referencePackages/src/system.formats.asn1/8.0.0/System.Formats.Asn1.8.0.0.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/system.formats.asn1/8.0.1/System.Formats.Asn1.8.0.1.csproj b/src/referencePackages/src/system.formats.asn1/8.0.1/System.Formats.Asn1.8.0.1.csproj index 3c23e09bef..eb9f6227bc 100644 --- a/src/referencePackages/src/system.formats.asn1/8.0.1/System.Formats.Asn1.8.0.1.csproj +++ b/src/referencePackages/src/system.formats.asn1/8.0.1/System.Formats.Asn1.8.0.1.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/referencePackages/src/system.io.filesystem.accesscontrol/5.0.0/System.IO.FileSystem.AccessControl.5.0.0.csproj b/src/referencePackages/src/system.io.filesystem.accesscontrol/5.0.0/System.IO.FileSystem.AccessControl.5.0.0.csproj index 8df3a5f059..e3c3bfac1a 100644 --- a/src/referencePackages/src/system.io.filesystem.accesscontrol/5.0.0/System.IO.FileSystem.AccessControl.5.0.0.csproj +++ b/src/referencePackages/src/system.io.filesystem.accesscontrol/5.0.0/System.IO.FileSystem.AccessControl.5.0.0.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/referencePackages/src/system.memory/4.5.4/System.Memory.4.5.4.csproj b/src/referencePackages/src/system.memory/4.5.4/System.Memory.4.5.4.csproj index c77fb8d777..77c118016f 100644 --- a/src/referencePackages/src/system.memory/4.5.4/System.Memory.4.5.4.csproj +++ b/src/referencePackages/src/system.memory/4.5.4/System.Memory.4.5.4.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/referencePackages/src/system.memory/4.5.5/System.Memory.4.5.5.csproj b/src/referencePackages/src/system.memory/4.5.5/System.Memory.4.5.5.csproj index 5b1fb4ffb1..b280ad8d17 100644 --- a/src/referencePackages/src/system.memory/4.5.5/System.Memory.4.5.5.csproj +++ b/src/referencePackages/src/system.memory/4.5.5/System.Memory.4.5.5.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/referencePackages/src/system.memory/4.6.0/System.Memory.4.6.0.csproj b/src/referencePackages/src/system.memory/4.6.0/System.Memory.4.6.0.csproj index 5afbd5427a..89cc7847cb 100644 --- a/src/referencePackages/src/system.memory/4.6.0/System.Memory.4.6.0.csproj +++ b/src/referencePackages/src/system.memory/4.6.0/System.Memory.4.6.0.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/referencePackages/src/system.reflection.dispatchproxy/4.8.1/System.Reflection.DispatchProxy.4.8.1.csproj b/src/referencePackages/src/system.reflection.dispatchproxy/4.8.1/System.Reflection.DispatchProxy.4.8.1.csproj index 10f11ffd86..71d1061191 100644 --- a/src/referencePackages/src/system.reflection.dispatchproxy/4.8.1/System.Reflection.DispatchProxy.4.8.1.csproj +++ b/src/referencePackages/src/system.reflection.dispatchproxy/4.8.1/System.Reflection.DispatchProxy.4.8.1.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.reflection.emit/4.7.0/System.Reflection.Emit.4.7.0.csproj b/src/referencePackages/src/system.reflection.emit/4.7.0/System.Reflection.Emit.4.7.0.csproj index 93d49be1b0..a7f9c24fe2 100644 --- a/src/referencePackages/src/system.reflection.emit/4.7.0/System.Reflection.Emit.4.7.0.csproj +++ b/src/referencePackages/src/system.reflection.emit/4.7.0/System.Reflection.Emit.4.7.0.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.reflection.metadata/5.0.0/System.Reflection.Metadata.5.0.0.csproj b/src/referencePackages/src/system.reflection.metadata/5.0.0/System.Reflection.Metadata.5.0.0.csproj index b2198cf725..5fc92c12de 100644 --- a/src/referencePackages/src/system.reflection.metadata/5.0.0/System.Reflection.Metadata.5.0.0.csproj +++ b/src/referencePackages/src/system.reflection.metadata/5.0.0/System.Reflection.Metadata.5.0.0.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.reflection.metadata/6.0.0/System.Reflection.Metadata.6.0.0.csproj b/src/referencePackages/src/system.reflection.metadata/6.0.0/System.Reflection.Metadata.6.0.0.csproj index fcd658704b..f4416d037b 100644 --- a/src/referencePackages/src/system.reflection.metadata/6.0.0/System.Reflection.Metadata.6.0.0.csproj +++ b/src/referencePackages/src/system.reflection.metadata/6.0.0/System.Reflection.Metadata.6.0.0.csproj @@ -7,11 +7,11 @@ - + - + diff --git a/src/referencePackages/src/system.reflection.metadata/7.0.0/System.Reflection.Metadata.7.0.0.csproj b/src/referencePackages/src/system.reflection.metadata/7.0.0/System.Reflection.Metadata.7.0.0.csproj index f6b959f5c3..8bb3ac6ed8 100644 --- a/src/referencePackages/src/system.reflection.metadata/7.0.0/System.Reflection.Metadata.7.0.0.csproj +++ b/src/referencePackages/src/system.reflection.metadata/7.0.0/System.Reflection.Metadata.7.0.0.csproj @@ -7,16 +7,16 @@ - + - + - - + + diff --git a/src/referencePackages/src/system.reflection.metadata/8.0.0/System.Reflection.Metadata.8.0.0.csproj b/src/referencePackages/src/system.reflection.metadata/8.0.0/System.Reflection.Metadata.8.0.0.csproj index 5a12c848af..de8742199c 100644 --- a/src/referencePackages/src/system.reflection.metadata/8.0.0/System.Reflection.Metadata.8.0.0.csproj +++ b/src/referencePackages/src/system.reflection.metadata/8.0.0/System.Reflection.Metadata.8.0.0.csproj @@ -7,20 +7,20 @@ - + - + - + - - + + diff --git a/src/referencePackages/src/system.reflection.metadataloadcontext/6.0.0/System.Reflection.MetadataLoadContext.6.0.0.csproj b/src/referencePackages/src/system.reflection.metadataloadcontext/6.0.0/System.Reflection.MetadataLoadContext.6.0.0.csproj index 37aabb43ba..4880cc3dfb 100644 --- a/src/referencePackages/src/system.reflection.metadataloadcontext/6.0.0/System.Reflection.MetadataLoadContext.6.0.0.csproj +++ b/src/referencePackages/src/system.reflection.metadataloadcontext/6.0.0/System.Reflection.MetadataLoadContext.6.0.0.csproj @@ -8,14 +8,14 @@ - - + + - - - + + + diff --git a/src/referencePackages/src/system.reflection.metadataloadcontext/7.0.0/System.Reflection.MetadataLoadContext.7.0.0.csproj b/src/referencePackages/src/system.reflection.metadataloadcontext/7.0.0/System.Reflection.MetadataLoadContext.7.0.0.csproj index 5401764949..86349262c7 100644 --- a/src/referencePackages/src/system.reflection.metadataloadcontext/7.0.0/System.Reflection.MetadataLoadContext.7.0.0.csproj +++ b/src/referencePackages/src/system.reflection.metadataloadcontext/7.0.0/System.Reflection.MetadataLoadContext.7.0.0.csproj @@ -8,19 +8,19 @@ - - + + - - + + - - - + + + diff --git a/src/referencePackages/src/system.reflection.metadataloadcontext/8.0.0/System.Reflection.MetadataLoadContext.8.0.0.csproj b/src/referencePackages/src/system.reflection.metadataloadcontext/8.0.0/System.Reflection.MetadataLoadContext.8.0.0.csproj index fba930606d..6156cb0349 100644 --- a/src/referencePackages/src/system.reflection.metadataloadcontext/8.0.0/System.Reflection.MetadataLoadContext.8.0.0.csproj +++ b/src/referencePackages/src/system.reflection.metadataloadcontext/8.0.0/System.Reflection.MetadataLoadContext.8.0.0.csproj @@ -8,24 +8,24 @@ - - + + - - + + - - + + - - - + + + diff --git a/src/referencePackages/src/system.resources.extensions/6.0.0/System.Resources.Extensions.6.0.0.csproj b/src/referencePackages/src/system.resources.extensions/6.0.0/System.Resources.Extensions.6.0.0.csproj index aa2a0a3492..58fce11126 100644 --- a/src/referencePackages/src/system.resources.extensions/6.0.0/System.Resources.Extensions.6.0.0.csproj +++ b/src/referencePackages/src/system.resources.extensions/6.0.0/System.Resources.Extensions.6.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.resources.extensions/7.0.0/System.Resources.Extensions.7.0.0.csproj b/src/referencePackages/src/system.resources.extensions/7.0.0/System.Resources.Extensions.7.0.0.csproj index 4ac88fa10c..56c2d82547 100644 --- a/src/referencePackages/src/system.resources.extensions/7.0.0/System.Resources.Extensions.7.0.0.csproj +++ b/src/referencePackages/src/system.resources.extensions/7.0.0/System.Resources.Extensions.7.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.resources.extensions/8.0.0/System.Resources.Extensions.8.0.0.csproj b/src/referencePackages/src/system.resources.extensions/8.0.0/System.Resources.Extensions.8.0.0.csproj index 28a08f622f..1803bc25b4 100644 --- a/src/referencePackages/src/system.resources.extensions/8.0.0/System.Resources.Extensions.8.0.0.csproj +++ b/src/referencePackages/src/system.resources.extensions/8.0.0/System.Resources.Extensions.8.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.security.accesscontrol/5.0.0/System.Security.AccessControl.5.0.0.csproj b/src/referencePackages/src/system.security.accesscontrol/5.0.0/System.Security.AccessControl.5.0.0.csproj index c300b93795..bf28d786c7 100644 --- a/src/referencePackages/src/system.security.accesscontrol/5.0.0/System.Security.AccessControl.5.0.0.csproj +++ b/src/referencePackages/src/system.security.accesscontrol/5.0.0/System.Security.AccessControl.5.0.0.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.security.accesscontrol/6.0.0/System.Security.AccessControl.6.0.0.csproj b/src/referencePackages/src/system.security.accesscontrol/6.0.0/System.Security.AccessControl.6.0.0.csproj index 49c7bc29e0..3f63c0faa2 100644 --- a/src/referencePackages/src/system.security.accesscontrol/6.0.0/System.Security.AccessControl.6.0.0.csproj +++ b/src/referencePackages/src/system.security.accesscontrol/6.0.0/System.Security.AccessControl.6.0.0.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.security.cryptography.cng/5.0.0/System.Security.Cryptography.Cng.5.0.0.csproj b/src/referencePackages/src/system.security.cryptography.cng/5.0.0/System.Security.Cryptography.Cng.5.0.0.csproj index af7307b0fd..679c70dcba 100644 --- a/src/referencePackages/src/system.security.cryptography.cng/5.0.0/System.Security.Cryptography.Cng.5.0.0.csproj +++ b/src/referencePackages/src/system.security.cryptography.cng/5.0.0/System.Security.Cryptography.Cng.5.0.0.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.security.cryptography.pkcs/6.0.0/System.Security.Cryptography.Pkcs.6.0.0.csproj b/src/referencePackages/src/system.security.cryptography.pkcs/6.0.0/System.Security.Cryptography.Pkcs.6.0.0.csproj index 2b51e166c6..8aa9d36e10 100644 --- a/src/referencePackages/src/system.security.cryptography.pkcs/6.0.0/System.Security.Cryptography.Pkcs.6.0.0.csproj +++ b/src/referencePackages/src/system.security.cryptography.pkcs/6.0.0/System.Security.Cryptography.Pkcs.6.0.0.csproj @@ -7,19 +7,19 @@ - + - - - - + + + + - - + + diff --git a/src/referencePackages/src/system.security.cryptography.pkcs/6.0.1/System.Security.Cryptography.Pkcs.6.0.1.csproj b/src/referencePackages/src/system.security.cryptography.pkcs/6.0.1/System.Security.Cryptography.Pkcs.6.0.1.csproj index c485f1514f..2dd64ca62e 100644 --- a/src/referencePackages/src/system.security.cryptography.pkcs/6.0.1/System.Security.Cryptography.Pkcs.6.0.1.csproj +++ b/src/referencePackages/src/system.security.cryptography.pkcs/6.0.1/System.Security.Cryptography.Pkcs.6.0.1.csproj @@ -7,19 +7,19 @@ - + - - - - + + + + - - + + diff --git a/src/referencePackages/src/system.security.cryptography.pkcs/6.0.4/System.Security.Cryptography.Pkcs.6.0.4.csproj b/src/referencePackages/src/system.security.cryptography.pkcs/6.0.4/System.Security.Cryptography.Pkcs.6.0.4.csproj index cbf268b528..e7e9e77742 100644 --- a/src/referencePackages/src/system.security.cryptography.pkcs/6.0.4/System.Security.Cryptography.Pkcs.6.0.4.csproj +++ b/src/referencePackages/src/system.security.cryptography.pkcs/6.0.4/System.Security.Cryptography.Pkcs.6.0.4.csproj @@ -7,19 +7,19 @@ - + - - - - + + + + - - + + diff --git a/src/referencePackages/src/system.security.cryptography.pkcs/7.0.0/System.Security.Cryptography.Pkcs.7.0.0.csproj b/src/referencePackages/src/system.security.cryptography.pkcs/7.0.0/System.Security.Cryptography.Pkcs.7.0.0.csproj index 35157022ce..5ab3600446 100644 --- a/src/referencePackages/src/system.security.cryptography.pkcs/7.0.0/System.Security.Cryptography.Pkcs.7.0.0.csproj +++ b/src/referencePackages/src/system.security.cryptography.pkcs/7.0.0/System.Security.Cryptography.Pkcs.7.0.0.csproj @@ -7,23 +7,23 @@ - + - + - - - - + + + + - - + + diff --git a/src/referencePackages/src/system.security.cryptography.pkcs/7.0.2/System.Security.Cryptography.Pkcs.7.0.2.csproj b/src/referencePackages/src/system.security.cryptography.pkcs/7.0.2/System.Security.Cryptography.Pkcs.7.0.2.csproj index 1d2a807648..f2d6e0fbbc 100644 --- a/src/referencePackages/src/system.security.cryptography.pkcs/7.0.2/System.Security.Cryptography.Pkcs.7.0.2.csproj +++ b/src/referencePackages/src/system.security.cryptography.pkcs/7.0.2/System.Security.Cryptography.Pkcs.7.0.2.csproj @@ -7,23 +7,23 @@ - + - + - - - - + + + + - - + + diff --git a/src/referencePackages/src/system.security.cryptography.pkcs/8.0.0/System.Security.Cryptography.Pkcs.8.0.0.csproj b/src/referencePackages/src/system.security.cryptography.pkcs/8.0.0/System.Security.Cryptography.Pkcs.8.0.0.csproj index 77734ab726..7f0f3d06d0 100644 --- a/src/referencePackages/src/system.security.cryptography.pkcs/8.0.0/System.Security.Cryptography.Pkcs.8.0.0.csproj +++ b/src/referencePackages/src/system.security.cryptography.pkcs/8.0.0/System.Security.Cryptography.Pkcs.8.0.0.csproj @@ -7,27 +7,27 @@ - + - + - + - - - - + + + + - - + + diff --git a/src/referencePackages/src/system.security.cryptography.protecteddata/6.0.0/System.Security.Cryptography.ProtectedData.6.0.0.csproj b/src/referencePackages/src/system.security.cryptography.protecteddata/6.0.0/System.Security.Cryptography.ProtectedData.6.0.0.csproj index 8440f4e845..9648b78797 100644 --- a/src/referencePackages/src/system.security.cryptography.protecteddata/6.0.0/System.Security.Cryptography.ProtectedData.6.0.0.csproj +++ b/src/referencePackages/src/system.security.cryptography.protecteddata/6.0.0/System.Security.Cryptography.ProtectedData.6.0.0.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.security.cryptography.protecteddata/8.0.0/System.Security.Cryptography.ProtectedData.8.0.0.csproj b/src/referencePackages/src/system.security.cryptography.protecteddata/8.0.0/System.Security.Cryptography.ProtectedData.8.0.0.csproj index d7194fbad3..fdce9d49e3 100644 --- a/src/referencePackages/src/system.security.cryptography.protecteddata/8.0.0/System.Security.Cryptography.ProtectedData.8.0.0.csproj +++ b/src/referencePackages/src/system.security.cryptography.protecteddata/8.0.0/System.Security.Cryptography.ProtectedData.8.0.0.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.security.cryptography.xml/6.0.0/System.Security.Cryptography.Xml.6.0.0.csproj b/src/referencePackages/src/system.security.cryptography.xml/6.0.0/System.Security.Cryptography.Xml.6.0.0.csproj index 1eb28c84c7..49ccfac7d2 100644 --- a/src/referencePackages/src/system.security.cryptography.xml/6.0.0/System.Security.Cryptography.Xml.6.0.0.csproj +++ b/src/referencePackages/src/system.security.cryptography.xml/6.0.0/System.Security.Cryptography.Xml.6.0.0.csproj @@ -8,14 +8,14 @@ - - + + - - - + + + diff --git a/src/referencePackages/src/system.security.cryptography.xml/6.0.1/System.Security.Cryptography.Xml.6.0.1.csproj b/src/referencePackages/src/system.security.cryptography.xml/6.0.1/System.Security.Cryptography.Xml.6.0.1.csproj index 0f294076d7..759fb0e752 100644 --- a/src/referencePackages/src/system.security.cryptography.xml/6.0.1/System.Security.Cryptography.Xml.6.0.1.csproj +++ b/src/referencePackages/src/system.security.cryptography.xml/6.0.1/System.Security.Cryptography.Xml.6.0.1.csproj @@ -8,14 +8,14 @@ - - + + - - - + + + diff --git a/src/referencePackages/src/system.security.cryptography.xml/7.0.1/System.Security.Cryptography.Xml.7.0.1.csproj b/src/referencePackages/src/system.security.cryptography.xml/7.0.1/System.Security.Cryptography.Xml.7.0.1.csproj index feee2e265f..89e2735b13 100644 --- a/src/referencePackages/src/system.security.cryptography.xml/7.0.1/System.Security.Cryptography.Xml.7.0.1.csproj +++ b/src/referencePackages/src/system.security.cryptography.xml/7.0.1/System.Security.Cryptography.Xml.7.0.1.csproj @@ -8,17 +8,17 @@ - + - + - - - + + + diff --git a/src/referencePackages/src/system.security.cryptography.xml/8.0.0/System.Security.Cryptography.Xml.8.0.0.csproj b/src/referencePackages/src/system.security.cryptography.xml/8.0.0/System.Security.Cryptography.Xml.8.0.0.csproj index 932bb2d3a1..d65bc54f36 100644 --- a/src/referencePackages/src/system.security.cryptography.xml/8.0.0/System.Security.Cryptography.Xml.8.0.0.csproj +++ b/src/referencePackages/src/system.security.cryptography.xml/8.0.0/System.Security.Cryptography.Xml.8.0.0.csproj @@ -8,21 +8,21 @@ - + - + - + - - - + + + diff --git a/src/referencePackages/src/system.security.permissions/6.0.0/System.Security.Permissions.6.0.0.csproj b/src/referencePackages/src/system.security.permissions/6.0.0/System.Security.Permissions.6.0.0.csproj index 3596d5689a..a04afb85d6 100644 --- a/src/referencePackages/src/system.security.permissions/6.0.0/System.Security.Permissions.6.0.0.csproj +++ b/src/referencePackages/src/system.security.permissions/6.0.0/System.Security.Permissions.6.0.0.csproj @@ -9,12 +9,12 @@ - - + + - + diff --git a/src/referencePackages/src/system.security.permissions/7.0.0/System.Security.Permissions.7.0.0.csproj b/src/referencePackages/src/system.security.permissions/7.0.0/System.Security.Permissions.7.0.0.csproj index 2a4118ec90..7b4a568680 100644 --- a/src/referencePackages/src/system.security.permissions/7.0.0/System.Security.Permissions.7.0.0.csproj +++ b/src/referencePackages/src/system.security.permissions/7.0.0/System.Security.Permissions.7.0.0.csproj @@ -8,15 +8,15 @@ - + - + - + diff --git a/src/referencePackages/src/system.text.encoding.codepages/4.5.1/System.Text.Encoding.CodePages.4.5.1.csproj b/src/referencePackages/src/system.text.encoding.codepages/4.5.1/System.Text.Encoding.CodePages.4.5.1.csproj index 88e497ee56..865c15f1a5 100644 --- a/src/referencePackages/src/system.text.encoding.codepages/4.5.1/System.Text.Encoding.CodePages.4.5.1.csproj +++ b/src/referencePackages/src/system.text.encoding.codepages/4.5.1/System.Text.Encoding.CodePages.4.5.1.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/referencePackages/src/system.text.encoding.codepages/6.0.0/System.Text.Encoding.CodePages.6.0.0.csproj b/src/referencePackages/src/system.text.encoding.codepages/6.0.0/System.Text.Encoding.CodePages.6.0.0.csproj index 45da20d381..bfb49d2608 100644 --- a/src/referencePackages/src/system.text.encoding.codepages/6.0.0/System.Text.Encoding.CodePages.6.0.0.csproj +++ b/src/referencePackages/src/system.text.encoding.codepages/6.0.0/System.Text.Encoding.CodePages.6.0.0.csproj @@ -7,12 +7,12 @@ - + - - + + diff --git a/src/referencePackages/src/system.text.encoding.codepages/7.0.0/System.Text.Encoding.CodePages.7.0.0.csproj b/src/referencePackages/src/system.text.encoding.codepages/7.0.0/System.Text.Encoding.CodePages.7.0.0.csproj index 12b9029b33..afef70a9d6 100644 --- a/src/referencePackages/src/system.text.encoding.codepages/7.0.0/System.Text.Encoding.CodePages.7.0.0.csproj +++ b/src/referencePackages/src/system.text.encoding.codepages/7.0.0/System.Text.Encoding.CodePages.7.0.0.csproj @@ -7,12 +7,12 @@ - + - - + + diff --git a/src/referencePackages/src/system.text.encodings.web/6.0.0/System.Text.Encodings.Web.6.0.0.csproj b/src/referencePackages/src/system.text.encodings.web/6.0.0/System.Text.Encodings.Web.6.0.0.csproj index 56d02eaa1c..ae3409b435 100644 --- a/src/referencePackages/src/system.text.encodings.web/6.0.0/System.Text.Encodings.Web.6.0.0.csproj +++ b/src/referencePackages/src/system.text.encodings.web/6.0.0/System.Text.Encodings.Web.6.0.0.csproj @@ -8,13 +8,13 @@ - + - - - + + + diff --git a/src/referencePackages/src/system.text.encodings.web/7.0.0/System.Text.Encodings.Web.7.0.0.csproj b/src/referencePackages/src/system.text.encodings.web/7.0.0/System.Text.Encodings.Web.7.0.0.csproj index bf68b52666..e859607b7a 100644 --- a/src/referencePackages/src/system.text.encodings.web/7.0.0/System.Text.Encodings.Web.7.0.0.csproj +++ b/src/referencePackages/src/system.text.encodings.web/7.0.0/System.Text.Encodings.Web.7.0.0.csproj @@ -8,13 +8,13 @@ - + - - - + + + diff --git a/src/referencePackages/src/system.text.encodings.web/8.0.0/System.Text.Encodings.Web.8.0.0.csproj b/src/referencePackages/src/system.text.encodings.web/8.0.0/System.Text.Encodings.Web.8.0.0.csproj index 7c3b2a23c8..b1e8565b36 100644 --- a/src/referencePackages/src/system.text.encodings.web/8.0.0/System.Text.Encodings.Web.8.0.0.csproj +++ b/src/referencePackages/src/system.text.encodings.web/8.0.0/System.Text.Encodings.Web.8.0.0.csproj @@ -8,13 +8,13 @@ - + - - - + + + diff --git a/src/referencePackages/src/system.text.json/6.0.0/System.Text.Json.6.0.0.csproj b/src/referencePackages/src/system.text.json/6.0.0/System.Text.Json.6.0.0.csproj index 843a277633..dab72d2889 100644 --- a/src/referencePackages/src/system.text.json/6.0.0/System.Text.Json.6.0.0.csproj +++ b/src/referencePackages/src/system.text.json/6.0.0/System.Text.Json.6.0.0.csproj @@ -8,18 +8,18 @@ - - + + - - - - - - - + + + + + + + diff --git a/src/referencePackages/src/system.text.json/7.0.3/System.Text.Json.7.0.3.csproj b/src/referencePackages/src/system.text.json/7.0.3/System.Text.Json.7.0.3.csproj index 46071ff454..b202cde789 100644 --- a/src/referencePackages/src/system.text.json/7.0.3/System.Text.Json.7.0.3.csproj +++ b/src/referencePackages/src/system.text.json/7.0.3/System.Text.Json.7.0.3.csproj @@ -8,22 +8,22 @@ - - + + - + - - - - - - - + + + + + + + diff --git a/src/referencePackages/src/system.text.json/8.0.4/System.Text.Json.8.0.4.csproj b/src/referencePackages/src/system.text.json/8.0.4/System.Text.Json.8.0.4.csproj index 5b2e4721e7..c68ee91e69 100644 --- a/src/referencePackages/src/system.text.json/8.0.4/System.Text.Json.8.0.4.csproj +++ b/src/referencePackages/src/system.text.json/8.0.4/System.Text.Json.8.0.4.csproj @@ -8,25 +8,25 @@ - - + + - + - + - - - - - - + + + + + + diff --git a/src/referencePackages/src/system.text.json/8.0.5/System.Text.Json.8.0.5.csproj b/src/referencePackages/src/system.text.json/8.0.5/System.Text.Json.8.0.5.csproj index f70ea96363..fd7da83a2f 100644 --- a/src/referencePackages/src/system.text.json/8.0.5/System.Text.Json.8.0.5.csproj +++ b/src/referencePackages/src/system.text.json/8.0.5/System.Text.Json.8.0.5.csproj @@ -8,21 +8,21 @@ - - + + - + - - - - - - + + + + + + diff --git a/src/referencePackages/src/system.threading.channels/7.0.0/System.Threading.Channels.7.0.0.csproj b/src/referencePackages/src/system.threading.channels/7.0.0/System.Threading.Channels.7.0.0.csproj index 9d5f5e423d..82cbc686a5 100644 --- a/src/referencePackages/src/system.threading.channels/7.0.0/System.Threading.Channels.7.0.0.csproj +++ b/src/referencePackages/src/system.threading.channels/7.0.0/System.Threading.Channels.7.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.threading.tasks.extensions/4.5.4/System.Threading.Tasks.Extensions.4.5.4.csproj b/src/referencePackages/src/system.threading.tasks.extensions/4.5.4/System.Threading.Tasks.Extensions.4.5.4.csproj index 8ebfba211f..42f30d30eb 100644 --- a/src/referencePackages/src/system.threading.tasks.extensions/4.5.4/System.Threading.Tasks.Extensions.4.5.4.csproj +++ b/src/referencePackages/src/system.threading.tasks.extensions/4.5.4/System.Threading.Tasks.Extensions.4.5.4.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.threading.tasks.extensions/4.6.0/System.Threading.Tasks.Extensions.4.6.0.csproj b/src/referencePackages/src/system.threading.tasks.extensions/4.6.0/System.Threading.Tasks.Extensions.4.6.0.csproj index 8ecaf72028..daa6a52064 100644 --- a/src/referencePackages/src/system.threading.tasks.extensions/4.6.0/System.Threading.Tasks.Extensions.4.6.0.csproj +++ b/src/referencePackages/src/system.threading.tasks.extensions/4.6.0/System.Threading.Tasks.Extensions.4.6.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.windows.extensions/6.0.0/System.Windows.Extensions.6.0.0.csproj b/src/referencePackages/src/system.windows.extensions/6.0.0/System.Windows.Extensions.6.0.0.csproj index 4176c2e56d..31530f85c3 100644 --- a/src/referencePackages/src/system.windows.extensions/6.0.0/System.Windows.Extensions.6.0.0.csproj +++ b/src/referencePackages/src/system.windows.extensions/6.0.0/System.Windows.Extensions.6.0.0.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/referencePackages/src/system.windows.extensions/7.0.0/System.Windows.Extensions.7.0.0.csproj b/src/referencePackages/src/system.windows.extensions/7.0.0/System.Windows.Extensions.7.0.0.csproj index c54aafc203..81f22b8a18 100644 --- a/src/referencePackages/src/system.windows.extensions/7.0.0/System.Windows.Extensions.7.0.0.csproj +++ b/src/referencePackages/src/system.windows.extensions/7.0.0/System.Windows.Extensions.7.0.0.csproj @@ -8,11 +8,11 @@ - + - + From 42d215368028d753bbb4332a7e1a6cd216a42e34 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 4 Mar 2025 16:36:13 +0100 Subject: [PATCH 3/8] Remove SBRP self reference from Version.Details.xml --- eng/Version.Details.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6564d6c40..a4c4559c33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,12 +8,6 @@ - - https://github.com/dotnet/source-build-reference-packages - 412f115947777b9babf97716a20b056d0d77b1b9 - - - https://github.com/dotnet/arcade 6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d From 7d5a4dfec670b109275b754c96cd639d9040efb2 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 4 Mar 2025 16:32:20 +0000 Subject: [PATCH 4/8] Use an allow list instead --- src/packageSourceGenerator/PackageSourceGenerator.proj | 8 +++++++- .../PackageSourceGeneratorTask/GenerateProject.cs | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/packageSourceGenerator/PackageSourceGenerator.proj b/src/packageSourceGenerator/PackageSourceGenerator.proj index a5bb3c1fdb..003e3314df 100644 --- a/src/packageSourceGenerator/PackageSourceGenerator.proj +++ b/src/packageSourceGenerator/PackageSourceGenerator.proj @@ -26,6 +26,11 @@ $([MSBuild]::NormalizeDirectory('$(BasePackageTargetDirectory)', '$(PackageVersion)')) + + + + + + RemoveRuntimeSpecificDependencies="true" + AllowedPackageReference="@(AllowedPackageReference)" /> diff --git a/src/packageSourceGenerator/PackageSourceGeneratorTask/GenerateProject.cs b/src/packageSourceGenerator/PackageSourceGeneratorTask/GenerateProject.cs index e514c5717b..d4b1de7034 100644 --- a/src/packageSourceGenerator/PackageSourceGeneratorTask/GenerateProject.cs +++ b/src/packageSourceGenerator/PackageSourceGeneratorTask/GenerateProject.cs @@ -56,6 +56,11 @@ public class GenerateProject : Task /// public ITaskItem[] FrameworkReferences { get; set; } = Array.Empty(); + /// + /// The list of dependencies (package id) that should get emitted as PackageReference items. + /// + public string[]? AllowedPackageReference { get; set; } + public override bool Execute() { string referenceIncludes = ""; @@ -92,8 +97,8 @@ public override bool Execute() string dependencyVersion = packageDependency.GetMetadata("Version"); string dependencyProjectRelativePath = Path.Combine(packageDependency.ItemSpec.ToLowerInvariant(), dependencyVersion, $"{packageDependency.ItemSpec}.{dependencyVersion}.csproj"); - // If the dependency doesn't exist, emit a package reference (i.e. for source-build-externals packages like Newtonsoft.Json). Otherwise, emit a project reference. - if (!File.Exists(Path.Combine(ProjectRoot, dependencyProjectRelativePath))) + // If the dependency is on the package reference allowed list (i.e. for source-build-externals packages like Newtonsoft.Json), emit a package reference. Otherwise, emit a project reference. + if (AllowedPackageReference is not null && AllowedPackageReference.Contains(packageDependency.ItemSpec)) { packageReferences += $" {Environment.NewLine}"; } From 5e8a84a125b900d65dc53ce351f6e1d8d7ae5338 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 4 Mar 2025 17:42:11 +0100 Subject: [PATCH 5/8] Fix --- .../PackageSourceGenerator.proj | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/packageSourceGenerator/PackageSourceGenerator.proj b/src/packageSourceGenerator/PackageSourceGenerator.proj index 003e3314df..833cfdd263 100644 --- a/src/packageSourceGenerator/PackageSourceGenerator.proj +++ b/src/packageSourceGenerator/PackageSourceGenerator.proj @@ -353,7 +353,8 @@ TargetPath="$(PackageProjectTargetPath)" CompileItems="@(PackageCompileItem)" PackageDependencies="@(PackageDependency)" - FrameworkReferences="@(PackageFrameworkReference)" /> + FrameworkReferences="@(PackageFrameworkReference)" + AllowedPackageReference="@(AllowedPackageReference)" /> @@ -373,8 +374,7 @@ ExcludeTargetFrameworks="$(ExcludeTargetFrameworks)" RemoveIcon="true" RemoveReadMe="true" - RemoveRuntimeSpecificDependencies="true" - AllowedPackageReference="@(AllowedPackageReference)" /> + RemoveRuntimeSpecificDependencies="true" /> @@ -408,14 +408,10 @@ - - - - + @(AllowedPackageReference)" /> Date: Tue, 4 Mar 2025 21:46:08 +0100 Subject: [PATCH 6/8] Re-generate packages --- .../src/microsoft.build.tasks.core/17.8.3/Customizations.props | 2 +- .../17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj | 2 +- .../microsoft.build.utilities.core/17.8.3/Customizations.props | 2 +- .../17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj | 2 +- .../microsoft.codeanalysis.common/4.1.0/Customizations.props | 2 +- .../4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Customizations.props b/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Customizations.props index 06f0b04c3b..1be5fc0986 100644 --- a/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Customizations.props +++ b/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Customizations.props @@ -2,7 +2,7 @@ - + diff --git a/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj b/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj index 12ece3489b..45a5084b6c 100644 --- a/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj +++ b/src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj @@ -7,7 +7,6 @@ - @@ -16,6 +15,7 @@ + diff --git a/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Customizations.props b/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Customizations.props index 06f0b04c3b..1be5fc0986 100644 --- a/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Customizations.props +++ b/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Customizations.props @@ -2,7 +2,7 @@ - + diff --git a/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj b/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj index c0fc5e0525..7951af1494 100644 --- a/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj +++ b/src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj @@ -7,9 +7,9 @@ - + diff --git a/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Customizations.props b/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Customizations.props index ba6014f082..f31a7383cc 100644 --- a/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Customizations.props +++ b/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Customizations.props @@ -2,7 +2,7 @@ - + diff --git a/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj b/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj index 0de18f1ae0..324b5540bf 100644 --- a/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj +++ b/src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj @@ -8,7 +8,7 @@ - + From 739bd21ce2159513e84f427718939fdbe563ee59 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 4 Mar 2025 22:13:45 +0100 Subject: [PATCH 7/8] Add new dependency to Version.Details.xml --- eng/Version.Details.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4c4559c33..d6564d6c40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,6 +8,12 @@ + + https://github.com/dotnet/source-build-reference-packages + 412f115947777b9babf97716a20b056d0d77b1b9 + + + https://github.com/dotnet/arcade 6d4b01bce3a29c172faff5abc0bfe2ae3d1fef3d From 1fe816772be152fd5d9c13764b3f40b1d5a531c7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 4 Mar 2025 20:58:09 -0600 Subject: [PATCH 8/8] Remove dependencyPackageProject references from readme. --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index cb1bbc4ff4..cd64e2409e 100644 --- a/README.md +++ b/README.md @@ -53,11 +53,6 @@ for detailed guidance. ./generate.sh --package system.buffers,4.5.1 ``` -After generating new reference packages, all new projects must be referenced as a -[DependencyPackageProjects](https://github.com/dotnet/source-build-reference-packages/blob/main/eng/Build.props#L9). -These must be defined in dependency order. There is a -[tracking issue](https://github.com/dotnet/source-build/issues/1690) to address this manual step. - The tooling does not handle all situations and sometimes the generated code will need manual tweeks to get it to compile. If this occurs when generating a newer version of an existing package, it can be helpful to regenerate the older version to see what customizations to the generated code were made. @@ -73,9 +68,6 @@ generated packages show changes when being regenerated. the case, the changes to the existing package should be reverted. 2. The generate tooling has changed since the last time this package was generated. The new changes should be considered better/correct and should be committed. -* Add `DependencyPackageProjects` for all new projects in the -[eng/Build.props](https://github.com/dotnet/source-build-reference-packages/blob/main/eng/Build.props#L9) -in the correct dependency order. * Run build with the `./build.sh -sb` command. * If the compilation produces numerous compilation issue - run the `./build.sh --projects ` command for each generated reference package separately.