From 04f06aee23174d2e76e6318a9be3260304a4e343 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 23 Aug 2021 16:30:04 +0200 Subject: [PATCH 1/5] Remove EOL tfms and upgrade to net7.0 --- Directory.Build.props | 25 +- .../adding-api-guidelines.md | 4 +- docs/coding-guidelines/project-guidelines.md | 6 +- docs/workflow/building/libraries/README.md | 2 +- docs/workflow/testing/libraries/testing.md | 5 +- eng/BeforeTargetFrameworkInference.targets | 2 +- eng/Versions.props | 3 +- eng/build.ps1 | 4 +- eng/build.sh | 4 +- .../libraries-sdk-aspnetcore.linux.Dockerfile | 2 +- ...ibraries-sdk-aspnetcore.windows.Dockerfile | 2 +- eng/docker/libraries-sdk.linux.Dockerfile | 2 +- eng/docker/libraries-sdk.windows.Dockerfile | 2 +- eng/packaging.targets | 21 +- .../crossgen2-comparison-build-job.yml | 2 +- eng/pipelines/coreclr/templates/perf-job.yml | 2 +- eng/pipelines/libraries/base-job.yml | 2 +- eng/pipelines/libraries/build-job.yml | 2 +- eng/pipelines/libraries/run-test-job.yml | 2 +- eng/targetingpacks.targets | 4 +- .../tests/TestUtilities/TestUtilities.csproj | 6 +- src/libraries/Directory.Build.props | 2 +- src/libraries/Directory.Build.targets | 12 +- .../ref/Microsoft.Bcl.AsyncInterfaces.csproj | 2 +- .../src/Microsoft.Bcl.AsyncInterfaces.csproj | 2 +- ...Microsoft.Bcl.AsyncInterfaces.Tests.csproj | 5 +- ...gnostics.Tracing.EventSource.Redist.csproj | 2 +- ...cs.Tracing.EventSource.Redist.Tests.csproj | 2 +- ...oft.Extensions.Caching.Abstractions.csproj | 2 +- ...oft.Extensions.Caching.Abstractions.csproj | 2 +- ...Microsoft.Extensions.Caching.Memory.csproj | 2 +- ...Microsoft.Extensions.Caching.Memory.csproj | 2 +- ...oft.Extensions.Caching.Memory.Tests.csproj | 2 +- ...tensions.Configuration.Abstractions.csproj | 2 +- ...tensions.Configuration.Abstractions.csproj | 4 +- ...oft.Extensions.Configuration.Binder.csproj | 2 +- ...oft.Extensions.Configuration.Binder.csproj | 2 +- ...tensions.Configuration.Binder.Tests.csproj | 2 +- ...xtensions.Configuration.CommandLine.csproj | 2 +- ...xtensions.Configuration.CommandLine.csproj | 2 +- ...ons.Configuration.CommandLine.Tests.csproj | 2 +- ....Configuration.EnvironmentVariables.csproj | 2 +- ....Configuration.EnvironmentVariables.csproj | 2 +- ...guration.EnvironmentVariables.Tests.csproj | 2 +- ...nsions.Configuration.FileExtensions.csproj | 2 +- ...nsions.Configuration.FileExtensions.csproj | 2 +- ....Configuration.FileExtensions.Tests.csproj | 2 +- ...rosoft.Extensions.Configuration.Ini.csproj | 2 +- ...rosoft.Extensions.Configuration.Ini.csproj | 2 +- ....Extensions.Configuration.Ini.Tests.csproj | 2 +- ...osoft.Extensions.Configuration.Json.csproj | 2 +- ...osoft.Extensions.Configuration.Json.csproj | 5 +- ...Extensions.Configuration.Json.Tests.csproj | 2 +- ...xtensions.Configuration.UserSecrets.csproj | 2 +- ...xtensions.Configuration.UserSecrets.csproj | 2 +- ...ons.Configuration.UserSecrets.Tests.csproj | 2 +- ...rosoft.Extensions.Configuration.Xml.csproj | 2 +- ...rosoft.Extensions.Configuration.Xml.csproj | 4 +- ....Extensions.Configuration.Xml.Tests.csproj | 4 +- .../Microsoft.Extensions.Configuration.csproj | 2 +- .../Microsoft.Extensions.Configuration.csproj | 2 +- ...ions.Configuration.Functional.Tests.csproj | 2 +- ...soft.Extensions.Configuration.Tests.csproj | 2 +- ...ns.DependencyInjection.Abstractions.csproj | 20 +- ...ns.DependencyInjection.Abstractions.csproj | 5 +- ...ndencyInjection.Specification.Tests.csproj | 2 +- ...soft.Extensions.DependencyInjection.csproj | 8 +- ...soft.Extensions.DependencyInjection.csproj | 18 +- ...yInjection.ExternalContainers.Tests.csproj | 6 +- ...xtensions.DependencyInjection.Tests.csproj | 8 +- ...icrosoft.Extensions.DependencyModel.csproj | 14 +- ...icrosoft.Extensions.DependencyModel.csproj | 9 +- ...ft.Extensions.DependencyModel.Tests.csproj | 3 +- ...tensions.FileProviders.Abstractions.csproj | 5 +- ...tensions.FileProviders.Abstractions.csproj | 2 +- ....Extensions.FileProviders.Composite.csproj | 2 +- ....Extensions.FileProviders.Composite.csproj | 2 +- ...sions.FileProviders.Composite.Tests.csproj | 8 +- ...t.Extensions.FileProviders.Physical.csproj | 6 +- ...t.Extensions.FileProviders.Physical.csproj | 12 +- ...nsions.FileProviders.Physical.Tests.csproj | 4 +- ...osoft.Extensions.FileSystemGlobbing.csproj | 6 +- ...osoft.Extensions.FileSystemGlobbing.csproj | 2 +- ...Extensions.FileSystemGlobbing.Tests.csproj | 2 +- .../BuildWebHostInvalidSignature.csproj | 2 +- .../BuildWebHostPatternTestSite.csproj | 2 +- .../CreateHostBuilderInvalidSignature.csproj | 2 +- .../CreateHostBuilderPatternTestSite.csproj | 2 +- ...reateWebHostBuilderInvalidSignature.csproj | 2 +- ...CreateWebHostBuilderPatternTestSite.csproj | 2 +- ...xtensions.HostFactoryResolver.Tests.csproj | 4 +- .../tests/MockHostTypes/MockHostTypes.csproj | 2 +- .../NoSpecialEntryPointPattern.csproj | 2 +- ...alEntryPointPatternBuildsThenThrows.csproj | 2 +- .../NoSpecialEntryPointPatternExits.csproj | 2 +- .../NoSpecialEntryPointPatternHangs.csproj | 2 +- ...oSpecialEntryPointPatternMainNoArgs.csproj | 2 +- .../NoSpecialEntryPointPatternThrows.csproj | 2 +- .../TopLevelStatements.csproj | 2 +- ...oft.Extensions.Hosting.Abstractions.csproj | 5 +- ...oft.Extensions.Hosting.Abstractions.csproj | 8 +- ....Extensions.Hosting.WindowsServices.csproj | 10 +- ....Extensions.Hosting.WindowsServices.csproj | 14 +- ...sions.Hosting.WindowsServices.Tests.csproj | 2 +- .../ref/Microsoft.Extensions.Hosting.csproj | 15 +- .../src/Microsoft.Extensions.Hosting.csproj | 23 +- .../src/Common/ApplicationType.cs | 2 +- .../IntegrationTesting/src/Common/Tfm.cs | 2 +- .../src/Deployers/ApplicationDeployer.cs | 2 +- .../src/Deployers/SelfHostDeployer.cs | 2 +- ...Extensions.Hosting.Functional.Tests.csproj | 4 +- ...icrosoft.Extensions.Hosting.TestApp.csproj | 2 +- ...osoft.Extensions.Hosting.Unit.Tests.csproj | 4 +- .../ref/Microsoft.Extensions.Http.csproj | 4 +- .../src/Microsoft.Extensions.Http.csproj | 4 +- .../Microsoft.Extensions.Http.Tests.csproj | 4 +- ...oft.Extensions.Logging.Abstractions.csproj | 5 +- ...oft.Extensions.Logging.Abstractions.csproj | 4 +- ...ft.Extensions.Logging.Configuration.csproj | 2 +- ...ft.Extensions.Logging.Configuration.csproj | 2 +- ...icrosoft.Extensions.Logging.Console.csproj | 6 +- ...icrosoft.Extensions.Logging.Console.csproj | 6 +- ...ft.Extensions.Logging.Console.Tests.csproj | 2 +- .../Microsoft.Extensions.Logging.Debug.csproj | 2 +- .../Microsoft.Extensions.Logging.Debug.csproj | 2 +- ...crosoft.Extensions.Logging.EventLog.csproj | 2 +- ...crosoft.Extensions.Logging.EventLog.csproj | 4 +- ...soft.Extensions.Logging.EventSource.csproj | 4 +- ...soft.Extensions.Logging.EventSource.csproj | 4 +- ...xtensions.Logging.EventSource.Tests.csproj | 2 +- ...soft.Extensions.Logging.TraceSource.csproj | 2 +- ...soft.Extensions.Logging.TraceSource.csproj | 2 +- .../ref/Microsoft.Extensions.Logging.csproj | 2 +- .../src/Microsoft.Extensions.Logging.csproj | 7 +- .../Microsoft.Extensions.Logging.Tests.csproj | 4 +- ...ft.Extensions.Logging.Testing.Tests.csproj | 2 +- ...ons.Options.ConfigurationExtensions.csproj | 2 +- ...ons.Options.ConfigurationExtensions.csproj | 2 +- ...tions.ConfigurationExtensions.Tests.csproj | 2 +- ....Extensions.Options.DataAnnotations.csproj | 2 +- ....Extensions.Options.DataAnnotations.csproj | 4 +- .../ref/Microsoft.Extensions.Options.csproj | 2 +- .../src/Microsoft.Extensions.Options.csproj | 4 +- .../Microsoft.Extensions.Options.Tests.csproj | 4 +- .../Microsoft.Extensions.Primitives.csproj | 8 +- .../Microsoft.Extensions.Primitives.csproj | 2 +- ...crosoft.Extensions.Primitives.Tests.csproj | 8 +- .../src/Microsoft.NETCore.Platforms.csproj | 2 +- .../Directory.Build.props | 2 +- ...rosoft.Win32.Registry.AccessControl.csproj | 8 +- ...rosoft.Win32.Registry.AccessControl.csproj | 2 +- ....Win32.Registry.AccessControl.Tests.csproj | 2 +- .../ref/Microsoft.Win32.SystemEvents.csproj | 8 +- ...rosoft.Win32.SystemEvents.netframework.cs} | 0 .../src/Microsoft.Win32.SystemEvents.csproj | 6 +- .../Microsoft.Win32.SystemEvents.Tests.csproj | 2 +- .../Microsoft.Windows.Compatibility.csproj | 8 +- ...XmlSerializer.Generator.runtimeconfig.json | 4 +- src/libraries/Native/build-native.sh | 2 +- .../System.CodeDom/ref/System.CodeDom.csproj | 18 +- ...t461.cs => System.CodeDom.netframework.cs} | 0 .../System.CodeDom/src/System.CodeDom.csproj | 2 +- .../tests/System.CodeDom.Tests.csproj | 4 +- .../ref/System.Collections.Immutable.csproj | 7 +- .../src/System.Collections.Immutable.csproj | 2 +- .../System.Collections.Immutable.Tests.csproj | 9 +- ...onentModel.Composition.Registration.csproj | 7 +- .../src/CompatibilitySuppressions.xml | 7 + ...onentModel.Composition.Registration.csproj | 4 +- .../System.ComponentModel.Composition.csproj | 4 +- .../System.ComponentModel.Composition.csproj | 4 +- .../System.Composition.AttributedModel.csproj | 2 +- ...em.Composition.AttributeModel.Tests.csproj | 2 +- .../src/System.Composition.Convention.csproj | 2 +- ...System.Composition.Convention.Tests.csproj | 2 +- .../src/System.Composition.Hosting.csproj | 4 +- .../System.Composition.Hosting.Tests.csproj | 4 +- .../src/System.Composition.Runtime.csproj | 2 +- .../System.Composition.Runtime.Tests.csproj | 4 +- .../src/System.Composition.TypedParts.csproj | 2 +- ...System.Composition.TypedParts.Tests.csproj | 4 +- .../src/System.Composition.csproj | 2 +- ...ion.Demos.ExtendedCollectionImports.csproj | 2 +- .../tests/System.Composition.Tests.csproj | 4 +- .../tests/TestLibrary/TestLibrary.csproj | 2 +- ....Configuration.ConfigurationManager.csproj | 21 +- ...tion.ConfigurationManager.netframework.cs} | 0 .../src/CompatibilitySuppressions.xml | 12 +- ....Configuration.ConfigurationManager.csproj | 12 +- ...guration.ConfigurationManager.Tests.csproj | 2 +- .../ref/System.Data.Odbc.csproj | 8 +- ...61.cs => System.Data.Odbc.netframework.cs} | 0 .../src/CompatibilitySuppressions.xml | 208 +++- .../src/System.Data.Odbc.csproj | 7 +- .../tests/System.Data.Odbc.Tests.csproj | 4 +- .../ref/System.Data.OleDb.csproj | 27 +- ...1.cs => System.Data.OleDb.netframework.cs} | 0 .../src/System.Data.OleDb.csproj | 2 +- .../tests/System.Data.OleDb.Tests.csproj | 6 +- ...System.Diagnostics.DiagnosticSource.csproj | 16 +- ...System.Diagnostics.DiagnosticSource.csproj | 4 +- ....Diagnostics.DiagnosticSource.Tests.csproj | 4 +- .../ref/System.Diagnostics.EventLog.csproj | 13 +- ...stem.Diagnostics.EventLog.netframework.cs} | 0 .../src/System.Diagnostics.EventLog.csproj | 19 +- .../System.Diagnostics.EventLog.Tests.csproj | 6 +- ...stem.Diagnostics.PerformanceCounter.csproj | 8 +- ...ostics.PerformanceCounter.netframework.cs} | 0 ...stem.Diagnostics.PerformanceCounter.csproj | 11 +- ...iagnostics.PerformanceCounter.Tests.csproj | 4 +- .../src/System.Diagnostics.Process.csproj | 2 +- ...DirectoryServices.AccountManagement.csproj | 11 +- ...DirectoryServices.AccountManagement.csproj | 17 +- ...oryServices.AccountManagement.Tests.csproj | 4 +- .../System.DirectoryServices.Protocols.csproj | 11 +- .../System.DirectoryServices.Protocols.csproj | 11 +- ...m.DirectoryServices.Protocols.Tests.csproj | 4 +- .../ref/System.DirectoryServices.csproj | 17 +- .../src/System.DirectoryServices.csproj | 21 +- .../System.DirectoryServices.Tests.csproj | 4 +- .../ref/System.Drawing.Common.csproj | 8 +- ... => System.Drawing.Common.netframework.cs} | 0 .../src/CompatibilitySuppressions.xml | 34 +- .../src/System.Drawing.Common.csproj | 12 +- .../tests/System.Drawing.Common.Tests.csproj | 2 +- .../ref/System.Formats.Asn1.csproj | 7 +- .../src/System.Formats.Asn1.csproj | 4 +- .../tests/System.Formats.Asn1.Tests.csproj | 4 +- .../ref/System.Formats.Cbor.csproj | 13 +- .../src/CompatibilitySuppressions.xml | 7 + .../src/System.Formats.Cbor.csproj | 2 +- .../src/System.IO.FileSystem.DriveInfo.csproj | 4 +- .../src/System.IO.Hashing.csproj | 2 +- .../tests/System.IO.Hashing.Tests.csproj | 2 +- .../System.IO.IsolatedStorage.Tests.csproj | 2 +- .../ref/System.IO.Packaging.csproj | 15 +- ...cs => System.IO.Packaging.netframework.cs} | 0 .../src/System.IO.Packaging.csproj | 4 +- .../tests/System.IO.Packaging.Tests.csproj | 2 +- .../ref/System.IO.Pipelines.csproj | 4 +- .../src/System.IO.Pipelines.csproj | 16 +- .../tests/System.IO.Pipelines.Tests.csproj | 6 +- .../ref/System.IO.Pipes.csproj | 12 +- .../src/System.IO.Pipes.csproj | 11 +- .../ref/System.IO.Ports.csproj | 11 +- ...461.cs => System.IO.Ports.netframework.cs} | 0 .../src/System.IO.Ports.csproj | 10 +- .../tests/System.IO.Ports.Tests.csproj | 4 +- .../ref/System.Management.csproj | 5 +- .../src/System.Management.csproj | 6 +- .../tests/System.Management.Tests.csproj | 4 +- .../ref/System.Memory.Data.csproj | 12 +- .../src/System.Memory.Data.csproj | 8 +- .../tests/System.Memory.Data.Tests.csproj | 2 +- .../ref/System.Net.Http.Json.csproj | 32 +- .../src/System.Net.Http.Json.csproj | 6 +- .../System.Net.Http.Json.Unit.Tests.csproj | 6 +- .../ref/System.Net.Http.WinHttpHandler.csproj | 11 +- .../src/System.Net.Http.WinHttpHandler.csproj | 6 +- ...ttp.WinHttpHandler.Functional.Tests.csproj | 4 +- .../ref/System.Numerics.Tensors.csproj | 8 +- .../src/System.Numerics.Tensors.csproj | 4 +- .../System.Numerics.Tensors.Tests.csproj | 2 +- .../CodeAnalysis/NullableAttributes.cs | 3 +- .../ref/System.Reflection.Context.csproj | 6 +- .../src/System.Reflection.Context.csproj | 4 +- .../ref/System.Reflection.Metadata.csproj | 5 +- .../src/System.Reflection.Metadata.csproj | 2 +- .../Internal/Utilities/StreamExtensions.cs | 2 +- .../PEReader.EmbeddedPortablePdb.cs | 2 +- .../System.Reflection.Metadata.Tests.csproj | 4 +- ...stem.Reflection.MetadataLoadContext.csproj | 4 +- ...stem.Reflection.MetadataLoadContext.csproj | 6 +- .../Reflection/TypeLoading/General/Helpers.cs | 2 +- ...eflection.MetadataLoadContext.Tests.csproj | 2 +- .../ref/System.Resources.Extensions.csproj | 7 +- .../src/System.Resources.Extensions.csproj | 7 +- .../System.Resources.Extensions.Tests.csproj | 6 +- .../ref/System.Runtime.Caching.csproj | 4 +- .../src/System.Runtime.Caching.csproj | 9 +- .../src/System/Runtime/Caching/Counters.cs | 4 +- .../Runtime/Caching/MemoryCacheStatistics.cs | 2 +- .../Caching/PhysicalMemoryMonitor.Unix.cs | 2 +- .../tests/System.Runtime.Caching.Tests.csproj | 4 +- .../System.Runtime.Caching/CountersTest.cs | 4 +- ...tem.Runtime.CompilerServices.Unsafe.csproj | 4 +- ...tem.Runtime.CompilerServices.Unsafe.ilproj | 9 +- ...time.Serialization.Formatters.Tests.csproj | 6 +- .../System.Security.Cryptography.Pkcs.csproj | 12 +- ...ecurity.Cryptography.Pkcs.netframework.cs} | 0 .../src/CompatibilitySuppressions.xml | 1092 ++++++++++++++++- .../System.Security.Cryptography.Pkcs.csproj | 30 +- ...em.Security.Cryptography.Pkcs.Tests.csproj | 10 +- ...Security.Cryptography.ProtectedData.csproj | 15 +- ...ryptography.ProtectedData.netframework.cs} | 0 ...Security.Cryptography.ProtectedData.csproj | 8 +- ...ty.Cryptography.ProtectedData.Tests.csproj | 4 +- ...urity.Cryptography.X509Certificates.csproj | 8 +- .../System.Security.Cryptography.Xml.csproj | 16 +- ...Security.Cryptography.Xml.netframework.cs} | 0 .../src/CompatibilitySuppressions.xml | 254 +++- .../System.Security.Cryptography.Xml.csproj | 2 +- ...tem.Security.Cryptography.Xml.Tests.csproj | 4 +- .../ref/System.Security.Permissions.csproj | 46 +- ...stem.Security.Permissions.netframework.cs} | 0 .../src/CompatibilitySuppressions.xml | 48 +- .../src/System.Security.Permissions.csproj | 9 +- .../System.ServiceModel.Syndication.csproj | 10 +- ....ServiceModel.Syndication.netframework.cs} | 0 .../src/CompatibilitySuppressions.xml | 34 +- .../System.ServiceModel.Syndication.csproj | 7 +- ...stem.ServiceModel.Syndication.Tests.csproj | 6 +- ...em.ServiceProcess.ServiceController.csproj | 16 +- ...Process.ServiceController.netframework.cs} | 0 ...em.ServiceProcess.ServiceController.csproj | 15 +- .../ServiceProcess/ServiceController.cs | 2 +- ...ocess.ServiceController.TestService.csproj | 2 +- ...viceProcess.ServiceController.Tests.csproj | 4 +- .../System.Speech/ref/System.Speech.csproj | 4 +- .../System.Speech/src/System.Speech.csproj | 10 +- .../ref/System.Text.Encoding.CodePages.csproj | 6 +- .../src/System.Text.Encoding.CodePages.csproj | 6 +- ...ystem.Text.Encoding.CodePages.Tests.csproj | 6 +- .../ref/System.Text.Encodings.Web.csproj | 6 +- .../src/System.Text.Encodings.Web.csproj | 15 +- .../Web/OptimizedInboxTextEncoder.cs | 5 +- .../System.Text.Encodings.Web.Tests.csproj | 6 +- .../ref/System.Text.Json.csproj | 21 +- .../src/System.Text.Json.csproj | 11 +- .../System.Text.Json.Tests.csproj | 8 +- .../ref/System.Threading.AccessControl.csproj | 16 +- ...m.Threading.AccessControl.netframework.cs} | 0 .../src/CompatibilitySuppressions.xml | 72 ++ .../src/System.Threading.AccessControl.csproj | 2 +- ...ystem.Threading.AccessControl.Tests.csproj | 2 +- .../ref/System.Threading.Channels.csproj | 7 +- .../src/CompatibilitySuppressions.xml | 30 +- .../src/System.Threading.Channels.csproj | 17 +- .../System.Threading.Channels.Tests.csproj | 4 +- .../System.Threading.Tasks.Dataflow.csproj | 11 +- .../System.Threading.Tasks.Dataflow.csproj | 6 +- ...stem.Threading.Tasks.Dataflow.Tests.csproj | 4 +- .../ref/System.Windows.Extensions.csproj | 4 +- .../src/System.Windows.Extensions.csproj | 2 +- src/libraries/shims/ApiCompat.proj | 17 +- src/libraries/slngen.proj | 4 +- .../installer.tasks/installer.tasks.csproj | 6 +- 347 files changed, 2697 insertions(+), 936 deletions(-) rename src/libraries/Microsoft.Win32.SystemEvents/ref/{Microsoft.Win32.SystemEvents.net461.cs => Microsoft.Win32.SystemEvents.netframework.cs} (100%) rename src/libraries/System.CodeDom/ref/{System.CodeDom.net461.cs => System.CodeDom.netframework.cs} (100%) create mode 100644 src/libraries/System.ComponentModel.Composition.Registration/src/CompatibilitySuppressions.xml rename src/libraries/System.Configuration.ConfigurationManager/ref/{System.Configuration.ConfigurationManager.net461.cs => System.Configuration.ConfigurationManager.netframework.cs} (100%) rename src/libraries/System.Data.Odbc/ref/{System.Data.Odbc.net461.cs => System.Data.Odbc.netframework.cs} (100%) rename src/libraries/System.Data.OleDb/ref/{System.Data.OleDb.net461.cs => System.Data.OleDb.netframework.cs} (100%) rename src/libraries/System.Diagnostics.EventLog/ref/{System.Diagnostics.EventLog.net461.cs => System.Diagnostics.EventLog.netframework.cs} (100%) rename src/libraries/System.Diagnostics.PerformanceCounter/ref/{System.Diagnostics.PerformanceCounter.net461.cs => System.Diagnostics.PerformanceCounter.netframework.cs} (100%) rename src/libraries/System.Drawing.Common/ref/{System.Drawing.Common.net461.cs => System.Drawing.Common.netframework.cs} (100%) create mode 100644 src/libraries/System.Formats.Cbor/src/CompatibilitySuppressions.xml rename src/libraries/System.IO.Packaging/ref/{System.IO.Packaging.net461.cs => System.IO.Packaging.netframework.cs} (100%) rename src/libraries/System.IO.Ports/ref/{System.IO.Ports.net461.cs => System.IO.Ports.netframework.cs} (100%) rename src/libraries/System.Security.Cryptography.Pkcs/ref/{System.Security.Cryptography.Pkcs.net461.cs => System.Security.Cryptography.Pkcs.netframework.cs} (100%) rename src/libraries/System.Security.Cryptography.ProtectedData/ref/{System.Security.Cryptography.ProtectedData.net461.cs => System.Security.Cryptography.ProtectedData.netframework.cs} (100%) rename src/libraries/System.Security.Cryptography.Xml/ref/{System.Security.Cryptography.Xml.net461.cs => System.Security.Cryptography.Xml.netframework.cs} (100%) rename src/libraries/System.Security.Permissions/ref/{System.Security.Permissions.net461.cs => System.Security.Permissions.netframework.cs} (100%) rename src/libraries/System.ServiceModel.Syndication/ref/{System.ServiceModel.Syndication.net461.cs => System.ServiceModel.Syndication.netframework.cs} (100%) rename src/libraries/System.ServiceProcess.ServiceController/ref/{System.ServiceProcess.ServiceController.net461.cs => System.ServiceProcess.ServiceController.netframework.cs} (100%) rename src/libraries/System.Threading.AccessControl/ref/{System.Threading.AccessControl.net461.cs => System.Threading.AccessControl.netframework.cs} (100%) diff --git a/Directory.Build.props b/Directory.Build.props index a26486bc6a6c1..7a79159f2355e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -41,18 +41,27 @@ - $(PreviousReleaseMajorVersion).$(MinorVersion) - 6.0 - 6.0 + 7.0 .NETCoreApp $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion) + Microsoft.NETCore.App + .NET $(NetCoreAppCurrentVersion) net$(NetCoreAppCurrentVersion) - netcoreapp3.1 - net$(AspNetCoreAppCurrentVersion) + net6.0 + + 6.0 net$(NetCoreAppToolCurrentVersion) $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) - Microsoft.NETCore.App - .NET $(NetCoreAppCurrentVersion) + + 5.0 + $(NetCoreAppLatestStableVersion).0 + net$(NetCoreAppLatestStableVersion) + + 6.0 + net$(AspNetCoreAppCurrentVersion) + + net462 + net472 @@ -82,7 +91,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILStrip', 'Debug', '$(NetCoreAppToolCurrent)')) $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'installer.tasks.dll')) - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', 'net461', 'installer.tasks.dll')) + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetFrameworkToolCurrent)', 'installer.tasks.dll')) $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'Microsoft.NET.CrossGen.props')) $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'Microsoft.NET.CrossGen.targets')) $([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll')) diff --git a/docs/coding-guidelines/adding-api-guidelines.md b/docs/coding-guidelines/adding-api-guidelines.md index b744eb1c4de1c..36d03f92237be 100644 --- a/docs/coding-guidelines/adding-api-guidelines.md +++ b/docs/coding-guidelines/adding-api-guidelines.md @@ -24,8 +24,8 @@ the implementation without compat concerns in future releases. ### Determine target framework -`net5.0` is the target framework version currently under development and the new apis -should be added to `net5.0`. [More Information on TargetFrameworks](https://docs.microsoft.com/en-us/dotnet/standard/frameworks) +`net7.0` is the target framework version currently under development and the new apis +should be added to `net7.0`. [More Information on TargetFrameworks](https://docs.microsoft.com/en-us/dotnet/standard/frameworks) ## Making the changes in repo diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md index 85a405d2fe4b7..926cd965c7fa0 100644 --- a/docs/coding-guidelines/project-guidelines.md +++ b/docs/coding-guidelines/project-guidelines.md @@ -52,7 +52,7 @@ Pure netstandard configuration: All supported targets with unique windows/unix build for netcoreapp: ``` - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetFrameworkCurrent)-windows ``` @@ -108,7 +108,7 @@ Example: Example: ``` - netstandard2.0;net461;net472;net5.0 + netstandard2.0;net462;net472;net5.0 ... @@ -141,7 +141,7 @@ In the src directory for a library there should be only **one** `.csproj` file t All libraries should use `` for all their references to libraries that compose the shared framework of the current .NETCoreApp. That will cause them to be resolved against the locally built targeting pack which is located at `artifacts\bin\microsoft.netcore.app.ref`. The only exception to that rule right now is for partial facades which directly reference System.Private.CoreLib and thus need to directly reference other partial facades to avoid type conflicts. -Other target frameworks than .NETCoreApp latest (i.e. `netstandard2.0`, `net461`, `netcoreapp3.0`) should use ProjectReference items to reference dependencies. +Other target frameworks than .NETCoreApp latest (i.e. `netstandard2.0`, `net462`, `net6.0`) should use ProjectReference items to reference dependencies. ### src\ILLink Contains the files used to direct the trimming tool. See [ILLink files](../workflow/trimming/ILLink-files.md). diff --git a/docs/workflow/building/libraries/README.md b/docs/workflow/building/libraries/README.md index 662be5442da36..0b0e4fcade28c 100644 --- a/docs/workflow/building/libraries/README.md +++ b/docs/workflow/building/libraries/README.md @@ -74,7 +74,7 @@ The libraries build has two logical components, the native build which produces The build settings (BuildTargetFramework, TargetOS, Configuration, Architecture) are generally defaulted based on where you are building (i.e. which OS or which architecture) but we have a few shortcuts for the individual properties that can be passed to the build scripts: -- `-framework|-f` identifies the target framework for the build. Possible values include `net5.0` (currently the latest .NET version) or `net48` (the latest .NETFramework version). (msbuild property `BuildTargetFramework`) +- `-framework|-f` identifies the target framework for the build. Possible values include `net7.0` (currently the latest .NET version) or `net48` (the latest .NETFramework version). (msbuild property `BuildTargetFramework`) - `-os` identifies the OS for the build. It defaults to the OS you are running on but possible values include `windows`, `Unix`, `Linux`, or `OSX`. (msbuild property `TargetOS`) - `-configuration|-c Debug|Release` controls the optimization level the compilers use for the build. It defaults to `Debug`. (msbuild property `Configuration`) - `-arch` identifies the architecture for the build. It defaults to `x64` but possible values include `x64`, `x86`, `arm`, or `arm64`. (msbuild property `TargetArchitecture`) diff --git a/docs/workflow/testing/libraries/testing.md b/docs/workflow/testing/libraries/testing.md index a78a3d0409868..cb17c48b6cc7a 100644 --- a/docs/workflow/testing/libraries/testing.md +++ b/docs/workflow/testing/libraries/testing.md @@ -101,7 +101,4 @@ dotnet build /t:Test /p:Outerloop=true ### Running tests on a different target framework -Each test project can potentially have multiple target frameworks. There are some tests that might be OS-specific, or might be testing an API that is available only on some target frameworks, so the `TargetFrameworks` property specifies the valid target frameworks. By default we will build and run only the default build target framework which is `net5.0`. The rest of the `TargetFrameworks` will need to be built and ran by specifying the `BuildTargetFramework` option, e.g.: -```cmd -dotnet build src\libraries\System.Runtime\tests\System.Runtime.Tests.csproj /p:BuildTargetFramework=net472 -``` +Each test project can potentially have multiple target frameworks. There are some tests that might be OS-specific, or might be testing an API that is available only on some target frameworks, so the `TargetFrameworks` property specifies the valid target frameworks. \ No newline at end of file diff --git a/eng/BeforeTargetFrameworkInference.targets b/eng/BeforeTargetFrameworkInference.targets index 93609381fb4b1..b82462e1acc1d 100644 --- a/eng/BeforeTargetFrameworkInference.targets +++ b/eng/BeforeTargetFrameworkInference.targets @@ -3,7 +3,7 @@ <_OriginalTargetFramework>$(TargetFramework) $(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1)))) - + $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)', '$(TargetFrameworkPattern)', '${1}')) diff --git a/eng/Versions.props b/eng/Versions.props index 7eb456c824dfb..2af1f8a2af9f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,10 +9,9 @@ 6.0.100 alpha 1 - 6 - $(PreviousReleaseMajorVersion).$(MinorVersion).0.0 + $(MajorVersion).$(MinorVersion).0.0 false release diff --git a/eng/build.ps1 b/eng/build.ps1 index 894c53eea4fca..a8e8a165d6bf9 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -72,8 +72,8 @@ function Get-Help() { Write-Host "Libraries settings:" Write-Host " -allconfigurations Build packages for all build configurations." Write-Host " -coverage Collect code coverage when testing." - Write-Host " -framework (-f) Build framework: net6.0 or net48." - Write-Host " [Default: net6.0]" + Write-Host " -framework (-f) Build framework: net7.0 or net48." + Write-Host " [Default: net7.0]" Write-Host " -testnobuild Skip building tests when invoking -test." Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all." Write-Host "" diff --git a/eng/build.sh b/eng/build.sh index 128e720d3c0b2..1b20d7a922bc5 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -62,8 +62,8 @@ usage() echo "Libraries settings:" echo " --allconfigurations Build packages for all build configurations." echo " --coverage Collect code coverage when testing." - echo " --framework (-f) Build framework: net6.0 or net48." - echo " [Default: net6.0]" + echo " --framework (-f) Build framework: net7.0 or net48." + echo " [Default: net7.0]" echo " --testnobuild Skip building tests when invoking -test." echo " --testscope Test scope, allowed values: innerloop, outerloop, all." echo "" diff --git a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile index 49a9e2bfdc24a..184ffdb8bcc8b 100644 --- a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile @@ -14,7 +14,7 @@ RUN ./src/coreclr/build.sh -release -skiptests -clang9 && \ FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=/repo/artifacts/bin/testhost -ARG TFM=net6.0 +ARG TFM=net7.0 ARG OS=Linux ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile index 18e42d3da0379..75cc112b6acb3 100644 --- a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile @@ -4,7 +4,7 @@ ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:6.0-nanoserver-1809 FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost" -ARG TFM=net6.0 +ARG TFM=net7.0 ARG OS=windows ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index 8c9c4225045da..6f79a9c39ee7c 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -13,7 +13,7 @@ RUN ./build.sh -ci -subset clr+libs -runtimeconfiguration release -c $CONFIGURAT FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=/repo/artifacts/bin/testhost -ARG TFM=net6.0 +ARG TFM=net7.0 ARG OS=Linux ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/docker/libraries-sdk.windows.Dockerfile b/eng/docker/libraries-sdk.windows.Dockerfile index d0e4a5bb839a9..6a7b7764185b3 100644 --- a/eng/docker/libraries-sdk.windows.Dockerfile +++ b/eng/docker/libraries-sdk.windows.Dockerfile @@ -4,7 +4,7 @@ ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:6.0-nanoserver-1809 FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost" -ARG TFM=net6.0 +ARG TFM=net7.0 ARG OS=windows ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/packaging.targets b/eng/packaging.targets index af4d2deb6a58e..a9b01c581b042 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -4,7 +4,7 @@ true true - $([MSBuild]::Subtract($(PreviousReleaseMajorVersion), 1)).0.0 + $(NetCoreAppLatestStablePackageBaselineVersion) AddNETStandardCompatErrorFileForPackaging;IncludeAnalyzersInPackage;$(PackDependsOn) @@ -14,7 +14,7 @@ $(TargetsForTfmSpecificDebugSymbolsInPackage);AddRuntimeSpecificSymbolToPackage false - true + true $(MSBuildThisFileDirectory)useSharedDesignerContext.txt @@ -53,7 +53,7 @@ <_FrameworkAssemblyReferences Include="$(MSBuildProjectName)" - TargetFramework="net461" /> + TargetFramework="$(NetFrameworkMinimum)" /> @@ -63,8 +63,8 @@ $(NoWarn);NU5128 - - + + @@ -153,11 +153,18 @@ - + + ($(TargetFrameworks.Contains('$(NetCoreAppMinimum)')) or $(TargetFrameworks.Contains('$(NetCoreAppCurrent)'))) and + '$(DisableNETStandardCompatErrorForNETCoreApp)' != 'true'" /> + + diff --git a/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml b/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml index a595173f708b5..c4eddc7c79be6 100644 --- a/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml @@ -80,7 +80,7 @@ jobs: - name: crossgen2location value: $(productDirectory)$(dir)$(targetFlavor)$(dir)x64$(dir)crossgen2$(dir)crossgen2.dll - name: librariesProductDllDir - value: $(Build.SourcesDirectory)$(dir)artifacts$(dir)bin$(dir)runtime$(dir)net6.0-$(osGroup)$(osSubgroup)-$(buildConfig)-$(archType) + value: $(Build.SourcesDirectory)$(dir)artifacts$(dir)bin$(dir)runtime$(dir)net7.0-$(osGroup)$(osSubgroup)-$(buildConfig)-$(archType) - ${{ parameters.variables }} diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index b9ebab6925dd2..e789ece0eed33 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -5,7 +5,7 @@ parameters: osSubgroup: '' container: '' runtimeVariant: '' - framework: net6.0 # Specify the appropriate framework when running release branches (ie netcoreapp3.0 for release/3.0) + framework: net7.0 # Specify the appropriate framework when running release branches (ie net6.0 for release/6.0) liveLibrariesBuildConfig: '' variables: {} runtimeType: 'coreclr' diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 9c5cff7cc5e81..2c5b604acfc9b 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -5,7 +5,7 @@ parameters: osSubgroup: '' crossBuild: false crossrootfsDir: '' - framework: 'net6.0' + framework: 'net7.0' isOfficialAllConfigurations: false isSourceBuild: false liveRuntimeBuildConfig: '' diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index 4faaff1ac7036..0451b16b81ae7 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -6,7 +6,7 @@ parameters: targetRid: '' crossBuild: false crossrootfsDir: '' - framework: 'net6.0' + framework: 'net7.0' isOfficialBuild: false isOfficialAllConfigurations: false runtimeVariant: '' diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index c580d807de16e..d8cb8c5ef80ae 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -4,7 +4,7 @@ parameters: osSubgroup: '' archType: '' targetRid: '' - framework: 'net6.0' + framework: 'net7.0' isOfficialBuild: false liveRuntimeBuildConfig: '' runtimeFlavor: 'coreclr' diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 0f44b205eb6a0..d5022732a93f7 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -71,9 +71,7 @@ '$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <_NetCoreAppTargetFrameworkIdentifier Condition="$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))">netcoreapp - <_NetCoreAppTargetFrameworkIdentifier Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0'))">net - %(ResolvedFrameworkReference.TargetingPackPath)\ref\$(_NetCoreAppTargetFrameworkIdentifier)$(TargetFrameworkVersion.TrimStart('v'))\ + %(ResolvedFrameworkReference.TargetingPackPath)\ref\net$(TargetFrameworkVersion.TrimStart('v'))\ - $(NetCoreAppCurrent);net461 + $(NetCoreAppMinimum);$(NetFrameworkMinimum) - + - + diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 0be101164991b..07b1de16aef7b 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -20,7 +20,7 @@ false $(RepositoryEngineeringDir)LicenseHeader.txt - net461;net462;net47;net471;net472 + net462;net47;net471;net472 diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index ca9b42f35ca9f..2b438d6ebba20 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -22,7 +22,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)')) $([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)')) - $(NoWarn);nullable + $(NoWarn);nullable $(NoWarn);nullable;CA1052 - + + - - + diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/ref/Microsoft.Bcl.AsyncInterfaces.csproj b/src/libraries/Microsoft.Bcl.AsyncInterfaces/ref/Microsoft.Bcl.AsyncInterfaces.csproj index 603d16c0f724d..b7bbceaa14bbb 100644 --- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/ref/Microsoft.Bcl.AsyncInterfaces.csproj +++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/ref/Microsoft.Bcl.AsyncInterfaces.csproj @@ -1,6 +1,6 @@ - net461;netstandard2.0;netstandard2.1 + netstandard2.0;$(NetFrameworkMinimum);netstandard2.1 diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj b/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj index bee3601a24617..2f9311e21bc55 100644 --- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj +++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj @@ -1,6 +1,6 @@ - net461;netstandard2.0;netstandard2.1 + netstandard2.0;$(NetFrameworkMinimum);netstandard2.1 true Provides the IAsyncEnumerable<T> and IAsyncDisposable interfaces and helper types for .NET Standard 2.0. This package is not required starting with .NET Standard 2.1 and .NET Core 3.0. diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/tests/Microsoft.Bcl.AsyncInterfaces.Tests.csproj b/src/libraries/Microsoft.Bcl.AsyncInterfaces/tests/Microsoft.Bcl.AsyncInterfaces.Tests.csproj index 79f4f9b7fc525..6562df4029d70 100644 --- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/tests/Microsoft.Bcl.AsyncInterfaces.Tests.csproj +++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/tests/Microsoft.Bcl.AsyncInterfaces.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -12,7 +12,8 @@ System.Threading.Tasks\tests\System.Runtime.CompilerServices\ConfiguredAsyncDisposable.cs - + System.Threading.Tasks.Extensions\tests\ManualResetValueTaskSourceTests.cs diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj index 6d2b9e91c040d..087671572eab6 100644 --- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj +++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj @@ -10,7 +10,7 @@ Microsoft.Diagnostics.Tracing.EventSource $(MSBuildProjectName) Microsoft.Diagnostics.Tracing.EventSource $(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;TARGET_WINDOWS - net461 + $(NetFrameworkMinimum) enable true true diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj index 7ad4466cda769..b1e4dd6e21e7c 100644 --- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj +++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj @@ -2,7 +2,7 @@ $(DefineConstants);USE_MDT_EVENTSOURCE true - net461 + $(NetFrameworkMinimum) ..\..\System.Diagnostics.Tracing\tests diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj index 1ef4e9bf60eae..791bcd0c99850 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj index b5279da71f651..9764c4d36df80 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Caching abstractions for in-memory cache and distributed cache. diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj index d62099807bb67..44c4d42fa0377 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj index 495c645ba993a..ee0119c1453f8 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache. diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj index 7046da24da6d6..5704f98966885 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj index d6b7d921c7a1e..f026a351a444f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj index 24cbc9380f00f..0b79f05f83022 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Abstractions of key-value pair based configuration. @@ -17,7 +17,7 @@ Microsoft.Extensions.Configuration.IConfigurationSection - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj index 93e90d2109a8d..154dc3b84a94f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj index ec4d33e23eeee..6f384e43a071b 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration. diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj index 754d58e94e7a9..6f72c650a34d4 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true true diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj index 041fb7e77f76f..e4886f5e0b697 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj index e86f2b36065ff..8a5598960f20e 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Command line configuration provider implementation for Microsoft.Extensions.Configuration. diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj index 14a7ec39efdc7..18b0c90b1e0ad 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index 45d78b92ea24b..ac7b4214362cd 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index c12fa852d9b76..d83ecf51782ca 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Environment variables configuration provider implementation for Microsoft.Extensions.Configuration. diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj index 62b5a8e31deb7..588b801f1c35d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj index 510044d8e6b32..2535eb11cda0b 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj index 0c6a948a2acbd..7f7c25a769ffa 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration. diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj index 909eff7b6106a..9ae3029a16c23 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/tests/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj index 84d96fe5db4a1..ad27db350dab0 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj index 045743ef32bb4..b46a7651073c7 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true INI configuration provider implementation for Microsoft.Extensions.Configuration. diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj index d395499e63550..e452a5fb4511a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/tests/Microsoft.Extensions.Configuration.Ini.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj index 744d7343adea1..ef20fa8d810df 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) 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 ba9b9995989eb..eaf08f0a675ec 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 @@ -1,7 +1,7 @@ - netstandard2.1;netstandard2.0;net461 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) true true JSON configuration provider implementation for Microsoft.Extensions.Configuration. @@ -15,8 +15,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj index a106c36d44094..b6a33a1f71dd0 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj index 9d75126ff173f..a7531b562f601 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) 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 d488eecf483e7..22a433c4c5841 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 @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true User secrets configuration provider implementation for Microsoft.Extensions.Configuration. diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj index 5563693f653c0..0ebca5670ee07 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj index 07a5625a3ceda..90c3cb3e8bdc2 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index c9c66f5c8c67f..09583c74c16b0 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true XML configuration provider implementation for Microsoft.Extensions.Configuration. @@ -14,7 +14,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj index 85e8e1de25876..bfc35bc9dc431 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true @@ -19,7 +19,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj index e1533c3eadf9e..311697da63901 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj index 62243f8db8537..bc0bf6e7cc443 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider. diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj index e28690dc03d71..44a7fc6b58915 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj index 2354ddcd9ffcc..2d38ecef11273 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/Microsoft.Extensions.Configuration.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index 75ea735a625ea..d0feccac1cd5e 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -1,15 +1,29 @@ - netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable + + + + - + + + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index dc32454f1759a..0143657e4fe90 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true enable Abstractions for dependency injection. @@ -30,8 +30,7 @@ Microsoft.Extensions.DependencyInjection.IServiceCollection - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj index 4c1f40cce828d..70a0c0126f3d3 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true false false diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj index c8ea291c9b5d7..6d9bf7eb7a7cd 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) @@ -9,7 +9,11 @@ - + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj index 7ee51306d042d..700d9cc1e5211 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -1,9 +1,9 @@  - $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - False + false Annotations $(NoWarn);CP0001 @@ -14,9 +14,10 @@ - True - $(DefineConstants);IL_EMIT - $(DefineConstants);SAVE_ASSEMBLIES + true + $(DefineConstants);IL_EMIT + $(DefineConstants);SAVE_ASSEMBLIES @@ -31,7 +32,6 @@ - @@ -49,13 +49,13 @@ - - + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj index e74abce985bf8..2eef0a5ed9679 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj @@ -1,14 +1,14 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true $(NoWarn);CS8002 - false + false @@ -27,7 +27,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj index 698e3ec3dd659..e97dc3307ecaf 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj @@ -1,11 +1,11 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true true - $(NoWarn);CS0436 + $(NoWarn);CS0436 @@ -14,7 +14,7 @@ Link="Shared\SingleThreadedSynchronizationContext.cs" /> - + @@ -27,7 +27,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj index 107d05b171bfd..fcc0bfb8e7a4d 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj @@ -1,16 +1,20 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable - - - - + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj index 73949750fc3f1..642a7f7166861 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj @@ -1,6 +1,6 @@  - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true @@ -27,15 +27,16 @@ Microsoft.Extensions.DependencyModel.DependencyContext - + - + - + + diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj index d9f4d1ebc92b1..5dfad85cb61d2 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true $(DefaultItemExcludes);nonentrypointassembly\* @@ -17,7 +17,6 @@ - diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj index b198cac2def85..436e5f92f36e5 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -12,4 +12,7 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj index 65a64a494f92c..3e83ae70c800b 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -2,7 +2,7 @@ Microsoft.Extensions.FileProviders - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true Abstractions of files and directories. diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj index bb27ead339417..90ae3bb605ab6 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj @@ -1,7 +1,7 @@ Microsoft.Extensions.FileProviders - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj index f692dd38aae88..4ee9aedde5907 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj @@ -2,7 +2,7 @@ Microsoft.Extensions.FileProviders - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Composite file and directory providers for Microsoft.Extensions.FileProviders. diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj index 00761bc974c5d..6e5719a7b31e5 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/tests/Microsoft.Extensions.FileProviders.Composite.Tests.csproj @@ -2,17 +2,19 @@ Microsoft.Extensions.FileProviders.Composite - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true + + + + - - diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj index be7871ffa187c..41daf0960a905 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -14,4 +14,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index c0790fbf1e3aa..079953a6eb5fa 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -2,7 +2,7 @@ Microsoft.Extensions.FileProviders - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true true @@ -22,11 +22,6 @@ - - - - - @@ -38,4 +33,9 @@ + + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj index 515300a27aec6..0aea28efab883 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj @@ -2,7 +2,7 @@ Microsoft.Extensions.FileProviders.Physical - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true false @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj index ade27836c9d80..c2d428aae02ab 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) @@ -9,4 +9,8 @@ + + + + diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj index 2b6f76bd26c4f..10b3beca84586 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true File system globbing to find files matching a specified pattern. diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj index d871ed685eaa7..18043e2391cb0 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/tests/Microsoft.Extensions.FileSystemGlobbing.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateHostBuilderInvalidSignature/CreateHostBuilderInvalidSignature.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateHostBuilderPatternTestSite/CreateHostBuilderPatternTestSite.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateWebHostBuilderInvalidSignature/CreateWebHostBuilderInvalidSignature.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/CreateWebHostBuilderPatternTestSite/CreateWebHostBuilderPatternTestSite.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj index dc808c40b7cc9..eb36d2f000790 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/Microsoft.Extensions.HostFactoryResolver.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -8,7 +8,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/MockHostTypes/MockHostTypes.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/MockHostTypes/MockHostTypes.csproj index ed642b4209adb..2c9f3a71fc5ee 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/MockHostTypes/MockHostTypes.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/MockHostTypes/MockHostTypes.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPattern/NoSpecialEntryPointPattern.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPattern/NoSpecialEntryPointPattern.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPattern/NoSpecialEntryPointPattern.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPattern/NoSpecialEntryPointPattern.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternBuildsThenThrows/NoSpecialEntryPointPatternBuildsThenThrows.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternBuildsThenThrows/NoSpecialEntryPointPatternBuildsThenThrows.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternBuildsThenThrows/NoSpecialEntryPointPatternBuildsThenThrows.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternBuildsThenThrows/NoSpecialEntryPointPatternBuildsThenThrows.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternExits/NoSpecialEntryPointPatternExits.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternExits/NoSpecialEntryPointPatternExits.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternExits/NoSpecialEntryPointPatternExits.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternExits/NoSpecialEntryPointPatternExits.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternHangs/NoSpecialEntryPointPatternHangs.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternHangs/NoSpecialEntryPointPatternHangs.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternHangs/NoSpecialEntryPointPatternHangs.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternHangs/NoSpecialEntryPointPatternHangs.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternMainNoArgs/NoSpecialEntryPointPatternMainNoArgs.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternMainNoArgs/NoSpecialEntryPointPatternMainNoArgs.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternMainNoArgs/NoSpecialEntryPointPatternMainNoArgs.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternMainNoArgs/NoSpecialEntryPointPatternMainNoArgs.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternThrows/NoSpecialEntryPointPatternThrows.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternThrows/NoSpecialEntryPointPatternThrows.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternThrows/NoSpecialEntryPointPatternThrows.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/NoSpecialEntryPointPatternThrows/NoSpecialEntryPointPatternThrows.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatements/TopLevelStatements.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatements/TopLevelStatements.csproj index 716b25a87281d..1d8d76f900ada 100644 --- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatements/TopLevelStatements.csproj +++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/TopLevelStatements/TopLevelStatements.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj index 4bdb11c052a41..b89de32e6913c 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);CS0618 @@ -14,8 +14,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj index c1d22e36caf28..3dfdd377448fe 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -1,7 +1,7 @@  - netstandard2.1;netstandard2.0;net461 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) Microsoft.Extensions.Hosting true Hosting and startup abstractions for applications. @@ -18,11 +18,11 @@ - + - + + diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj index 7a8ba64d60d73..402784fa725bb 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj @@ -1,17 +1,17 @@  - net461;netstandard2.0;netstandard2.1 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) true - - - - + + + + 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 243e794856786..88472dd6b31bc 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 @@ -1,22 +1,22 @@  - net461;netstandard2.0;netstandard2.1 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) true .NET hosting infrastructure for Windows Services. - - + + + - + - - - + + diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj index 67b1cb31ee521..ef1085964e61e 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj index 23ab5b0212b88..1fbf58820452e 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -1,13 +1,18 @@ - netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);CS0618 + + + + + @@ -19,4 +24,12 @@ + + + + + + + + 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 b868be57845e0..163ccf2b26174 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -1,24 +1,21 @@  - $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true Hosting and startup infrastructures for applications. false - - - - - - + - + + + @@ -48,16 +45,16 @@ - + - + + - + + - diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/ApplicationType.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/ApplicationType.cs index f11413cba1eb1..ec190cb32eaf1 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/ApplicationType.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/ApplicationType.cs @@ -11,7 +11,7 @@ public enum ApplicationType Portable, /// - /// All dlls are published with the app for x-copy deploy. Net461 requires this because ASP.NET Core is not in the GAC. + /// All dlls are published with the app for x-copy deploy. Net462 requires this because ASP.NET Core is not in the GAC. /// Standalone } diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs index 90d1b7d9d74ad..a4ae0c12f9236 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs @@ -7,7 +7,7 @@ namespace Microsoft.Extensions.Hosting.IntegrationTesting { public static class Tfm { - public const string Net461 = "net461"; + public const string Net462 = "net462"; public const string NetCoreApp20 = "netcoreapp2.0"; public const string NetCoreApp21 = "netcoreapp2.1"; public const string NetCoreApp22 = "netcoreapp2.2"; diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/ApplicationDeployer.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/ApplicationDeployer.cs index 99364b076f56f..37540702fcb75 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/ApplicationDeployer.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/ApplicationDeployer.cs @@ -61,7 +61,7 @@ private void ValidateParameters() private RuntimeFlavor GetRuntimeFlavor(string tfm) { - if (Tfm.Matches(Tfm.Net461, tfm)) + if (Tfm.Matches(Tfm.Net462, tfm)) { return RuntimeFlavor.Clr; } diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/SelfHostDeployer.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/SelfHostDeployer.cs index 3be5a0a0e129c..79e87c59ee980 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/SelfHostDeployer.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/SelfHostDeployer.cs @@ -84,7 +84,7 @@ protected async Task StartSelfHostAsync() // Core+Standalone always publishes. This must be Clr+Standalone or Core+Portable. // Run from the pre-built bin/{config}/{tfm} directory. var targetFramework = DeploymentParameters.TargetFramework - ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? Tfm.Net461 : Tfm.NetCoreApp22); + ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? Tfm.Net462 : Tfm.NetCoreApp22); workingDirectory = Path.Combine(DeploymentParameters.ApplicationPath, "bin", DeploymentParameters.Configuration, targetFramework); // CurrentDirectory will point to bin/{config}/{tfm}, but the config and static files aren't copied, point to the app base instead. DeploymentParameters.EnvironmentVariables["DOTNET_CONTENTROOT"] = DeploymentParameters.ApplicationPath; diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj index ffd54fef7784b..11a32baa9ccb6 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true @@ -27,7 +27,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/TestApp/Microsoft.Extensions.Hosting.TestApp.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/TestApp/Microsoft.Extensions.Hosting.TestApp.csproj index 399232d63b797..5fc2054947865 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/TestApp/Microsoft.Extensions.Hosting.TestApp.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/TestApp/Microsoft.Extensions.Hosting.TestApp.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true Exe diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj index ee0c814c41b3f..3764ce16a0b64 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj @@ -1,10 +1,10 @@ - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetFrameworkMinimum) true true - true + true diff --git a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj index 24bab7c79b7b5..cf20bea4e4017 100644 --- a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index d2206f7e9dae7..b1ce1cb771932 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Annotations The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. The HttpClient factory provides extensibility to plug in DelegatingHandlers that address cross-cutting concerns such as service location, load balancing, and reliability. The default HttpClient factory provides built-in diagnostics and logging and manages the lifetimes of connections in a performant way. @@ -29,7 +29,7 @@ System.Net.Http.IHttpClientFactory - + diff --git a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj index 3b3033a2d429c..863b903aca173 100644 --- a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests/Microsoft.Extensions.Http.Tests.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true @@ -29,7 +29,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj index 8a736a657507a..79e8a04503003 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -9,4 +9,7 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 71e35b67179fa..6bcbd82e50e24 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true true @@ -30,7 +30,7 @@ Microsoft.Extensions.Logging.Abstractions.NullLogger Link="Common\System\Text\ValueStringBuilder.cs" /> - + diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj index 96453d7f665ed..b2928cb1ee45f 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index 976be509012be..05d6e92d2fd19 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Configuration support for Microsoft.Extensions.Logging. diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index 765b78729358e..665cf6453397d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ - + 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 51e9eb48083b4..b8ce8334901c5 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 @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true annotations $(DefineConstants);NO_SUPPRESS_GC_TRANSITION @@ -29,7 +29,7 @@ Link="Common\Interop\Windows\Interop.GetStdHandle.cs" /> - + @@ -50,7 +50,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj index 6caa09d4a5fa9..d762d320452a3 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true true diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj index 046103224ca35..a798d6fd40682 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index 2c176051f1f2d..c945c35b0468e 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine(). diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj index 41ab6a29cfaf4..21432125ec612 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index 04daa2e9d224d..d83438de0ba49 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true true Windows Event Log logger provider implementation for Microsoft.Extensions.Logging. @@ -21,7 +21,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj index 99dea9fad13d1..ddf0bc58c9380 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) @@ -17,7 +17,7 @@ - + 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 8b0a16bb9db5c..d01ff9dc85119 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 @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true true @@ -16,7 +16,7 @@ Link="Common\src\Extensions\Logging\NullScope.cs" /> - + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj index ba8087956f5de..2a0442a515afa 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj index 35d85582fedfd..5013b3707b77b 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index 7a0010c995814..fdecd36b373d5 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true TraceSource logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent(). diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj index 745210c365826..6116d1f7dc521 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index f06527607f126..0ca69de9c2590 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -1,7 +1,7 @@ - netstandard2.1;netstandard2.0;net461 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) true false @@ -25,12 +25,11 @@ - + - + diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj index 13f533ababd9d..6586026447c58 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetFrameworkMinimum) true @@ -34,7 +34,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj index c729cbe733115..49e334b679eeb 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 85bfa45c2696e..da3d6f7098dda 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 5d30bfa93e2bc..ad7d5aecc4e6e 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) true Provides additional configuration specific functionality related to Options. diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Microsoft.Extensions.Options.ConfigurationExtensions.Tests.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Microsoft.Extensions.Options.ConfigurationExtensions.Tests.csproj index 91a11d65d3b1a..5cd686baa3bd1 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Microsoft.Extensions.Options.ConfigurationExtensions.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Microsoft.Extensions.Options.ConfigurationExtensions.Tests.csproj @@ -2,7 +2,7 @@ enable - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj index 3c1c982479cf1..c4ae1671fc350 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj index 149921ab06d4b..2bf5673b76649 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -1,7 +1,7 @@ - netstandard2.1;netstandard2.0;net461 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) true Provides additional DataAnnotations specific functionality related to Options. @@ -20,7 +20,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj index c441c3ec38a19..c7f85313b4d75 100644 --- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj @@ -1,6 +1,6 @@ - netstandard2.0;netstandard2.1;net461 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj index 04dd8ce5f1500..5be040626e1bb 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -1,7 +1,7 @@ - netstandard2.1;netstandard2.0;net461 + netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) true Provides a strongly typed way of specifying and accessing settings using dependency injection. @@ -22,7 +22,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests/Microsoft.Extensions.Options.Tests.csproj b/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests/Microsoft.Extensions.Options.Tests.csproj index f9e8426555e30..b6fe16d15b995 100644 --- a/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests/Microsoft.Extensions.Options.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests/Microsoft.Extensions.Options.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj index 3c011149f7644..6f30d88d5fcf5 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj @@ -1,17 +1,21 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable + + - + + + diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index 369c1d06dd1ce..a8f50fa5b880c 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true true diff --git a/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj b/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj index cc7faa40de52d..2e90ac80baab9 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/tests/Microsoft.Extensions.Primitives.Tests.csproj @@ -1,15 +1,17 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true + + + + - - diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj index 589e92e6c28a1..b846ab63ea730 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppToolCurrent);net472 + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) false Microsoft.NETCore.Platforms.BuildTasks diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props index 0955dded51194..fac4b55f49cd7 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props +++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props @@ -1,7 +1,7 @@  - $([MSBuild]::Add($(PreviousReleaseMajorVersion), 5)).$(MinorVersion).0.0 + $([MSBuild]::Add($(MajorVersion), 5)).$(MinorVersion).0.0 Microsoft true diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj index a0b77d033ab7e..0be62e5266660 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -13,6 +13,12 @@ + + + + + + diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj index 881805e1df0ef..973493dafe271 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj @@ -9,7 +9,7 @@ Commonly Used Types: System.Security.AccessControl.RegistryAccessRule System.Security.AccessControl.RegistryAuditRule System.Security.AccessControl.RegistrySecurity - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj index a260d2cc62449..ad0a485c27481 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)-windows diff --git a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj index 60b298c4b14d5..1f0fc28b2e3a1 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj @@ -1,16 +1,16 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable - - + + - + diff --git a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.net461.cs b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.netframework.cs similarity index 100% rename from src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.net461.cs rename to src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.netframework.cs diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index 068e9ed7954e4..cf313f1b9f991 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -7,7 +7,7 @@ Commonly Used Types: Microsoft.Win32.SystemEvents true enable - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) @@ -15,7 +15,7 @@ Microsoft.Win32.SystemEvents $(DefineConstants);FEATURE_CER true - SR.PlatformNotSupported_SystemEvents + SR.PlatformNotSupported_SystemEvents @@ -120,7 +120,7 @@ Microsoft.Win32.SystemEvents + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj index 83d774de46421..9f54ccc27082a 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;net461 + $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) true diff --git a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj index db26b6b15df89..48f40e7ff52f5 100644 --- a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj +++ b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj @@ -1,13 +1,13 @@  - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 false true $(NoWarn);NU5128 - This Windows Compatibility Pack provides access to APIs that were previously available only for .NET Framework. It can be used from both .NET Core as well as .NET Standard. + This Windows Compatibility Pack provides access to APIs that were previously available only for .NET Framework. It can be used from both .NET as well as .NET Standard. @@ -40,7 +40,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/build/dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json b/src/libraries/Microsoft.XmlSerializer.Generator/src/build/dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json index 0d300fe395801..893bfd9327c2d 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/src/build/dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json +++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/build/dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json @@ -1,9 +1,9 @@ { "runtimeOptions": { - "tfm": "netcoreapp3.1", + "tfm": "net6.0", "framework": { "name": "Microsoft.NETCore.App", - "version": "3.1.0" + "version": "6.0.0" }, "rollForward": "LatestMajor" } diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh index ba3e88b4260be..946a98f078d8b 100755 --- a/src/libraries/Native/build-native.sh +++ b/src/libraries/Native/build-native.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -usage_list=("-outconfig: Configuration, typically a quadruplet such as 'net6.0-Linux-Release-x64', used to name output directory.") +usage_list=("-outconfig: Configuration, typically a quadruplet such as 'net7.0-Linux-Release-x64', used to name output directory.") usage_list+=("-staticLibLink: Optional argument to statically link any native library.") __scriptpath="$(cd "$(dirname "$0")"; pwd -P)" diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj index 3267a92c1d628..5b921ee1ed5f8 100644 --- a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj @@ -1,12 +1,22 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + - - + + - + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.net461.cs b/src/libraries/System.CodeDom/ref/System.CodeDom.netframework.cs similarity index 100% rename from src/libraries/System.CodeDom/ref/System.CodeDom.net461.cs rename to src/libraries/System.CodeDom/ref/System.CodeDom.netframework.cs diff --git a/src/libraries/System.CodeDom/src/System.CodeDom.csproj b/src/libraries/System.CodeDom/src/System.CodeDom.csproj index 8446f3bb71c25..3298565b357d3 100644 --- a/src/libraries/System.CodeDom/src/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/src/System.CodeDom.csproj @@ -2,7 +2,7 @@ true $(DefineConstants);CODEDOM - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) annotations false true diff --git a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj index fd358c6c57b4a..ac519acf967e4 100644 --- a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj +++ b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -111,7 +111,7 @@ - + diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj index 01c989df4fef6..05ce08b055144 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -11,6 +11,11 @@ + + + + + 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 9f95b79a7d3ab..4451ca02abaec 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true This package provides collections that are thread safe and guaranteed to never change their contents, also known as immutable collections. Like strings, any methods that perform modifications will not change the existing instance but instead return a new instance. For efficiency reasons, the implementation uses a sharing mechanism to ensure that newly created instances share as much data as possible with the previous instance while ensuring that operations have a predictable time complexity. diff --git a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj index 5dc59a3838215..594062fdaa109 100644 --- a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj +++ b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj @@ -1,17 +1,19 @@ 0436 - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true - + @@ -74,7 +76,6 @@ - @@ -96,7 +97,7 @@ - + diff --git a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj index c92f8b2348972..203ffa9d762ae 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.1 + $(NetCoreAppCurrent);$(NetCoreAppMinimum) @@ -11,4 +11,9 @@ + + + + + \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/CompatibilitySuppressions.xml b/src/libraries/System.ComponentModel.Composition.Registration/src/CompatibilitySuppressions.xml new file mode 100644 index 0000000000000..067e25f7b384a --- /dev/null +++ b/src/libraries/System.ComponentModel.Composition.Registration/src/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + .NETStandard,Version=v2.1 + + \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj index 93d35759d7faf..aea47bdd2b19c 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.1 + $(NetCoreAppCurrent);$(NetCoreAppMinimum) false true true @@ -43,7 +43,7 @@ System.ComponentModel.Composition.Registration.ExportBuilder - + diff --git a/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj index 5b6fcbd2306e2..590465ddf8cbd 100644 --- a/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 enable @@ -10,7 +10,7 @@ - + diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj index 303afd8efae80..95b6da0e8e029 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 enable false true @@ -201,7 +201,7 @@ System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> diff --git a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj index b040e4eec6fa0..c5373fc98b7af 100644 --- a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj +++ b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true Microsoft Provides common attributes used by System.Composition types. diff --git a/src/libraries/System.Composition.AttributedModel/tests/System.Composition.AttributeModel.Tests.csproj b/src/libraries/System.Composition.AttributedModel/tests/System.Composition.AttributeModel.Tests.csproj index b10127ed9daa0..8aef684e2caf5 100644 --- a/src/libraries/System.Composition.AttributedModel/tests/System.Composition.AttributeModel.Tests.csproj +++ b/src/libraries/System.Composition.AttributedModel/tests/System.Composition.AttributeModel.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) diff --git a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj index ecd963c233eb5..af6722aca9051 100644 --- a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj +++ b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) false true Microsoft diff --git a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj index 9474efba0b959..841657bbb9c0c 100644 --- a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj +++ b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) diff --git a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj index 14367daa8aaad..deed17cdeb6e8 100644 --- a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj +++ b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) false true Microsoft @@ -52,7 +52,7 @@ System.Composition.Hosting.CompositionHost - + \ No newline at end of file diff --git a/src/libraries/System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj b/src/libraries/System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj index 931a211e15180..8e6cdee5158b7 100644 --- a/src/libraries/System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj +++ b/src/libraries/System.Composition.Hosting/tests/System.Composition.Hosting.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj b/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj index ffb18894400e0..457e1adb1767c 100644 --- a/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj +++ b/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj @@ -1,7 +1,7 @@ System.Composition - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true Microsoft Contains runtime components of the Managed Extensibility Framework. diff --git a/src/libraries/System.Composition.Runtime/tests/System.Composition.Runtime.Tests.csproj b/src/libraries/System.Composition.Runtime/tests/System.Composition.Runtime.Tests.csproj index 83e64920c6c6c..5439d9d781d20 100644 --- a/src/libraries/System.Composition.Runtime/tests/System.Composition.Runtime.Tests.csproj +++ b/src/libraries/System.Composition.Runtime/tests/System.Composition.Runtime.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj index adcf26c17e4db..7aac1386dd37b 100644 --- a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -1,7 +1,7 @@ System.Composition - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) false true Microsoft diff --git a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj index 293590ae99aff..b4346c10b8206 100644 --- a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj +++ b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/System.Composition/src/System.Composition.csproj b/src/libraries/System.Composition/src/System.Composition.csproj index 9314413cfd507..2cb5eeae0332a 100644 --- a/src/libraries/System.Composition/src/System.Composition.csproj +++ b/src/libraries/System.Composition/src/System.Composition.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true Microsoft diff --git a/src/libraries/System.Composition/tests/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj b/src/libraries/System.Composition/tests/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj index 13c75ae1df6f0..8456d2bdc904d 100644 --- a/src/libraries/System.Composition/tests/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj +++ b/src/libraries/System.Composition/tests/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/System.Composition/tests/System.Composition.Tests.csproj b/src/libraries/System.Composition/tests/System.Composition.Tests.csproj index 2eace5fc8d2ab..f9242fd5e2f45 100644 --- a/src/libraries/System.Composition/tests/System.Composition.Tests.csproj +++ b/src/libraries/System.Composition/tests/System.Composition.Tests.csproj @@ -1,7 +1,7 @@ System.Composition.Lightweight.UnitTests - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -39,7 +39,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj b/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj index bc524e4f37f4e..3045d462256d4 100644 --- a/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj +++ b/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461 + netstandard2.0;$(NetFrameworkMinimum) diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj index fa1f81b9e1987..691e786cd022d 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj @@ -1,12 +1,12 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);CS0618 - - - + + + @@ -14,7 +14,18 @@ - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.net461.cs b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.netframework.cs similarity index 100% rename from src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.net461.cs rename to src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.netframework.cs diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml b/src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml index f1cdac2f6519b..8a07071730984 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml @@ -4,36 +4,36 @@ CP0002 M:System.Configuration.SettingsAttributeDictionary.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext) lib/netstandard2.0/System.Configuration.ConfigurationManager.dll - lib/net461/System.Configuration.ConfigurationManager.dll + lib/net462/System.Configuration.ConfigurationManager.dll CP0002 M:System.Configuration.SettingsContext.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext) lib/netstandard2.0/System.Configuration.ConfigurationManager.dll - lib/net461/System.Configuration.ConfigurationManager.dll + lib/net462/System.Configuration.ConfigurationManager.dll CP0002 M:System.Configuration.Internal.DelegatingConfigHost.RefreshConfigPaths lib/netstandard2.0/System.Configuration.ConfigurationManager.dll - lib/net461/System.Configuration.ConfigurationManager.dll + lib/net462/System.Configuration.ConfigurationManager.dll CP0002 M:System.Configuration.Internal.DelegatingConfigHost.get_HasLocalConfig lib/netstandard2.0/System.Configuration.ConfigurationManager.dll - lib/net461/System.Configuration.ConfigurationManager.dll + lib/net462/System.Configuration.ConfigurationManager.dll CP0002 M:System.Configuration.Internal.DelegatingConfigHost.get_HasRoamingConfig lib/netstandard2.0/System.Configuration.ConfigurationManager.dll - lib/net461/System.Configuration.ConfigurationManager.dll + lib/net462/System.Configuration.ConfigurationManager.dll CP0002 M:System.Configuration.Internal.DelegatingConfigHost.get_IsAppConfigHttp lib/netstandard2.0/System.Configuration.ConfigurationManager.dll - lib/net461/System.Configuration.ConfigurationManager.dll + lib/net462/System.Configuration.ConfigurationManager.dll \ No newline at end of file diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj index 302b968839166..7877d0e24f930 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) false $(NoWarn);CA1847 @@ -11,10 +11,12 @@ Commonly Used Types: System.Configuration.Configuration System.Configuration.ConfigurationManager + true + @@ -259,12 +261,14 @@ System.Configuration.ConfigurationManager Link="Common\System\IO\TempFileCollection.cs" /> + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> + + @@ -293,10 +297,12 @@ System.Configuration.ConfigurationManager + - + + diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj index 975159597c1bb..38c03d6d6c284 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true diff --git a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj index 3f557d722422e..a0cb55fed0df8 100644 --- a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj @@ -1,16 +1,16 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable - - + + - + diff --git a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.net461.cs b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.netframework.cs similarity index 100% rename from src/libraries/System.Data.Odbc/ref/System.Data.Odbc.net461.cs rename to src/libraries/System.Data.Odbc/ref/System.Data.Odbc.netframework.cs diff --git a/src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml b/src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml index 5d34f5842a63b..ba81808c4eec9 100644 --- a/src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml @@ -16,133 +16,265 @@ CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset lib/net6.0/System.Data.Odbc.dll - runtimes/illumos/lib/net6.0/System.Data.Odbc.dll + runtimes/linux/lib/net6.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) lib/net6.0/System.Data.Odbc.dll - runtimes/illumos/lib/net6.0/System.Data.Odbc.dll + runtimes/linux/lib/net6.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset lib/net6.0/System.Data.Odbc.dll - runtimes/ios/lib/net6.0/System.Data.Odbc.dll + runtimes/osx/lib/net6.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) lib/net6.0/System.Data.Odbc.dll - runtimes/ios/lib/net6.0/System.Data.Odbc.dll + runtimes/osx/lib/net6.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset lib/net6.0/System.Data.Odbc.dll - runtimes/linux/lib/net6.0/System.Data.Odbc.dll + runtimes/win/lib/net6.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) lib/net6.0/System.Data.Odbc.dll - runtimes/linux/lib/net6.0/System.Data.Odbc.dll + runtimes/win/lib/net6.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset - lib/net6.0/System.Data.Odbc.dll - runtimes/osx/lib/net6.0/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/freebsd/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) - lib/net6.0/System.Data.Odbc.dll - runtimes/osx/lib/net6.0/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/freebsd/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset - lib/net6.0/System.Data.Odbc.dll - runtimes/solaris/lib/net6.0/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/linux/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) - lib/net6.0/System.Data.Odbc.dll - runtimes/solaris/lib/net6.0/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/linux/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset - lib/net6.0/System.Data.Odbc.dll - runtimes/tvos/lib/net6.0/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/osx/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) - lib/net6.0/System.Data.Odbc.dll - runtimes/tvos/lib/net6.0/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/osx/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset - lib/net6.0/System.Data.Odbc.dll - runtimes/win/lib/net6.0/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/win/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) - lib/net6.0/System.Data.Odbc.dll - runtimes/win/lib/net6.0/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/win/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset - lib/netcoreapp3.1/System.Data.Odbc.dll - runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/illumos/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) - lib/netcoreapp3.1/System.Data.Odbc.dll - runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/illumos/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset - lib/netcoreapp3.1/System.Data.Odbc.dll - runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/ios/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) - lib/netcoreapp3.1/System.Data.Odbc.dll - runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/ios/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset - lib/netcoreapp3.1/System.Data.Odbc.dll - runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/solaris/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) - lib/netcoreapp3.1/System.Data.Odbc.dll - runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/solaris/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.get_Offset - lib/netcoreapp3.1/System.Data.Odbc.dll - runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/tvos/lib/net7.0/System.Data.Odbc.dll CP0002 M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32) - lib/netcoreapp3.1/System.Data.Odbc.dll - runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll + lib/net7.0/System.Data.Odbc.dll + runtimes/tvos/lib/net7.0/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcCommand + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcCommandBuilder + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcConnection + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcConnectionStringBuilder + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcDataAdapter + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcDataReader + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcError + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcErrorCollection + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcException + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcFactory + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcInfoMessageEventArgs + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcInfoMessageEventHandler + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcMetaDataCollectionNames + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcMetaDataColumnNames + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcParameter + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcParameterCollection + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcRowUpdatedEventArgs + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcRowUpdatedEventHandler + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcRowUpdatingEventArgs + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcRowUpdatingEventHandler + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcTransaction + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll + + + CP0001 + T:System.Data.Odbc.OdbcType + lib/netstandard2.0/System.Data.Odbc.dll + lib/net462/System.Data.Odbc.dll CP1002 diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj index 628b8d1e9e045..738028b8dcd6f 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-FreeBSD;netcoreapp3.1-Linux;netcoreapp3.1-OSX;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-FreeBSD;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);CA2249;CA1838 enable true @@ -20,10 +20,9 @@ System.Data.Odbc.OdbcTransaction true - $(NoWarn);SA1121 + $(NoWarn);SA1121 SR.Odbc_PlatformNotSupported - - $(NoWarn);CS8600;CS8601;CS8602;CS8604 + diff --git a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj index d22d70ea780ba..1170a886025cd 100644 --- a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj +++ b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj @@ -1,7 +1,7 @@ $(DefineConstants);TargetsWindows - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetFrameworkMinimum)-windows @@ -39,7 +39,7 @@ - + diff --git a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj index 4cc65fb4368cf..57d44b384b3ee 100644 --- a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj @@ -1,24 +1,29 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);0618 enable - - - - - - - - + + + + + + + + + + + + + @@ -28,4 +33,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.net461.cs b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.netframework.cs similarity index 100% rename from src/libraries/System.Data.OleDb/ref/System.Data.OleDb.net461.cs rename to src/libraries/System.Data.OleDb/ref/System.Data.OleDb.netframework.cs diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index a5e9b24830224..bb41fa45ce25a 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows true enable diff --git a/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj b/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj index 35d80cbf9f22e..8e528489f29af 100644 --- a/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj +++ b/src/libraries/System.Data.OleDb/tests/System.Data.OleDb.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)-windows @@ -12,10 +12,10 @@ - + - + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index 11c17335ed818..a54956959f258 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -1,29 +1,35 @@ - $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) false enable + - $(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS + $(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS + + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> + - + + + - + + 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 bac2f7cbbb518..510487abedfd3 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -4,7 +4,7 @@ false $(NoWarn);SA1205;CA1845 enable - $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools) @@ -24,7 +24,7 @@ System.Diagnostics.DiagnosticSource - + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj index 00b5834146ecd..a9191d5aa8289 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj @@ -31,13 +31,13 @@ - + - + diff --git a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj index ce61cd0884de5..84b169f9da824 100644 --- a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj @@ -1,25 +1,26 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - - + + - + - + + - + diff --git a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.net461.cs b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.netframework.cs similarity index 100% rename from src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.net461.cs rename to src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.netframework.cs diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index edaf849ba695b..33c1953ecdcd5 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);CA1838;CA1847 true Provides the System.Diagnostics.EventLog class, which allows the applications to use the windows event log service. @@ -9,11 +9,13 @@ Commonly Used Types: System.Diagnostics.EventLog + true SR.PlatformNotSupported_EventLog + @@ -103,21 +105,16 @@ System.Diagnostics.EventLog - + + - - - - - - - + @@ -140,6 +137,10 @@ System.Diagnostics.EventLog + + + + - $(NetCoreAppCurrent)-windows;net461 + $(NetCoreAppCurrent)-windows;$/NetFrameworkMinimum) true @@ -23,7 +23,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj index b01b83e73273f..9851685566186 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj @@ -1,18 +1,18 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true - - + + - + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.net461.cs b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.netframework.cs similarity index 100% rename from src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.net461.cs rename to src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.netframework.cs diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 5d99e220260f1..dfb057725b802 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);CA1847 true Provides the System.Diagnostics.PerformanceCounter class, which allows access to Windows performance counters. @@ -11,7 +11,7 @@ System.Diagnostics.PerformanceCounter - true + true SR.PlatformNotSupported_PerfCounters @@ -127,12 +127,9 @@ System.Diagnostics.PerformanceCounter Link="Common\System\Diagnostics\NetFrameworkUtils.cs" /> - - - - + @@ -150,7 +147,7 @@ System.Diagnostics.PerformanceCounter - + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj index ec9fd29024628..2146bf437cbe6 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;net461 + $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) @@ -20,7 +20,7 @@ - + \ No newline at end of file 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 1bf0c43270e42..8fc3f34d19495 100644 --- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -322,7 +322,7 @@ - + diff --git a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj index 46061476b9aea..8f2f511cc1735 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj @@ -1,20 +1,21 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 - - - - + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index b994abfb5ee24..b4fc19afcc6cc 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -3,7 +3,7 @@ true $(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 $(NoWarn);CA2249 true true @@ -92,37 +92,34 @@ - - - - - - - + - + - + + + + diff --git a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj index 4b9d9ec1ea318..6ee1a6b7217ba 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj @@ -18,12 +18,12 @@ PreserveNewest - + - + diff --git a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj index 7779fa037c4be..ef5b7753642a8 100644 --- a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj @@ -1,22 +1,23 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 - - - - + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj index d317292d1144a..108bf2f43b9f2 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-OSX;netcoreapp3.1-Linux;netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum);netstandard2.0 true true true @@ -85,9 +85,6 @@ Common\Interop\OSX\Interop.Libraries.cs - - - @@ -101,8 +98,7 @@ - + @@ -110,4 +106,7 @@ + + + diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj index ed21973294f49..9a78a3acd5438 100644 --- a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj @@ -56,11 +56,11 @@ PreserveNewest - + - + diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj index a8259f7fffe83..a3409278335c2 100644 --- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 true enable @@ -14,23 +14,22 @@ - - - - - - - + + - + + + + + diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index 6cbf2240119c7..74b52350cf0f4 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 true enable true @@ -22,8 +22,6 @@ System.DirectoryServices.ActiveDirectory.DomainController SR.DirectoryServices_PlatformNotSupported - - $(NoWarn);CS8600;CS8602;CS8604;CS8605 @@ -158,13 +156,7 @@ System.DirectoryServices.ActiveDirectory.DomainController - - - - - - @@ -174,7 +166,7 @@ System.DirectoryServices.ActiveDirectory.DomainController - + @@ -183,11 +175,16 @@ System.DirectoryServices.ActiveDirectory.DomainController - + - + + + + + + diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj index 6d791b64cf7a1..7c86e128ac562 100644 --- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj +++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj @@ -31,10 +31,10 @@ - + - + diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj index 8dbce3bef1d29..2842484527cb4 100644 --- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true enable @@ -9,9 +9,9 @@ - + - + @@ -26,7 +26,7 @@ - + diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.net461.cs b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.netframework.cs similarity index 100% rename from src/libraries/System.Drawing.Common/ref/System.Drawing.Common.net461.cs rename to src/libraries/System.Drawing.Common/ref/System.Drawing.Common.netframework.cs diff --git a/src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml b/src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml index 22af7d449fc47..514724ff46316 100644 --- a/src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml @@ -4,66 +4,78 @@ CP0002 M:System.Drawing.Graphics.GetContextInfo(System.Drawing.PointF@) lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0002 M:System.Drawing.Graphics.GetContextInfo(System.Drawing.PointF@,System.Drawing.Region@) lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0001 T:System.Drawing.FontConverter lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0001 T:System.Drawing.IconConverter lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0001 T:System.Drawing.ImageConverter lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0001 T:System.Drawing.ImageFormatConverter lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0001 T:System.Drawing.Printing.MarginsConverter lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0002 F:System.Drawing.Imaging.Encoder.ColorSpace lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0002 F:System.Drawing.Imaging.Encoder.ImageItems lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0002 F:System.Drawing.Imaging.Encoder.SaveAsCmyk lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll CP0002 F:System.Drawing.Imaging.EncoderParameterValueType.ValueTypePointer lib/netstandard2.0/System.Drawing.Common.dll - lib/net461/System.Drawing.Common.dll + lib/net462/System.Drawing.Common.dll + + + CP0001 + T:System.Drawing.ColorTranslator + lib/netstandard2.0/System.Drawing.Common.dll + lib/net6.0/System.Drawing.Common.dll + + + CP0001 + T:System.Drawing.SystemColors + lib/netstandard2.0/System.Drawing.Common.dll + lib/net6.0/System.Drawing.Common.dll \ No newline at end of file diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index 96003e63638f5..07dd32177629a 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -5,7 +5,7 @@ CS0618 $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS;FEATURE_SYSTEM_EVENTS true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-Unix;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true true @@ -23,10 +23,10 @@ Unix support is disabled by default. See https://aka.ms/systemdrawingnonwindows - true - SR.SystemDrawingCommon_PlatformNotSupported + true + SR.SystemDrawingCommon_PlatformNotSupported - + @@ -329,14 +329,14 @@ Unix support is disabled by default. See https://aka.ms/systemdrawingnonwindows - + - + diff --git a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj index ca1116cd5ad54..ac1fa3b57cfdc 100644 --- a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj +++ b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj @@ -118,7 +118,7 @@ - + diff --git a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj index adb92a819c462..3b5d2183acfbb 100644 --- a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -10,6 +10,11 @@ + + + + + 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 6c8a6d9ed36c5..5e264c499d307 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true Provides classes that can read and write the ASN.1 BER, CER, and DER data formats. @@ -68,7 +68,7 @@ System.Formats.Asn1.AsnWriter - + diff --git a/src/libraries/System.Formats.Asn1/tests/System.Formats.Asn1.Tests.csproj b/src/libraries/System.Formats.Asn1/tests/System.Formats.Asn1.Tests.csproj index 1c4965e48777e..68bdc72edf895 100644 --- a/src/libraries/System.Formats.Asn1/tests/System.Formats.Asn1.Tests.csproj +++ b/src/libraries/System.Formats.Asn1/tests/System.Formats.Asn1.Tests.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -52,7 +52,7 @@ CommonTest\System\Security\Cryptography\ByteUtils.cs - + diff --git a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj index c2f243296b552..963fb857541bd 100644 --- a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj @@ -1,17 +1,20 @@ - $(NetCoreAppCurrent);net5.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum) enable + - - - - + + + + + + diff --git a/src/libraries/System.Formats.Cbor/src/CompatibilitySuppressions.xml b/src/libraries/System.Formats.Cbor/src/CompatibilitySuppressions.xml new file mode 100644 index 0000000000000..8520fb12af7b6 --- /dev/null +++ b/src/libraries/System.Formats.Cbor/src/CompatibilitySuppressions.xml @@ -0,0 +1,7 @@ + + + + PKV006 + net5.0 + + \ No newline at end of file diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj index e5a5db727adc0..d456daec3ab4b 100644 --- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net5.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum) true enable true 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 c00e72c5513f4..94b6ed97635eb 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 @@ -47,7 +47,7 @@ - + - + diff --git a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj index acfa86bb798d8..20eb7e5484fd3 100644 --- a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj +++ b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true true diff --git a/src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj b/src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj index 4c6b5621e3bb1..fca817ed928ce 100644 --- a/src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj +++ b/src/libraries/System.IO.Hashing/tests/System.IO.Hashing.Tests.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj index 5765f53e6056e..6f9c8a9719515 100644 --- a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj +++ b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj @@ -53,7 +53,7 @@ - + diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj index c2ea960539aeb..5d09e2eec0fea 100644 --- a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj @@ -1,21 +1,26 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable - + - + - - + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.net461.cs b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.netframework.cs similarity index 100% rename from src/libraries/System.IO.Packaging/ref/System.IO.Packaging.net461.cs rename to src/libraries/System.IO.Packaging/ref/System.IO.Packaging.netframework.cs diff --git a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj index cc566e6515a1e..cb26ef4451cf8 100644 --- a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable $(NoWarn);CA1847 @@ -49,8 +49,8 @@ - + diff --git a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj index f9a26bb66dc20..3ab1405bbca3f 100644 --- a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj +++ b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj index 78741b99b7885..9c851436ee8ec 100644 --- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -10,7 +10,7 @@ - + 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 34f79827374ac..9e40c472ad87f 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true Single producer single consumer byte buffer management. @@ -54,13 +54,6 @@ System.IO.Pipelines.PipeReader - - - - - - - @@ -74,4 +67,11 @@ System.IO.Pipelines.PipeReader + + + + + + + diff --git a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj index 6b8db4abd8250..296a71c153e53 100644 --- a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj +++ b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -44,7 +44,7 @@ - + @@ -58,7 +58,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj index e283308b14ee1..bc664b2c29020 100644 --- a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj +++ b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj @@ -1,24 +1,16 @@ - - $(NetCoreAppCurrent);net5.0;netcoreapp3.1 + $(NetCoreAppCurrent) enable - - - 4.1.2.0 - 5.0.0.0 - - - + 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 3113dd32f9721..e5c57ff105fb5 100644 --- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -166,6 +166,10 @@ + + + + @@ -176,12 +180,7 @@ - - - - - - + diff --git a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj index c6278c5404322..511eb67eee6b4 100644 --- a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj @@ -1,14 +1,19 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - - + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.IO.Ports/ref/System.IO.Ports.net461.cs b/src/libraries/System.IO.Ports/ref/System.IO.Ports.netframework.cs similarity index 100% rename from src/libraries/System.IO.Ports/ref/System.IO.Ports.net461.cs rename to src/libraries/System.IO.Ports/ref/System.IO.Ports.netframework.cs diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj index 1ab0b8cdd9161..f203ec883dc50 100644 --- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj @@ -4,7 +4,7 @@ $(DefineConstants);SERIAL_PORTS true annotations - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0-Unix;netstandard2.0;$(NetFrameworkMinimum)-windows true Provides classes for controlling serial ports. @@ -138,16 +138,16 @@ System.IO.Ports.SerialPort - + - + - + - + diff --git a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj index 13d9cb01024af..0bf9d111a10e0 100644 --- a/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj +++ b/src/libraries/System.IO.Ports/tests/System.IO.Ports.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-FreeBSD;$(NetFrameworkMinimum)-windows @@ -120,7 +120,7 @@ - + diff --git a/src/libraries/System.Management/ref/System.Management.csproj b/src/libraries/System.Management/ref/System.Management.csproj index 18b7fb4064a3c..02ab319121bfd 100644 --- a/src/libraries/System.Management/ref/System.Management.csproj +++ b/src/libraries/System.Management/ref/System.Management.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 @@ -12,8 +12,7 @@ - - + diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index 516c38a9de6f2..3078de74ffc79 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -3,7 +3,7 @@ true $(NoWarn);0618 true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 true true true @@ -63,10 +63,8 @@ System.Management.SelectQuery - - - + diff --git a/src/libraries/System.Management/tests/System.Management.Tests.csproj b/src/libraries/System.Management/tests/System.Management.Tests.csproj index 6592e12738f4d..4c6f19a2478eb 100644 --- a/src/libraries/System.Management/tests/System.Management.Tests.csproj +++ b/src/libraries/System.Management/tests/System.Management.Tests.csproj @@ -23,10 +23,10 @@ CleanUp.mof - + - + \ No newline at end of file diff --git a/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj b/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj index 01e210e939f3e..7332b7fab9608 100644 --- a/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj +++ b/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj @@ -1,17 +1,25 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable + - + + + + + + + + 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 8c5ac857a0bc1..fc193b493e4f8 100644 --- a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj +++ b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj @@ -1,6 +1,6 @@  - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true enable true @@ -18,10 +18,8 @@ System.BinaryData Link="Common\System\IO\ReadOnlyMemoryStream.cs" /> - - - - + diff --git a/src/libraries/System.Memory.Data/tests/System.Memory.Data.Tests.csproj b/src/libraries/System.Memory.Data/tests/System.Memory.Data.Tests.csproj index 011c8545fe010..22f772aff4d85 100644 --- a/src/libraries/System.Memory.Data/tests/System.Memory.Data.Tests.csproj +++ b/src/libraries/System.Memory.Data/tests/System.Memory.Data.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj index 1687a6caa509f..cfdc0ca0cc39e 100644 --- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj @@ -1,31 +1,37 @@  - $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable + + - - - - - - - + + + - + - - + + + + + - - + + + + + + + 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 72024127132e8..6b810bb91e5b1 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true Provides extension methods for System.Net.Http.HttpClient and System.Net.Http.HttpContent that perform automatic serialization and deserialization using System.Text.Json. @@ -34,9 +34,11 @@ System.Net.Http.Json.JsonContent + + @@ -45,6 +47,7 @@ System.Net.Http.Json.JsonContent + @@ -52,6 +55,7 @@ System.Net.Http.Json.JsonContent + diff --git a/src/libraries/System.Net.Http.Json/tests/UnitTests/System.Net.Http.Json.Unit.Tests.csproj b/src/libraries/System.Net.Http.Json/tests/UnitTests/System.Net.Http.Json.Unit.Tests.csproj index 0997a1c96f77d..447b136bf972d 100644 --- a/src/libraries/System.Net.Http.Json/tests/UnitTests/System.Net.Http.Json.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http.Json/tests/UnitTests/System.Net.Http.Json.Unit.Tests.csproj @@ -1,12 +1,12 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) - + @@ -16,7 +16,7 @@ - + diff --git a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj index abb8c9bcb21f6..1e58e007ee239 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -13,7 +13,14 @@ - + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index 250126a0d3d73..571c8c06532b0 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetcoreAppCurrent);netstandard2.1-windows;netstandard2.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows true enable true @@ -105,7 +105,7 @@ System.Net.Http.WinHttpHandler + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> @@ -125,7 +125,7 @@ System.Net.Http.WinHttpHandler - + diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj index 47dbdd201719e..bf498dc38ba5f 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj @@ -149,10 +149,10 @@ - + - + diff --git a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj index ed6005dc03048..7e6fe343f8a47 100644 --- a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -8,11 +8,15 @@ - + + + + + \ No newline at end of file diff --git a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj index e147a5183b547..58239d9c0dce8 100644 --- a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true @@ -32,7 +32,7 @@ System.Numerics.Tensors.SparseTensor<T> - + diff --git a/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj b/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj index 669b0084f4ab4..042e4791b6a3d 100644 --- a/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj +++ b/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs index 586d76d022275..361f88fa360c3 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs @@ -3,8 +3,7 @@ namespace System.Diagnostics.CodeAnalysis { -// These attributes already shipped with .NET Core 3.1 in System.Runtime -#if !NETCOREAPP3_0 && !NETCOREAPP3_1 && !NETSTANDARD2_1 +#if !NETSTANDARD2_1 /// Specifies that null is allowed as an input even if the corresponding type disallows it. [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)] #if SYSTEM_PRIVATE_CORELIB diff --git a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj index 39d6843b59f20..ccc35dfd3458b 100644 --- a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj +++ b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj @@ -4,7 +4,7 @@ plan on shipping a new desktop version out of band. Instead add API to a different assembly. --> 4.0.0.0 - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 enable @@ -15,4 +15,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj index 41aa629316561..6dbdf79fc98ae 100644 --- a/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj +++ b/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 enable true true @@ -74,7 +74,7 @@ System.Reflection.Context.CustomReflectionContext - + diff --git a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj index 5ae1a3762e53a..5b77d7e47ac50 100644 --- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj @@ -2,7 +2,7 @@ true false - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -15,4 +15,7 @@ + + + \ No newline at end of file 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 4b183a5876891..ab75e192fc855 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -3,7 +3,7 @@ true en-US false - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true This packages provides a low-level .NET (ECMA-335) metadata reader and writer. It's geared for performance and is the ideal choice for building higher-level libraries that intend to provide their own object model, such as compilers. diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/StreamExtensions.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/StreamExtensions.cs index 89175b7f84afd..8e562a5e61e4e 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/StreamExtensions.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/StreamExtensions.cs @@ -76,7 +76,7 @@ internal static int TryReadAll(this Stream stream, byte[] buffer, int offset, in return totalBytesRead; } -#if NETCOREAPP3_0_OR_GREATER +#if NETCOREAPP internal static int TryReadAll(this Stream stream, Span buffer) { int totalBytesRead = 0; diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.EmbeddedPortablePdb.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.EmbeddedPortablePdb.cs index 43d6e31584e92..a099e858919c2 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.EmbeddedPortablePdb.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.EmbeddedPortablePdb.cs @@ -100,7 +100,7 @@ internal static unsafe NativeHeapMemoryBlock DecodeEmbeddedPortablePdbDebugDirec try { -#if NETCOREAPP3_0_OR_GREATER +#if NETCOREAPP actualLength = deflate.TryReadAll(new Span(decompressed.Pointer, decompressed.Size)); #else using var decompressedStream = new UnmanagedMemoryStream(decompressed.Pointer, decompressed.Size, decompressed.Size, FileAccess.Write); 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 ac19479d9a47e..7138184f5bd94 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 @@ -3,7 +3,7 @@ true false 436 - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) - + diff --git a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj index fe4145d630c00..c78802fa499f1 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -9,7 +9,7 @@ - + \ No newline at end of file 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 1c7ce45ad8cbb..c440191179e41 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -3,7 +3,7 @@ System.Reflection true - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true Provides read-only reflection on assemblies in an isolated context with support for assemblies that have different architectures and runtimes. @@ -147,7 +147,7 @@ System.Reflection.MetadataAssemblyResolver - + @@ -157,11 +157,9 @@ System.Reflection.MetadataAssemblyResolver - - diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs b/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs index 2c45856dcf736..1cd472bb203f8 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Helpers.cs @@ -367,7 +367,7 @@ public static RoAssemblyName ToRoAssemblyName(this AssemblyName assemblyName) public static byte[] ToUtf8(this string s) => Encoding.UTF8.GetBytes(s); -#if NETCOREAPP3_1_OR_GREATER +#if NETCOREAPP public static string ToUtf16(this ReadOnlySpan utf8) => Encoding.UTF8.GetString(utf8); #else public static unsafe string ToUtf16(this ReadOnlySpan utf8) diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj index 62a8a2e49b35b..78f831c71d498 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) $(NoWarn);SYSLIB0005 diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj index 99037ae459c92..5405d3f0f4f07 100644 --- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable @@ -11,4 +11,9 @@ + + + + + \ No newline at end of file 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 a0a79e45adfff..0636108ade77b 100644 --- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -1,11 +1,12 @@ true - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) $(DefineConstants);RESOURCES_EXTENSIONS enable true $(TargetsForTfmSpecificContentInPackage);GeneratePackageTargetsFile + true Provides classes which read and write resources in a format that supports non-primitive objects. Commonly Used Types: @@ -36,7 +37,7 @@ System.Resources.Extensions.PreserializedResourceWriter Link="System\Numerics\Hashing\HashHelpers.cs" /> - + diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj index bcee4a27b6037..5cac9f8b819e6 100644 --- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;net461 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetFrameworkMinimum) true @@ -18,11 +18,11 @@ - + - + diff --git a/src/libraries/System.Runtime.Caching/ref/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/ref/System.Runtime.Caching.csproj index 2823f20016908..cbd4480c66a50 100644 --- a/src/libraries/System.Runtime.Caching/ref/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/ref/System.Runtime.Caching.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index 8d7d5ba2071e4..2a764b0052626 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0 true true true @@ -76,8 +76,10 @@ System.Runtime.Caching.ObjectCache + + + - @@ -100,7 +102,4 @@ System.Runtime.Caching.ObjectCache - - - diff --git a/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/Counters.cs b/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/Counters.cs index 5e8a3712054f9..b49d9e138090e 100644 --- a/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/Counters.cs +++ b/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/Counters.cs @@ -9,12 +9,12 @@ namespace System.Runtime.Caching { -#if NET5_0_OR_GREATER +#if NETCOREAPP [UnsupportedOSPlatform("browser")] #endif internal sealed class Counters : EventSource { -#if NETCOREAPP3_1_OR_GREATER +#if NETCOREAPP private const string EVENT_SOURCE_NAME_ROOT = "System.Runtime.Caching."; private const int NUM_COUNTERS = 7; diff --git a/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/MemoryCacheStatistics.cs b/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/MemoryCacheStatistics.cs index 107c46f0158c9..05f51af3f0341 100644 --- a/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/MemoryCacheStatistics.cs +++ b/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/MemoryCacheStatistics.cs @@ -153,7 +153,7 @@ private void InitializeConfiguration(NameValueCollection config) _configCacheMemoryLimitMegabytes = ConfigUtil.GetIntValue(config, ConfigUtil.CacheMemoryLimitMegabytes, _configCacheMemoryLimitMegabytes, true, int.MaxValue); _configPhysicalMemoryLimitPercentage = ConfigUtil.GetIntValue(config, ConfigUtil.PhysicalMemoryLimitPercentage, _configPhysicalMemoryLimitPercentage, true, 100); } -#if !NETCOREAPP3_1_OR_GREATER +#if !NETCOREAPP if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && _configPhysicalMemoryLimitPercentage > 0) { throw new PlatformNotSupportedException(SR.PlatformNotSupported_PhysicalMemoryLimitPercentage); diff --git a/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Unix.cs b/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Unix.cs index 9963bb7f41cd5..9629e44006713 100644 --- a/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Unix.cs +++ b/src/libraries/System.Runtime.Caching/src/System/Runtime/Caching/PhysicalMemoryMonitor.Unix.cs @@ -22,7 +22,7 @@ internal sealed partial class PhysicalMemoryMonitor : MemoryMonitor * highlights how our behavior might be slightly different from windows in these * cases since this was a monitor that cared about actual physical memory. */ -#if NETCOREAPP3_1_OR_GREATER +#if NETCOREAPP private int lastGCCount; protected override int GetCurrentPressure() diff --git a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj index 96d8e280cde7b..44e522ec5cdbc 100644 --- a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj +++ b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj @@ -16,10 +16,10 @@ - + - + diff --git a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching/CountersTest.cs b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching/CountersTest.cs index a3b6f5e1c1562..5d403d81833b6 100644 --- a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching/CountersTest.cs +++ b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching/CountersTest.cs @@ -74,7 +74,7 @@ private async Task PollCounters(string cacheName) { MemoryCacheCounterValues counters = new MemoryCacheCounterValues(); -#if NETCOREAPP3_1_OR_GREATER +#if NETCOREAPP var events = new ConcurrentQueue(); using (var listener = new TestEventListener("System.Runtime.Caching." + cacheName, EventLevel.Verbose, eventCounterInterval: 0.1d)) { @@ -135,7 +135,7 @@ private async Task PollCounters(string cacheName) return counters; } -#if NETCOREAPP3_1_OR_GREATER +#if NETCOREAPP private static async Task WaitForEventCountersAsync(ConcurrentQueue events) { DateTime startTime = DateTime.UtcNow; diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj index 766ea9a8ae7fe..47bd10acddb11 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj @@ -3,7 +3,7 @@ true false enable - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj index a9e3de0c4543b..4b552a0a38eb2 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj @@ -1,6 +1,6 @@  - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) IMPL OPT @@ -17,12 +17,11 @@ System.Runtime.CompilerServices.Unsafe #define netcoreapp System.Runtime - + netstandard - + mscorlib - #define $(TargetFramework) @@ -30,7 +29,7 @@ System.Runtime.CompilerServices.Unsafe + Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'" /> - + - + @@ -48,7 +48,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index c3816073efa46..aba835e6e6c0f 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -1,12 +1,12 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable - - - + + + @@ -16,7 +16,7 @@ - + @@ -24,7 +24,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.net461.cs b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.netframework.cs similarity index 100% rename from src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.net461.cs rename to src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.netframework.cs diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/CompatibilitySuppressions.xml b/src/libraries/System.Security.Cryptography.Pkcs/src/CompatibilitySuppressions.xml index b56749eac2c27..efe54addd46e4 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/CompatibilitySuppressions.xml @@ -4,85 +4,85 @@ CP0002 M:System.Security.Cryptography.Pkcs.CmsSigner.get_PrivateKey lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.CmsSigner.set_PrivateKey(System.Security.Cryptography.AsymmetricAlgorithm) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.CmsSigner.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.AsymmetricAlgorithm) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.ContentInfo.GetContentType(System.ReadOnlySpan{System.Byte}) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.EnvelopedCms.Decode(System.ReadOnlySpan{System.Byte}) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.EnvelopedCms.Decrypt(System.Security.Cryptography.Pkcs.RecipientInfo,System.Security.Cryptography.AsymmetricAlgorithm) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.SignedCms.Decode(System.ReadOnlySpan{System.Byte}) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.SignedCms.AddCertificate(System.Security.Cryptography.X509Certificates.X509Certificate2) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.SignedCms.RemoveCertificate(System.Security.Cryptography.X509Certificates.X509Certificate2) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.SignerInfo.GetSignature lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.SignerInfo.get_SignatureAlgorithm lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.SignerInfo.AddUnsignedAttribute(System.Security.Cryptography.AsnEncodedData) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.SignerInfo.RemoveUnsignedAttribute(System.Security.Cryptography.AsnEncodedData) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll CP0002 M:System.Security.Cryptography.Pkcs.SubjectIdentifier.MatchesCertificate(System.Security.Cryptography.X509Certificates.X509Certificate2) lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - lib/net461/System.Security.Cryptography.Pkcs.dll + lib/net462/System.Security.Cryptography.Pkcs.dll PKV006 @@ -184,4 +184,1068 @@ runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll true + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Builder + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12CertBag + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Info + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo + ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Builder + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12CertBag + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Info + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo + ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Builder + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12CertBag + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Info + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo + lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Builder + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12CertBag + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Info + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo + lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Builder + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12CertBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Info + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Builder + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12CertBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Info + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo + runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Builder + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12CertBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Info + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0002 + M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Builder + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12CertBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12Info + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + + + CP0001 + T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo + runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll + runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll + true + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 035c881a0064b..c02809899d175 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -4,7 +4,7 @@ true $(NoWarn);CA5384 enable - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.1-windows;netstandard2.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows true Provides support for PKCS and CMS algorithms. @@ -15,7 +15,6 @@ System.Security.Cryptography.Pkcs.EnvelopedCms true true - true @@ -555,7 +554,7 @@ System.Security.Cryptography.Pkcs.EnvelopedCms - + - - - - - - - - - - - - - @@ -668,7 +654,7 @@ System.Security.Cryptography.Pkcs.EnvelopedCms - + @@ -676,4 +662,14 @@ System.Security.Cryptography.Pkcs.EnvelopedCms + + + + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj index b8291963b5a33..8b280222d25fe 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj @@ -34,11 +34,12 @@ - + + @@ -65,16 +66,13 @@ - - - - + - + diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj index 7b9702905467c..9d7492d09d15d 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj @@ -1,16 +1,19 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable - - - - - + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.net461.cs b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.netframework.cs similarity index 100% rename from src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.net461.cs rename to src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.netframework.cs diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index c2b3a7ee6cdb1..7f9803502455e 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows enable true true @@ -13,8 +13,8 @@ System.Security.Cryptography.ProtectedData - true - true + true + true SR.PlatformNotSupported_CryptographyProtectedData @@ -49,7 +49,7 @@ System.Security.Cryptography.ProtectedData - + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj index 928f3b243f3e1..c0c9213c7d702 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)-windows @@ -11,7 +11,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj index 3b1071dd9124b..820ec32238c5a 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj @@ -2,7 +2,7 @@ true $(NoWarn);CA5384 - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent); + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent) enable @@ -591,7 +591,7 @@ - + - + - + diff --git a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj index d6f285edd38c7..85710409a558b 100644 --- a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj @@ -1,10 +1,10 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - - + + @@ -12,12 +12,20 @@ + + + + + + + + - + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.net461.cs b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.netframework.cs similarity index 100% rename from src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.net461.cs rename to src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.netframework.cs diff --git a/src/libraries/System.Security.Cryptography.Xml/src/CompatibilitySuppressions.xml b/src/libraries/System.Security.Cryptography.Xml/src/CompatibilitySuppressions.xml index dd6795c03dbea..61d4ffd566cca 100644 --- a/src/libraries/System.Security.Cryptography.Xml/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Security.Cryptography.Xml/src/CompatibilitySuppressions.xml @@ -4,42 +4,282 @@ CP0002 F:System.Security.Cryptography.Xml.SignedXml.XmlDsigSHA256Url lib/netstandard2.0/System.Security.Cryptography.Xml.dll - lib/net461/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll CP0002 F:System.Security.Cryptography.Xml.SignedXml.XmlDsigRSASHA256Url lib/netstandard2.0/System.Security.Cryptography.Xml.dll - lib/net461/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll CP0002 F:System.Security.Cryptography.Xml.SignedXml.XmlDsigSHA384Url lib/netstandard2.0/System.Security.Cryptography.Xml.dll - lib/net461/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll CP0002 F:System.Security.Cryptography.Xml.SignedXml.XmlDsigRSASHA384Url lib/netstandard2.0/System.Security.Cryptography.Xml.dll - lib/net461/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll CP0002 F:System.Security.Cryptography.Xml.SignedXml.XmlDsigSHA512Url lib/netstandard2.0/System.Security.Cryptography.Xml.dll - lib/net461/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll CP0002 F:System.Security.Cryptography.Xml.SignedXml.XmlDsigRSASHA512Url lib/netstandard2.0/System.Security.Cryptography.Xml.dll - lib/net461/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll CP0001 T:System.Security.Cryptography.Xml.CryptoSignedXmlRecursionException lib/netstandard2.0/System.Security.Cryptography.Xml.dll - lib/net461/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.CipherData + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.CipherReference + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.DataObject + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.DataReference + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.DSAKeyValue + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.EncryptedData + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.EncryptedKey + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.EncryptedReference + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.EncryptedType + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.EncryptedXml + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.EncryptionMethod + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.EncryptionProperty + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.EncryptionPropertyCollection + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.IRelDecryptor + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.KeyInfo + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.KeyInfoClause + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.KeyInfoEncryptedKey + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.KeyInfoName + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.KeyInfoNode + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.KeyInfoRetrievalMethod + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.KeyInfoX509Data + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.KeyReference + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.Reference + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.ReferenceList + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.RSAKeyValue + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.Signature + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.SignedInfo + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.SignedXml + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.Transform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.TransformChain + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDecryptionTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDsigBase64Transform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDsigC14NTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDsigC14NWithCommentsTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDsigEnvelopedSignatureTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDsigExcC14NTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDsigExcC14NWithCommentsTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDsigXPathTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlDsigXsltTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll + + + CP0001 + T:System.Security.Cryptography.Xml.XmlLicenseTransform + lib/netstandard2.0/System.Security.Cryptography.Xml.dll + lib/net462/System.Security.Cryptography.Xml.dll \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj index 3ffca2e0cc756..8d3951f21a45e 100644 --- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true Provides classes to support the creation and validation of XML digital signatures. The classes in this namespace implement the World Wide Web Consortium Recommendation, "XML-Signature Syntax and Processing", described at http://www.w3.org/TR/xmldsig-core/. diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj index cd32ff9c8c4e1..1948e09dd249e 100644 --- a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) - + diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj index 1bfcb7285abf8..64eb421f7b150 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,44 +1,33 @@ - $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + - - + + - - - - - - - - - - - - - - - - + + + + - + @@ -46,4 +35,21 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.net461.cs b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.netframework.cs similarity index 100% rename from src/libraries/System.Security.Permissions/ref/System.Security.Permissions.net461.cs rename to src/libraries/System.Security.Permissions/ref/System.Security.Permissions.netframework.cs diff --git a/src/libraries/System.Security.Permissions/src/CompatibilitySuppressions.xml b/src/libraries/System.Security.Permissions/src/CompatibilitySuppressions.xml index defbb6beb0892..a25261e4420d1 100644 --- a/src/libraries/System.Security.Permissions/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Security.Permissions/src/CompatibilitySuppressions.xml @@ -12,19 +12,19 @@ CP0002 M:System.Security.Permissions.KeyContainerPermissionAccessEntryCollection.CopyTo(System.Array,System.Int32) lib/netstandard2.0/System.Security.Permissions.dll - lib/net461/System.Security.Permissions.dll + lib/net462/System.Security.Permissions.dll CP0002 M:System.Security.Permissions.KeyContainerPermissionAccessEntryCollection.#ctor lib/netstandard2.0/System.Security.Permissions.dll - lib/net461/System.Security.Permissions.dll + lib/net462/System.Security.Permissions.dll CP0002 M:System.Security.Permissions.KeyContainerPermissionAccessEntryEnumerator.#ctor lib/netstandard2.0/System.Security.Permissions.dll - lib/net461/System.Security.Permissions.dll + lib/net462/System.Security.Permissions.dll CP0001 @@ -124,4 +124,46 @@ lib/netstandard2.0/System.Security.Permissions.dll true + + CP0001 + T:System.Xaml.Permissions.XamlLoadPermission + ref/net5.0/System.Security.Permissions.dll + lib/netstandard2.0/System.Security.Permissions.dll + true + + + CP0001 + T:System.Security.Policy.Evidence + ref/net5.0/System.Security.Permissions.dll + lib/netstandard2.0/System.Security.Permissions.dll + true + + + CP0001 + T:System.Security.Policy.EvidenceBase + ref/net5.0/System.Security.Permissions.dll + lib/netstandard2.0/System.Security.Permissions.dll + true + + + CP0001 + T:System.Xaml.Permissions.XamlLoadPermission + lib/net5.0/System.Security.Permissions.dll + lib/netstandard2.0/System.Security.Permissions.dll + true + + + CP0001 + T:System.Security.Policy.Evidence + lib/net5.0/System.Security.Permissions.dll + lib/netstandard2.0/System.Security.Permissions.dll + true + + + CP0001 + T:System.Security.Policy.EvidenceBase + lib/net5.0/System.Security.Permissions.dll + lib/netstandard2.0/System.Security.Permissions.dll + true + \ No newline at end of file diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index a2e84882939d5..c2af2e395d4f7 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -1,11 +1,11 @@ true - $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true Provides types supporting Code Access Security (CAS). - + @@ -189,12 +189,11 @@ - + - @@ -202,7 +201,7 @@ - + diff --git a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj index 9826a5f94e9ba..3e2cad5698967 100644 --- a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj @@ -1,10 +1,10 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - - + + @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.net461.cs b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.netframework.cs similarity index 100% rename from src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.net461.cs rename to src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.netframework.cs diff --git a/src/libraries/System.ServiceModel.Syndication/src/CompatibilitySuppressions.xml b/src/libraries/System.ServiceModel.Syndication/src/CompatibilitySuppressions.xml index 311a18dcc13dd..36854279dd370 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.ServiceModel.Syndication/src/CompatibilitySuppressions.xml @@ -24,102 +24,102 @@ CP0002 M:System.ServiceModel.Syndication.SyndicationFeed.get_Documentation lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeed.set_Documentation(System.ServiceModel.Syndication.SyndicationLink) lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeed.get_TimeToLive lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeed.set_TimeToLive(System.Nullable{System.TimeSpan}) lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeed.get_SkipHours lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeed.get_SkipDays lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeed.get_TextInput lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeed.set_TextInput(System.ServiceModel.Syndication.SyndicationTextInput) lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeedFormatter.get_UriParser lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeedFormatter.set_UriParser(System.ServiceModel.Syndication.TryParseUriCallback) lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeedFormatter.get_DateTimeParser lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0002 M:System.ServiceModel.Syndication.SyndicationFeedFormatter.set_DateTimeParser(System.ServiceModel.Syndication.TryParseDateTimeCallback) lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0001 T:System.ServiceModel.Syndication.TryParseDateTimeCallback lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0001 T:System.ServiceModel.Syndication.TryParseUriCallback lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0001 T:System.ServiceModel.Syndication.SyndicationTextInput lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0001 T:System.ServiceModel.Syndication.XmlDateTimeData lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll CP0001 T:System.ServiceModel.Syndication.XmlUriData lib/netstandard2.0/System.ServiceModel.Syndication.dll - lib/net461/System.ServiceModel.Syndication.dll + lib/net462/System.ServiceModel.Syndication.dll \ No newline at end of file diff --git a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj index 8adc81696720e..7ba4dead1db6e 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true true Provides classes related to service model syndication. @@ -56,18 +56,15 @@ - - - - + diff --git a/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj b/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj index 368d45236e161..665056f7901c6 100644 --- a/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj +++ b/src/libraries/System.ServiceModel.Syndication/tests/System.ServiceModel.Syndication.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -38,7 +38,7 @@ - + @@ -61,7 +61,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj index d9255a57f8a81..7cced91900265 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -1,25 +1,25 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable - - + + - + + + + - + - - - \ No newline at end of file diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.net461.cs b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.netframework.cs similarity index 100% rename from src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.net461.cs rename to src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.netframework.cs diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 7a3f433ead307..213b3738c3e64 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows $(NoWarn);CA2249 enable true @@ -79,13 +79,15 @@ System.ServiceProcess.ServiceType + + + - @@ -97,16 +99,13 @@ System.ServiceProcess.ServiceType - - - - - - + + + diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceController.cs b/src/libraries/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceController.cs index e72f8827aaf9e..51c83257ce9d0 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceController.cs +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System/ServiceProcess/ServiceController.cs @@ -927,7 +927,7 @@ public void Stop() /// /// true to stop all running dependent services together with the service; false to stop only the service. /// -#if NETCOREAPP3_1_OR_GREATER +#if NETCOREAPP public #else private diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj index a0300f8a838e9..106deebd65f41 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj @@ -2,7 +2,7 @@ true Exe - $(NetCoreAppCurrent);net461-windows + $(NetCoreAppCurrent);$(NetFrameworkMinimum)-windows annotations diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj index ca07717ba52e9..31d14138e3c3d 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)-windows @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Speech/ref/System.Speech.csproj b/src/libraries/System.Speech/ref/System.Speech.csproj index 47a37eb580cbf..5ba22b6db2fe2 100644 --- a/src/libraries/System.Speech/ref/System.Speech.csproj +++ b/src/libraries/System.Speech/ref/System.Speech.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/src/libraries/System.Speech/src/System.Speech.csproj b/src/libraries/System.Speech/src/System.Speech.csproj index 6d6dc95987327..0a72d5a24dbf7 100644 --- a/src/libraries/System.Speech/src/System.Speech.csproj +++ b/src/libraries/System.Speech/src/System.Speech.csproj @@ -1,7 +1,7 @@  true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0 $(NoWarn);CS0649;SA1129;CA1847 @@ -19,8 +19,6 @@ System.Speech.Recognition.SpeechRecognizer true SR.PlatformNotSupported_SystemSpeech - - $(NoWarn);IDE0079 @@ -229,12 +227,8 @@ System.Speech.Recognition.SpeechRecognizer upstable_jpn.upsmap - - - - - + diff --git a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj index d37062131e365..5e0c2cd932587 100644 --- a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj @@ -1,16 +1,16 @@ enable - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) - + - + \ No newline at end of file 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 635eb8239901a..89032f2e210a4 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 @@ -2,7 +2,7 @@ true enable - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows true true true @@ -60,7 +60,7 @@ System.Text.CodePagesEncodingProvider - + @@ -85,7 +85,7 @@ System.Text.CodePagesEncodingProvider - + diff --git a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj index 569288d61d2ba..5d8b54603d829 100644 --- a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj @@ -1,14 +1,14 @@ true - $(NetCoreAppCurrent);net461-windows + $(NetCoreAppCurrent);$(NetFrameworkMinimum)-windows - + - + \ No newline at end of file diff --git a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj index 1f72a38924935..83fd4dd166c1f 100644 --- a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true $(NoWarn);CS3011 @@ -12,11 +12,11 @@ - + - + \ No newline at end of file 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 543b592971659..ec39570c09d82 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 @@ -1,12 +1,11 @@ true - $(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-Browser;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable $(NoWarn);CS3011;CS3019 - $(DefineConstants);TARGET_BROWSER true Provides types for encoding and escaping strings for use in JavaScript, HyperText Markup Language (HTML), and uniform resource locators (URL). @@ -15,6 +14,10 @@ System.Text.Encodings.Web.HtmlEncoder System.Text.Encodings.Web.UrlEncoder System.Text.Encodings.Web.JavaScriptEncoder + + + $(DefineConstants);TARGET_BROWSER + @@ -46,8 +49,6 @@ System.Text.Encodings.Web.JavaScriptEncoder - - @@ -64,12 +65,6 @@ System.Text.Encodings.Web.JavaScriptEncoder - - - - - - diff --git a/src/libraries/System.Text.Encodings.Web/src/System/Text/Encodings/Web/OptimizedInboxTextEncoder.cs b/src/libraries/System.Text.Encodings.Web/src/System/Text/Encodings/Web/OptimizedInboxTextEncoder.cs index 22cea33ffc8b6..afaf22888d081 100644 --- a/src/libraries/System.Text.Encodings.Web/src/System/Text/Encodings/Web/OptimizedInboxTextEncoder.cs +++ b/src/libraries/System.Text.Encodings.Web/src/System/Text/Encodings/Web/OptimizedInboxTextEncoder.cs @@ -41,7 +41,7 @@ internal OptimizedInboxTextEncoder( _scalarEscaper = scalarEscaper; _allowedBmpCodePoints = allowedCodePointsBmp; -#if DEBUG && !NETCOREAPP3_1 +#if DEBUG // Debug-only assertion to validate that we're no longer using the input // argument once the field value has been assigned. All accesses to the bitmap // should now go through our instance field. In debug mode, if any code violates @@ -427,12 +427,11 @@ public unsafe int GetIndexOfFirstCharToEncode(ReadOnlySpan data) { idx = GetIndexOfFirstCharToEncodeSsse3(pData, lengthInChars); } -#if NET5_0_OR_GREATER else if (AdvSimd.Arm64.IsSupported && BitConverter.IsLittleEndian) { idx = GetIndexOfFirstCharToEncodeAdvSimd64(pData, lengthInChars); } -#endif + Debug.Assert(0 <= idx && idx <= lengthInChars); #endif diff --git a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj index 7c3a5f19b0f3f..89c2dd318f69a 100644 --- a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj +++ b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) 13.0 @@ -41,7 +41,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj index 6ef8f2ad1f044..bee1138355549 100644 --- a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj @@ -1,38 +1,41 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true + - + + + + + + + - + + - + - - - - \ No newline at end of file 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 d18d2c01221d3..ee6223e109d37 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) @@ -298,7 +298,7 @@ System.Text.Json.Utf8JsonReader - + @@ -307,7 +307,7 @@ System.Text.Json.Utf8JsonReader - + @@ -325,7 +325,6 @@ System.Text.Json.Utf8JsonReader - @@ -334,7 +333,7 @@ System.Text.Json.Utf8JsonReader - + @@ -345,7 +344,7 @@ System.Text.Json.Utf8JsonReader - + diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj index a59430f5cb3de..df68f3c94bde8 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj @@ -1,6 +1,6 @@  - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true $(NoWarn);SYSLIB0020 @@ -14,7 +14,7 @@ - $(DefineConstants);BUILDING_INBOX_LIBRARY + $(DefineConstants);BUILDING_INBOX_LIBRARY @@ -200,7 +200,7 @@ - + @@ -208,7 +208,7 @@ - + diff --git a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj index 3f57e01ad4d1b..2a134ef7ff2cc 100644 --- a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj @@ -1,18 +1,28 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable + - - + + + + + + + + + + + diff --git a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.net461.cs b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.netframework.cs similarity index 100% rename from src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.net461.cs rename to src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.netframework.cs diff --git a/src/libraries/System.Threading.AccessControl/src/CompatibilitySuppressions.xml b/src/libraries/System.Threading.AccessControl/src/CompatibilitySuppressions.xml index 1fabb2d07af7b..2220998a09786 100644 --- a/src/libraries/System.Threading.AccessControl/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Threading.AccessControl/src/CompatibilitySuppressions.xml @@ -16,4 +16,76 @@ PKV007 .NETStandard,Version=v1.3-win + + CP0001 + T:System.Security.AccessControl.EventWaitHandleAccessRule + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.EventWaitHandleAuditRule + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.EventWaitHandleRights + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.EventWaitHandleSecurity + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.MutexAccessRule + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.MutexAuditRule + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.MutexRights + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.MutexSecurity + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.SemaphoreAccessRule + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.SemaphoreAuditRule + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.SemaphoreRights + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + + + CP0001 + T:System.Security.AccessControl.SemaphoreSecurity + lib/netstandard2.0/System.Threading.AccessControl.dll + lib/net462/System.Threading.AccessControl.dll + \ No newline at end of file diff --git a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index f71a0d7bc6dc6..f506bc9546f4b 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows true enable true diff --git a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj index 4c7946f33b824..f9ae2dfcf26d0 100644 --- a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj +++ b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;net461-windows + $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)-windows - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable - + - + diff --git a/src/libraries/System.Threading.Channels/src/CompatibilitySuppressions.xml b/src/libraries/System.Threading.Channels/src/CompatibilitySuppressions.xml index 229a4736a7075..9ec73df7914cb 100644 --- a/src/libraries/System.Threading.Channels/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Threading.Channels/src/CompatibilitySuppressions.xml @@ -1,7 +1,35 @@ - + PKV006 .NETStandard,Version=v1.3 + + CP0002 + M:System.Threading.Channels.ChannelClosedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext) + lib/netcoreapp3.0/System.Threading.Channels.dll + lib/netstandard2.0/System.Threading.Channels.dll + true + + + CP0002 + M:System.Threading.Channels.ChannelReader`1.ReadAllAsync(System.Threading.CancellationToken) + lib/netcoreapp3.0/System.Threading.Channels.dll + lib/netstandard2.0/System.Threading.Channels.dll + true + + + CP0002 + M:System.Threading.Channels.ChannelClosedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext) + lib/netstandard2.1/System.Threading.Channels.dll + lib/netstandard2.0/System.Threading.Channels.dll + true + + + CP0002 + M:System.Threading.Channels.ChannelReader`1.ReadAllAsync(System.Threading.CancellationToken) + lib/netstandard2.1/System.Threading.Channels.dll + lib/netstandard2.0/System.Threading.Channels.dll + true + \ No newline at end of file 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 a4dca9d793858..3fbd124e68787 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true Provides types for passing data between producers and consumers. @@ -13,25 +13,28 @@ System.Threading.Channel<T> - - + + + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> - + @@ -50,7 +53,7 @@ System.Threading.Channel<T> - + diff --git a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj index 45be5f8572173..b3723431805c7 100644 --- a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj +++ b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true @@ -19,7 +19,7 @@ - + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj index 925e102aaee11..829cb62550682 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj @@ -1,14 +1,19 @@ - $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable + - + + + + + + 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 3f799e4e1e21f..9e25717ce34b7 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.1;netstandard2.0;net461 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) enable true TPL Dataflow promotes actor/agent-oriented designs through primitives for in-process message passing, dataflow, and pipelining. TDF builds upon the APIs and scheduling infrastructure provided by the Task Parallel Library (TPL), and integrates with the language support for asynchrony provided by C#, Visual Basic, and F#. @@ -26,7 +26,7 @@ System.Threading.Tasks.Dataflow.WriteOnceBlock<T> + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> @@ -58,7 +58,7 @@ System.Threading.Tasks.Dataflow.WriteOnceBlock<T> + Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj index d78224779d494..f75dee77d5123 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);net461 + $(NetCoreAppCurrent);$(NetFrameworkMinimum) @@ -29,7 +29,7 @@ - + diff --git a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj index 080d2f34b074a..324bdf24af246 100644 --- a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.1 + $(NetCoreAppCurrent);$(NetCoreAppMinimum) @@ -16,7 +16,7 @@ - + diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj index f2d4cc54d1012..0197d8d49d3bf 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1 + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum) true Provides miscellaneous Windows-specific types diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj index 4ade3e1c90441..47ae748d32730 100644 --- a/src/libraries/shims/ApiCompat.proj +++ b/src/libraries/shims/ApiCompat.proj @@ -1,13 +1,5 @@ - - - false - net5.0 - microsoft.netcore.app.ref - 5.0.0 - - @@ -16,7 +8,7 @@ - + @@ -92,14 +84,13 @@ - $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', '$(PreviousNetCoreAppPackageId)', '$(PreviousNetCoreAppPackageVersion)', 'ref', '$(PreviousNetCoreApp)')) + $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.netcore.app.ref', '$(NetCoreAppLatestStablePackageBaselineVersion)', 'ref', '$(NetCoreAppLatestStable)')) <_previousNetCoreAppBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.PreviousNetCoreApp.txt <_previousNetCoreAppBaselineParam>--baseline "$(_previousNetCoreAppBaselineFile)" <_previousNetCoreAppBaselineParam Condition="'$(UpdatePreviousNetCoreAppBaseline)' == 'true'">> "$(_previousNetCoreAppBaselineFile)" - - + - + diff --git a/src/libraries/slngen.proj b/src/libraries/slngen.proj index b66fb67b6f3b7..f625292684763 100644 --- a/src/libraries/slngen.proj +++ b/src/libraries/slngen.proj @@ -81,8 +81,8 @@ $(ProjectFileTargetFrameworks.Replace('</TargetFrameworks>', '')) $([System.Text.RegularExpressions.Regex]::Replace('$(ProjectFileTargetFrameworks)', '(-[^;]+)', '')) - - $([System.Text.RegularExpressions.Regex]::IsMatch('$(ProjectFileTargetFrameworks);', '(netstandard.+|netcoreapp.+|net4.+)(?=.*;\1;)')) + + $([System.Text.RegularExpressions.Regex]::IsMatch('$(ProjectFileTargetFrameworks);', '(netstandard.+|net4.+)(?=.*;\1;)')) diff --git a/src/tasks/installer.tasks/installer.tasks.csproj b/src/tasks/installer.tasks/installer.tasks.csproj index 45fe8463b5b55..24c7686e55aa6 100644 --- a/src/tasks/installer.tasks/installer.tasks.csproj +++ b/src/tasks/installer.tasks/installer.tasks.csproj @@ -1,6 +1,6 @@ - $(TargetFrameworkForNETCoreTasks);net461 + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) false false @@ -10,12 +10,12 @@ - + - + From ceea47692400fd2f200d6891a3af80691eb75be1 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 25 Aug 2021 12:21:18 +0200 Subject: [PATCH 2/5] Make linker tests net7 aware Make installer tests run on net7.0 Don't attempt to use live apphost Fix payloads Regenerate test files Fix package testing --- eng/targetingpacks.targets | 6 +++- .../linker/SupportFiles/Directory.Build.props | 12 -------- .../SupportFiles/Directory.Build.targets | 21 ++------------ eng/testing/linker/project.csproj.template | 22 ++++++++++----- eng/testing/linker/trimmingTests.targets | 26 ++++++++++-------- .../tests/Assets/TestUtils/TestProjects.props | 2 +- .../Assets/TestUtils/TestProjects.targets | 26 ++++++++++++++++-- .../src/System.Composition.csproj | 7 +++++ .../System.Diagnostics.EventLog.Tests.csproj | 2 +- .../System.Resources.Extensions.Tests.csproj | 4 ++- .../tests/TestData.resources | Bin 8046 -> 8046 bytes src/libraries/sendtohelixhelp.proj | 4 +-- src/libraries/testPackages/testPackages.proj | 4 +++ 13 files changed, 78 insertions(+), 58 deletions(-) diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index d5022732a93f7..9dd37bef8fa1c 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -18,8 +18,12 @@ '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))"> true + + false false false + + <_AppHostBaselinePackVersion Condition="'$(UseLocalAppHostPack)' != 'true'">6.0.0-rc.1.21411.2 @@ -44,7 +48,7 @@ Condition="'@(KnownRuntimePack)' == '' or !@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))"/> diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index 458994a1822eb..bb7beb3a3cc8c 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -8,23 +8,11 @@ link false true - false - - true true true false true - - $(NoWarn);IL2111 - - - - - diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets index ecdbc7771bc69..491c45e4a43fa 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -1,33 +1,16 @@ + $([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)', '$(OutputPath)', 'AppBundle')) project.dll - - - - - - - - - - - - - - + Condition="'$(TargetArchitecture)' == 'wasm' And '$(TargetOS)' == 'browser'" /> diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template index e3a89acd65329..83d26c8c2df90 100644 --- a/eng/testing/linker/project.csproj.template +++ b/eng/testing/linker/project.csproj.template @@ -1,7 +1,13 @@ + {TargetFramework} Exe + {NetCoreAppMaximumVersion} + {UseMonoRuntime} + {RuntimeIdentifier} + + {MonoAOTCompilerDir} {MonoProjectRoot} {MonoAOTCompilerTasksAssemblyPath} @@ -9,14 +15,16 @@ {JsonToItemsTaskFactoryTasksAssemblyPath} {RuntimeConfigParserTasksAssemblyPath} {MicrosoftNetCoreAppRuntimePackRidDir} - {RepositoryEngineeringDir} - {TestTargetFramework} - {RuntimeIdentifier} - {UseMonoRuntime} - {TargetingPackDir} - {NetCoreAppMaximumVersion} - {MicrosoftNETCoreAppVersion} + + {ProductVersion} + {NetCoreAppCurrent} + {NetCoreAppCurrentVersion} + {MicrosoftNetCoreAppFrameworkName} + {MicrosoftNetCoreAppRefPackDir} + {MicrosoftNetCoreAppRuntimePackDir} + + {RepositoryEngineeringDir} <_ExtraTrimmerArgs>{ExtraTrimmerArgs} $(_ExtraTrimmerArgs) diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets index f1759616bd73b..b2cb80e9b7987 100644 --- a/eng/testing/linker/trimmingTests.targets +++ b/eng/testing/linker/trimmingTests.targets @@ -25,16 +25,16 @@ $([MSBuild]::NormalizeDirectory('$(TrimmingTestProjectsDir)', '$(MSBuildProjectName)', '%(Filename)', '$(PackageRID)')) $(PackageRID) - $(NetCoreAppCurrent) - $(NetCoreAppCurrent)-%(TestConsoleAppSourceFiles.TargetOS) + $(NetCoreAppCurrent) + $(NetCoreAppCurrent)-%(TestConsoleAppSourceFiles.TargetOS) %(ProjectDir)project.csproj - $([MSBuild]::NormalizePath('%(ProjectDir)', 'bin', '$(Configuration)', '%(TestTargetFramework)', '%(TestRuntimeIdentifier)', 'publish', 'project')) - $([MSBuild]::NormalizePath('%(ProjectDir)', 'bin', '$(Configuration)', '%(TestTargetFramework)', '%(TestRuntimeIdentifier)', 'AppBundle', 'run-v8.sh')) - $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TestTargetFramework)', '%(TestRuntimeIdentifier)', 'publish')) - $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TestTargetFramework)', '%(TestRuntimeIdentifier)', 'AppBundle')) + $([MSBuild]::NormalizePath('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'publish', 'project')) + $([MSBuild]::NormalizePath('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'AppBundle', 'run-v8.sh')) + $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'publish')) + $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'AppBundle')) @@ -81,12 +81,10 @@ diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props index 969dc3cc0129e..3f595ca7026f6 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.props +++ b/src/installer/tests/Assets/TestUtils/TestProjects.props @@ -5,7 +5,7 @@ --> - net6.0 + net7.0 false + + 7.0 + + + + + + + diff --git a/src/libraries/System.Composition/src/System.Composition.csproj b/src/libraries/System.Composition/src/System.Composition.csproj index 2cb5eeae0332a..0b3a7b2d40fed 100644 --- a/src/libraries/System.Composition/src/System.Composition.csproj +++ b/src/libraries/System.Composition/src/System.Composition.csproj @@ -25,4 +25,11 @@ System.Composition.CompositionContextExtensions + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj b/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj index c5b351adc7c50..a1bc84d9c3958 100644 --- a/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj +++ b/src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-windows;$/NetFrameworkMinimum) + $(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum) true diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj index 5cac9f8b819e6..dc2bb32692ebe 100644 --- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj @@ -28,7 +28,9 @@ + product code during the build. + Important: When invoking this target, pass the target framewok in as well, + i.e.: dotnet build -f net7.0-windows /t:GenerateTestResourcesFile. --> <_executor>Microsoft.DotNet.RemoteExecutor.dll diff --git a/src/libraries/System.Resources.Extensions/tests/TestData.resources b/src/libraries/System.Resources.Extensions/tests/TestData.resources index fcfc618c068836146f25441482028e3d04753798..9b9413df94091d91930baa714ab84b03e0342ec0 100644 GIT binary patch delta 18 acmaE7_s(v^6=p{B$%3pJoBuKwN&^5*W(Oz$ delta 18 acmaE7_s(v^6=p`W$%3pJoBuKwN&^5*Tn8rr diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 98219ea6f270e..5aa33aaf35ea6 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -327,8 +327,8 @@ $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'emsdk')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono', 'wasm', 'build')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(NetCoreAppCurrent)-$(Configuration)')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'RemoteLoopServer', '$(NetCoreAppCurrent)-$(Configuration)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'NetCoreServer', '$(AspNetCoreAppCurrent)-$(Configuration)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin', 'RemoteLoopServer', '$(AspNetCoreAppCurrent)-$(Configuration)')) Workloads- EMSDK- diff --git a/src/libraries/testPackages/testPackages.proj b/src/libraries/testPackages/testPackages.proj index 544ebe1b25f33..c0924b462ecb5 100644 --- a/src/libraries/testPackages/testPackages.proj +++ b/src/libraries/testPackages/testPackages.proj @@ -67,6 +67,10 @@ the repository retargets NetCoreAppCurrent to the next major version. --> + + + + Date: Wed, 8 Sep 2021 09:29:56 +0200 Subject: [PATCH 3/5] PR feedback and build failures --- docs/coding-guidelines/project-guidelines.md | 2 +- src/coreclr/scripts/superpmi_benchmarks.py | 2 +- src/libraries/Common/tests/StaticTestGenerator/Program.cs | 2 +- .../System.IO.Packaging/ref/System.IO.Packaging.csproj | 5 ++++- .../ref/System.Threading.Channels.csproj | 2 +- ...tandard21.cs => System.Threading.Channels.netcoreapp.cs} | 0 .../src/System.Threading.Channels.csproj | 6 +++--- ...ration.netstandard2.cs => AsyncOperation.netstandard.cs} | 0 ...etstandard21.cs => ChannelClosedException.netcoreapp.cs} | 0 ...lReader.netstandard21.cs => ChannelReader.netcoreapp.cs} | 0 .../ref/System.Threading.Tasks.Dataflow.csproj | 2 +- ...d21.cs => System.Threading.Tasks.Dataflow.netcoreapp.cs} | 0 src/mono/wasm/Makefile | 2 +- src/mono/wasm/build/WasmApp.LocalBuild.props | 2 +- src/mono/wasm/build/WasmApp.Native.targets | 2 +- 15 files changed, 15 insertions(+), 12 deletions(-) rename src/libraries/System.Threading.Channels/ref/{System.Threading.Channels.netstandard21.cs => System.Threading.Channels.netcoreapp.cs} (100%) rename src/libraries/System.Threading.Channels/src/System/Threading/Channels/{AsyncOperation.netstandard2.cs => AsyncOperation.netstandard.cs} (100%) rename src/libraries/System.Threading.Channels/src/System/Threading/Channels/{ChannelClosedException.netstandard21.cs => ChannelClosedException.netcoreapp.cs} (100%) rename src/libraries/System.Threading.Channels/src/System/Threading/Channels/{ChannelReader.netstandard21.cs => ChannelReader.netcoreapp.cs} (100%) rename src/libraries/System.Threading.Tasks.Dataflow/ref/{System.Threading.Tasks.Dataflow.netstandard21.cs => System.Threading.Tasks.Dataflow.netcoreapp.cs} (100%) diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md index 926cd965c7fa0..796cbea97ee14 100644 --- a/docs/coding-guidelines/project-guidelines.md +++ b/docs/coding-guidelines/project-guidelines.md @@ -149,7 +149,7 @@ Contains the files used to direct the trimming tool. See [ILLink files](../workf ### src output All src outputs are under -`bin\$(MSBuildProjectName)\$(TargetFramework)` +`artifacts\bin\$(MSBuildProjectName)\$(TargetFramework)` ## tests Similar to the src projects tests projects will define a `TargetFrameworks` property so they can list out the set of target frameworks they support. diff --git a/src/coreclr/scripts/superpmi_benchmarks.py b/src/coreclr/scripts/superpmi_benchmarks.py index 6981fa22cbba0..07064e65b8080 100644 --- a/src/coreclr/scripts/superpmi_benchmarks.py +++ b/src/coreclr/scripts/superpmi_benchmarks.py @@ -154,7 +154,7 @@ def build_and_run(coreclr_args, output_mch_name): run_command( [dotnet_exe, "build", project_file, "--configuration", "Release", - "--framework", "net6.0", "--no-restore", "/p:NuGetPackageRoot=" + artifacts_packages_directory, + "--framework", "net7.0", "--no-restore", "/p:NuGetPackageRoot=" + artifacts_packages_directory, "-o", artifacts_directory], _exit_on_fail=True) # Disable ReadyToRun so we always JIT R2R methods and collect them diff --git a/src/libraries/Common/tests/StaticTestGenerator/Program.cs b/src/libraries/Common/tests/StaticTestGenerator/Program.cs index 2274463eba964..bd81a9e53f2d2 100644 --- a/src/libraries/Common/tests/StaticTestGenerator/Program.cs +++ b/src/libraries/Common/tests/StaticTestGenerator/Program.cs @@ -273,7 +273,7 @@ from part in line.Split(' ') // Invalid command line arguments. Console.WriteLine("Usage: "); Console.WriteLine(" Example:"); - Console.WriteLine(@" dotnet run d:\tmpoutput d:\repos\runtime\artifacts\bin\testhost\net6.0-windows-Debug-x64\shared\Microsoft.NETCore.App\6.0.0\ d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net6.0-windows-Debug\System.Runtime.Tests.dll"); + Console.WriteLine(@" dotnet run d:\tmpoutput d:\repos\runtime\artifacts\bin\testhost\net7.0-windows-Debug-x64\shared\Microsoft.NETCore.App\7.0.0\ d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net7.0-windows-Debug\System.Runtime.Tests.dll"); testAssemblyPath = string.Empty; runtimeAssembliesPath = string.Empty; outputPath = string.Empty; diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj index 5d09e2eec0fea..f977d06ac9412 100644 --- a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj @@ -10,6 +10,10 @@ + + + + @@ -20,7 +24,6 @@ - \ No newline at end of file diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj index fc48d17768cff..48dad1698db79 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.netstandard21.cs b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.netcoreapp.cs similarity index 100% rename from src/libraries/System.Threading.Channels/ref/System.Threading.Channels.netstandard21.cs rename to src/libraries/System.Threading.Channels/ref/System.Threading.Channels.netcoreapp.cs 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 3fbd124e68787..d82fa4673f5de 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -15,17 +15,17 @@ System.Threading.Channel<T> - - - diff --git a/src/libraries/System.Threading.Channels/src/System/Threading/Channels/AsyncOperation.netstandard2.cs b/src/libraries/System.Threading.Channels/src/System/Threading/Channels/AsyncOperation.netstandard.cs similarity index 100% rename from src/libraries/System.Threading.Channels/src/System/Threading/Channels/AsyncOperation.netstandard2.cs rename to src/libraries/System.Threading.Channels/src/System/Threading/Channels/AsyncOperation.netstandard.cs diff --git a/src/libraries/System.Threading.Channels/src/System/Threading/Channels/ChannelClosedException.netstandard21.cs b/src/libraries/System.Threading.Channels/src/System/Threading/Channels/ChannelClosedException.netcoreapp.cs similarity index 100% rename from src/libraries/System.Threading.Channels/src/System/Threading/Channels/ChannelClosedException.netstandard21.cs rename to src/libraries/System.Threading.Channels/src/System/Threading/Channels/ChannelClosedException.netcoreapp.cs diff --git a/src/libraries/System.Threading.Channels/src/System/Threading/Channels/ChannelReader.netstandard21.cs b/src/libraries/System.Threading.Channels/src/System/Threading/Channels/ChannelReader.netcoreapp.cs similarity index 100% rename from src/libraries/System.Threading.Channels/src/System/Threading/Channels/ChannelReader.netstandard21.cs rename to src/libraries/System.Threading.Channels/src/System/Threading/Channels/ChannelReader.netcoreapp.cs diff --git a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj index 829cb62550682..901a2f1b2e113 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.netstandard21.cs b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.netcoreapp.cs similarity index 100% rename from src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.netstandard21.cs rename to src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.netcoreapp.cs diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile index 52e5de9e30227..4a4aaed86b1cf 100644 --- a/src/mono/wasm/Makefile +++ b/src/mono/wasm/Makefile @@ -17,7 +17,7 @@ BINDIR?=$(TOP)/artifacts/bin OBJDIR?=$(TOP)/artifacts/obj PINVOKE_TABLE?=$(TOP)/artifacts/obj/wasm/pinvoke-table.h MONO_BIN_DIR?=$(BINDIR)/mono/Browser.wasm.$(CONFIG) -NATIVE_BIN_DIR?=$(BINDIR)/native/net6.0-Browser-$(CONFIG)-wasm +NATIVE_BIN_DIR?=$(BINDIR)/native/net7.0-Browser-$(CONFIG)-wasm ICU_LIBDIR?= SYSTEM_NATIVE_LIBDIR?=$(TOP)/src/libraries/Native/Unix/System.Native _MSBUILD_WASM_BUILD_ARGS=/p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=$(CONFIG) diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index d92024f720d46..055d03e8f17f7 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -22,7 +22,7 @@ - <_NetCoreAppToolCurrent>net6.0 + <_NetCoreAppToolCurrent>net7.0 false diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets index 5b43374ab16b7..03af11c734a51 100644 --- a/src/mono/wasm/build/WasmApp.Native.targets +++ b/src/mono/wasm/build/WasmApp.Native.targets @@ -443,7 +443,7 @@ EMSCRIPTEN_KEEPALIVE void mono_wasm_load_profiler_aot (const char *desc) { mono_ <_WasmAssembliesInternal Remove="@(_WasmAssembliesInternal)" /> <_WasmAOTSearchPaths Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)" /> - <_WasmAOTSearchPaths Include="$(MicrosoftNetCoreAppRuntimePackRidDir)\lib\net6.0" /> + <_WasmAOTSearchPaths Include="$(MicrosoftNetCoreAppRuntimePackRidDir)\lib\net7.0" /> From 72ee52ff5d5759cfc02547dbed7a0a55356e25e3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 8 Sep 2021 17:33:02 +0200 Subject: [PATCH 4/5] Revert netstandard2.1 tfm drops --- ...ns.DependencyInjection.Abstractions.csproj | 4 +- ...ns.DependencyInjection.Abstractions.csproj | 4 +- ...soft.Extensions.DependencyInjection.csproj | 4 +- ...soft.Extensions.DependencyInjection.csproj | 4 +- .../ref/Microsoft.Extensions.Hosting.csproj | 2 +- .../src/Microsoft.Extensions.Hosting.csproj | 4 +- .../Microsoft.Windows.Compatibility.csproj | 4 +- ...onentModel.Composition.Registration.csproj | 4 +- .../src/CompatibilitySuppressions.xml | 7 - ...onentModel.Composition.Registration.csproj | 4 +- .../ref/System.Net.Http.WinHttpHandler.csproj | 2 +- .../src/System.Net.Http.WinHttpHandler.csproj | 4 +- .../ref/System.Reflection.Context.csproj | 2 +- .../src/System.Reflection.Context.csproj | 2 +- .../System.Security.Cryptography.Pkcs.csproj | 4 +- .../src/CompatibilitySuppressions.xml | 1064 ----------------- .../System.Security.Cryptography.Pkcs.csproj | 10 +- .../ref/System.Threading.Channels.csproj | 4 +- .../src/System.Threading.Channels.csproj | 8 +- .../System.Threading.Tasks.Dataflow.csproj | 4 +- .../System.Threading.Tasks.Dataflow.csproj | 4 +- 21 files changed, 40 insertions(+), 1109 deletions(-) delete mode 100644 src/libraries/System.ComponentModel.Composition.Registration/src/CompatibilitySuppressions.xml diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index d0feccac1cd5e..c88311054d7c4 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) enable @@ -23,7 +23,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index 0143657e4fe90..f4ad2addae170 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) true enable Abstractions for dependency injection. @@ -30,7 +30,7 @@ Microsoft.Extensions.DependencyInjection.IServiceCollection - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj index 6d9bf7eb7a7cd..71e3f9dcb84d2 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj index 700d9cc1e5211..f1efaee3f0dbf 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) false Annotations @@ -51,7 +51,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj index 1fbf58820452e..22d6346c6e698 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) $(NoWarn);CS0618 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 163ccf2b26174..a9dcd34765f88 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) true Hosting and startup infrastructures for applications. @@ -45,7 +45,7 @@ - + diff --git a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj index 48f40e7ff52f5..81e4ca60c5b46 100644 --- a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj +++ b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0 false true @@ -40,7 +40,7 @@ - + diff --git a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj index 203ffa9d762ae..51c40c424eadd 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj @@ -1,13 +1,13 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1 - + diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/CompatibilitySuppressions.xml b/src/libraries/System.ComponentModel.Composition.Registration/src/CompatibilitySuppressions.xml deleted file mode 100644 index 067e25f7b384a..0000000000000 --- a/src/libraries/System.ComponentModel.Composition.Registration/src/CompatibilitySuppressions.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - PKV006 - .NETStandard,Version=v2.1 - - \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj index aea47bdd2b19c..c6266b16e5255 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1 false true true @@ -43,7 +43,7 @@ System.ComponentModel.Composition.Registration.ExportBuilder - + diff --git a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj index 1e58e007ee239..dddd1f55ef1dc 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) enable diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index 571c8c06532b0..426ce76f614dd 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.1-windows;netstandard2.1;netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows true enable true @@ -125,7 +125,7 @@ System.Net.Http.WinHttpHandler - + diff --git a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj index ccc35dfd3458b..da33605c0dec0 100644 --- a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj +++ b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj @@ -4,7 +4,7 @@ plan on shipping a new desktop version out of band. Instead add API to a different assembly. --> 4.0.0.0 - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0 enable diff --git a/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj index 6dbdf79fc98ae..57bbccb4e2b63 100644 --- a/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj +++ b/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0 + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0 enable true true diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index aba835e6e6c0f..56def1bf6555c 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -1,12 +1,12 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) enable - + diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/CompatibilitySuppressions.xml b/src/libraries/System.Security.Cryptography.Pkcs/src/CompatibilitySuppressions.xml index efe54addd46e4..daad0d31168c6 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/CompatibilitySuppressions.xml +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/CompatibilitySuppressions.xml @@ -184,1068 +184,4 @@ runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll true - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Builder - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12CertBag - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Info - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo - ref/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Builder - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12CertBag - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Info - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo - ref/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Builder - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12CertBag - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Info - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo - lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Builder - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12CertBag - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Info - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo - lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Builder - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12CertBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Info - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Builder - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12CertBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Info - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo - runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Builder - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12CertBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Info - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.#ctor(System.Security.Cryptography.Pkcs.SubjectIdentifierType,System.Security.Cryptography.X509Certificates.X509Certificate2,System.Security.Cryptography.RSAEncryptionPadding) - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0002 - M:System.Security.Cryptography.Pkcs.CmsRecipient.get_RSAEncryptionPadding - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Builder - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12CertBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ConfidentialityMode - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12Info - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12IntegrityMode - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12KeyBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContents - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SafeContentsBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12SecretBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs12ShroudedKeyBag - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs8PrivateKeyInfo - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Pkcs9LocalKeyId - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampRequest - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampToken - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - - - CP0001 - T:System.Security.Cryptography.Pkcs.Rfc3161TimestampTokenInfo - runtimes/win/lib/netstandard2.1/System.Security.Cryptography.Pkcs.dll - runtimes/win/lib/netstandard2.0/System.Security.Cryptography.Pkcs.dll - true - \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index c02809899d175..a54bafc8b9622 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -4,7 +4,7 @@ true $(NoWarn);CA5384 enable - $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.1-windows;netstandard2.1;netstandard2.0-windows;netstandard2.0;$(NetFrameworkMinimum)-windows true Provides support for PKCS and CMS algorithms. @@ -554,7 +554,7 @@ System.Security.Cryptography.Pkcs.EnvelopedCms - + - + + + + - diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj index 48dad1698db79..6c5a3004f4d6e 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -1,11 +1,11 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) enable - + 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 d82fa4673f5de..37c4effae5ae4 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) enable true Provides types for passing data between producers and consumers. @@ -22,11 +22,11 @@ System.Threading.Channel<T> + Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))" /> + Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))" /> @@ -53,7 +53,7 @@ System.Threading.Channel<T> - + diff --git a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj index 901a2f1b2e113..09bd25d17d2a7 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj @@ -1,12 +1,12 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) enable - + 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 9e25717ce34b7..424fbcd9e8ca8 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum) enable true TPL Dataflow promotes actor/agent-oriented designs through primitives for in-process message passing, dataflow, and pipelining. TDF builds upon the APIs and scheduling infrastructure provided by the Task Parallel Library (TPL), and integrates with the language support for asynchrony provided by C#, Visual Basic, and F#. @@ -26,7 +26,7 @@ System.Threading.Tasks.Dataflow.WriteOnceBlock<T> + Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))" /> From 5f04ac553eeed6d3a26a6712289810699e5a99a2 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 8 Sep 2021 17:38:44 +0200 Subject: [PATCH 5/5] Build fix --- .../ref/System.ComponentModel.Composition.Registration.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj index 51c40c424eadd..05d3c7f3fd8dc 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj @@ -7,7 +7,7 @@ - +