From 809a06f45161ae686a06b9e9ccc2f45097b91657 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 23 Jul 2020 17:20:26 +0200 Subject: [PATCH] Remove depprojs in favor of PackageReferences (#35606) - Remove depprojs which currently binplace external references into the RefPath folders in favor of PackageReference and PackageDownload items. - Build all configurations by default when building an individual project (either on the CLI or inside VS) same as with the official SDK. This enables .NETFramework Test Explorer support. - Centrally define libraries that compose the shared framework instead of in each Directory.Build.props file to be able to build the targeting pack first and consume it in the OOB libraries. - Use ProjectReferences to reference OOB projects. Compile against the reference assembly but use the implementation assembly app-local during runtime. - Remove OOBs from the testhost and remove the testhost folder for .NETFramework as it isn't required anymore. - Only binplace for $(NetCoreAppCurrent) to compose a) the targeting pack, b) the runtime pack, c) the testhost, d) a full closure for the shims. - Use Targeting Packs for OOB projects (with their implicit assembly references) but still explicitly define granular references for .NETCoreApp configurations (DisableImplicitAssemblyReferences switch). Use the implicit targeting pack references in some Microsoft.Extensions.* cases. - Remove placeholder configurations as they aren't needed anymore with explicit P2Ps vs Targeting Pack references. - Remove implicit assembly references (ie for .NETFramework, mscorlib) - Remove AssemblySearchPath hacks that were introduced with b7c4cb7 as the targeting pack is now used by default. - Reduce unnecessary .NETFramework configurations that were added to run tests in favor of the already existing ref&src configurations. - Stop hardcoding the paths for wasm assemblies and use the returned TargetPath of the ProjectReferences. - Addressed formatting (ItemGroups, References at the bottom of the project file, ordering of references, use LibrariesProjectRoot instead of a relative path, unnecessary AssemblyName and RootNamespace properties which are identical to the project name, ordering of tfms) - Revert "fix clean (#33758)" --- Build.proj | 6 +- Directory.Build.props | 2 +- docs/coding-guidelines/project-guidelines.md | 21 +-- docs/project/library-servicing.md | 2 +- docs/workflow/building/libraries/README.md | 2 +- eng/AvoidRestoreCycleOnSelfReference.targets | 14 ++ eng/BeforeTargetFrameworkInference.targets | 4 - eng/Configurations.props | 2 - eng/Subsets.props | 9 +- eng/Version.Details.xml | 2 +- eng/Versions.props | 37 +++- eng/build.ps1 | 2 +- eng/build.sh | 2 +- eng/illink.targets | 2 +- eng/pipelines/coreclr/templates/perf-job.yml | 6 +- eng/pipelines/libraries/base-job.yml | 6 +- eng/pipelines/libraries/build-job.yml | 4 +- .../libraries/helix-queues-setup.yml | 12 +- eng/pipelines/libraries/outerloop.yml | 2 +- eng/pipelines/libraries/run-test-job.yml | 4 +- eng/pipelines/runtime.yml | 2 +- eng/referenceAssemblies.props | 8 +- eng/referenceFromRuntime.targets | 124 -------------- eng/references.targets | 95 +++++------ eng/resolveContract.targets | 49 +++++- eng/restore/repoRestore.props | 1 + eng/targetingpacks.targets | 106 ++++++++++++ eng/testing/.runsettings | 4 - eng/testing/RunnerTemplate.cmd | 6 - eng/testing/netfx.exe.config | 1 - eng/testing/outerBuild.targets | 8 +- eng/testing/runsettings.targets | 1 - eng/testing/runtimeConfiguration.targets | 40 ++--- eng/testing/tests.mobile.targets | 15 +- eng/testing/tests.props | 2 - eng/testing/tests.targets | 10 +- eng/testing/xunit/xunit.console.targets | 10 +- eng/testing/xunit/xunit.targets | 7 + global.json | 2 +- ...ateRuntimeRootILLinkDescriptorFile.targets | 2 +- .../Common/src/System/HexConverter.cs | 2 +- .../test/ConditionalFactTest.cs | 2 +- .../test/ConditionalTheoryTest.cs | 2 +- .../tests/TestUtilities/TestUtilities.csproj | 11 +- src/libraries/Directory.Build.props | 82 ++------- src/libraries/Directory.Build.targets | 123 ++++++------- .../Microsoft.CSharp/Directory.Build.props | 1 - .../src/Microsoft.CSharp.csproj | 2 - .../tests/Microsoft.CSharp.Tests.csproj | 5 +- ...gnostics.Tracing.EventSource.Redist.csproj | 7 +- ...cs.Tracing.EventSource.Redist.Tests.csproj | 3 +- ...oft.Extensions.Caching.Abstractions.csproj | 2 +- ...oft.Extensions.Caching.Abstractions.csproj | 8 +- ...Microsoft.Extensions.Caching.Memory.csproj | 15 +- ...Microsoft.Extensions.Caching.Memory.csproj | 18 +- ...oft.Extensions.Caching.Memory.Tests.csproj | 8 +- ...tensions.Configuration.Abstractions.csproj | 6 +- ...tensions.Configuration.Abstractions.csproj | 17 +- ...oft.Extensions.Configuration.Binder.csproj | 8 +- ...oft.Extensions.Configuration.Binder.csproj | 13 +- ...tensions.Configuration.Binder.Tests.csproj | 5 +- ...xtensions.Configuration.CommandLine.csproj | 6 +- ...xtensions.Configuration.CommandLine.csproj | 13 +- ...ons.Configuration.CommandLine.Tests.csproj | 6 +- ....Configuration.EnvironmentVariables.csproj | 6 +- ....Configuration.EnvironmentVariables.csproj | 12 +- ...guration.EnvironmentVariables.Tests.csproj | 6 +- ...nsions.Configuration.FileExtensions.csproj | 10 +- ...nsions.Configuration.FileExtensions.csproj | 17 +- ....Configuration.FileExtensions.Tests.csproj | 3 +- ...rosoft.Extensions.Configuration.Ini.csproj | 10 +- ...rosoft.Extensions.Configuration.Ini.csproj | 15 +- ....Extensions.Configuration.Ini.Tests.csproj | 5 +- ...osoft.Extensions.Configuration.Json.csproj | 16 +- ...osoft.Extensions.Configuration.Json.csproj | 29 ++-- ...Extensions.Configuration.Json.Tests.csproj | 5 +- ...xtensions.Configuration.UserSecrets.csproj | 8 +- ...xtensions.Configuration.UserSecrets.csproj | 25 +-- ...ons.Configuration.UserSecrets.Tests.csproj | 4 +- ...rosoft.Extensions.Configuration.Xml.csproj | 12 +- ...rosoft.Extensions.Configuration.Xml.csproj | 26 +-- ....Extensions.Configuration.Xml.Tests.csproj | 11 +- .../Microsoft.Extensions.Configuration.csproj | 6 +- .../Microsoft.Extensions.Configuration.csproj | 12 +- ...ions.Configuration.Functional.Tests.csproj | 11 +- ...soft.Extensions.Configuration.Tests.csproj | 6 +- ...ns.DependencyInjection.Abstractions.csproj | 2 +- ...ns.DependencyInjection.Abstractions.csproj | 9 +- ...soft.Extensions.DependencyInjection.csproj | 12 +- ...soft.Extensions.DependencyInjection.csproj | 57 +++---- ...yInjection.ExternalContainers.Tests.csproj | 23 ++- ...xtensions.DependencyInjection.Tests.csproj | 9 +- .../ServiceCollectionServiceExtensionsTest.cs | 5 +- ...icrosoft.Extensions.DependencyModel.csproj | 6 +- ...icrosoft.Extensions.DependencyModel.csproj | 16 +- .../tests/DependencyContextLoaderTests.cs | 2 +- ...ft.Extensions.DependencyModel.Tests.csproj | 12 +- .../NonEntryPointClass.cs | 12 ++ .../nonentrypointassembly.csproj | 8 + ...tensions.FileProviders.Abstractions.csproj | 4 +- ...tensions.FileProviders.Abstractions.csproj | 12 +- ....Extensions.FileProviders.Composite.csproj | 6 +- ....Extensions.FileProviders.Composite.csproj | 12 +- ...sions.FileProviders.Composite.Tests.csproj | 5 +- ...t.Extensions.FileProviders.Physical.csproj | 8 +- ...t.Extensions.FileProviders.Physical.csproj | 23 +-- ...nsions.FileProviders.Physical.Tests.csproj | 4 +- ...osoft.Extensions.FileSystemGlobbing.csproj | 2 +- ...osoft.Extensions.FileSystemGlobbing.csproj | 9 +- ...Extensions.FileSystemGlobbing.Tests.csproj | 6 +- .../BuildWebHostInvalidSignature.csproj | 2 +- .../BuildWebHostPatternTestSite.csproj | 2 +- .../CreateHostBuilderInvalidSignature.csproj | 2 +- .../CreateHostBuilderPatternTestSite.csproj | 2 +- ...reateWebHostBuilderInvalidSignature.csproj | 2 +- ...CreateWebHostBuilderPatternTestSite.csproj | 2 +- ...xtensions.HostFactoryResolver.Tests.csproj | 2 +- .../tests/MockHostTypes/MockHostTypes.csproj | 2 +- ...oft.Extensions.Hosting.Abstractions.csproj | 19 ++- ...oft.Extensions.Hosting.Abstractions.csproj | 26 ++- .../ref/Microsoft.Extensions.Hosting.csproj | 22 +-- .../src/Microsoft.Extensions.Hosting.csproj | 71 +++----- ...Extensions.Hosting.Functional.Tests.csproj | 6 +- ...icrosoft.Extensions.Hosting.TestApp.csproj | 9 +- .../tests/UnitTests/HostBuilderTests.cs | 4 +- ...osoft.Extensions.Hosting.Unit.Tests.csproj | 4 +- .../ref/Microsoft.Extensions.Http.csproj | 17 +- .../src/Microsoft.Extensions.Http.csproj | 18 +- .../Microsoft.Extensions.Http.Tests.csproj | 9 +- ...oft.Extensions.Logging.Abstractions.csproj | 2 +- ...oft.Extensions.Logging.Abstractions.csproj | 8 +- ...ft.Extensions.Logging.Configuration.csproj | 12 +- ...ft.Extensions.Logging.Configuration.csproj | 30 ++-- ...icrosoft.Extensions.Logging.Console.csproj | 13 +- ...icrosoft.Extensions.Logging.Console.csproj | 49 ++---- ...ft.Extensions.Logging.Console.Tests.csproj | 4 +- .../Microsoft.Extensions.Logging.Debug.csproj | 8 +- .../Microsoft.Extensions.Logging.Debug.csproj | 19 +-- ...crosoft.Extensions.Logging.EventLog.csproj | 10 +- ...crosoft.Extensions.Logging.EventLog.csproj | 32 ++-- ...soft.Extensions.Logging.EventSource.csproj | 8 +- ...soft.Extensions.Logging.EventSource.csproj | 38 ++--- ...xtensions.Logging.EventSource.Tests.csproj | 6 +- ...soft.Extensions.Logging.TraceSource.csproj | 8 +- ...soft.Extensions.Logging.TraceSource.csproj | 23 +-- .../ref/Microsoft.Extensions.Logging.csproj | 10 +- .../src/Microsoft.Extensions.Logging.csproj | 38 ++--- .../Microsoft.Extensions.Logging.Tests.csproj | 19 ++- .../Common/TraceSourceLoggerProviderTest.cs | 2 +- .../tests/Common/TraceSourceScopeTest.cs | 2 +- ...ft.Extensions.Logging.Testing.Tests.csproj | 7 +- ...ons.Options.ConfigurationExtensions.csproj | 14 +- ...ons.Options.ConfigurationExtensions.csproj | 24 +-- ....Extensions.Options.DataAnnotations.csproj | 8 +- ....Extensions.Options.DataAnnotations.csproj | 20 +-- .../ref/Microsoft.Extensions.Options.csproj | 14 +- .../src/Microsoft.Extensions.Options.csproj | 25 +-- .../Microsoft.Extensions.Options.Tests.csproj | 12 +- .../Microsoft.Extensions.Primitives.csproj | 9 +- .../Microsoft.Extensions.Primitives.csproj | 30 ++-- ...crosoft.Extensions.Primitives.Tests.csproj | 3 +- .../Microsoft.IO.Redist/Directory.Build.props | 1 - .../src/Microsoft.IO.Redist.csproj | 11 +- .../Directory.Build.props | 1 - .../src/Microsoft.VisualBasic.Core.vbproj | 2 +- .../Microsoft.VisualBasic.Core.Tests.csproj | 6 +- .../Directory.Build.props | 1 - ...rosoft.Win32.Registry.AccessControl.csproj | 6 +- ...rosoft.Win32.Registry.AccessControl.csproj | 17 +- ....Win32.Registry.AccessControl.Tests.csproj | 8 +- .../Directory.Build.props | 2 - .../ref/Microsoft.Win32.Registry.csproj | 5 +- .../src/Microsoft.Win32.Registry.csproj | 18 +- .../Microsoft.Win32.Registry.Tests.csproj | 5 +- .../ref/Microsoft.Win32.SystemEvents.csproj | 6 +- .../src/Microsoft.Win32.SystemEvents.csproj | 15 +- .../Microsoft.Win32.SystemEvents.Tests.csproj | 5 +- ...osoft.XmlSerializer.Generator.Tests.csproj | 6 +- src/libraries/Native/build-native.proj | 34 ++-- src/libraries/Native/native-binplace.proj | 7 +- src/libraries/NetCoreAppLibrary.props | 161 ++++++++++++++++++ .../System.AppContext/Directory.Build.props | 1 - .../src/System.AppContext.csproj | 1 - .../System.Buffers/Directory.Build.props | 1 - .../System.CodeDom/ref/System.CodeDom.csproj | 7 +- .../System.CodeDom/src/System.CodeDom.csproj | 7 +- .../tests/System.CodeDom.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../src/System.Collections.Concurrent.csproj | 8 +- .../Directory.Build.props | 1 - .../ref/System.Collections.Immutable.cs | 4 +- .../ref/System.Collections.Immutable.csproj | 19 ++- .../src/System.Collections.Immutable.csproj | 29 ++-- .../System.Collections.Immutable.Tests.csproj | 10 +- .../Directory.Build.props | 1 - .../src/System.Collections.NonGeneric.csproj | 2 - .../Directory.Build.props | 1 - .../src/System.Collections.Specialized.csproj | 2 - .../System.Collections/Directory.Build.props | 1 - .../src/System.Collections.csproj | 1 - .../Directory.Build.props | 1 - ...em.ComponentModel.Annotations.Tests.csproj | 5 +- ...onentModel.Composition.Registration.csproj | 5 +- ...odel.Composition.Registration.Tests.csproj | 3 + .../System.ComponentModel.Composition.csproj | 2 +- .../System.ComponentModel.Composition.csproj | 6 +- ...nentModel.Composition.Noop.Assembly.csproj | 3 + ...em.ComponentModel.Composition.Tests.csproj | 16 +- .../Directory.Build.props | 1 - ...stem.ComponentModel.EventBasedAsync.csproj | 2 - .../Directory.Build.props | 1 - .../System.ComponentModel.Primitives.csproj | 2 - .../Directory.Build.props | 1 - ...System.ComponentModel.TypeConverter.csproj | 2 - .../Directory.Build.props | 1 - .../src/System.ComponentModel.csproj | 2 - .../System.Composition.AttributedModel.csproj | 7 +- ...em.Composition.AttributeModel.Tests.csproj | 8 +- .../src/System.Composition.Convention.csproj | 13 +- ...System.Composition.Convention.Tests.csproj | 7 +- .../src/System.Composition.Hosting.csproj | 12 +- .../System.Composition.Hosting.Tests.csproj | 8 +- .../src/System.Composition.Runtime.csproj | 9 +- .../System.Composition.Runtime.Tests.csproj | 8 +- .../src/System.Composition.TypedParts.csproj | 14 +- ...System.Composition.TypedParts.Tests.csproj | 10 +- ...ion.Demos.ExtendedCollectionImports.csproj | 6 +- .../tests/System.Composition.Tests.csproj | 7 +- .../tests/TestLibrary/TestLibrary.csproj | 5 +- ....Configuration.ConfigurationManager.csproj | 8 +- ....Configuration.ConfigurationManager.csproj | 12 +- ...guration.ConfigurationManager.Tests.csproj | 8 +- .../System/Configuration/TypeUtilTests.cs | 9 +- .../System.Console/Directory.Build.props | 1 - .../System.Data.Common/Directory.Build.props | 1 - .../src/System.Data.Common.csproj | 1 - .../tests/System.Data.Common.Tests.csproj | 1 + .../Directory.Build.props | 1 - .../src/System.Data.DataSetExtensions.csproj | 1 - .../ref/System.Data.Odbc.csproj | 7 +- .../src/System.Data.Odbc.csproj | 35 ++-- .../tests/OdbcParameterTests.cs | 1 - .../tests/System.Data.Odbc.Tests.csproj | 5 +- .../ref/System.Data.OleDb.csproj | 6 +- .../src/System.Data.OleDb.csproj | 19 +-- .../tests/System.Data.OleDb.Tests.csproj | 9 +- .../Directory.Build.props | 1 - .../src/System.Diagnostics.Contracts.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Diagnostics.Debug.csproj | 1 - .../System.Diagnostics.Debug.Tests.csproj | 13 +- .../Directory.Build.props | 1 - ...System.Diagnostics.DiagnosticSource.csproj | 18 +- ...System.Diagnostics.DiagnosticSource.csproj | 24 +-- ....Diagnostics.DiagnosticSource.Tests.csproj | 6 +- .../ref/System.Diagnostics.EventLog.csproj | 9 +- .../src/System.Diagnostics.EventLog.csproj | 19 +-- .../System.Diagnostics.EventLog.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../System.Diagnostics.FileVersionInfo.csproj | 4 +- ...ostics.FileVersionInfo.TestAssembly.csproj | 1 - ...stem.Diagnostics.PerformanceCounter.csproj | 7 +- ...stem.Diagnostics.PerformanceCounter.csproj | 21 +-- ...iagnostics.PerformanceCounter.Tests.csproj | 10 +- .../Directory.Build.props | 1 - .../src/System.Diagnostics.Process.csproj | 3 +- .../System.Diagnostics.Process.Tests.csproj | 6 +- .../Directory.Build.props | 1 - .../src/System.Diagnostics.StackTrace.csproj | 15 +- .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../src/System.Diagnostics.Tools.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Diagnostics.TraceSource.csproj | 18 +- .../Directory.Build.props | 1 - .../src/System.Diagnostics.Tracing.csproj | 1 - ...DirectoryServices.AccountManagement.csproj | 21 ++- ...oryServices.AccountManagement.Tests.csproj | 12 +- .../System.DirectoryServices.Protocols.csproj | 9 +- ...m.DirectoryServices.Protocols.Tests.csproj | 10 +- .../ref/System.DirectoryServices.csproj | 2 +- .../src/System.DirectoryServices.csproj | 14 +- .../System.DirectoryServices.Tests.csproj | 8 +- .../src/System.Drawing.Common.csproj | 5 +- .../tests/System.Drawing.Common.Tests.csproj | 9 +- .../Directory.Build.props | 1 - .../src/System.Drawing.Primitives.csproj | 20 +-- .../Directory.Build.props | 1 - .../src/System.Dynamic.Runtime.csproj | 2 - .../System.Formats.Asn1/Directory.Build.props | 1 - .../ref/System.Formats.Asn1.csproj | 4 +- .../src/System.Formats.Asn1.csproj | 11 +- .../tests/System.Formats.Asn1.Tests.csproj | 6 +- .../ref/System.Formats.Cbor.csproj | 4 +- .../tests/System.Formats.Cbor.Tests.csproj | 3 + .../Directory.Build.props | 1 - .../src/System.Globalization.Calendars.csproj | 1 - .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../src/System.Globalization.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.IO.Compression.Brotli.csproj | 2 - .../Directory.Build.props | 1 - .../src/System.IO.Compression.ZipFile.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.IO.Compression.csproj | 2 - .../Directory.Build.props | 2 - .../System.IO.FileSystem.AccessControl.csproj | 6 +- .../System.IO.FileSystem.AccessControl.csproj | 30 ++-- ...m.IO.FileSystem.AccessControl.Tests.csproj | 11 +- .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../System.IO.FileSystem.Primitives.csproj | 1 - .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../src/System.IO.FileSystem.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.IO.IsolatedStorage.csproj | 6 +- .../System.IO.IsolatedStorage.Tests.csproj | 3 + .../Directory.Build.props | 1 - .../src/System.IO.MemoryMappedFiles.csproj | 1 - .../ref/System.IO.Packaging.csproj | 13 +- .../src/System.IO.Packaging.csproj | 20 +-- .../tests/System.IO.Packaging.Tests.csproj | 6 +- .../ref/System.IO.Pipelines.csproj | 9 +- .../src/System.IO.Pipelines.csproj | 14 +- .../tests/System.IO.Pipelines.Tests.csproj | 14 +- .../Directory.Build.props | 2 - .../src/System.IO.Pipes.AccessControl.csproj | 23 +-- ...System.IO.Pipes.AccessControl.Tests.csproj | 3 + .../System.IO.Pipes/Directory.Build.props | 1 - .../src/System.IO.Pipes.csproj | 8 +- .../tests/System.IO.Pipes.Tests.csproj | 4 + .../ref/System.IO.Ports.csproj | 7 +- .../src/System.IO.Ports.csproj | 29 +--- .../tests/System.IO.Ports.Tests.csproj | 9 +- .../Directory.Build.props | 1 - .../System.IO.UnmanagedMemoryStream.csproj | 1 - src/libraries/System.IO/Directory.Build.props | 1 - src/libraries/System.IO/src/System.IO.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Linq.Expressions.csproj | 2 - .../System.Linq.Expressions.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../src/System.Linq.Parallel.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Linq.Queryable.csproj | 2 - .../System.Linq/Directory.Build.props | 1 - .../System.Linq/src/System.Linq.csproj | 7 - .../src/System.Management.csproj | 8 +- .../tests/System.Management.Tests.csproj | 8 +- .../System.Memory/Directory.Build.props | 1 - .../tests/System.Memory.Tests.csproj | 1 - .../Directory.Build.props | 1 - .../ref/System.Net.Http.Json.csproj | 5 +- .../src/System.Net.Http.Json.csproj | 30 ++-- ...stem.Net.Http.Json.Functional.Tests.csproj | 6 +- .../System.Net.Http.Json.Unit.Tests.csproj | 7 +- .../ref/System.Net.Http.WinHttpHandler.csproj | 9 +- .../src/System.Net.Http.WinHttpHandler.csproj | 12 +- ...ttp.WinHttpHandler.Functional.Tests.csproj | 11 +- ....Net.Http.WinHttpHandler.Unit.Tests.csproj | 2 +- .../System.Net.Http/Directory.Build.props | 1 - .../src/System.Net.Http.csproj | 9 +- .../System.Net.Http.Functional.Tests.csproj | 7 +- .../System.Net.Http.Unit.Tests.csproj | 4 +- .../Directory.Build.props | 1 - .../src/System.Net.HttpListener.csproj | 5 +- .../System.Net.HttpListener.Tests.csproj | 3 - .../System.Net.Mail/Directory.Build.props | 1 - .../src/System.Net.Mail.csproj | 5 +- .../System.Net.Mail.Functional.Tests.csproj | 3 - .../Unit/System.Net.Mail.Unit.Tests.csproj | 9 +- .../Directory.Build.props | 1 - .../src/System.Net.NameResolution.csproj | 3 +- ...System.Net.NameResolution.Pal.Tests.csproj | 2 +- ...ystem.Net.NameResolution.Unit.Tests.csproj | 2 +- .../Directory.Build.props | 1 - .../src/System.Net.NetworkInformation.csproj | 4 +- .../System.Net.Ping/Directory.Build.props | 1 - .../src/System.Net.Ping.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Net.Primitives.csproj | 2 - ...tem.Net.Primitives.Functional.Tests.csproj | 3 - .../System.Net.Primitives.Pal.Tests.csproj | 2 +- ...stem.Net.Primitives.UnitTests.Tests.csproj | 2 +- .../System.Net.Requests/Directory.Build.props | 1 - .../src/System.Net.Requests.csproj | 4 +- .../System.Net.Security/Directory.Build.props | 1 - .../ref/System.Net.Security.csproj | 4 +- .../src/System.Net.Security.csproj | 5 +- .../System.Net.Security.Tests.csproj | 1 + .../System.Net.Security.Unit.Tests.csproj | 9 +- .../Directory.Build.props | 1 - .../System.Net.Sockets/Directory.Build.props | 1 - .../src/System.Net.Sockets.csproj | 3 +- .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../src/System.Net.WebHeaderCollection.csproj | 1 - .../System.Net.WebProxy/Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../System.Net.WebSockets.Client.Tests.csproj | 2 +- ...em.Net.WebSockets.WebSocketProtocol.csproj | 4 +- ...em.Net.WebSockets.WebSocketProtocol.csproj | 23 +-- ....WebSockets.WebSocketProtocol.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../src/System.Net.WebSockets.csproj | 1 - .../ref/System.Numerics.Tensors.csproj | 14 +- .../src/System.Numerics.Tensors.csproj | 17 +- .../System.Numerics.Tensors.Tests.csproj | 9 +- .../Directory.Build.props | 1 - .../System.ObjectModel/Directory.Build.props | 1 - .../src/System.ObjectModel.csproj | 1 - .../Directory.Build.props | 2 - ...m.Private.DataContractSerialization.csproj | 2 - .../System.Private.Uri/Directory.Build.props | 1 - .../src/System.Private.Uri.csproj | 1 - .../Directory.Build.props | 2 - .../src/System.Private.Xml.Linq.csproj | 3 +- .../System.Private.Xml/Directory.Build.props | 2 - .../src/System.Private.Xml.csproj | 1 - .../System.Xml.RW.XmlWriterApi.Tests.csproj | 6 +- .../ref/System.Reflection.Context.csproj | 4 - .../src/System.Reflection.Context.csproj | 7 +- .../System.Reflection.Context.Tests.csproj | 3 + .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - ...System.Reflection.Emit.ILGeneration.csproj | 1 - .../Directory.Build.props | 1 - .../System.Reflection.Emit.Lightweight.csproj | 1 - .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../src/System.Reflection.Extensions.csproj | 1 - .../Directory.Build.props | 1 - .../ref/System.Reflection.Metadata.csproj | 11 +- .../src/System.Reflection.Metadata.csproj | 17 +- .../System.Reflection.Metadata.Tests.csproj | 10 +- ...stem.Reflection.MetadataLoadContext.csproj | 2 +- ...stem.Reflection.MetadataLoadContext.csproj | 15 +- ...eflection.MetadataLoadContext.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../src/System.Reflection.Primitives.csproj | 1 - .../Directory.Build.props | 1 - .../System.Reflection.TypeExtensions.csproj | 1 - .../System.Reflection/Directory.Build.props | 1 - .../src/System.Reflection.csproj | 1 - .../ref/System.Resources.Extensions.csproj | 4 +- .../src/System.Resources.Extensions.csproj | 11 +- .../System.Resources.Extensions.Tests.csproj | 11 +- .../Directory.Build.props | 1 - .../src/System.Resources.Reader.csproj | 1 - .../Directory.Build.props | 1 - .../System.Resources.ResourceManager.csproj | 1 - ...tem.Resources.ResourceManager.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../src/System.Resources.Writer.csproj | 1 - .../src/System.Runtime.Caching.csproj | 5 +- .../tests/System.Runtime.Caching.Tests.csproj | 8 +- .../Directory.Build.props | 1 - ...tem.Runtime.CompilerServices.Unsafe.csproj | 8 +- ...tem.Runtime.CompilerServices.Unsafe.ilproj | 19 ++- ...ntime.CompilerServices.Unsafe.Tests.csproj | 5 +- .../Directory.Build.props | 1 - ...em.Runtime.CompilerServices.VisualC.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Runtime.Extensions.csproj | 8 +- .../Directory.Build.props | 1 - .../src/System.Runtime.Handles.csproj | 1 - .../Directory.Build.props | 1 - ....Runtime.InteropServices.JavaScript.csproj | 1 - ...me.InteropServices.JavaScript.Tests.csproj | 8 +- .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../src/System.Runtime.InteropServices.csproj | 2 - .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../src/System.Runtime.Loader.csproj | 1 - ...Runtime.Loader.DefaultContext.Tests.csproj | 9 +- ...ime.Loader.RefEmitLoadContext.Tests.csproj | 9 +- .../Directory.Build.props | 1 - .../src/System.Runtime.Numerics.csproj | 1 - .../Directory.Build.props | 1 - ...em.Runtime.Serialization.Formatters.csproj | 12 +- .../tests/FormatterServicesTests.Windows.cs | 1 + ...time.Serialization.Formatters.Tests.csproj | 34 +++- .../Directory.Build.props | 1 - .../System.Runtime.Serialization.Json.csproj | 3 - .../Directory.Build.props | 1 - ...em.Runtime.Serialization.Primitives.csproj | 2 - .../Directory.Build.props | 1 - .../System.Runtime.Serialization.Xml.csproj | 5 +- ....Serialization.Xml.Canonicalization.csproj | 4 + ...ialization.Xml.ReflectionOnly.Tests.csproj | 3 + ...tem.Runtime.Serialization.Xml.Tests.csproj | 3 + .../System.Runtime/Directory.Build.props | 1 - .../System.Runtime/src/System.Runtime.csproj | 5 +- .../tests/System.Runtime.Tests.csproj | 7 +- .../Directory.Build.props | 2 - .../ref/System.Security.AccessControl.csproj | 12 +- .../src/System.Security.AccessControl.csproj | 21 +-- ...System.Security.AccessControl.Tests.csproj | 6 +- .../Directory.Build.props | 1 - .../src/System.Security.Claims.csproj | 1 - .../Directory.Build.props | 1 - ...urity.Cryptography.Algorithms.Tests.csproj | 4 + .../Directory.Build.props | 2 - .../System.Security.Cryptography.Cng.csproj | 15 +- .../System.Security.Cryptography.Cng.csproj | 19 ++- ...tem.Security.Cryptography.Cng.Tests.csproj | 6 +- .../Directory.Build.props | 1 - .../System.Security.Cryptography.Csp.csproj | 1 - ...tem.Security.Cryptography.Csp.Tests.csproj | 3 + .../Directory.Build.props | 1 - ...stem.Security.Cryptography.Encoding.csproj | 1 - .../Directory.Build.props | 2 - ...ystem.Security.Cryptography.OpenSsl.csproj | 15 +- ...ystem.Security.Cryptography.OpenSsl.csproj | 15 +- ...Security.Cryptography.OpenSsl.Tests.csproj | 5 +- .../System.Security.Cryptography.Pkcs.csproj | 19 +-- .../System.Security.Cryptography.Pkcs.csproj | 83 ++++----- .../tests/EnvelopedCms/EdgeCasesTests.cs | 8 +- .../tests/EnvelopedCms/GeneralTests.cs | 4 +- .../SignedCms/SignedCmsWholeDocumentTests.cs | 4 +- ...em.Security.Cryptography.Pkcs.Tests.csproj | 9 +- .../Directory.Build.props | 1 - ...em.Security.Cryptography.Primitives.csproj | 1 - ...Security.Cryptography.ProtectedData.csproj | 4 +- ...Security.Cryptography.ProtectedData.csproj | 12 +- ...ty.Cryptography.ProtectedData.Tests.csproj | 8 +- .../Directory.Build.props | 1 - ...urity.Cryptography.X509Certificates.csproj | 4 +- ...Cryptography.X509Certificates.Tests.csproj | 2 + .../System.Security.Cryptography.Xml.csproj | 7 +- .../System.Security.Cryptography.Xml.csproj | 31 +--- ...tem.Security.Cryptography.Xml.Tests.csproj | 8 +- .../ref/System.Security.Permissions.csproj | 37 ++-- .../src/System.Security.Permissions.csproj | 22 +-- .../System.Security.Permissions.Tests.csproj | 5 +- .../Directory.Build.props | 2 - .../System.Security.Principal.Windows.csproj | 13 +- .../System.Security.Principal.Windows.csproj | 9 +- ...em.Security.Principal.Windows.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../src/System.Security.Principal.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Security.SecureString.csproj | 2 - .../System.ServiceModel.Syndication.csproj | 25 ++- .../System.ServiceModel.Syndication.csproj | 15 +- ...stem.ServiceModel.Syndication.Tests.csproj | 8 +- ...em.ServiceProcess.ServiceController.csproj | 4 +- ...em.ServiceProcess.ServiceController.csproj | 23 +-- ...ocess.ServiceController.TestService.csproj | 5 +- ...viceProcess.ServiceController.Tests.csproj | 7 +- .../Directory.Build.props | 1 - .../ref/System.Text.Encoding.CodePages.csproj | 8 +- .../src/System.Text.Encoding.CodePages.csproj | 39 ++--- ...ystem.Text.Encoding.CodePages.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../System.Text.Encoding.Extensions.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Text.Encoding.csproj | 1 - .../Directory.Build.props | 1 - .../ref/System.Text.Encodings.Web.csproj | 19 +-- .../src/System.Text.Encodings.Web.csproj | 18 +- .../System.Text.Encodings.Web.Tests.csproj | 5 +- .../System.Text.Json/Directory.Build.props | 1 - .../System.Text.Json/ref/System.Text.Json.cs | 4 +- .../ref/System.Text.Json.csproj | 24 +-- .../src/System.Text.Json.csproj | 58 ++++--- .../tests/System.Text.Json.Tests.csproj | 9 +- .../Directory.Build.props | 1 - .../src/System.Text.RegularExpressions.csproj | 1 - ...ystem.Text.RegularExpressions.Tests.csproj | 2 +- .../ref/System.Threading.AccessControl.csproj | 7 +- .../src/System.Threading.AccessControl.csproj | 13 +- ...ystem.Threading.AccessControl.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../ref/System.Threading.Channels.csproj | 19 ++- .../src/System.Threading.Channels.csproj | 15 +- .../System.Threading.Channels.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../System.Threading.Tasks.Dataflow.csproj | 6 +- .../System.Threading.Tasks.Dataflow.csproj | 29 +--- ...stem.Threading.Tasks.Dataflow.Tests.csproj | 5 +- .../Directory.Build.props | 1 - .../Directory.Build.props | 1 - .../System.Threading.Tasks.Parallel.csproj | 2 - .../Directory.Build.props | 1 - .../src/System.Threading.Tasks.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Threading.Thread.csproj | 2 - .../Directory.Build.props | 1 - .../src/System.Threading.ThreadPool.csproj | 1 - .../Directory.Build.props | 1 - .../src/System.Threading.Timer.csproj | 1 - .../System.Threading/Directory.Build.props | 1 - .../src/System.Threading.csproj | 1 - .../Directory.Build.props | 1 - .../ref/System.Transactions.Local.csproj | 1 - .../src/System.Transactions.Local.csproj | 4 +- ...System.Utf8String.Experimental.Forwards.cs | 2 +- .../ref/System.Utf8String.Experimental.cs | 6 +- .../ref/System.Utf8String.Experimental.csproj | 26 +-- .../src/System.Utf8String.Experimental.csproj | 44 ++--- ...ystem.Utf8String.Experimental.Tests.csproj | 12 +- .../System.ValueTuple/Directory.Build.props | 1 - .../ref/System.ValueTuple.csproj | 4 +- .../src/System.ValueTuple.csproj | 2 +- .../Directory.Build.props | 1 - .../ref/System.Windows.Extensions.csproj | 14 +- .../src/System.Windows.Extensions.csproj | 6 +- .../System.Windows.Extensions.Tests.csproj | 2 + .../Directory.Build.props | 1 - .../src/System.Xml.ReaderWriter.csproj | 5 +- .../Directory.Build.props | 1 - .../src/System.Xml.XDocument.csproj | 7 +- .../Directory.Build.props | 1 - .../src/System.Xml.XPath.XDocument.csproj | 6 +- .../System.Xml.XPath/Directory.Build.props | 1 - .../src/System.Xml.XPath.csproj | 5 +- .../Directory.Build.props | 1 - .../src/System.Xml.XmlDocument.csproj | 6 +- .../Directory.Build.props | 1 - .../src/System.Xml.XmlSerializer.csproj | 6 +- src/libraries/pkg/baseline/packageIndex.json | 1 + src/libraries/pkg/test/testPackages.proj | 3 - src/libraries/pretest.proj | 153 +++++++++-------- src/libraries/ref.proj | 75 +++++++- src/libraries/restore/Directory.Build.props | 3 +- src/libraries/restore/Directory.Build.targets | 2 - .../binplacePackages/binplacePackages.depproj | 53 ------ src/libraries/restore/depproj.proj | 28 --- .../netcoreapp/external.netcoreapp.depproj | 20 --- src/libraries/restore/netfx/netfx.depproj | 126 -------------- .../netstandard/external.netstandard.depproj | 128 -------------- .../runtime/referenceFromRuntime.targets | 13 -- src/libraries/restore/runtime/runtime.depproj | 34 ++-- src/libraries/sendtohelix.proj | 11 +- src/libraries/sendtohelixhelp.proj | 7 +- src/libraries/shims/ApiCompat.proj | 27 +-- src/libraries/shims/Directory.Build.props | 7 +- .../shims/generated/Directory.Build.props | 33 +++- .../shims/manual/Directory.Build.props | 6 +- src/libraries/shims/manual/System.Data.csproj | 5 +- src/libraries/src.proj | 47 ++--- src/mono/wasm/wasm.targets | 63 +++---- .../installer.tasks/installer.tasks.csproj | 2 +- 648 files changed, 2712 insertions(+), 3323 deletions(-) create mode 100644 eng/AvoidRestoreCycleOnSelfReference.targets delete mode 100644 eng/referenceFromRuntime.targets create mode 100644 eng/targetingpacks.targets create mode 100644 src/libraries/Microsoft.Extensions.DependencyModel/tests/nonentrypointassembly/NonEntryPointClass.cs create mode 100644 src/libraries/Microsoft.Extensions.DependencyModel/tests/nonentrypointassembly/nonentrypointassembly.csproj create mode 100644 src/libraries/NetCoreAppLibrary.props delete mode 100644 src/libraries/restore/binplacePackages/binplacePackages.depproj delete mode 100644 src/libraries/restore/depproj.proj delete mode 100644 src/libraries/restore/netcoreapp/external.netcoreapp.depproj delete mode 100644 src/libraries/restore/netfx/netfx.depproj delete mode 100644 src/libraries/restore/netstandard/external.netstandard.depproj delete mode 100644 src/libraries/restore/runtime/referenceFromRuntime.targets diff --git a/Build.proj b/Build.proj index dc4a15ab5f4..2041d3d4fcc 100644 --- a/Build.proj +++ b/Build.proj @@ -1,5 +1,9 @@ + + BuildTargetFramework=$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)')) + + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'installer.tasks')) $([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'netstandard2.0', 'installer.tasks.dll')) - $([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net46', 'installer.tasks.dll')) + $([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net461', 'installer.tasks.dll')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs')) $([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages')) diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md index 36a43555aff..60afda9ea79 100644 --- a/docs/coding-guidelines/project-guidelines.md +++ b/docs/coding-guidelines/project-guidelines.md @@ -7,8 +7,6 @@ once before you can iterate and work on a given library project. - Setup tools (currently done in restore in build.cmd/sh) - Restore external dependencies - CoreCLR - Copy to `bin\runtime\$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)` - - Netstandard Library - Copy to `bin\ref\netstandard2.0` - - NetFx targeting pack - Copy to `bin\ref\net472` - Build targeting pack - Build src\libraries\ref.proj which builds all references assembly projects. For reference assembly project information see [ref](#ref) - Build product @@ -28,7 +26,7 @@ Below is a list of all the various options we pivot the project builds on: ## Individual build properties The following are the properties associated with each build pivot -- `$(BuildTargetFramework) -> netstandard2.1 | net5.0 | net472` +- `$(BuildTargetFramework) -> Any .NETCoreApp, .NETStandard or .NETFramework TFM, e.g. net5.0` - `$(TargetOS) -> Windows | Linux | OSX | FreeBSD | [defaults to running OS when empty]` - `$(Configuration) -> Release | [defaults to Debug when empty]` - `$(TargetArchitecture) - x86 | x64 | arm | arm64 | [defaults to x64 when empty]` @@ -60,23 +58,10 @@ Pure netstandard configuration: All supported targets with unique windows/unix build for netcoreapp: ``` - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461-Windows_NT ``` -### Placeholder Target Frameworks -Placeholder Target Framework can be added to the `` property to indicate the build system that the specific project is inbox in that framework and that Build Setting needs to be ignored. - -Placeholder target frameworks start with _ prefix. - -Example: -When we have a project that has a `netstandard2.0` target framework that means that this project is compatible with any build setting. So if we do a vertical build for `net472` this project will be built as part of the vertical because `net472` is compatible with `netstandard2.0`. This means that in the runtime and testhost binaries the netstandard2.0 implementation will be included, and we will test against those assets instead of testing against the framework inbox asset. In order to tell the build system to not include this project as part of the `net472` vertical we need to add a placeholder target framework: -``` - - netstandard2.0;_net472 - -``` - ## Options for building A full or individual project build is centered around BuildTargetFramework, TargetOS, Configuration and TargetArchitecture. @@ -94,7 +79,7 @@ When building an individual project the `BuildTargetFramework` and `TargetOS` wi ## Supported full build settings - .NET Core latest on current OS (default) -> `$(NetCoreAppCurrent)-[RunningOS]` -- .NET Framework latest -> `$(NetFrameworkCurrent)-Windows_NT` +- .NET Framework latest -> `net48-Windows_NT` # Library project guidelines diff --git a/docs/project/library-servicing.md b/docs/project/library-servicing.md index 29934d1606f..3dc16895951 100644 --- a/docs/project/library-servicing.md +++ b/docs/project/library-servicing.md @@ -4,7 +4,7 @@ This document provides the steps necessary after modifying a CoreFx library in a ## Check for existence of a .pkgproj -Most CoreFx libraries are not packaged by default. Some libraries have their output packaged in `Microsoft.Private.CoreFx.NetCoreApp`, which is always built, while other libraries have their own specific packages, which are only built on-demand. Your first step is to determine whether or not your library has its own package. To do this, go into the root folder for the library you've made changes to. If there is a `pkg` folder there (which should have a `.pkgproj` file inside of it), your library does have its own package. If there is no `pkg` folder there, the library should be built as part of `Microsoft.Private.CoreFx.NetCoreApp` and shipped as part of `Microsoft.NetCore.App`. To confirm this, check for the `IsNETCoreApp` property being set to `true` in the library's `Directory.Build.props` (or dir.props). If it is, then there is nothing that needs to be done. If it's not, contact a member of the servicing team for guidance, as this situation goes against our convention. +Most libraries are not packaged by default. Some libraries have their output packaged in `Microsoft.Private.CoreFx.NetCoreApp`, which is always built, while other libraries have their own specific packages, which are only built on-demand. Your first step is to determine whether or not your library has its own package. To do this, go into the root folder for the library you've made changes to. If there is a `pkg` folder there (which should have a `.pkgproj` file inside of it), your library does have its own package. If there is no `pkg` folder there, the library should be built as part of `Microsoft.Private.CoreFx.NetCoreApp` and shipped as part of `Microsoft.NetCore.App`. To confirm this, check if the library is listed in NetCoreAppLibrary.props. If it is, then there is nothing that needs to be done. If it's not, contact a member of the servicing team for guidance, as this situation goes against our convention. For example, if you made changes to [System.Data.SqlClient](https://github.com/dotnet/runtime/tree/master/src/libraries/Microsoft.Win32.Registry), then you have a .pkgproj, and will have to follow the steps in this document. However, if you made changes to [System.Collections](https://github.com/dotnet/runtime/tree/master/src/libraries/System.Collections), then you don't have a .pkgproj, and you do not need to do any further work for servicing. diff --git a/docs/workflow/building/libraries/README.md b/docs/workflow/building/libraries/README.md index 44eb0eb209e..7f8c12b108e 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 `net472`. (msbuild property `BuildTargetFramework`) +- `-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`) - `-os` identifies the OS for the build. It defaults to the OS you are running on but possible values include `Windows_NT`, `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/eng/AvoidRestoreCycleOnSelfReference.targets b/eng/AvoidRestoreCycleOnSelfReference.targets new file mode 100644 index 00000000000..cb665cb070d --- /dev/null +++ b/eng/AvoidRestoreCycleOnSelfReference.targets @@ -0,0 +1,14 @@ + + + + <_PackageIdTemp>$(PackageId) + $(PackageId)_temp + + + + + $(_PackageIdTemp) + + + \ No newline at end of file diff --git a/eng/BeforeTargetFrameworkInference.targets b/eng/BeforeTargetFrameworkInference.targets index 92adb5df635..abef4c8981a 100644 --- a/eng/BeforeTargetFrameworkInference.targets +++ b/eng/BeforeTargetFrameworkInference.targets @@ -6,10 +6,6 @@ $(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-')))) - - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) - - diff --git a/eng/Configurations.props b/eng/Configurations.props index aa8e9add17d..59424f7cc30 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -29,8 +29,6 @@ $(NetCoreAppCurrent) Microsoft.NETCore.App .NET $(NetCoreAppCurrentVersion) - - net472 WINDOWS7.0 diff --git a/eng/Subsets.props b/eng/Subsets.props index 958389db150..ba103417c83 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -59,7 +59,7 @@ mono.llvm+ $(DefaultMonoSubsets)mono.runtime+mono.corelib - libs.depprojs+libs.native+libs.ref+libs.src+libs.pretest+libs.packages + libs.native+libs.ref+libs.src+libs.pretest+libs.packages corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles+installers+installer.tests installer.pkgprojs @@ -95,7 +95,6 @@ - @@ -177,12 +176,6 @@ - - - Configuration=$(LibrariesConfiguration) - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2940b3c13c7..cf9414cfae4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,7 +46,7 @@ https://github.com/dotnet/arcade ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 - + https://github.com/dotnet/arcade ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 diff --git a/eng/Versions.props b/eng/Versions.props index c06cc9058ab..4d00ac9bfe4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,6 +18,7 @@ true true false + true dotnet $(ContainerName) @@ -56,10 +57,10 @@ 5.0.0-beta.20364.3 5.0.0-beta.20364.3 5.0.0-beta.20364.3 - 5.0.0-beta.20364.3 + 5.0.0-beta.20367.6 2.5.1-beta.20364.3 5.0.0-beta.20364.3 - 5.0.0-beta.20364.3 + 5.0.0-beta.20367.6 5.0.0-beta.20364.3 5.0.0-preview.4.20202.18 @@ -69,7 +70,36 @@ 5.0.0-preview.8.20359.4 + 4.5.1 + 4.3.0 + 4.3.0 + 4.7.0 + 4.8.1 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.5.4 + 4.3.4 + 4.3.1 + 4.5.0 + 4.3.0 + 4.3.1 + 4.3.1 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.1 + 4.7.0 + 4.7.0 + 4.7.0 5.0.0-preview.4.20202.18 + 4.3.0 + 4.5.4 + 4.5.0 + 1.1.1 + 4.3.0 5.0.0-alpha.1.19563.3 5.0.0-beta.20364.1 @@ -82,6 +112,7 @@ 5.0.0-beta.20364.1 2.2.0-prerelease.19564.1 + 2.0.3 99.99.99-master-20200228.3 99.99.99-master-20200228.3 @@ -101,8 +132,6 @@ $(RefOnlyMicrosoftBuildVersion) 4.9.4 4.9.4 - - 4.8.0 16.8.0-preview-20200716-03 1.0.0-prerelease.20352.3 diff --git a/eng/build.ps1 b/eng/build.ps1 index f8b205bd393..016ed15d203 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -65,7 +65,7 @@ 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: net5.0 or net472." + Write-Host " -framework (-f) Build framework: net5.0 or net48." Write-Host " [Default: net5.0]" Write-Host " -testnobuild Skip building tests when invoking -test." Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all." diff --git a/eng/build.sh b/eng/build.sh index eb0cb586ebf..da8e3770f59 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -60,7 +60,7 @@ usage() echo "Libraries settings:" echo " --allconfigurations Build packages for all build configurations." echo " --coverage Collect code coverage when testing." - echo " --framework (-f) Build framework: net5.0 or net472." + echo " --framework (-f) Build framework: net5.0 or net48." echo " [Default: net5.0]" echo " --testnobuild Skip building tests when invoking -test." echo " --testscope Test scope, allowed values: innerloop, outerloop, all." diff --git a/eng/illink.targets b/eng/illink.targets index 601b0b798fb..79eb5d40964 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -27,7 +27,7 @@ $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NET_ILLink_Tasks)', 'tools')) $(ILLinkTasksDir)netcoreapp3.0/ILLink.Tasks.dll - $(ILLinkTasksDir)$(NetFrameworkCurrent)/ILLink.Tasks.dll + $(ILLinkTasksDir)net472/ILLink.Tasks.dll $(IntermediateOutputPath)$(TargetName)$(TargetExt) $(IntermediateOutputPath)$(TargetName).pdb $(IntermediateOutputPath)PreTrim/ diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index 4284a79368f..d0cc3cee0a5 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -91,10 +91,12 @@ jobs: displayName: Create Core_Root condition: and(succeeded(), ne(variables.runtimeFlavorName, 'Mono')) - - script: "build.cmd -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)\\bin\\mono\\$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\.dotnet-mono /E /I /Y;copy $(Build.SourcesDirectory)\\artifacts\\bin\\coreclr\\$(osGroup).$(archType).$(buildConfigUpper)\\corerun.exe $(Build.SourcesDirectory)\\.dotnet-mono\\shared\\Microsoft.NETCore.App\\5.0.0\\corerun.exe" + # Copy the runtime directory into the testhost folder to include OOBs. + + - script: "build.cmd -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)\\bin\\mono\\$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\runtime\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\shared\\Microsoft.NETCore.App\\5.0.0 /E /I /Y;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\.dotnet-mono /E /I /Y;copy $(Build.SourcesDirectory)\\artifacts\\bin\\coreclr\\$(osGroup).$(archType).$(buildConfigUpper)\\corerun.exe $(Build.SourcesDirectory)\\.dotnet-mono\\shared\\Microsoft.NETCore.App\\5.0.0\\corerun.exe" displayName: "Create mono dotnet (Windows)" condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), eq(variables.osGroup, 'Windows_NT')) - - script: "mkdir $(Build.SourcesDirectory)/.dotnet-mono;./build.sh -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;cp $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/.dotnet-mono -r;cp $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)/corerun $(Build.SourcesDirectory)/.dotnet-mono/shared/Microsoft.NETCore.App/5.0.0/corerun" + - script: "mkdir $(Build.SourcesDirectory)/.dotnet-mono;./build.sh -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;cp $(Build.SourcesDirectory)/artifacts/bin/runtime/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/shared/Microsoft.NETCore.App/5.0.0 -rf;cp $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/.dotnet-mono -r;cp $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)/corerun $(Build.SourcesDirectory)/.dotnet-mono/shared/Microsoft.NETCore.App/5.0.0/corerun" displayName: "Create mono dotnet (Linux)" condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), ne(variables.osGroup, 'Windows_NT')) diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index bf5a9a2321f..2ae778e8939 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -4,7 +4,7 @@ parameters: archType: '' osSubgroup: '' crossrootfsDir: '' - framework: '' + framework: 'net5.0' isOfficialAllConfigurations: false isSourceBuild: false liveRuntimeBuildConfig: '' @@ -25,10 +25,10 @@ parameters: jobs: - template: /eng/common/templates/job/job.yml parameters: - ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}: + ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}: displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if in(parameters.framework, 'allConfigurations', 'net472') }}: + ${{ if in(parameters.framework, 'allConfigurations', 'net48') }}: displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }} name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index f4b02cf0621..4854b682716 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -4,7 +4,7 @@ parameters: osSubgroup: '' archType: '' crossrootfsDir: '' - framework: '' + framework: 'net5.0' isOfficialBuild: false isOfficialAllConfigurations: false runtimeVariant: '' @@ -65,7 +65,7 @@ jobs: - ${{ if eq(parameters.osGroup, 'Browser') }}: - EMSDK_PATH: /usr/local/emscripten - # Tests only run for 'allConfiguration' and 'net472' build-jobs + # Tests only run for 'allConfiguration' and 'net48' build-jobs # If platform is in testBuildPlatforms we build tests as well. - ${{ if or(eq(parameters.runTests, true), containsValue(parameters.testBuildPlatforms, parameters.platform)) }}: - _subset: libs+libs.tests diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 58d1f89fe3c..33d0ea5aa9d 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -88,7 +88,7 @@ jobs: # Windows_NT x64 - ${{ if eq(parameters.platform, 'Windows_NT_x64') }}: # netcoreapp - - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}: + - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net48') }}: - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - Windows.81.Amd64.Open - Windows.10.Amd64.ServerRS5.Open @@ -101,8 +101,8 @@ jobs: - ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}: - (Windows.Nano.1809.Amd64.Open)windows.10.amd64.serverrs5.open@mcr.microsoft.com/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504 - # NET472 - - ${{ if eq(parameters.jobParameters.framework, 'net472') }}: + # .NETFramework + - ${{ if eq(parameters.jobParameters.framework, 'net48') }}: - Windows.10.Amd64.Client19H1.Open # AllConfigurations @@ -112,7 +112,7 @@ jobs: # Windows_NT x86 - ${{ if eq(parameters.platform, 'Windows_NT_x86') }}: # netcoreapp - - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}: + - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net48') }}: - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - Windows.7.Amd64.Open - Windows.10.Amd64.ServerRS5.Open @@ -124,8 +124,8 @@ jobs: - Windows.7.Amd64.Open - Windows.10.Amd64.Server19H1.Open - # NET472 - - ${{ if eq(parameters.jobParameters.framework, 'net472') }}: + # .NETFramework + - ${{ if eq(parameters.jobParameters.framework, 'net48') }}: - Windows.10.Amd64.Client19H1.Open # Windows_NT arm diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml index 9afbf206e5f..d88481ea37d 100644 --- a/eng/pipelines/libraries/outerloop.yml +++ b/eng/pipelines/libraries/outerloop.yml @@ -99,6 +99,6 @@ jobs: jobParameters: isOfficialBuild: ${{ variables['isOfficialBuild'] }} isFullMatrix: ${{ variables['isFullMatrix'] }} - framework: net472 + framework: net48 runTests: true testScope: outerloop \ No newline at end of file diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index 6c5e397d4dd..faa5ab29e30 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -3,7 +3,7 @@ parameters: osGroup: '' osSubgroup: '' archType: '' - framework: '' + framework: 'net5.0' isOfficialBuild: false liveRuntimeBuildConfig: '' runtimeFlavor: 'coreclr' @@ -55,7 +55,7 @@ jobs: - ${{ if ne(parameters.dependsOn[0], '') }}: - ${{ parameters.dependsOn }} - ${{ if eq(parameters.dependsOn[0], '') }}: - - ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}: + - ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}: - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} # tests are built as part of product build - ${{ if or(ne(parameters.archType, parameters.dependsOnTestArchitecture), ne(parameters.buildConfig, parameters.dependsOnTestBuildConfiguration)) }}: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 831fa959900..17afa74cdb3 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -576,7 +576,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isFullMatrix: ${{ variables.isFullMatrix }} - framework: net472 + framework: net48 runTests: true testScope: innerloop condition: >- diff --git a/eng/referenceAssemblies.props b/eng/referenceAssemblies.props index a5e0e553f12..94508fa244a 100644 --- a/eng/referenceAssemblies.props +++ b/eng/referenceAssemblies.props @@ -1,9 +1,9 @@ - $(AdditionalBuildTargetFrameworks);netstandard2.0 - $(AdditionalBuildTargetFrameworks);netstandard2.1 + !$(BuildTargetFramework.StartsWith('netstandard')) and + !$(BuildTargetFramework.StartsWith('net4'))"> + $(AdditionalBuildTargetFrameworks);netstandard2.0 + $(AdditionalBuildTargetFrameworks);netstandard2.1 diff --git a/eng/referenceFromRuntime.targets b/eng/referenceFromRuntime.targets deleted file mode 100644 index 34d0eb49199..00000000000 --- a/eng/referenceFromRuntime.targets +++ /dev/null @@ -1,124 +0,0 @@ - - - - AddRuntimeProjectReference; - $(PrepareProjectReferencesDependsOn); - - - AddRuntimeProjectReference; - $(ResolveReferencesDependsOn); - - - AddRuntimeProjectReference; - $(CleanDependsOn) - - - - - $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'restore', 'runtime', 'runtime.depproj')) - - - - - - - - false - _referencePathFromRestoredRuntime - - - - - - - - - - - - - - - - - - - - - - - - - <_referencePathFromRuntime Include="@(RuntimeFiles)" Private="false" /> - <_referencePathFromRuntime Include="@(_referencePathFromRestoredRuntime)" Private="false" /> - - <_referencePathFromRuntime Include="@(ReferenceFromRuntime->'$(RuntimePath)%(Identity).dll')" Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'" /> - - <_referencePathFromRuntimeByFileName Include="@(_referencePathFromRuntime->'%(FileName)')" Condition="'%(_referencePathFromRuntime.Extension)' == '.dll'" > - %(Identity) - - - - - - - - - - - <_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileNameFiltered)" - Condition="'@(_referencePathFromRuntimeByFileNameFiltered)' == '@(ReferenceFromRuntime)' and '%(Identity)' != ''"> - @(ReferenceFromRuntime->'%(Aliases)') - - - <_remainingReferenceFromRuntime Include="@(ReferenceFromRuntime)" Exclude="@(_filteredReferencePathFromRuntimeByFileName)" /> - - - <_remainingReferenceFromRuntimeWithNI Include="@(_remainingReferenceFromRuntime->'%(Identity).ni')"> - %(Identity) - - - <_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileNameFiltered)" - Condition="'@(_referencePathFromRuntimeByFileNameFiltered)' == '@(_remainingReferenceFromRuntimeWithNI)' and '%(Identity)' != ''"> - @(_remainingReferenceFromRuntimeWithNI->'%(Aliases)') - - - <_missingReferenceFromRuntime Include="@(_remainingReferenceFromRuntimeWithNI)" Exclude="@(_filteredReferencePathFromRuntimeByFileName)" /> - - - - - - - - <_aliasedReferencePathFromRuntime Include="@(_filteredReferencePathFromRuntimeByFileName->'%(ReferencePath)')" Condition="'%(_filteredReferencePathFromRuntimeByFileName.Aliases)' != ''" /> - - - - - - - - - - - - - - diff --git a/eng/references.targets b/eng/references.targets index efcac7d0515..0f3ea17b4a4 100644 --- a/eng/references.targets +++ b/eng/references.targets @@ -1,67 +1,56 @@ - $(RefPath) - $(RefPath) - $(AssemblySearchPaths);$(RefPath);{RawFileName} <_FindDependencies>false - - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) - - - true - true - - - - - - - + + + + + + + + + + + + + + false + + + + + - - - - - - false - + <_transitiveProjectReferenceWithExclusion Include="@(ProjectReference)"> + %(DefaultReferenceExclusion.Identity) + + - + + - - - - - - - - %(DefaultReferenceDirs.Identity) - - <_defaultReferenceExclusionsFullPath Include="%(DefaultReferenceExclusions.RefDir)%(DefaultReferenceExclusions.Identity).dll" /> - - - + - - - - - - - - \ No newline at end of file + diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets index 2f59f5d9a51..6f4bb0e253e 100644 --- a/eng/resolveContract.targets +++ b/eng/resolveContract.targets @@ -1,8 +1,18 @@ + + $(MicrosoftNetCoreAppRefPackRefDir) + + $(ContractDependencyPaths);@(ReferencePath->'%(RelativeDir)'->Distinct()) + + - $(LibrariesProjectRoot)$(MSBuildProjectName)/ref/$(MSBuildProjectName).csproj + $(LibrariesProjectRoot)$(MSBuildProjectName)\ref\$(MSBuildProjectName).csproj true - $(RefPath)/$(MSBuildProjectName).dll + $(NetCoreAppCurrentRefPath)$(TargetFileName) + $([MSBuild]::NormalizePath('$(BaseOutputPath)', 'ref', '$(TargetFramework)-$(Configuration)', '$(TargetFileName)')) false @@ -10,8 +20,43 @@ + + + false + ResolvedMatchingContract + + + + + + + + + + + + + false + + + + <_resolvedP2PFiltered Include="@(ProjectReference)"> + $([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)')) + %(ProjectReference.SkipUseReferenceAssembly) + + <_ResolvedProjectReferencePaths Update="@(_resolvedProjectReferenceFiltred)" + Condition="'%(_resolvedP2PFiltered.ProjectReferenceItemSpec)' == '%(_resolvedP2PFiltered.MSBuildSourceProjectFile)' and + '%(_resolvedP2PFiltered.SkipUseReferenceAssembly)' == 'true'" + ReferenceAssembly="" /> + + \ No newline at end of file diff --git a/eng/restore/repoRestore.props b/eng/restore/repoRestore.props index 300c542e8cb..d2ca92d6db0 100644 --- a/eng/restore/repoRestore.props +++ b/eng/restore/repoRestore.props @@ -1,5 +1,6 @@ + $(RepoRoot)artifacts\toolset\Common\ false unused diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets new file mode 100644 index 00000000000..e39ce8fdada --- /dev/null +++ b/eng/targetingpacks.targets @@ -0,0 +1,106 @@ + + + <_UseLocalTargetingRuntimePack>true + false + + + + + + + $(PkgMicrosoft_NETCore_App)\ref\$(_ShortFrameworkIdentifier)$(_ShortFrameworkVersion)\ + + + + + + + + + + + false + + + + + + + %(ResolvedFrameworkReference.TargetingPackPath)\ref\$(_ShortFrameworkIdentifier)$(_ShortFrameworkVersion)\ + + + + + + + + + + $(AssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\')) + $(DesignTimeAssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\')) + + + + + + + + + + + + + + + + + + + + + + + <_targetingPackReferenceExclusion Include="$(TargetName)" /> + <_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->'%(Filename)')" /> + <_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" /> + + + + <_targetingPackReferenceWithExclusion Include="@(Reference)"> + %(_targetingPackReferenceExclusion.Identity) + + + + + \ No newline at end of file diff --git a/eng/testing/.runsettings b/eng/testing/.runsettings index fabc0310a7a..cf00c4a4673 100644 --- a/eng/testing/.runsettings +++ b/eng/testing/.runsettings @@ -18,10 +18,6 @@ $$TESTCASEFILTER$$ $$DOTNETHOSTPATH$$ - - - $$DEVPATH$$ - diff --git a/eng/testing/RunnerTemplate.cmd b/eng/testing/RunnerTemplate.cmd index fe28e9157a6..10737eabe70 100644 --- a/eng/testing/RunnerTemplate.cmd +++ b/eng/testing/RunnerTemplate.cmd @@ -41,12 +41,6 @@ set EXECUTION_DIR=%~dp0 :argparser_end -if not defined RUNTIME_PATH ( - echo error: -r^|--runtime-path argument is required. - call :usage - exit /b -1 -) - :: Don't use a globally installed SDK. set DOTNET_MULTILEVEL_LOOKUP=0 diff --git a/eng/testing/netfx.exe.config b/eng/testing/netfx.exe.config index ed7d7d08243..e131497fc76 100644 --- a/eng/testing/netfx.exe.config +++ b/eng/testing/netfx.exe.config @@ -1,7 +1,6 @@ - \ No newline at end of file diff --git a/eng/testing/outerBuild.targets b/eng/testing/outerBuild.targets index 4623b0e54d2..c071944c21d 100644 --- a/eng/testing/outerBuild.targets +++ b/eng/testing/outerBuild.targets @@ -1,8 +1,12 @@ + Targets="Test"> + + + + \ No newline at end of file diff --git a/eng/testing/runsettings.targets b/eng/testing/runsettings.targets index 10496127b8a..5a2c9a84d68 100644 --- a/eng/testing/runsettings.targets +++ b/eng/testing/runsettings.targets @@ -36,7 +36,6 @@ .Replace('$$DISABLEPARALLELIZATION$$', '$([MSBuild]::ValueOrDefault('$(TestDisableParallelization)', 'false'))') .Replace('$$DISABLEAPPDOMAIN$$', '$([MSBuild]::ValueOrDefault('$(TestDisableAppDomain)', 'false'))') .Replace('$$TESTCASEFILTER$$', '$(_testFilter)') - .Replace('$$DEVPATH$$', '$(TestHostRootPath)') .Replace('$$DOTNETHOSTPATH$$', '$(TestHostRootPath)$([System.IO.Path]::GetFileName('$(DotNetTool)'))')) diff --git a/eng/testing/runtimeConfiguration.targets b/eng/testing/runtimeConfiguration.targets index f687adfad40..d69182992c7 100644 --- a/eng/testing/runtimeConfiguration.targets +++ b/eng/testing/runtimeConfiguration.targets @@ -1,45 +1,31 @@ - - $(MSBuildThisFileDirectory)netfx.exe.config - - true + true + true + true + $(MSBuildThisFileDirectory)netfx.exe.config + + $(TargetPath).config - - + - - - - - - - \ No newline at end of file diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 5622b19e249..dc7dd97397e 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -183,21 +183,8 @@ - - - - - - - - - - - - + DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" /> diff --git a/eng/testing/tests.props b/eng/testing/tests.props index bf2f93fcceb..65664f7f749 100644 --- a/eng/testing/tests.props +++ b/eng/testing/tests.props @@ -29,8 +29,6 @@ $(PackageRID) true - false - diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets index 757ff016360..2fe669a10ba 100644 --- a/eng/testing/tests.targets +++ b/eng/testing/tests.targets @@ -19,11 +19,6 @@ $(RunScriptHostDir)dotnet - - - - - PrepareForRun @@ -96,7 +91,10 @@ - "$(RunScriptOutputPath)" --runtime-path "$(TestHostRootPath.TrimEnd('\/'))" + "$(RunScriptOutputPath)" + + $(RunTestsCommand) --runtime-path "$(TestHostRootPath.TrimEnd('\/'))" $(RunTestsCommand) --rsp-file "$(TestRspFile)" "$(RunScriptOutputPath)" $(AssemblyName) $(TargetArchitecture) "$(RunScriptOutputPath)" $(JSEngine) $(AssemblyName).dll $(_withoutCategories.Replace(';', ' -notrait category=')) diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets index 6364d461124..5b71327e964 100644 --- a/eng/testing/xunit/xunit.console.targets +++ b/eng/testing/xunit/xunit.console.targets @@ -43,19 +43,17 @@ - - <_testRunnerConfigSourceFile Include="$(TargetDir)$(TargetName).exe.config" /> <_testRunnerConfigDestFile Include="$(TargetDir)xunit.console.exe.config" /> - - diff --git a/eng/testing/xunit/xunit.targets b/eng/testing/xunit/xunit.targets index b14d3b7cbf2..feb429aab6b 100644 --- a/eng/testing/xunit/xunit.targets +++ b/eng/testing/xunit/xunit.targets @@ -1,4 +1,11 @@ + + + + + $(OutDir) diff --git a/global.json b/global.json index 64916dd7429..1c3df45ddb5 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20364.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20372.2", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3", diff --git a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets index 18a6d21e57d..bbed0d41985 100644 --- a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets +++ b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets @@ -12,7 +12,7 @@ <_RexcepFilePath Condition=" '$(_RexcepFilePath)' == '' ">$(MSBuildThisFileDirectory)..\vm\rexcep.h <_ILLinkDescriptorsIntermediatePath>$(IntermediateOutputPath)ILLink.Descriptors.Combined.xml <_ILLinkTasksToolsDir>$(PkgMicrosoft_NET_ILLink_Tasks)/tools - <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/$(NetFrameworkCurrent)/ + <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/net472/ <_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp3.0/ <_ILLinkTasksPath>$(_ILLinkTasksDir)ILLink.Tasks.dll diff --git a/src/libraries/Common/src/System/HexConverter.cs b/src/libraries/Common/src/System/HexConverter.cs index df2e4417b40..d0cd3f074dc 100644 --- a/src/libraries/Common/src/System/HexConverter.cs +++ b/src/libraries/Common/src/System/HexConverter.cs @@ -98,7 +98,7 @@ namespace System #endif public static unsafe string ToString(ReadOnlySpan bytes, Casing casing = Casing.Upper) { -#if NET45 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472 || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 +#if NETFRAMEWORK || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0 Span result = stackalloc char[0]; if (bytes.Length > 16) { diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs index da0f988066e..c66728c0ac9 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalFactTest.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Testing { Asserter.TestRan = true; } -#elif NET472 +#elif NETFRAMEWORK [ConditionalFact] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] public void ThisTestMustRunOnCLR() diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs index a5fbb8ecc31..b55264f85da 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/ConditionalTheoryTest.cs @@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Testing { Asserter.TestRan = true; } -#elif NET472 +#elif NETFRAMEWORK [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [MemberData(nameof(GetInts))] diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj index cc22d6724e6..8b6dd469902 100644 --- a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj +++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj @@ -5,7 +5,7 @@ This assembly is referenced from rid agnostic configurations therefore we can't make it RID specific and instead use runtime checks. --> - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -63,4 +63,13 @@ + + + + + + + + + diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 834d3a24ce7..57898d4ff67 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -3,6 +3,7 @@ true + true @@ -10,14 +11,11 @@ $(RepositoryEngineeringDir)BeforeTargetFrameworkInference.targets - $(RepoRoot)artifacts\toolset\Common\ $([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24')) true $(RepositoryEngineeringDir)depProj.common.targets $(LibrariesProjectRoot)OSGroups.json - $(NetCoreAppCurrent) false - $(AdditionalBuildTargetFrameworks);$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-NetBSD;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris $(RepositoryEngineeringDir)LicenseHeader.txt @@ -40,10 +38,13 @@ the build system to use browser/ios/android as the RuntimeOS for produced package RIDs. --> $(TargetOS.ToLowerInvariant()) - - Debug - $(TargetFramework) - $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) + + Debug + $(TargetFramework) + + net45;net451;net452;net46;net461;net462;net47;net471;net472 + $(AdditionalBuildTargetFrameworks);netstandard2.0 + $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) @@ -142,11 +143,10 @@ $(RuntimeOS)-$(TargetArchitecture) - - true - true - true + true + true - true - true - false - false true - - true false @@ -238,14 +232,7 @@ true - - - $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common')) - $([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'src')) - $([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests')) - - - + false - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(BuildSettings)')) - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(BuildTargetFramework)')) - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.0')) - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.1')) - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetFrameworkCurrent)')) + $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetCoreAppCurrent)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)')) $([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'src', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj')) @@ -280,6 +264,7 @@ $(ArtifactsBinDir)pkg\aspnetcoreapp\lib $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildSettings)')) + $([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', '$(SharedFrameworkName)', '$(ProductVersion)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref')) $([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)')) @@ -292,7 +277,9 @@ $(ArtifactsObjDir)version.txt - $(AdditionalBuildTargetFrameworks);netstandard2.0 + $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common')) + $([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'src')) + $([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests')) @@ -308,23 +295,6 @@ false - - - true - true - - $([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(ProductVersion)')) - - $(NETCoreAppTestSharedFrameworkPath) - $(TestHostRootPath) - - $(TestHostRuntimePath)PlatformManifest.txt - - - - - - @@ -354,22 +324,6 @@ - - - - false - - - - - - - - false true diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 39a6e0ecaef..7fdfb48f2a9 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -1,7 +1,4 @@ - - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) - @@ -17,6 +14,22 @@ $(OutputPath)$(MSBuildProjectName).xml + true + true + + true + + true @@ -41,21 +54,18 @@ - + true true - $(IsNETCoreApp) - $(IsNetFxNETStandard) true true true - net45;net451;net46;net461;net462;net47;net471;net472;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;$(netcoreappCurrent); - + @@ -63,74 +73,52 @@ - - $(RuntimePath) - $(BuildTargetFrameworkRefPath) - $(RuntimePath) + + $(NetCoreAppCurrentRuntimePath) + $(NetCoreAppCurrentRefPath) + $(NetCoreAppCurrentRuntimePath) + - - $(NETCoreAppPackageRuntimePath) + + $(NETCoreAppPackageRuntimePath) $(NETCoreAppPackageRefPath) - $(NETCoreAppPackageRuntimePath) - $(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture) - $(RefRootPath)microsoft.netcore.app\$(Configuration) - $(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture) + $(NETCoreAppPackageRuntimePath) + $(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture) + $(RefRootPath)microsoft.netcore.app\$(Configuration) + $(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture) - ILLinkTrimAssembly=true + ILLinkTrimAssembly=true - + $(ASPNETCoreAppPackageRuntimePath) $(ASPNETCoreAppPackageRefPath) - - $(NETCoreAppTestSharedFrameworkPath) - $(NETCoreAppTestSharedFrameworkPath) - - - $(TestHostRootPath) - $(TestHostRootPath) + + $(NETCoreAppTestSharedFrameworkPath) + $(NETCoreAppTestSharedFrameworkPath) - - - $(MicrosoftNetCoreAppRefPackRefDir) - - - + $(MicrosoftNetCoreAppRuntimePackNativeDir) - $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir) - - - - - $(NetStandard20RefPath) - - - $(NetStandard21RefPath) - - - - $(RefRootPath)netcoreapp2.0/ - - - - - $(RefRootPath)%(Identity)/ - - - - $(ArtifactsBinDir)runtime/%(Identity)-$(Configuration)-$(TargetArchitecture) - $(ArtifactsBinDir)runtime/%(Identity)-$(Configuration)-$(TargetArchitecture) + $(MicrosoftNetCoreAppRefPackRefDir) + $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir) + @@ -141,9 +129,9 @@ - + @@ -193,6 +181,7 @@ '$(Configuration)' != '$(CoreCLRConfiguration)'">Configuration=$(CoreCLRConfiguration) Configuration=$(MonoConfiguration) + false @@ -200,7 +189,9 @@ - + @@ -222,6 +213,19 @@ + + + + + + + @@ -233,7 +237,6 @@ true - true @@ -253,7 +256,7 @@ - true + true diff --git a/src/libraries/Microsoft.CSharp/Directory.Build.props b/src/libraries/Microsoft.CSharp/Directory.Build.props index 9155a7a0764..5073e779def 100644 --- a/src/libraries/Microsoft.CSharp/Directory.Build.props +++ b/src/libraries/Microsoft.CSharp/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj index 0a85130f66d..5aadca703ef 100644 --- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -1,7 +1,5 @@ - Microsoft.CSharp - Microsoft.CSharp $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) enable $(NoWarn);nullable diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index 11dfc740701..b36a8845bbd 100644 --- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net48 - netstandard2.0 + netstandard2.0;net461 - + - - - - + + + + + + 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 bb102231181..3992cb1adb5 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,22 +1,16 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true - - - - - - - - - - + + + + + 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 5cff85d11fe..d72fff10e63 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -10,7 +10,11 @@ Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs" /> - + + + + + 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 b7895cdb04d..d6b7d921c7a 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,9 +1,11 @@ - netstandard2.0 + netstandard2.0;net461 - + + + 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 1bc83e66b5c..c8f49137904 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,23 +1,16 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 + true - + - - - - - - - - - + + 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 4df616e0132..4a128e5c384 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,10 +1,12 @@ - netstandard2.0 + netstandard2.0;net461 - - + + + + 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 2a1759b0d0c..0c2ba3fbdfe 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,20 +1,13 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true - - - - - - - - + + 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 2f02865ce4f..219d53b133e 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -13,7 +13,8 @@ - + + 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 152fd02a265..041fb7e77f7 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,10 +1,10 @@ - netstandard2.0 + netstandard2.0;net461 - - + + 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 980c31e3b20..5797401b7fe 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,18 +1,15 @@ - netstandard2.0;$(DefaultNetCoreTargetFramework);net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false - - - - - - + + 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 6fd320df92d..14a7ec39efd 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -15,7 +15,9 @@ - + + + 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 2cdfea08ba7..45d78b92ea2 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,10 +1,10 @@ - netstandard2.0 + netstandard2.0;net461 - - + + 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 7debc9c3c30..0c2ba3fbdfe 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,19 +1,13 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true - - - - - - - + + 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 ad7e1cb18d5..62b5a8e31de 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -15,7 +15,9 @@ - + + + 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 a40874d8ed4..510044d8e6b 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,12 +1,12 @@ - netstandard2.0 + netstandard2.0;net461 - - - - + + + + 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 9c7df603e51..4eb56f8e802 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,21 +1,16 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true - - - - - - - - - + + + + + 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 d3c63062e03..89a8fb5ee48 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -12,6 +12,7 @@ + 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 ea7d7410353..84d96fe5db4 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,12 +1,12 @@ - netstandard2.0 + netstandard2.0;net461 - - - - + + + + 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 88f10cc47d3..f30343e2fcb 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,20 +1,15 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true - - - - - - - - + + + + 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 ea3ba9cfb77..d395499e635 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -15,7 +15,8 @@ - + + 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 ee7309646a1..2ab4a8b6be9 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,14 +1,16 @@ - netstandard2.0 + netstandard2.0;net461 - - - - - - + + + + + + + + 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 d313804efd7..0f4b2c3d325 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,31 +1,24 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true true + + false - - - - - - + + + + - - - - - - - - - - + + + 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 06c4ed8eefc..a106c36d440 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -15,8 +15,9 @@ - + + 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 97089510aa4..9d75126ff17 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,10 +1,12 @@ - netstandard2.0 + netstandard2.0;net461 - - + + + + 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 5df32c91033..fe99bc62fc9 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,21 +1,17 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false - - - - - - - - - + + + + @@ -23,11 +19,4 @@ - - - - - - - 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 6f5aa314eab..5563693f653 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,13 +1,13 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 68a8306997a..07a5625a3ce 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,12 +1,14 @@ - netstandard2.0 + netstandard2.0;net461 - - - - + + + + + + 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 9260eb9ec9d..c90577e4fe8 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,31 +1,21 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false - - - - - - - - - - - - + + + + + - - - - 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 dfb45ab9f8c..7a98c89e480 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -22,13 +22,18 @@ Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\RuntimeFrameworks.cs" /> - + - + + + + + + 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 724bfef2ca5..e1533c3eadf 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj @@ -1,10 +1,10 @@ - netstandard2.0 + netstandard2.0;net461 - - + + 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 0c4d78a16ea..a017ce7e523 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj @@ -1,19 +1,13 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true - - - - - - - + + 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 c162152be6b..c2e3a8eeef9 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -11,6 +11,15 @@ + + + + + + + + + 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 ddfc57ce028..a1bf18a9e98 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -11,7 +11,9 @@ - + + + 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 942dbe0ee15..36abc792ab9 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 @@ - netstandard2.0 + netstandard2.0;net461 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 0d3119d83d6..a8e1db4822e 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,8 +1,7 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 $(DefineConstants);ActivatorUtilities_In_DependencyInjection true enable @@ -19,10 +18,4 @@ Link="Common\src\Extensions\ActivatorUtilities\ObjectFactory.cs" /> - - - - - - 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 d4098d54f3b..549b9e74322 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj @@ -1,13 +1,15 @@ - netstandard2.0;netstandard2.1 + netstandard2.0;netstandard2.1;net461 - - - - + + + + + + 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 50cdcabc140..17dc779a710 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -1,8 +1,7 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1 - true + $(NetCoreAppCurrent);net461;netstandard2.0;netstandard2.1 False @@ -14,36 +13,6 @@ $(DefineConstants);SAVE_ASSEMBLIES - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -56,4 +25,28 @@ Link="Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs" /> + + + + + + + + + + + + + + + + + + + + + + + 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 bf641d02f32..d741185f418 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,10 +1,14 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true $(NoWarn);CS8002 - false + + + + + false @@ -16,8 +20,8 @@ - - + + @@ -29,4 +33,15 @@ + + + + + + + + + + + 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 6a2b15545e1..5dcd273c8b5 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,7 +1,7 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -13,13 +13,10 @@ - - - - - + + diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceCollectionServiceExtensionsTest.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceCollectionServiceExtensionsTest.cs index 2ceeab1ac0b..cdecbb6bc70 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceCollectionServiceExtensionsTest.cs +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceCollectionServiceExtensionsTest.cs @@ -1,6 +1,5 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -extern alias DIAbstractions; using System; using Microsoft.AspNetCore.Testing; @@ -8,8 +7,6 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Specification.Fakes; using Xunit; -using AbstractionsSR = DIAbstractions::System.SR; - namespace Microsoft.Extensions.DependencyInjection { public class ServiceCollectionServiceExtensionsTest @@ -350,7 +347,7 @@ namespace Microsoft.Extensions.DependencyInjection ExceptionAssert.ThrowsArgument( () => collection.TryAddEnumerable(descriptor), "descriptor", - AbstractionsSR.Format(AbstractionsSR.TryAddIndistinguishableTypeToEnumerable, implementationType, serviceType)); + string.Format(@"Implementation type cannot be '{0}' because it is indistinguishable from other services registered for '{1}'.", implementationType, serviceType)); } [Fact] 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 4133d3704ec..86069259a9b 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj @@ -1,12 +1,8 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) + netstandard2.0;net461 - - - - 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 b6794fc1c8e..39dbc199219 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj @@ -1,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true @@ -19,16 +18,15 @@ - - - + - - - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextLoaderTests.cs b/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextLoaderTests.cs index fe4dc14c93d..8e8070e8a51 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextLoaderTests.cs +++ b/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextLoaderTests.cs @@ -81,7 +81,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests var loader = new DependencyContextLoader(); var context = loader.Load(typeof(DependencyContextLoaderTests).Assembly); - context.RuntimeLibraries.Should().Contain(l => l.Name == "Microsoft.Extensions.DependencyModel"); + context.RuntimeLibraries.Should().Contain(l => l.Name == "nonentrypointassembly"); } [Fact] 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 fa4e2326a57..d9f4d1ebc92 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,21 +1,23 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true + $(DefaultItemExcludes);nonentrypointassembly\* true - - - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/nonentrypointassembly/NonEntryPointClass.cs b/src/libraries/Microsoft.Extensions.DependencyModel/tests/nonentrypointassembly/NonEntryPointClass.cs new file mode 100644 index 00000000000..283734eebf5 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.DependencyModel/tests/nonentrypointassembly/NonEntryPointClass.cs @@ -0,0 +1,12 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; + +namespace nonentrypointassembly +{ + public class NonEntryPointClass + { + } +} diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/nonentrypointassembly/nonentrypointassembly.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/tests/nonentrypointassembly/nonentrypointassembly.csproj new file mode 100644 index 00000000000..0f39283f6e1 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.DependencyModel/tests/nonentrypointassembly/nonentrypointassembly.csproj @@ -0,0 +1,8 @@ + + + + netstandard2.0 + true + + + 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 778d01d8f90..32239798f1f 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,11 +1,11 @@ - netstandard2.0 + netstandard2.0;net461 - + 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 8c16ef3ce82..b55c758da87 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,8 +2,7 @@ Microsoft.Extensions.FileProviders - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true @@ -13,13 +12,8 @@ - - - - - - - + + 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 9c945ef56a7..bb27ead3394 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,13 +1,13 @@ Microsoft.Extensions.FileProviders - netstandard2.0 + netstandard2.0;net461 - - + + 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 898fe2fbd58..80db265cd68 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,19 +2,13 @@ Microsoft.Extensions.FileProviders - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true - - - - - - - + + 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 05183b81816..a9e97be7d36 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,12 +2,15 @@ Microsoft.Extensions.FileProviders.Composite - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 c6b18a0ac30..cb4948ba130 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,13 +1,13 @@ - netstandard2.0 + netstandard2.0;net461 - - - + + + 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 ba390655fe1..376c72160f6 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,17 +2,11 @@ Microsoft.Extensions.FileProviders - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true true - - - $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) - - @@ -21,17 +15,14 @@ - - - + + + - - - - - - + + + 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 11edb64eab6..b59f5900e88 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -15,7 +15,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 3b99a60054e..b939996a35b 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 @@ - netstandard2.0 + netstandard2.0;net461 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 ab4b23464b4..cf923440da6 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -1,8 +1,7 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true @@ -11,10 +10,4 @@ Link="Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs" /> - - - - - - 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 80a382c4ba1..d871ed685ea 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,8 +1,12 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true + + + + diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/BuildWebHostInvalidSignature/BuildWebHostInvalidSignature.csproj index fcc7214c0b5..716b25a8728 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 fcc7214c0b5..716b25a8728 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 fcc7214c0b5..716b25a8728 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 fcc7214c0b5..716b25a8728 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 fcc7214c0b5..716b25a8728 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 fcc7214c0b5..716b25a8728 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 ce58ed38bbc..686592b4760 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/MockHostTypes/MockHostTypes.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/tests/MockHostTypes/MockHostTypes.csproj index 80a382c4ba1..88e03293e6c 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true 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 cd10bfb2b38..6b237427cde 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,16 +1,19 @@ - netstandard2.0;netstandard2.1 + netstandard2.0;netstandard2.1;net461 $(NoWarn);CS0618 - - - - - - - + + + + + + + + + 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 3de7d53d9c9..1cd83144a38 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,28 +1,24 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 Microsoft.Extensions.Hosting true + + false - - - - - - + + + + - - - - - - - + + + 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 8f69092efa8..63f62d833de 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -1,18 +1,20 @@ - netstandard2.0 + netstandard2.0;net461 $(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 d384aae9cc3..24879b235bb 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -1,58 +1,43 @@ - $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461 true - - - - $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) + + false - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + - - 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 fe116dda28f..2d67db82d52 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -24,4 +24,8 @@ + + + + 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 28b6ff9259f..399232d63b7 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,7 +1,14 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true Exe + + + + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs index 07e9c021a57..5c1a3b67d12 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs @@ -143,7 +143,7 @@ namespace Microsoft.Extensions.Hosting Assert.Equal(Environments.Production, env.EnvironmentName); #if NETCOREAPP Assert.NotNull(env.ApplicationName); -#elif NET472 +#elif NETFRAMEWORK // Note GetEntryAssembly returns null for the net4x console test runner. Assert.Null(env.ApplicationName); #else @@ -159,7 +159,7 @@ namespace Microsoft.Extensions.Hosting Assert.Equal(Environments.Production, env.EnvironmentName); #if NETCOREAPP Assert.NotNull(env.ApplicationName); -#elif NET472 +#elif NETFRAMEWORK // Note GetEntryAssembly returns null for the net4x console test runner. Assert.Null(env.ApplicationName); #else 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 af2ed3b68a5..b5365cdda84 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,7 +1,7 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net461 true @@ -12,6 +12,8 @@ + + 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 c798ddd1c30..d0551567b5e 100644 --- a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj @@ -1,12 +1,17 @@ - netstandard2.0 + netstandard2.0;net461 - + - - - - + + + + + + + + + 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 47eeebc131c..e27e847e380 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -1,14 +1,9 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true - - - $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) - - - - - + + + + - - - diff --git a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj index 81926a709d7..3c192f903d0 100644 --- a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -24,7 +24,12 @@ - + + + + + + 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 805321e4b70..905c8b20bbe 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 @@ - netstandard2.0 + netstandard2.0;net461 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 1462166794f..26c5d1f3329 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,8 +1,7 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 true @@ -15,9 +14,4 @@ Link="Common\src\Extensions\Logging\NullScope.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 d5e676b199f..880386c2298 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,12 +1,14 @@ - netstandard2.0 + netstandard2.0;net461 - - - - + + + + + + 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 31d6673acd7..b666c263a40 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,9 +1,10 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false @@ -11,24 +12,15 @@ Link="Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs" /> - - - - - - - - - - - - - - - - - + + + + + + + + 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 0756d569fde..f56ed2cc9d0 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,13 +1,16 @@ - netstandard2.0 + netstandard2.0;net461 - - - - + + + + + + + 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 3afd1b9ed23..84bcd7c4358 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,24 +1,13 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true annotations $(DefineConstants);NO_SUPPRESS_GC_TRANSITION + + false - - - $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) - - - - - - - - - - - + + - - - - - - - - - - - - - + + + + + + - - - - - - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests.csproj index 2524f77b4b4..6d1c916ab02 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests.csproj @@ -1,13 +1,13 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true true - + \ No newline at end of file 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 3857ebe8a7b..046103224ca 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,10 +1,12 @@ - netstandard2.0 + netstandard2.0;net461 - - + + + + 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 d1d2c4274e5..a6a8adb91ca 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,14 +1,12 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false - - - - @@ -17,14 +15,9 @@ - - - - - - - - + + + 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 21d4d4cb730..41ab6a29cfa 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,11 +1,13 @@ - netstandard2.0 + netstandard2.0;net461 - - - + + + + + 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 fca2aa1bcf1..893cded069d 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,26 +1,12 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1 - true + $(NetCoreAppCurrent);net461;netstandard2.0;netstandard2.1 true + + false - - - - - - - - - - - - - - - @@ -29,10 +15,14 @@ - - - - + + + + + + + + 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 ecf0ef7df93..fe5b5ee697d 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,10 +1,12 @@ - netstandard2.0 + netstandard2.0;net461 - - + + + + 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 d55f53f867f..0c532335ff2 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,10 +1,11 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true true + + false @@ -12,32 +13,21 @@ Link="Common\src\Extensions\Logging\NullExternalScopeProvider.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 4fa230c5669..ba8087956f5 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,12 +1,14 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 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 eaa0a981e27..35d85582fed 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,10 +1,12 @@ - netstandard2.0 + netstandard2.0;net461 - - + + + + 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 ca883dd4c7d..30ddca780a4 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,27 +1,16 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false - - - - - - - - - - - - - - - + + + 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 c79d0fdc612..745210c3658 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj @@ -1,11 +1,13 @@ - netstandard2.0 + netstandard2.0;net461 - - - + + + + + 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 5d4787254c6..50302ec2914 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -1,9 +1,10 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false @@ -15,34 +16,21 @@ Link="Common\src\Extensions\Logging\NullScope.cs" /> - - - - - - - - - - - - + + + + + - - + + - - - - - - - - - + + 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 cec257df2ec..83ceb2b2473 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net461 true @@ -18,10 +18,21 @@ Link="tests\DI.Common\Common\src\TestLogger.cs" /> + + + - - - + + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/TraceSourceLoggerProviderTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/Common/TraceSourceLoggerProviderTest.cs index b67ef0e7934..80d9e7ab190 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/TraceSourceLoggerProviderTest.cs +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/TraceSourceLoggerProviderTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if NET472 +#if NETFRAMEWORK using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/TraceSourceScopeTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/Common/TraceSourceScopeTest.cs index 6f9255dce6e..25bd315a867 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/TraceSourceScopeTest.cs +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/TraceSourceScopeTest.cs @@ -8,7 +8,7 @@ namespace Microsoft.Extensions.Logging.Test { public class TraceSourceScopeTest { -#if NET472 +#if NETFRAMEWORK [Fact] public static void DiagnosticsScope_PushesAndPops_LogicalOperationStack() { 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 420524704ec..908e9d0062d 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -18,4 +18,9 @@ + + + + + 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 be66538ec51..b28dde039c4 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,13 +1,15 @@ - netstandard2.0 + netstandard2.0;net461 - - - - - + + + + + + + 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 3d9e3c322e9..1f971266134 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,26 +1,18 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false - - - - - - - - - - - - - - + + + + + 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 b8dd59bff6f..c7fe04287c3 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,10 +1,12 @@ - netstandard2.0;netstandard2.1 + netstandard2.0;netstandard2.1;net461 - - + + + + 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 9adaadcc69d..1936fb85d67 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,28 +1,22 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false - - + + - - - - - - - - + + - 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 a119724225a..a71d9b27e59 100644 --- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj @@ -1,13 +1,15 @@ - netstandard2.0;netstandard2.1 + netstandard2.0;netstandard2.1;net461 - - - - - + + + + + + + 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 eda46678ac4..d9840099d4e 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -1,32 +1,23 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true + + false - - + + - - - - - - - - - - - + + - - + diff --git a/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests.csproj b/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests.csproj index 80a382c4ba1..3dfad737c84 100644 --- a/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options/tests/Microsoft.Extensions.Options.Tests.csproj @@ -1,8 +1,18 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true + + + + + + + + + + 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 a96a2cac069..aee88d8e234 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj @@ -1,11 +1,12 @@ - netstandard2.0;netstandard2.1 + netstandard2.0;netstandard2.1;net461 - - - + + + 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 bd8c31c27a1..0472414867b 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -1,10 +1,12 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 true true + + false + @@ -20,23 +22,11 @@ - - - - - - - - - - - - - - - - - - + + + + + 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 d468ddb1002..5bdba47205f 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,12 +1,13 @@ - $(NetCoreAppCurrent);net472 + $(NetCoreAppCurrent);net461 true + diff --git a/src/libraries/Microsoft.IO.Redist/Directory.Build.props b/src/libraries/Microsoft.IO.Redist/Directory.Build.props index 7dcfd0eaa20..ba1f965d83c 100644 --- a/src/libraries/Microsoft.IO.Redist/Directory.Build.props +++ b/src/libraries/Microsoft.IO.Redist/Directory.Build.props @@ -2,6 +2,5 @@ Open - false diff --git a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj index 41b1e51a0b5..b9a0737a28d 100644 --- a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj +++ b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj @@ -1,7 +1,6 @@ - Microsoft.IO.Redist - $(NetFrameworkCurrent) + net472 $(DefineConstants);MS_IO_REDIST true false @@ -196,12 +195,8 @@ - - - - - - + + diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props index 49b11607763..df1a1954877 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props +++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props @@ -5,6 +5,5 @@ $(MajorVersion).$(MinorVersion).$(PatchVersion) 10.0.6.0 Microsoft - true \ No newline at end of file diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj index 3fe68cb9c08..9d76a13c5fc 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj +++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj @@ -95,8 +95,8 @@ + - diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj index f7ed31e0b03..74c7f14cfee 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft.VisualBasic.Core.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -50,4 +50,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props b/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file 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 ab5061eb5c8..ac6eb1b1d33 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,16 +1,12 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 enable - - - 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 9ceaab88111..f93606b6a96 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 @@ -1,8 +1,7 @@ true - netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT - true + netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT enable @@ -10,17 +9,11 @@ SR.PlatformNotSupported_RegistryAccessControl true - - - - - - - - - - + + + + \ No newline at end of file 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 ee2fa0f75fa..c7ded4394f3 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,8 +1,14 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + + + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props index 27a4a5522a2..33e65b7cb46 100644 --- a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props +++ b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props @@ -2,8 +2,6 @@ Microsoft - true - false true \ No newline at end of file diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index b8b7036446b..cdf33b7f09e 100644 --- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkCurrent);net461 + netstandard2.0;net461 enable @@ -10,9 +10,6 @@ - - - diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj index 3030b9a60d1..76c93e82be7 100644 --- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj +++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj @@ -2,9 +2,8 @@ true $(DefineConstants);REGISTRY_ASSEMBLY - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);$(NetFrameworkCurrent)-Windows_NT;netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT true - true $(NoWarn);CA2249 enable @@ -74,10 +73,11 @@ - - + + + - + @@ -87,7 +87,11 @@ - - + + + + + + diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj index 1323c126075..36f086dad55 100644 --- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj +++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj @@ -1,7 +1,7 @@ $(DefineConstants);REGISTRY_ASSEMBLY - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + + + \ No newline at end of file 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 00a2bef840b..e0413852fed 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkCurrent);net461 + netstandard2.0;net461 enable @@ -10,8 +10,4 @@ - - - - \ No newline at end of file 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 ba2d1c66aa2..4cdba1a506e 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -2,9 +2,8 @@ true enable - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp3.0-Windows_NT;net461;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp3.0-Windows_NT;net461 true - true @@ -118,14 +117,13 @@ - - - - - + + @@ -135,7 +133,4 @@ - - - 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 3faa8abcdbe..dd477165222 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_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + + + diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj index 7109d5ba318..13024a3e7a7 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj @@ -29,11 +29,7 @@ - - - true - + - - + $(ArtifactsObjDir)_version.h @@ -11,9 +6,14 @@ <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS) - + + + + - + BeforeTargets="Build" + Condition="'$(TargetOS)' == 'Windows_NT' and + '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'"> - - - + + - - diff --git a/src/libraries/Native/native-binplace.proj b/src/libraries/Native/native-binplace.proj index f8a558defe3..4c49de39a4b 100644 --- a/src/libraries/Native/native-binplace.proj +++ b/src/libraries/Native/native-binplace.proj @@ -2,10 +2,11 @@ - $(NetCoreAppCurrent);netstandard2.0;$(NetFrameworkCurrent) + $(NetCoreAppCurrent) $(BuildTargetFramework) false true + true @@ -22,10 +23,6 @@ - - - - diff --git a/src/libraries/NetCoreAppLibrary.props b/src/libraries/NetCoreAppLibrary.props new file mode 100644 index 00000000000..710e7b172db --- /dev/null +++ b/src/libraries/NetCoreAppLibrary.props @@ -0,0 +1,161 @@ + + + + + Microsoft.CSharp; + Microsoft.VisualBasic.Core; + Microsoft.Win32.Primitives; + Microsoft.Win32.Registry; + System.AppContext; + System.Buffers; + System.Collections; + System.Collections.Concurrent; + System.Collections.Immutable; + System.Collections.NonGeneric; + System.Collections.Specialized; + System.ComponentModel; + System.ComponentModel.Annotations; + System.ComponentModel.EventBasedAsync; + System.ComponentModel.Primitives; + System.ComponentModel.TypeConverter; + System.Console; + System.Data.Common; + System.Data.DataSetExtensions; + System.Diagnostics.Contracts; + System.Diagnostics.Debug; + System.Diagnostics.DiagnosticSource; + System.Diagnostics.FileVersionInfo; + System.Diagnostics.Process; + System.Diagnostics.StackTrace; + System.Diagnostics.TextWriterTraceListener; + System.Diagnostics.Tools; + System.Diagnostics.TraceSource; + System.Diagnostics.Tracing; + System.Drawing.Primitives; + System.Dynamic.Runtime; + System.Formats.Asn1; + System.Globalization; + System.Globalization.Calendars; + System.Globalization.Extensions; + System.IO; + System.IO.Compression; + System.IO.Compression.Brotli; + System.IO.Compression.ZipFile; + System.IO.FileSystem; + System.IO.FileSystem.AccessControl; + System.IO.FileSystem.DriveInfo; + System.IO.FileSystem.Primitives; + System.IO.FileSystem.Watcher; + System.IO.IsolatedStorage; + System.IO.MemoryMappedFiles; + System.IO.Pipes; + System.IO.Pipes.AccessControl; + System.IO.UnmanagedMemoryStream; + System.Linq; + System.Linq.Expressions; + System.Linq.Parallel; + System.Linq.Queryable; + System.Memory; + System.Net.Http; + System.Net.Http.Json; + System.Net.HttpListener; + System.Net.Mail; + System.Net.NameResolution; + System.Net.NetworkInformation; + System.Net.Ping; + System.Net.Primitives; + System.Net.Requests; + System.Net.Security; + System.Net.ServicePoint; + System.Net.Sockets; + System.Net.WebClient; + System.Net.WebHeaderCollection; + System.Net.WebProxy; + System.Net.WebSockets; + System.Net.WebSockets.Client; + System.Numerics.Vectors; + System.ObjectModel; + System.Private.DataContractSerialization; + System.Private.Uri; + System.Private.Xml; + System.Private.Xml.Linq; + System.Reflection; + System.Reflection.DispatchProxy; + System.Reflection.Emit; + System.Reflection.Emit.ILGeneration; + System.Reflection.Emit.Lightweight; + System.Reflection.Extensions; + System.Reflection.Metadata; + System.Reflection.Primitives; + System.Reflection.TypeExtensions; + System.Resources.Reader; + System.Resources.ResourceManager; + System.Resources.Writer; + System.Runtime; + System.Runtime.CompilerServices.Unsafe; + System.Runtime.CompilerServices.VisualC; + System.Runtime.Extensions; + System.Runtime.Handles; + System.Runtime.InteropServices; + System.Runtime.InteropServices.JavaScript; + System.Runtime.InteropServices.RuntimeInformation; + System.Runtime.Intrinsics; + System.Runtime.Loader; + System.Runtime.Numerics; + System.Runtime.Serialization.Formatters; + System.Runtime.Serialization.Json; + System.Runtime.Serialization.Primitives; + System.Runtime.Serialization.Xml; + System.Security.AccessControl; + System.Security.Claims; + System.Security.Cryptography.Algorithms; + System.Security.Cryptography.Cng; + System.Security.Cryptography.Csp; + System.Security.Cryptography.Encoding; + System.Security.Cryptography.OpenSsl; + System.Security.Cryptography.Primitives; + System.Security.Cryptography.X509Certificates; + System.Security.Principal; + System.Security.Principal.Windows; + System.Security.SecureString; + System.Text.Encoding; + System.Text.Encoding.CodePages; + System.Text.Encoding.Extensions; + System.Text.Encodings.Web; + System.Text.Json; + System.Text.RegularExpressions; + System.Threading; + System.Threading.Channels; + System.Threading.Overlapped; + System.Threading.Tasks; + System.Threading.Tasks.Dataflow; + System.Threading.Tasks.Extensions; + System.Threading.Tasks.Parallel; + System.Threading.Thread; + System.Threading.ThreadPool; + System.Threading.Timer; + System.Transactions.Local; + System.ValueTuple; + System.Web.HttpUtility; + System.Xml.ReaderWriter; + System.Xml.XDocument; + System.Xml.XmlDocument; + System.Xml.XmlSerializer; + System.Xml.XPath; + System.Xml.XPath.XDocument; + + + Microsoft.Win32.Registry; + System.IO.FileSystem.AccessControl; + System.IO.Pipes.AccessControl; + System.Security.AccessControl; + System.Security.Cryptography.Cng; + System.Security.Cryptography.OpenSsl; + System.Security.Principal.Windows; + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.AppContext/Directory.Build.props b/src/libraries/System.AppContext/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.AppContext/Directory.Build.props +++ b/src/libraries/System.AppContext/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.AppContext/src/System.AppContext.csproj b/src/libraries/System.AppContext/src/System.AppContext.csproj index 0b924ac9f8c..4f2d15aa3b6 100644 --- a/src/libraries/System.AppContext/src/System.AppContext.csproj +++ b/src/libraries/System.AppContext/src/System.AppContext.csproj @@ -1,6 +1,5 @@ - System.AppContext true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Buffers/Directory.Build.props b/src/libraries/System.Buffers/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Buffers/Directory.Build.props +++ b/src/libraries/System.Buffers/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj index 189b1e64476..fdc597d599c 100644 --- a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj @@ -1,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -10,10 +9,6 @@ - - - - diff --git a/src/libraries/System.CodeDom/src/System.CodeDom.csproj b/src/libraries/System.CodeDom/src/System.CodeDom.csproj index 7217ca52bc6..e3622bd5d65 100644 --- a/src/libraries/System.CodeDom/src/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/src/System.CodeDom.csproj @@ -2,8 +2,7 @@ true $(DefineConstants);CODEDOM - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -129,8 +128,4 @@ - - - - \ No newline at end of file diff --git a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj index 9e92688da3e..f90d915dffa 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -110,4 +110,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Collections.Concurrent/Directory.Build.props b/src/libraries/System.Collections.Concurrent/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Collections.Concurrent/Directory.Build.props +++ b/src/libraries/System.Collections.Concurrent/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj index 93f3a50fc27..0584d13dbe8 100644 --- a/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj +++ b/src/libraries/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj @@ -1,7 +1,5 @@ - System.Collections.Concurrent - System.Collections.Concurrent true enable $(NetCoreAppCurrent) @@ -23,8 +21,8 @@ - - - + + + diff --git a/src/libraries/System.Collections.Immutable/Directory.Build.props b/src/libraries/System.Collections.Immutable/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Collections.Immutable/Directory.Build.props +++ b/src/libraries/System.Collections.Immutable/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs index 403bbf8aff6..bd650bdc323 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.cs @@ -413,7 +413,7 @@ namespace System.Collections.Immutable public static System.Collections.Immutable.ImmutableHashSet ToImmutableHashSet(this System.Collections.Immutable.ImmutableHashSet.Builder builder) { throw null; } } - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK public sealed partial class ImmutableHashSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.ISet, System.Collections.Generic.IReadOnlySet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet #else public sealed partial class ImmutableHashSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.ISet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet @@ -916,7 +916,7 @@ namespace System.Collections.Immutable public static System.Collections.Immutable.ImmutableSortedSet ToImmutableSortedSet(this System.Collections.Immutable.ImmutableSortedSet.Builder builder) { throw null; } } - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK public sealed partial class ImmutableSortedSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.Generic.ISet, System.Collections.Generic.IReadOnlySet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet #else public sealed partial class ImmutableSortedSet : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.Generic.ISet, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet 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 48e1f0bde56..57d3d7cec3d 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);netstandard1.0;netstandard1.3;netstandard2.0 + $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461 true enable @@ -12,16 +12,17 @@ - - - + + + - - - + - - + + + \ No newline at end of file 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 f2fc64f714f..f950c965cac 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -1,8 +1,7 @@ - $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461 true - true enable @@ -88,13 +87,13 @@ + - - + @@ -104,22 +103,14 @@ + - - - - - - - - - - - - - - - + + + + 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 f5130bcc181..f71e364a81e 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,10 +1,10 @@ 0436 - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 - @@ -77,8 +77,7 @@ - - + @@ -96,4 +95,7 @@ + + + diff --git a/src/libraries/System.Collections.NonGeneric/Directory.Build.props b/src/libraries/System.Collections.NonGeneric/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Collections.NonGeneric/Directory.Build.props +++ b/src/libraries/System.Collections.NonGeneric/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj index 9ec5c3a1eb9..5009669653d 100644 --- a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj +++ b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj @@ -1,7 +1,5 @@ - System.Collections.NonGeneric - System.Collections.NonGeneric true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Collections.Specialized/Directory.Build.props b/src/libraries/System.Collections.Specialized/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Collections.Specialized/Directory.Build.props +++ b/src/libraries/System.Collections.Specialized/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj index 6139444928b..1eff0c5b1da 100644 --- a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj +++ b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj @@ -1,7 +1,5 @@ - System.Collections.Specialized - System.Collections.Specialized $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Collections/Directory.Build.props b/src/libraries/System.Collections/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Collections/Directory.Build.props +++ b/src/libraries/System.Collections/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Collections/src/System.Collections.csproj b/src/libraries/System.Collections/src/System.Collections.csproj index 7ac500622b2..9f8e4b8bb62 100644 --- a/src/libraries/System.Collections/src/System.Collections.csproj +++ b/src/libraries/System.Collections/src/System.Collections.csproj @@ -1,6 +1,5 @@ - System.Collections true true $(NetCoreAppCurrent) diff --git a/src/libraries/System.ComponentModel.Annotations/Directory.Build.props b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.ComponentModel.Annotations/Directory.Build.props +++ b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj index 17571c6c869..5c9152f2cd2 100644 --- a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj +++ b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net48 @@ -42,4 +42,7 @@ + + + \ 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 bca38d6e8f4..68bae6aecf0 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,5 @@ - System.ComponentModel.Composition.Registration netstandard2.1 @@ -25,7 +24,7 @@ Link="Common\System\Composition\Diagnostics\TraceWriter.cs" /> - - + + diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj index 8c0707afe31..56a67708874 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj @@ -19,4 +19,7 @@ + + + \ No newline at end of file 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 cbf8732c35c..543c5c85ca1 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 @@ - netstandard2.0;_net461 + netstandard2.0 enable 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 826fc8dd9fa..519abadf0b6 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj @@ -1,8 +1,6 @@ - - - $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0;_$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0 true enable @@ -214,4 +212,4 @@ - + \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj index 6d6060c2a28..6bf5cb7f9f9 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj +++ b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj @@ -5,4 +5,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj index fc7811e645e..08e2e4cbaea 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj +++ b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj @@ -4,11 +4,6 @@ true $(NetCoreAppCurrent) - - - - - @@ -171,10 +166,11 @@ - - false - content - PreserveNewest - + + + \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props b/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props +++ b/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj b/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj index a3308013707..ad8ffe0f006 100644 --- a/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj +++ b/src/libraries/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj @@ -1,7 +1,5 @@ - System.ComponentModel.EventBasedAsync - System.ComponentModel.EventBasedAsync $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.ComponentModel.Primitives/Directory.Build.props b/src/libraries/System.ComponentModel.Primitives/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.ComponentModel.Primitives/Directory.Build.props +++ b/src/libraries/System.ComponentModel.Primitives/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj index 53e44fa05ea..aa386aae2df 100644 --- a/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj +++ b/src/libraries/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj @@ -1,7 +1,5 @@ - System.ComponentModel.Primitives - System.ComponentModel.Primitives $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props b/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props +++ b/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index f4869cbbb26..dfdb2e98936 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -1,7 +1,5 @@ - System.ComponentModel.TypeConverter - System.ComponentModel.TypeConverter true true $(NetCoreAppCurrent) diff --git a/src/libraries/System.ComponentModel/Directory.Build.props b/src/libraries/System.ComponentModel/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.ComponentModel/Directory.Build.props +++ b/src/libraries/System.ComponentModel/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj b/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj index fcaa643da27..5b0195df044 100644 --- a/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj +++ b/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj @@ -1,7 +1,5 @@ - System.ComponentModel - System.ComponentModel true $(NetCoreAppCurrent) enable 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 a39f3494bb0..999ec09ad8f 100644 --- a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj +++ b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj @@ -1,8 +1,6 @@ - System.Composition.AttributedModel - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -19,7 +17,4 @@ - - - \ No newline at end of file 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 45d5ed3df29..b10127ed9da 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -15,4 +15,10 @@ + + + + + + \ No newline at end of file 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 eed8dbc7d09..f954e1930f7 100644 --- a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj +++ b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj @@ -1,11 +1,6 @@ - System.Composition.Convention - - - - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -26,10 +21,6 @@ Link="Common\System\Composition\Diagnostics\TraceWriter.cs" /> - - - - - + \ No newline at end of file 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 376dc6bc76e..9474efba0b9 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,7 +1,6 @@ - System.Composition.Convention.Tests - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -16,4 +15,8 @@ + + + + \ No newline at end of file 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 23a9f0f4876..09ae2efdf03 100644 --- a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj +++ b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj @@ -1,11 +1,6 @@ - System.Composition.Hosting - - - - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -36,12 +31,9 @@ - + - - - \ 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 3d7e2480f35..931a211e151 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -12,4 +12,10 @@ + + + + + + \ 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 25aab756fed..cdd6654321f 100644 --- a/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj +++ b/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj @@ -1,9 +1,7 @@ System.Composition - System.Composition.Runtime - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -14,9 +12,4 @@ - - - - - \ No newline at end of file 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 8270d643810..83e64920c6c 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -10,4 +10,10 @@ + + + + + + \ 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 2d6a799248f..7294633de7e 100644 --- a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -1,9 +1,7 @@ System.Composition - System.Composition.TypedParts - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -31,12 +29,8 @@ Link="Common\System\Numerics\Hashing\HashHelpers.cs" /> - - - - - - - + + + \ No newline at end of file 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 b2a05265bb1..5701c13ee3f 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -8,4 +8,12 @@ Link="Common\System\Diagnostics\DebuggerAttributes.cs" /> + + + + + + + + \ No newline at end of file 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 83405db2622..13c75ae1df6 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,7 +1,6 @@ - Microsoft.Composition.Demos.ExtendedCollectionImports - netstandard2.0;$(NetFrameworkCurrent) + netstandard2.0;net461 @@ -10,4 +9,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Composition/tests/System.Composition.Tests.csproj b/src/libraries/System.Composition/tests/System.Composition.Tests.csproj index 412844950a7..2eace5fc8d2 100644 --- a/src/libraries/System.Composition/tests/System.Composition.Tests.csproj +++ b/src/libraries/System.Composition/tests/System.Composition.Tests.csproj @@ -1,8 +1,7 @@ System.Composition.Lightweight.UnitTests - System.Composition.Tests - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -36,7 +35,11 @@ + + + + \ 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 dd2b8953577..bc524e4f37f 100644 --- a/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj +++ b/src/libraries/System.Composition/tests/TestLibrary/TestLibrary.csproj @@ -1,8 +1,11 @@ - netstandard2.0;$(NetFrameworkCurrent) + netstandard2.0;net461 + + + \ No newline at end of file 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 d4a6743c141..4adc0b2edb5 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj @@ -1,8 +1,7 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) + netstandard2.0;net461 $(NoWarn);CS0618 - true @@ -15,11 +14,6 @@ - - - - - \ 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 2d71eb3b7e3..574ed1ed373 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj @@ -1,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -251,15 +250,10 @@ Link="Common\System\IO\TempFileCollection.cs" /> - - + + - - - - - 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 e4572e3663f..555d37eb2cb 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 @@ -4,7 +4,7 @@ true true true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;net461 + + + + + + diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs b/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs index 52da2e86daa..d9420fb1c03 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TypeUtilTests.cs @@ -46,15 +46,12 @@ namespace System.ConfigurationTests [Theory, // ConfigurationManager types roll forward + // ConfigurationManager isn't part of the shared framework and potentially app-local. + // https://github.com/dotnet/runtime/issues/12376#issuecomment-479670104 explains why testing the type roll forward behavior doesn't work in such cases. InlineData( "System.Configuration.UserSettingsGroup, System.Configuration.ConfigurationManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51", - typeof(UserSettingsGroup)), - // Mono doesn't care about the versioning here and will resolve the type back - InlineData( - "System.Configuration.UserSettingsGroup, System.Configuration.ConfigurationManager, Version=255.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51", - null) + typeof(UserSettingsGroup)) ] - [ActiveIssue("https://github.com/dotnet/runtime/issues/38351", TestRuntimes.Mono)] public void GetType_ConfigurationManagerTypes(string typeString, Type expectedType) { Assert.Equal(expectedType, TypeUtil.GetType(typeString, throwOnError: false)); diff --git a/src/libraries/System.Console/Directory.Build.props b/src/libraries/System.Console/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.Console/Directory.Build.props +++ b/src/libraries/System.Console/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file diff --git a/src/libraries/System.Data.Common/Directory.Build.props b/src/libraries/System.Data.Common/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Data.Common/Directory.Build.props +++ b/src/libraries/System.Data.Common/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Data.Common/src/System.Data.Common.csproj b/src/libraries/System.Data.Common/src/System.Data.Common.csproj index a872f6cefe4..5e445cebc31 100644 --- a/src/libraries/System.Data.Common/src/System.Data.Common.csproj +++ b/src/libraries/System.Data.Common/src/System.Data.Common.csproj @@ -1,6 +1,5 @@ - System.Data.Common true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj index 75ae4978aa7..3eff311a0a4 100644 --- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj +++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj @@ -119,6 +119,7 @@ + diff --git a/src/libraries/System.Data.DataSetExtensions/Directory.Build.props b/src/libraries/System.Data.DataSetExtensions/Directory.Build.props index 46a67e8e603..bfb6ea88243 100644 --- a/src/libraries/System.Data.DataSetExtensions/Directory.Build.props +++ b/src/libraries/System.Data.DataSetExtensions/Directory.Build.props @@ -4,6 +4,5 @@ 4.0.0.0 ECMA - true diff --git a/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj b/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj index 03a9ccaaf1a..e777c148ed6 100644 --- a/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj +++ b/src/libraries/System.Data.DataSetExtensions/src/System.Data.DataSetExtensions.csproj @@ -1,6 +1,5 @@ - System.Data.DataSetExtensions $(NetCoreAppCurrent) 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 1aa56e780ad..dec34df2a0f 100644 --- a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkCurrent);net461 + netstandard2.0;net461 @@ -9,9 +9,4 @@ - - - - - \ No newline at end of file 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 0592f1dd00b..8efc6e4c355 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -1,9 +1,8 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp2.0-FreeBSD;netcoreapp2.0-Linux;netcoreapp2.0-OSX;netcoreapp2.0-Windows_NT;netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp2.0-FreeBSD;netcoreapp2.0-Linux;netcoreapp2.0-OSX;netcoreapp2.0-Windows_NT;netstandard2.0;net461-Windows_NT true - true $(NoWarn);CA2249 @@ -126,12 +125,16 @@ - - - + + + System.Data.Odbc.OdbcMetaData.xml + - - + + + + @@ -148,10 +151,9 @@ + - - @@ -160,18 +162,13 @@ - - - - + - - - System.Data.Odbc.OdbcMetaData.xml - + + - - + + diff --git a/src/libraries/System.Data.Odbc/tests/OdbcParameterTests.cs b/src/libraries/System.Data.Odbc/tests/OdbcParameterTests.cs index 0264246c1a8..369bd2a07b6 100644 --- a/src/libraries/System.Data.Odbc/tests/OdbcParameterTests.cs +++ b/src/libraries/System.Data.Odbc/tests/OdbcParameterTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Data.SqlClient; using System.Text; using Xunit; 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 95c97d667a0..208f6a4ab83 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_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net461-Windows_NT @@ -39,4 +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 445fc32cff3..44d08a1f18d 100644 --- a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj @@ -1,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 $(NoWarn);0618 @@ -13,9 +12,6 @@ - - - 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 1ab198757c5..815959031db 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -1,8 +1,7 @@ true - netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT - true + netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT true @@ -96,15 +95,11 @@ System.Data.OleDb.OleDbMetaData.xml - - - - - - - - - - + + + + + + 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 268d99b2c71..d4874a8727f 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_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT @@ -12,4 +12,11 @@ + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Contracts/Directory.Build.props b/src/libraries/System.Diagnostics.Contracts/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Diagnostics.Contracts/Directory.Build.props +++ b/src/libraries/System.Diagnostics.Contracts/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj b/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj index 2e459ec3a06..dd3dc2940a5 100644 --- a/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj +++ b/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj @@ -1,6 +1,5 @@ - System.Diagnostics.Contracts true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Debug/Directory.Build.props b/src/libraries/System.Diagnostics.Debug/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Diagnostics.Debug/Directory.Build.props +++ b/src/libraries/System.Diagnostics.Debug/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj index b7a84d2aed1..dd3dc2940a5 100644 --- a/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj +++ b/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj @@ -1,6 +1,5 @@ - System.Diagnostics.Debug true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj index 4d90da957da..96893aa3faa 100644 --- a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -3,15 +3,16 @@ System.Diagnostics.Tests true None - $(NetCoreAppCurrent) + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix true - - - - - + + + + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props b/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props +++ b/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file 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 1766bbf5625..e34e24c6fbf 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -1,9 +1,9 @@ - netstandard2.0;netstandard1.1;netstandard1.3;net45;$(NetFrameworkCurrent) - true + netstandard2.0;netstandard1.1;netstandard1.3;net45 false enable + true @@ -15,21 +15,9 @@ - + - - - - - - - - - - - - \ No newline at end of file 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 0745b28f5a9..275bebeb1fe 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -4,8 +4,8 @@ false $(NoWarn);SA1205 enable - $(NetCoreAppCurrent);netstandard1.1;netstandard1.3;net45;net46;netstandard2.0;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard1.1;netstandard1.3;net45;net46;netstandard2.0 + true @@ -45,8 +45,6 @@ - - @@ -60,8 +58,6 @@ - - @@ -78,26 +74,24 @@ + + - + + + - - - - - - - - + + \ No newline at end of file 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 d06639f76f9..8cc016a3786 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 @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent);$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent);net48-Windows_NT @@ -18,4 +18,8 @@ + + + + \ No newline at end of file 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 4a6216abc11..3413c45fda3 100644 --- a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj @@ -1,6 +1,6 @@ - $(NetFrameworkCurrent);net461;netstandard2.0 + netstandard2.0;net461 @@ -11,13 +11,6 @@ - - - - - - - \ No newline at end of file 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 db056eb6bf9..42937d19fb5 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj @@ -1,9 +1,8 @@ true - $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;net461;netstandard2.0;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;net461;netstandard2.0 true - true @@ -99,14 +98,11 @@ - - - - - - + + + - @@ -121,12 +117,13 @@ - - + + + \ 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 efb0b608cbc..8ebc945c121 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_NT;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;net461 @@ -22,4 +22,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props b/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props +++ b/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj index e2c079b6020..06ae2e9836a 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj @@ -1,6 +1,5 @@ - System.Diagnostics.FileVersionInfo true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable @@ -47,8 +46,7 @@ - - + diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj index 74112e70a89..2067fee50c5 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj @@ -1,7 +1,6 @@ Exe - .dll false $(NetCoreAppCurrent) 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 d7a3700fc96..7a9aa75f8c3 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) + netstandard2.0;net461 true @@ -10,9 +10,4 @@ - - - - - \ No newline at end of file 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 5c19edbe272..225439e4973 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -1,10 +1,8 @@ - AnyCPU true - $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0;net461;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0;net461 true - true @@ -123,20 +121,16 @@ - - - - - - - + + + + - @@ -148,9 +142,12 @@ - + + + + \ No newline at end of file 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 18c5796f93d..0ddd69a7a64 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,8 +1,7 @@ - provider.res true - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;net461 @@ -18,9 +17,10 @@ - - Always - + + + + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Process/Directory.Build.props b/src/libraries/System.Diagnostics.Process/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.Diagnostics.Process/Directory.Build.props +++ b/src/libraries/System.Diagnostics.Process/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ 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 7c759f49f81..947d0f2a1bb 100644 --- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -1,6 +1,5 @@ - AnyCPU $(DefineConstants);FEATURE_REGISTRY true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS @@ -325,8 +324,8 @@ + - diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj index 83b129811ed..091c18cdbb7 100644 --- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj @@ -18,7 +18,6 @@ - @@ -39,9 +38,14 @@ Link="System\PasteArguments.Windows.cs" /> + + + + + diff --git a/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props b/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props +++ b/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj index 0b3dadaa19c..4c218b7212f 100644 --- a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj +++ b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj @@ -1,6 +1,5 @@ - System.Diagnostics.StackTrace true true enable @@ -23,15 +22,13 @@ - - - - - - - - + + + + + + diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props +++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Tools/Directory.Build.props b/src/libraries/System.Diagnostics.Tools/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Diagnostics.Tools/Directory.Build.props +++ b/src/libraries/System.Diagnostics.Tools/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj b/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj index 7e813184ea8..4f2d15aa3b6 100644 --- a/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj +++ b/src/libraries/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj @@ -1,6 +1,5 @@ - System.Diagnostics.Tools true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props b/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props +++ b/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj index 7baa10ff2bb..7b62f85f073 100644 --- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj +++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj @@ -28,17 +28,15 @@ - - - - - - - - - - + + + + + + + + diff --git a/src/libraries/System.Diagnostics.Tracing/Directory.Build.props b/src/libraries/System.Diagnostics.Tracing/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Diagnostics.Tracing/Directory.Build.props +++ b/src/libraries/System.Diagnostics.Tracing/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj b/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj index bae87cb23cb..dd3dc2940a5 100644 --- a/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj +++ b/src/libraries/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj @@ -1,6 +1,5 @@ - System.Diagnostics.Tracing true $(NetCoreAppCurrent) enable 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 04288a7c877..adbd9aecb52 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_NT;netstandard2.0;netcoreapp2.0-Windows_NT;_$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT true $(NoWarn);CA2249 @@ -91,24 +91,26 @@ Link="Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs" /> - - - - - - - + + + + + + + + @@ -119,7 +121,4 @@ - - - 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 f896e5f1bab..ff681406c78 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;net48 @@ -18,4 +18,14 @@ PreserveNewest + + + + + + + + + + \ 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 8ac014eba2d..c37e4da51fa 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_NT;netcoreapp2.0-Windows_NT;$(NetCoreAppCurrent)-OSX;netcoreapp2.0-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp2.0-Linux;netstandard2.0;_$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;$(NetCoreAppCurrent)-OSX;netcoreapp2.0-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp2.0-Linux;netstandard2.0 true @@ -81,13 +81,13 @@ - - + + @@ -103,7 +103,4 @@ - - - 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 682e1a9711a..1175b1d4215 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;net48 @@ -56,4 +56,12 @@ PreserveNewest + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj index 3df27100b06..68593ef6e13 100644 --- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj @@ -1,6 +1,6 @@ - netstandard2.0;_$(NetFrameworkCurrent) + netstandard2.0 diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index fcbbc47ff8d..fe5b6232d96 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_NT;netstandard2.0;netcoreapp2.0-Windows_NT;_$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT true @@ -137,18 +137,18 @@ + + + + + + - - - - - - diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj index 53be1a5cb23..f71b684f686 100644 --- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj +++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj @@ -2,7 +2,7 @@ $(NoWarn);SYSLIB0003 - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;net48 @@ -31,4 +31,10 @@ + + + + + + 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 0a20f122151..a2a36256425 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -347,10 +347,11 @@ placeholder.ico - + + + - 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 0b1354728a1..5537f87099e 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 @@ -2,8 +2,7 @@ true true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net48 @@ -106,4 +105,10 @@ System.Drawing.Tests.Icon_toolboxBitmapAttributeTest + + + + + + diff --git a/src/libraries/System.Drawing.Primitives/Directory.Build.props b/src/libraries/System.Drawing.Primitives/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Drawing.Primitives/Directory.Build.props +++ b/src/libraries/System.Drawing.Primitives/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj index be4e03afc74..fd17cd2352c 100644 --- a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj +++ b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj @@ -1,21 +1,10 @@ - Library System.Drawing - System.Drawing.Primitives $(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) enable - - - - - - - - - @@ -46,4 +35,13 @@ + + + + + + + + + diff --git a/src/libraries/System.Dynamic.Runtime/Directory.Build.props b/src/libraries/System.Dynamic.Runtime/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Dynamic.Runtime/Directory.Build.props +++ b/src/libraries/System.Dynamic.Runtime/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj b/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj index 2fb5c055bf3..152b87d25dd 100644 --- a/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj +++ b/src/libraries/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj @@ -1,7 +1,5 @@ - System.Dynamic.Runtime - System.Dynamic.Runtime true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Formats.Asn1/Directory.Build.props b/src/libraries/System.Formats.Asn1/Directory.Build.props index 749d7fc1c6b..ba1f965d83c 100644 --- a/src/libraries/System.Formats.Asn1/Directory.Build.props +++ b/src/libraries/System.Formats.Asn1/Directory.Build.props @@ -2,6 +2,5 @@ Open - true 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 7715f692f9c..ee0ebfbfe10 100644 --- a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj @@ -1,12 +1,12 @@ - netstandard2.0 + netstandard2.0;net461 enable - + 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 501a4f5ad36..f9fdc8c95a0 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -2,8 +2,7 @@ true enable - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -48,13 +47,11 @@ - - + + - - - + 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 beb4397ba6c..1c4965e4877 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -52,4 +52,8 @@ 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 db6640ae50f..574a834fd1e 100644 --- a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj @@ -7,7 +7,7 @@ - - + + diff --git a/src/libraries/System.Formats.Cbor/tests/System.Formats.Cbor.Tests.csproj b/src/libraries/System.Formats.Cbor/tests/System.Formats.Cbor.Tests.csproj index f1c45bd8a8e..e72dd108eee 100644 --- a/src/libraries/System.Formats.Cbor/tests/System.Formats.Cbor.Tests.csproj +++ b/src/libraries/System.Formats.Cbor/tests/System.Formats.Cbor.Tests.csproj @@ -29,4 +29,7 @@ + + + diff --git a/src/libraries/System.Globalization.Calendars/Directory.Build.props b/src/libraries/System.Globalization.Calendars/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Globalization.Calendars/Directory.Build.props +++ b/src/libraries/System.Globalization.Calendars/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj b/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj index c251f69ea9e..4f2d15aa3b6 100644 --- a/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj +++ b/src/libraries/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj @@ -1,6 +1,5 @@ - System.Globalization.Calendars true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Globalization.Extensions/Directory.Build.props b/src/libraries/System.Globalization.Extensions/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Globalization.Extensions/Directory.Build.props +++ b/src/libraries/System.Globalization.Extensions/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Globalization/Directory.Build.props b/src/libraries/System.Globalization/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Globalization/Directory.Build.props +++ b/src/libraries/System.Globalization/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Globalization/src/System.Globalization.csproj b/src/libraries/System.Globalization/src/System.Globalization.csproj index 4dacec6ff43..4f2d15aa3b6 100644 --- a/src/libraries/System.Globalization/src/System.Globalization.csproj +++ b/src/libraries/System.Globalization/src/System.Globalization.csproj @@ -1,6 +1,5 @@ - System.Globalization true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.Compression.Brotli/Directory.Build.props b/src/libraries/System.IO.Compression.Brotli/Directory.Build.props index aa25926ea66..8cda5782c1d 100644 --- a/src/libraries/System.IO.Compression.Brotli/Directory.Build.props +++ b/src/libraries/System.IO.Compression.Brotli/Directory.Build.props @@ -2,6 +2,5 @@ ECMA - true \ No newline at end of file diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj index 40101d08ad9..bdb837e5ef9 100644 --- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj +++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj @@ -1,7 +1,5 @@ - System.IO.Compression.Brotli - Library true enable $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) diff --git a/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props b/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props index aa25926ea66..8cda5782c1d 100644 --- a/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props +++ b/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props @@ -2,6 +2,5 @@ ECMA - true \ No newline at end of file diff --git a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj index ca1e0b34350..366de34f8b9 100644 --- a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj +++ b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj @@ -1,6 +1,5 @@ - System.IO.Compression.ZipFile true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.Compression/Directory.Build.props b/src/libraries/System.IO.Compression/Directory.Build.props index aa25926ea66..8cda5782c1d 100644 --- a/src/libraries/System.IO.Compression/Directory.Build.props +++ b/src/libraries/System.IO.Compression/Directory.Build.props @@ -2,6 +2,5 @@ ECMA - true \ No newline at end of file diff --git a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj index 8ec233ee5de..e22bba9c0c1 100644 --- a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj +++ b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj @@ -1,7 +1,5 @@ - System.IO.Compression - Library true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props index 27a4a5522a2..33e65b7cb46 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props +++ b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props @@ -2,8 +2,6 @@ Microsoft - true - false true \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index ed7f15c6b99..33c93c6d819 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -1,7 +1,6 @@ - netstandard2.0;$(NetFrameworkCurrent);net461 - true + netstandard2.0;net461 enable @@ -11,9 +10,6 @@ - - - diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index 3d496a69c3f..e7f893498e4 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -1,8 +1,7 @@ - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT true - true enable @@ -99,27 +98,26 @@ - - - - - - - + + + - - - - - + + + + - - + + + + + + diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj index 2130178404f..663ab486f55 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT @@ -14,4 +14,13 @@ + + + + + + + + + diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props b/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props +++ b/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props b/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props +++ b/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj b/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj index 3297291a295..94d0c640130 100644 --- a/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj +++ b/src/libraries/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj @@ -1,6 +1,5 @@ - System.IO.FileSystem.Primitives true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props +++ b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem/Directory.Build.props b/src/libraries/System.IO.FileSystem/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.IO.FileSystem/Directory.Build.props +++ b/src/libraries/System.IO.FileSystem/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file diff --git a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj index 827969b0281..0c36fbf8b21 100644 --- a/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj +++ b/src/libraries/System.IO.FileSystem/src/System.IO.FileSystem.csproj @@ -1,6 +1,5 @@ - System.IO.FileSystem true true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.IO.IsolatedStorage/Directory.Build.props b/src/libraries/System.IO.IsolatedStorage/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.IO.IsolatedStorage/Directory.Build.props +++ b/src/libraries/System.IO.IsolatedStorage/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj index 75bb5e2176c..066018d64f7 100644 --- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj +++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj @@ -36,8 +36,8 @@ - - - + + + 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 47504a43fde..57f315d8850 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 @@ -52,4 +52,7 @@ + + + diff --git a/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props b/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props +++ b/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj index 587c8045111..875e392be70 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj @@ -1,6 +1,5 @@ - System.IO.MemoryMappedFiles true enable $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser 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 56941538f8b..bb30574d28d 100644 --- a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj @@ -1,7 +1,6 @@ - netstandard2.0;netstandard1.3;net46;$(NetFrameworkCurrent) - true + netstandard2.0;netstandard1.3;net46 @@ -15,15 +14,7 @@ - - - + - - - - - - \ No newline at end of file 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 44240d76375..d8d6ce3f3da 100644 --- a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -1,8 +1,7 @@ true - netstandard2.0;net46;netstandard1.3;$(NetFrameworkCurrent)-Windows_NT - true + netstandard2.0;net46;netstandard1.3 enable @@ -10,22 +9,6 @@ $(DefineConstants);FEATURE_SERIALIZATION true - - - - - - - - - - - - - - - - @@ -57,7 +40,6 @@ - \ No newline at end of file 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 611983cc55b..41d84a25961 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 @@ -1,11 +1,15 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net48-Windows_NT + + + + \ 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 2af41b5283f..a038d3552d1 100644 --- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + netstandard2.0;net461 enable + true netcoreapp2.0 @@ -10,8 +11,8 @@ - - - + + + 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 545a857a951..f5e9a5531f5 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -1,7 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461 true enable @@ -46,11 +45,14 @@ - - - + + + + - + 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 0e9b268811f..5c0a2a305f4 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,13 +1,8 @@ true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 - - - - - @@ -49,4 +44,11 @@ + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props index 27a4a5522a2..33e65b7cb46 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props +++ b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props @@ -2,8 +2,6 @@ Microsoft - true - false true \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj index aa09673b2ed..81ac8d687ca 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/src/System.IO.Pipes.AccessControl.csproj @@ -1,25 +1,26 @@ - System.IO.Pipes.AccessControl - false - true - true - SR.PlatformNotSupported_AccessControl - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) enable + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) + + SR.PlatformNotSupported_AccessControl + true + true - - - + + + + + + + - - diff --git a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj index 21202e86f0e..57015e7b678 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj @@ -15,4 +15,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.IO.Pipes/Directory.Build.props b/src/libraries/System.IO.Pipes/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.IO.Pipes/Directory.Build.props +++ b/src/libraries/System.IO.Pipes/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file 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 becae30a11a..2016c93b4c0 100644 --- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj +++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj @@ -1,6 +1,5 @@ - System.IO.Pipes true true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) @@ -183,10 +182,11 @@ - + + + + - - diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index d3759ed22d1..ead46c1faaa 100644 --- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -59,4 +59,8 @@ + + + + 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 fba4e13b904..bb26f9be9a0 100644 --- a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj @@ -1,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -10,8 +9,4 @@ - - - - \ No newline at end of file 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 307aa3bf4b4..595800abe83 100644 --- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj @@ -4,8 +4,7 @@ $(DefineConstants);NOSPAN;SERIAL_PORTS true annotations - netstandard2.0-Windows_NT;netstandard2.0-Linux;netstandard2.0-OSX;netstandard2.0;net461-Windows_NT;netstandard2.0-FreeBSD;$(NetFrameworkCurrent)-Windows_NT - true + netstandard2.0-Windows_NT;netstandard2.0-Linux;netstandard2.0-OSX;netstandard2.0;net461-Windows_NT;netstandard2.0-FreeBSD @@ -134,28 +133,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + 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 67de446f547..d0797175561 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_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-FreeBSD;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-FreeBSD;net461-Windows_NT @@ -117,4 +117,11 @@ + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props b/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props +++ b/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj index af6feb10578..4f2d15aa3b6 100644 --- a/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj +++ b/src/libraries/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj @@ -1,6 +1,5 @@ - System.IO.UnmanagedMemoryStream true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.IO/Directory.Build.props b/src/libraries/System.IO/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.IO/Directory.Build.props +++ b/src/libraries/System.IO/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.IO/src/System.IO.csproj b/src/libraries/System.IO/src/System.IO.csproj index d7effb020f5..3b108d68267 100644 --- a/src/libraries/System.IO/src/System.IO.csproj +++ b/src/libraries/System.IO/src/System.IO.csproj @@ -1,6 +1,5 @@ - System.IO true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq.Expressions/Directory.Build.props b/src/libraries/System.Linq.Expressions/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Linq.Expressions/Directory.Build.props +++ b/src/libraries/System.Linq.Expressions/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 07d0cebd174..7972cdb54f1 100644 --- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -3,8 +3,6 @@ true $(NetCoreAppCurrent) enable - - false $(DefineConstants);FEATURE_DLG_INVOKE;FEATURE_FAST_CREATE $(DefineConstants);FEATURE_COMPILE diff --git a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index 48bc8a57cc6..ea477dc9d04 100644 --- a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -6,10 +6,6 @@ $(DefineConstants);FEATURE_INTERPRET $(NetCoreAppCurrent) - - - - @@ -246,5 +242,6 @@ + diff --git a/src/libraries/System.Linq.Parallel/Directory.Build.props b/src/libraries/System.Linq.Parallel/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Linq.Parallel/Directory.Build.props +++ b/src/libraries/System.Linq.Parallel/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj index f2c2c5627ed..c04ba4bf4e3 100644 --- a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj +++ b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj @@ -1,6 +1,5 @@ - System.Linq.Parallel true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq.Queryable/Directory.Build.props b/src/libraries/System.Linq.Queryable/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Linq.Queryable/Directory.Build.props +++ b/src/libraries/System.Linq.Queryable/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj index a531c2e8494..d3def1d1063 100644 --- a/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj +++ b/src/libraries/System.Linq.Queryable/src/System.Linq.Queryable.csproj @@ -1,7 +1,5 @@ - System.Linq.Queryable - System.Linq.Queryable $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Linq/Directory.Build.props b/src/libraries/System.Linq/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Linq/Directory.Build.props +++ b/src/libraries/System.Linq/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Linq/src/System.Linq.csproj b/src/libraries/System.Linq/src/System.Linq.csproj index a9caa2e36d3..ea585685f3e 100644 --- a/src/libraries/System.Linq/src/System.Linq.csproj +++ b/src/libraries/System.Linq/src/System.Linq.csproj @@ -1,15 +1,8 @@ - System.Linq - System.Linq $(NetCoreAppCurrent) enable - - - $(NetCoreAppCurrent) - - diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index ac50cd7a9b1..c91da1b9c5b 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_NT;netstandard2.0;netcoreapp2.0-Windows_NT;_$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT true @@ -60,11 +60,11 @@ - - - + + + diff --git a/src/libraries/System.Management/tests/System.Management.Tests.csproj b/src/libraries/System.Management/tests/System.Management.Tests.csproj index d71c4999db1..dfa032993bc 100644 --- a/src/libraries/System.Management/tests/System.Management.Tests.csproj +++ b/src/libraries/System.Management/tests/System.Management.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;net48 @@ -23,4 +23,10 @@ CleanUp.mof + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Memory/Directory.Build.props b/src/libraries/System.Memory/Directory.Build.props index 749d7fc1c6b..ba1f965d83c 100644 --- a/src/libraries/System.Memory/Directory.Build.props +++ b/src/libraries/System.Memory/Directory.Build.props @@ -2,6 +2,5 @@ Open - true diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj index 1b310ee36a4..d0508aaa6c7 100644 --- a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj +++ b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj @@ -1,7 +1,6 @@ true - true true true $(NetCoreAppCurrent) diff --git a/src/libraries/System.Net.Http.Json/Directory.Build.props b/src/libraries/System.Net.Http.Json/Directory.Build.props index 749d7fc1c6b..ba1f965d83c 100644 --- a/src/libraries/System.Net.Http.Json/Directory.Build.props +++ b/src/libraries/System.Net.Http.Json/Directory.Build.props @@ -2,6 +2,5 @@ Open - true 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 af8add8a69f..37e96e45e22 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,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0 + $(NetCoreAppCurrent);netstandard2.0;net461 enable @@ -15,4 +15,7 @@ + + + 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 ee6e5c6a9af..031e3a30153 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,13 +1,8 @@ - netstandard2.0;$(NetCoreAppCurrent);net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 enable - - - $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) - @@ -18,26 +13,31 @@ - - - - - + - - + + + + + + + + + + + - - diff --git a/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj b/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj index 2653fcb9dc5..81605d947b3 100644 --- a/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net48 @@ -29,4 +29,8 @@ + + + + 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 0f09eb18d9f..0997a1c96f7 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 - + @@ -16,4 +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 69bfc2c5a79..806d5504734 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,19 +1,12 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 enable - - - $(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths) - - - \ 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 8c06bc26a68..e29dc793e5e 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,9 +1,7 @@ - AnyCPU true - netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT - true + netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT true $(DefineConstants);WINHTTPHANDLER_DLL enable @@ -87,14 +85,10 @@ Link="Common\System\Net\Logging\NetEventSource.Common.cs" /> - - - + + - - - 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 98985ef8fc3..b1dbc739244 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 @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net48-Windows_NT true $(DefineConstants);WINHTTPHANDLER_TEST 8.0 @@ -141,5 +141,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index 502c0cc8e46..2471fc4aeee 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -8,7 +8,7 @@ annotations - + Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj index e6c23001804..62a033499f4 100644 --- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj +++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj @@ -1,7 +1,5 @@ - Library - System.Net.Http win true $(DefineConstants);HTTP_DLL @@ -666,6 +664,7 @@ + @@ -691,20 +690,22 @@ - + - + + + PreserveNewest diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 01fafd5a6ff..dc5bc00ef6a 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -281,12 +281,13 @@ - - - SelectedSitesTest.txt + + + + \ No newline at end of file diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index 9ca98181f81..cde8ce72f86 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -8,8 +8,8 @@ - - + + Open - true true \ No newline at end of file diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj index 8f6ce68838a..dfcacc7b665 100644 --- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj @@ -6,6 +6,7 @@ annotations + @@ -28,14 +29,10 @@ - - - - diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj index ea16d78ce8d..9da20596f81 100644 --- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj +++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj @@ -27,7 +27,4 @@ - - - diff --git a/src/libraries/System.Net.Mail/Directory.Build.props b/src/libraries/System.Net.Mail/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Net.Mail/Directory.Build.props +++ b/src/libraries/System.Net.Mail/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj index 766dc25eab7..73db7cf4eb5 100644 --- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj +++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj @@ -225,6 +225,7 @@ Link="Common\Interop\Windows\SspiCli\SSPIWrapper.cs" /> + @@ -244,10 +245,6 @@ - - - - diff --git a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj index 9ceee73590e..83bb83a34f4 100644 --- a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj +++ b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj @@ -31,7 +31,4 @@ - - - \ No newline at end of file diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj index 6b9e7bd1dfa..be49fc3e007 100644 --- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj +++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj @@ -23,10 +23,6 @@ - - - - @@ -264,4 +260,9 @@ + + + + + diff --git a/src/libraries/System.Net.NameResolution/Directory.Build.props b/src/libraries/System.Net.NameResolution/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.NameResolution/Directory.Build.props +++ b/src/libraries/System.Net.NameResolution/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj index 73f80add914..27f4e9570af 100644 --- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj +++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj @@ -1,6 +1,5 @@ - System.Net.NameResolution true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable @@ -113,6 +112,7 @@ + @@ -123,7 +123,6 @@ - diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index 66a902b68b3..3d260d337f6 100644 --- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -8,7 +8,7 @@ - + - + Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj index 5360c88d899..3bb0644d994 100644 --- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj +++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj @@ -1,7 +1,5 @@ - System.Net.NetworkInformation - Library true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD enable @@ -193,6 +191,7 @@ + @@ -203,7 +202,6 @@ - diff --git a/src/libraries/System.Net.Ping/Directory.Build.props b/src/libraries/System.Net.Ping/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.Ping/Directory.Build.props +++ b/src/libraries/System.Net.Ping/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj index b64a73e871a..b817ebac3ef 100644 --- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj +++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj @@ -1,6 +1,5 @@ - System.Net.Ping true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable diff --git a/src/libraries/System.Net.Primitives/Directory.Build.props b/src/libraries/System.Net.Primitives/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.Primitives/Directory.Build.props +++ b/src/libraries/System.Net.Primitives/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj index cfc1e85797b..07f176ab3ad 100644 --- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -1,7 +1,5 @@ - System.Net.Primitives - Library true false $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj index 7dca1982f9e..26cd2568e15 100644 --- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj @@ -27,7 +27,4 @@ - - - \ No newline at end of file diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj index 212d2de6287..26647c83c7f 100644 --- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj @@ -11,7 +11,7 @@ - + - + diff --git a/src/libraries/System.Net.Requests/Directory.Build.props b/src/libraries/System.Net.Requests/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.Requests/Directory.Build.props +++ b/src/libraries/System.Net.Requests/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj index 9db098574bb..96471eef5eb 100644 --- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj +++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj @@ -1,7 +1,5 @@ - System.Net.Requests - System.Net.Requests true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable @@ -85,6 +83,7 @@ + @@ -103,7 +102,6 @@ - diff --git a/src/libraries/System.Net.Security/Directory.Build.props b/src/libraries/System.Net.Security/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.Security/Directory.Build.props +++ b/src/libraries/System.Net.Security/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.Security/ref/System.Net.Security.csproj b/src/libraries/System.Net.Security/ref/System.Net.Security.csproj index 6e4bace9eb5..f5519a69b60 100644 --- a/src/libraries/System.Net.Security/ref/System.Net.Security.csproj +++ b/src/libraries/System.Net.Security/ref/System.Net.Security.csproj @@ -9,12 +9,10 @@ + - - - \ No newline at end of file diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj index 1c423af89c5..25be34b5258 100644 --- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj +++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj @@ -1,6 +1,5 @@ - System.Net.Security true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS @@ -345,6 +344,7 @@ + @@ -361,15 +361,14 @@ - + - diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 3845b272ae6..84bada8bc9f 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -108,5 +108,6 @@ + diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index 8379fd48c47..1d83e45035d 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -76,11 +76,4 @@ - - - - - - - - + \ No newline at end of file diff --git a/src/libraries/System.Net.ServicePoint/Directory.Build.props b/src/libraries/System.Net.ServicePoint/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Net.ServicePoint/Directory.Build.props +++ b/src/libraries/System.Net.ServicePoint/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file diff --git a/src/libraries/System.Net.Sockets/Directory.Build.props b/src/libraries/System.Net.Sockets/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.Net.Sockets/Directory.Build.props +++ b/src/libraries/System.Net.Sockets/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj index ac3e781f745..3d4d3c791e2 100644 --- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj +++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj @@ -1,6 +1,5 @@ - System.Net.Sockets true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser enable @@ -302,6 +301,7 @@ Link="Common\Interop\Unix\System.Native\Interop.Write.cs" /> + @@ -315,7 +315,6 @@ - diff --git a/src/libraries/System.Net.WebClient/Directory.Build.props b/src/libraries/System.Net.WebClient/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Net.WebClient/Directory.Build.props +++ b/src/libraries/System.Net.WebClient/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file diff --git a/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props b/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props +++ b/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj index d97d8456081..3d060d6ebc3 100644 --- a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj +++ b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj @@ -1,6 +1,5 @@ - System.Net.WebHeaderCollection true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Net.WebProxy/Directory.Build.props b/src/libraries/System.Net.WebProxy/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Net.WebProxy/Directory.Build.props +++ b/src/libraries/System.Net.WebProxy/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file diff --git a/src/libraries/System.Net.WebSockets.Client/Directory.Build.props b/src/libraries/System.Net.WebSockets.Client/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.WebSockets.Client/Directory.Build.props +++ b/src/libraries/System.Net.WebSockets.Client/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index 413be9b039f..248546468d0 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -6,7 +6,7 @@ - + - netstandard2.0 + netstandard2.0;net461 enable - + \ No newline at end of file diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj index 189e51596d3..092e7a753fa 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj @@ -1,9 +1,7 @@ - System.Net.WebSockets.WebSocketProtocol True - $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.1;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;netcoreapp2.1;net461 true enable @@ -21,27 +19,30 @@ - - - + - - + + + - - - + + + + + diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj index eb4d89c4de1..16b078941bf 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net48 + + + diff --git a/src/libraries/System.Net.WebSockets/Directory.Build.props b/src/libraries/System.Net.WebSockets/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.WebSockets/Directory.Build.props +++ b/src/libraries/System.Net.WebSockets/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj index c39977d0064..212dea7f6eb 100644 --- a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj +++ b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj @@ -1,6 +1,5 @@ - System.Net.WebSockets True $(NetCoreAppCurrent) enable 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 3bffad18351..c3ce692b4df 100644 --- a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj @@ -1,22 +1,12 @@ - netstandard2.0;netstandard1.1 + netstandard2.0;netstandard1.1;net461 enable - - - - true - - - - - - - + \ 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 b9e1821c6d4..655b63c2765 100644 --- a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj @@ -1,8 +1,7 @@ true - netstandard2.0;netstandard1.1;net461;$(NetFrameworkCurrent) - true + netstandard2.0;netstandard1.1;net461 enable @@ -19,18 +18,6 @@ - - - - - - - - - - - - - + \ No newline at end of file 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 ecbee246291..669b0084f4a 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,9 +1,7 @@ - True - $(NetCoreAppCurrent) - - + true + $(NetCoreAppCurrent);net461 @@ -34,8 +32,7 @@ - - + diff --git a/src/libraries/System.Numerics.Vectors/Directory.Build.props b/src/libraries/System.Numerics.Vectors/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Numerics.Vectors/Directory.Build.props +++ b/src/libraries/System.Numerics.Vectors/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.ObjectModel/Directory.Build.props b/src/libraries/System.ObjectModel/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.ObjectModel/Directory.Build.props +++ b/src/libraries/System.ObjectModel/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj b/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj index b531e567ae7..89776eac649 100644 --- a/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj +++ b/src/libraries/System.ObjectModel/src/System.ObjectModel.csproj @@ -1,6 +1,5 @@ - System.ObjectModel true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Private.DataContractSerialization/Directory.Build.props b/src/libraries/System.Private.DataContractSerialization/Directory.Build.props index 8c72c62fd59..63f02a0f817 100644 --- a/src/libraries/System.Private.DataContractSerialization/Directory.Build.props +++ b/src/libraries/System.Private.DataContractSerialization/Directory.Build.props @@ -2,7 +2,5 @@ Microsoft - true - false \ No newline at end of file diff --git a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj index 2252cd2cdc1..7ab4ab7cd8d 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj +++ b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj @@ -1,7 +1,5 @@ - System.Private.DataContractSerialization - System.Private.DataContractSerialization $(NoWarn);1634;1691;649 true true diff --git a/src/libraries/System.Private.Uri/Directory.Build.props b/src/libraries/System.Private.Uri/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Private.Uri/Directory.Build.props +++ b/src/libraries/System.Private.Uri/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj index a639777cb80..731f081a11e 100644 --- a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj @@ -1,6 +1,5 @@ - System.Private.Uri true enable $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent) diff --git a/src/libraries/System.Private.Xml.Linq/Directory.Build.props b/src/libraries/System.Private.Xml.Linq/Directory.Build.props index 05cc2bde64e..bdcfca3b543 100644 --- a/src/libraries/System.Private.Xml.Linq/Directory.Build.props +++ b/src/libraries/System.Private.Xml.Linq/Directory.Build.props @@ -2,7 +2,5 @@ Open - true - false \ No newline at end of file diff --git a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj index a24010636c2..4db38b8700d 100644 --- a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj +++ b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj @@ -1,11 +1,9 @@ - System.Private.Xml.Linq System.Xml $(NetCoreAppCurrent) - + diff --git a/src/libraries/System.Private.Xml/Directory.Build.props b/src/libraries/System.Private.Xml/Directory.Build.props index 05cc2bde64e..bdcfca3b543 100644 --- a/src/libraries/System.Private.Xml/Directory.Build.props +++ b/src/libraries/System.Private.Xml/Directory.Build.props @@ -2,7 +2,5 @@ Open - true - false \ No newline at end of file diff --git a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj index 01dcb093e6e..c3b7f512fce 100644 --- a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj +++ b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj @@ -1,6 +1,5 @@ - System.Private.Xml System.Xml true $(DefineConstants);FEATURE_COMPILED_XSL diff --git a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj index 3e6c2304979..66a1626bfe1 100644 --- a/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj @@ -38,11 +38,9 @@ - + - - - + \ No newline at end of file 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 7381fb80af8..4bce12a3522 100644 --- a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj +++ b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj @@ -10,8 +10,4 @@ - - - - \ 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 ea0fb7407b3..8ca7664c3e2 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 @@ - netstandard2.0;netstandard1.1;netstandard2.1 + netstandard2.1;netstandard2.0;netstandard1.1 enable @@ -64,9 +64,4 @@ - - - - - \ No newline at end of file diff --git a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj index c405873f4eb..490b4b0a011 100644 --- a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj +++ b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj @@ -25,4 +25,7 @@ Designer + + + \ No newline at end of file diff --git a/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props b/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props +++ b/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props b/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props +++ b/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj b/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj index 7294575b536..4f2d15aa3b6 100644 --- a/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj +++ b/src/libraries/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj @@ -1,6 +1,5 @@ - System.Reflection.Emit.ILGeneration true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props b/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props +++ b/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj b/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj index 2747800b877..4f2d15aa3b6 100644 --- a/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj +++ b/src/libraries/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj @@ -1,6 +1,5 @@ - System.Reflection.Emit.Lightweight true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Emit/Directory.Build.props b/src/libraries/System.Reflection.Emit/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Reflection.Emit/Directory.Build.props +++ b/src/libraries/System.Reflection.Emit/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Reflection.Extensions/Directory.Build.props b/src/libraries/System.Reflection.Extensions/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Reflection.Extensions/Directory.Build.props +++ b/src/libraries/System.Reflection.Extensions/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj index 5c08b886e3e..94d0c640130 100644 --- a/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj +++ b/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj @@ -1,6 +1,5 @@ - System.Reflection.Extensions true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.Metadata/Directory.Build.props b/src/libraries/System.Reflection.Metadata/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Reflection.Metadata/Directory.Build.props +++ b/src/libraries/System.Reflection.Metadata/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file 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 33546830d98..d3f3c661e77 100644 --- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj @@ -2,8 +2,7 @@ true false - $(NetCoreAppCurrent);netstandard1.1;netstandard2.0 - true + $(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461 enable @@ -14,11 +13,11 @@ + - - - - + + + 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 80692bdfc3a..2417558b785 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -3,8 +3,7 @@ true en-US false - $(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461 true enable @@ -249,9 +248,9 @@ - - + + @@ -266,12 +265,10 @@ - - + + - - - - + + 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 e3d82ffed0a..7d2de986909 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 - - + + + + + + \ No newline at end of file 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 aceadd0d97d..c065d83b357 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 @@ - netstandard2.0 + netstandard2.0;net461 enable 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 006e205f072..7e70cb22fd6 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -3,8 +3,7 @@ System.Reflection true - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 true enable @@ -146,7 +145,8 @@ - + @@ -160,9 +160,10 @@ - - - - + + + + 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 be8b471a6ec..68a69ab158b 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 $(NoWarn);SYSLIB0005 @@ -71,4 +71,7 @@ + + + diff --git a/src/libraries/System.Reflection.Primitives/Directory.Build.props b/src/libraries/System.Reflection.Primitives/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Reflection.Primitives/Directory.Build.props +++ b/src/libraries/System.Reflection.Primitives/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj index 5c3faa57e4a..dd3dc2940a5 100644 --- a/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj +++ b/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj @@ -1,6 +1,5 @@ - System.Reflection.Primitives true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props b/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props +++ b/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj index 058466cbef4..8668954a3ef 100644 --- a/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj +++ b/src/libraries/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj @@ -1,6 +1,5 @@ - System.Reflection.TypeExtensions true enable $(NetCoreAppCurrent) diff --git a/src/libraries/System.Reflection/Directory.Build.props b/src/libraries/System.Reflection/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Reflection/Directory.Build.props +++ b/src/libraries/System.Reflection/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Reflection/src/System.Reflection.csproj b/src/libraries/System.Reflection/src/System.Reflection.csproj index dff84ed4996..4f2d15aa3b6 100644 --- a/src/libraries/System.Reflection/src/System.Reflection.csproj +++ b/src/libraries/System.Reflection/src/System.Reflection.csproj @@ -1,6 +1,5 @@ - System.Reflection true $(NetCoreAppCurrent) enable 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 7b32ba82d11..2be35155d6d 100644 --- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj @@ -1,8 +1,6 @@ - netstandard2.0 - - + netstandard2.0;net461 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 00a7a46104f..d4d12186c56 100644 --- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -1,13 +1,10 @@ true - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 $(DefineConstants);RESOURCES_EXTENSIONS annotations - - @@ -31,11 +28,7 @@ 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 8bed771d651..b48848c7a45 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461 true @@ -16,7 +16,16 @@ + + + + + + + + + diff --git a/src/libraries/System.Resources.Reader/Directory.Build.props b/src/libraries/System.Resources.Reader/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Resources.Reader/Directory.Build.props +++ b/src/libraries/System.Resources.Reader/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj b/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj index 041d99ec9bd..81ff3cda55d 100644 --- a/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj +++ b/src/libraries/System.Resources.Reader/src/System.Resources.Reader.csproj @@ -1,6 +1,5 @@ - System.Resources.Reader System.Resources true $(NetCoreAppCurrent) diff --git a/src/libraries/System.Resources.ResourceManager/Directory.Build.props b/src/libraries/System.Resources.ResourceManager/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Resources.ResourceManager/Directory.Build.props +++ b/src/libraries/System.Resources.ResourceManager/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj index 61a965e9a83..4f2d15aa3b6 100644 --- a/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj +++ b/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj @@ -1,6 +1,5 @@ - System.Resources.ResourceManager true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj index 90486ca2aea..e049d6d494c 100644 --- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj +++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj @@ -4,7 +4,7 @@ true true true - $(NetCoreAppCurrent) + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix @@ -56,6 +56,9 @@ CopyToOutputDirectory="PreserveNewest" Visible="false" /> + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj index 4fc905dec87..8852455f782 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj @@ -1,9 +1,12 @@ true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net48 + + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props b/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props +++ b/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj index 2b8596cf8d9..d0ca0d4c320 100644 --- a/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj +++ b/src/libraries/System.Runtime.CompilerServices.VisualC/src/System.Runtime.CompilerServices.VisualC.csproj @@ -1,6 +1,5 @@ - System.Runtime.CompilerServices.VisualC enable true $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Extensions/Directory.Build.props b/src/libraries/System.Runtime.Extensions/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime.Extensions/Directory.Build.props +++ b/src/libraries/System.Runtime.Extensions/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index 1501be79fa8..b6029a4baee 100644 --- a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -1,16 +1,12 @@ - System.Runtime.Extensions - Library true $(NetCoreAppCurrent) enable - - - - + + diff --git a/src/libraries/System.Runtime.Handles/Directory.Build.props b/src/libraries/System.Runtime.Handles/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime.Handles/Directory.Build.props +++ b/src/libraries/System.Runtime.Handles/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj index 48cc45350aa..94d0c640130 100644 --- a/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj +++ b/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj @@ -1,6 +1,5 @@ - System.Runtime.Handles true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/Directory.Build.props b/src/libraries/System.Runtime.InteropServices.JavaScript/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Runtime.InteropServices.JavaScript/Directory.Build.props +++ b/src/libraries/System.Runtime.InteropServices.JavaScript/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj index 5d43a5781c2..c5455ea87f8 100644 --- a/src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj +++ b/src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj @@ -1,6 +1,5 @@ - System.Runtime.InteropServices.JavaScript true enable $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Tests.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Tests.csproj index 0bb06264f93..0ee94172358 100644 --- a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Tests.csproj @@ -1,13 +1,13 @@ true - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-Browser true - + @@ -16,4 +16,8 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props +++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime.InteropServices/Directory.Build.props b/src/libraries/System.Runtime.InteropServices/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.Runtime.InteropServices/Directory.Build.props +++ b/src/libraries/System.Runtime.InteropServices/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file diff --git a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj index 213c5439847..d1eeee845aa 100644 --- a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj +++ b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj @@ -1,7 +1,5 @@ - System.Runtime.InteropServices - Library true enable $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Intrinsics/Directory.Build.props b/src/libraries/System.Runtime.Intrinsics/Directory.Build.props index 9f52a8a3050..ba1f965d83c 100644 --- a/src/libraries/System.Runtime.Intrinsics/Directory.Build.props +++ b/src/libraries/System.Runtime.Intrinsics/Directory.Build.props @@ -1,7 +1,6 @@  - true Open diff --git a/src/libraries/System.Runtime.Loader/Directory.Build.props b/src/libraries/System.Runtime.Loader/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Runtime.Loader/Directory.Build.props +++ b/src/libraries/System.Runtime.Loader/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj b/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj index 2697388749b..dd3dc2940a5 100644 --- a/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj +++ b/src/libraries/System.Runtime.Loader/src/System.Runtime.Loader.csproj @@ -1,6 +1,5 @@ - System.Runtime.Loader true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj index 17348b2b70e..861551441fc 100644 --- a/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj +++ b/src/libraries/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj @@ -9,11 +9,10 @@ - - false - content - PreserveNewest - + diff --git a/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj index 5fe8fb3bc7b..f1580207d39 100644 --- a/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj +++ b/src/libraries/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj @@ -7,10 +7,9 @@ - - false - content - PreserveNewest - + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Numerics/Directory.Build.props b/src/libraries/System.Runtime.Numerics/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime.Numerics/Directory.Build.props +++ b/src/libraries/System.Runtime.Numerics/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj index 52ae4fe33fc..7e938de2925 100644 --- a/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj +++ b/src/libraries/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj @@ -1,7 +1,6 @@ System.Numerics - System.Runtime.Numerics true enable $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props +++ b/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj index 6dd50fdba5e..dba845f2eeb 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj +++ b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj @@ -1,7 +1,5 @@ - System.Runtime.Serialization.Formatters - System.Runtime.Serialization.Formatters $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser enable @@ -76,10 +74,10 @@ - - - - - + + + + + diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.Windows.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.Windows.cs index 8dd3da0bbdc..a64cab793e9 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.Windows.cs +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.Windows.cs @@ -11,6 +11,7 @@ namespace System.Runtime.Serialization.Formatters.Tests public partial class FormatterServicesTests { [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/39704", TestRuntimes.Mono)] public void GetUninitializedObject_COMObject_ThrowsNotSupportedException() { Type comObjectType = typeof(COMObject); diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj index 635709d5042..7e37cb04eed 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj @@ -2,7 +2,7 @@ true true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net48 @@ -29,14 +29,38 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props +++ b/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj b/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj index 42818f08979..59304bfd403 100644 --- a/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj +++ b/src/libraries/System.Runtime.Serialization.Json/src/System.Runtime.Serialization.Json.csproj @@ -1,13 +1,10 @@ - System.Runtime.Serialization.Json true $(NetCoreAppCurrent) - - \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props +++ b/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index adf56d49ade..e314354aef4 100644 --- a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -1,7 +1,5 @@ - System.Runtime.Serialization.Primitives - System.Runtime.Serialization.Primitives true enable $(NetCoreAppCurrent) diff --git a/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props +++ b/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj b/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj index 9763bac6672..4c211819d41 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/src/System.Runtime.Serialization.Xml.csproj @@ -1,13 +1,10 @@ - System.Runtime.Serialization.Xml true $(NetCoreAppCurrent) - - - + diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj index c7ff1d9518f..320a4c93973 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj @@ -66,4 +66,8 @@ Always + + + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj index 96a02163e07..e62c8b7f82d 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj @@ -45,4 +45,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj index 5a4999f4379..3080bd813ac 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj @@ -30,4 +30,7 @@ + + + diff --git a/src/libraries/System.Runtime/Directory.Build.props b/src/libraries/System.Runtime/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Runtime/Directory.Build.props +++ b/src/libraries/System.Runtime/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Runtime/src/System.Runtime.csproj b/src/libraries/System.Runtime/src/System.Runtime.csproj index 79e6ec20786..6e3a18228e7 100644 --- a/src/libraries/System.Runtime/src/System.Runtime.csproj +++ b/src/libraries/System.Runtime/src/System.Runtime.csproj @@ -1,6 +1,5 @@ - System.Runtime true $(NetCoreAppCurrent) enable @@ -12,10 +11,8 @@ - - - + diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj index 39ca7313460..eff661cba39 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj @@ -270,13 +270,14 @@ Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs" /> + - - - + + + \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/Directory.Build.props b/src/libraries/System.Security.AccessControl/Directory.Build.props index 27a4a5522a2..33e65b7cb46 100644 --- a/src/libraries/System.Security.AccessControl/Directory.Build.props +++ b/src/libraries/System.Security.AccessControl/Directory.Build.props @@ -2,8 +2,6 @@ Microsoft - true - false true \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index d5c60174700..b586ad27053 100644 --- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -1,8 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netstandard2.0;net461 true - true enable @@ -12,14 +11,11 @@ - - - - + - - + + \ No newline at end of file diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj index 5218ab9aa1a..5da1fe7abb5 100644 --- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -1,9 +1,8 @@ true - $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0 true - true enable @@ -11,9 +10,6 @@ true SR.PlatformNotSupported_AccessControl - - - @@ -82,19 +78,20 @@ - - - - - - - + + + + + + + diff --git a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj index 386ccc3d905..2d5068b4dcb 100644 --- a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj +++ b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.Tests.csproj @@ -1,7 +1,6 @@ - Linux;NetBSD;OSX - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT @@ -68,4 +67,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Claims/Directory.Build.props b/src/libraries/System.Security.Claims/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Security.Claims/Directory.Build.props +++ b/src/libraries/System.Security.Claims/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj b/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj index 2e3b10f4d02..ca146c46b5d 100644 --- a/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj +++ b/src/libraries/System.Security.Claims/src/System.Security.Claims.csproj @@ -1,6 +1,5 @@ - System.Security.Claims $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props b/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj index 6dd12410eb0..c10e46d8620 100644 --- a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj @@ -225,4 +225,8 @@ + + + + diff --git a/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props index 27a4a5522a2..33e65b7cb46 100644 --- a/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props @@ -2,8 +2,6 @@ Microsoft - true - false true \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj index 6650cbce60e..5828d687299 100644 --- a/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj @@ -1,8 +1,7 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461;net462;net47;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461;net462;net47 true - true enable @@ -17,18 +16,14 @@ - - - - - - - + + + - + diff --git a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj index 19dc0301e45..f689e3889e4 100644 --- a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj @@ -2,9 +2,8 @@ true true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;net462-Windows_NT;net47-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;net462-Windows_NT;net47-Windows_NT true - true enable @@ -355,18 +354,17 @@ - - - - + + + - @@ -380,4 +378,11 @@ + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj index 395f9a3db84..86112ff45cf 100644 --- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj @@ -1,7 +1,7 @@ $(DefineConstants);TESTING_CNG_IMPLEMENTATION - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net47-Windows_NT @@ -165,4 +165,8 @@ + + + + diff --git a/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj index 3f8bf0c98f0..36b40fc2016 100644 --- a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj +++ b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj @@ -1,6 +1,5 @@ - System.Security.Cryptography.Csp true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj index b37c1062363..a70488b38e8 100644 --- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj @@ -92,4 +92,7 @@ + + + diff --git a/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj index 8b57296b06e..aaf3fc1530b 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj +++ b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj @@ -1,6 +1,5 @@ - System.Security.Cryptography.Encoding true $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS enable diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props index 8c72c62fd59..63f02a0f817 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props @@ -2,7 +2,5 @@ Microsoft - true - false \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj index 2c895046911..1465cb0fabc 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj @@ -1,7 +1,6 @@ - $(NetCoreAppCurrent);netcoreapp3.0;net47;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netcoreapp3.0;net47 true enable @@ -17,19 +16,15 @@ - - - + + + + - - - - - diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj index 1edf80722b5..54ff81d2fb9 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj @@ -1,8 +1,7 @@ true - $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;netstandard2.0;net47;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;netstandard2.0;net47 true enable @@ -108,13 +107,14 @@ - + + - @@ -129,7 +129,10 @@ - - + + + + + diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj index 23783475d35..011e86be385 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj @@ -1,6 +1,5 @@ - Windows_NT $(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser @@ -127,4 +126,8 @@ Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs" /> + + + + 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 07a5f1e62c2..5b42437c4fa 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,14 +1,13 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461 true - true enable true - + 4.0.4.0 @@ -16,17 +15,15 @@ - - - - - - - - + + + + + + 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 3fe54dc8283..6ecdaa9e865 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 @@ -5,18 +5,15 @@ true $(NoWarn);CA5384 enable - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0;netstandard2.0-Windows_NT;netstandard2.1;netstandard2.1-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0;netstandard2.0-Windows_NT;netstandard2.1;netstandard2.1-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;net461-Windows_NT true - true true true - + 4.0.4.0 - - SR.SystemSecurityCryptographyPkcs_PlatformNotSupported @@ -318,39 +315,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -667,4 +631,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs b/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs index 5bf2db1c71f..6d9458cbc7b 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/EdgeCasesTests.cs @@ -309,7 +309,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests } [Theory] -#if !NET472 +#if !NETFRAMEWORK [InlineData(true)] #endif [InlineData(false)] @@ -319,7 +319,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests if (useSpan) { -#if !NET472 +#if !NETFRAMEWORK Assert.ThrowsAny(() => cms.Decode(ReadOnlySpan.Empty)); #else throw new Xunit.Sdk.XunitException( @@ -502,7 +502,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests [Theory] [InlineData(false)] -#if !NET472 +#if !NETFRAMEWORK [InlineData(true)] #endif public static void ContentInfoGetContentTypeUnknown(bool fromSpan) @@ -512,7 +512,7 @@ namespace System.Security.Cryptography.Pkcs.EnvelopedCmsTests.Tests if (fromSpan) { -#if NET472 +#if NETFRAMEWORK throw new Xunit.Sdk.XunitException( "This test should not evaluate for .NET Framework, the API is missing."); #else diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs b/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs index b94d0b76427..27f46fc67ee 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/GeneralTests.cs @@ -217,7 +217,7 @@ KoZIhvcNAwcECJ01qtX2EKx6oIAEEM7op+R2U3GQbYwlEj5X+h0AAAAAAAAAAAAA [Theory] [InlineData(false)] -#if !NET472 +#if !NETFRAMEWORK [InlineData(true)] #endif public static void TestContent(bool fromSpan) @@ -238,7 +238,7 @@ KoZIhvcNAwcECJ01qtX2EKx6oIAEEM7op+R2U3GQbYwlEj5X+h0AAAAAAAAAAAAA if (fromSpan) { -#if !NET472 +#if !NETFRAMEWORK cms.Decode(encodedMessage.AsSpan()); #else throw new Xunit.Sdk.XunitException( diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsWholeDocumentTests.cs b/src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsWholeDocumentTests.cs index a68b49eef97..8dc711c7df2 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsWholeDocumentTests.cs +++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsWholeDocumentTests.cs @@ -10,7 +10,7 @@ namespace System.Security.Cryptography.Pkcs.Tests public static class SignedCmsWholeDocumentTests { [Theory] -#if !NET472 +#if !NETFRAMEWORK [InlineData(true)] #endif [InlineData(false)] @@ -19,7 +19,7 @@ namespace System.Security.Cryptography.Pkcs.Tests SignedCms cms = new SignedCms(); if (fromSpan) { -#if !NET472 +#if !NETFRAMEWORK cms.Decode(SignedDocuments.RsaPssDocument.AsSpan()); #else throw new Xunit.Sdk.XunitException( 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 d050b65b704..64a3a8a6cb8 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 @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net48-Windows_NT + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj index 13998e38436..a75db1230a9 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj +++ b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj @@ -1,6 +1,5 @@ - System.Security.Cryptography.Primitives true true $(NetCoreAppCurrent) 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 7cb462c9f93..ac9410e6b68 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,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 enable @@ -12,7 +11,6 @@ - \ No newline at end of file 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 21221a5eba8..3a9ef745e2f 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,8 +1,7 @@ true - netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0;$(NetFrameworkCurrent)-Windows_NT - true + netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0 enable @@ -34,14 +33,9 @@ Link="Common\System\HResults.cs" /> - - - - - - - + + \ 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 2d90d9b44f0..acdc3f5b658 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,11 +1,17 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + + + + + + diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props index 42c6eafce67..d68d22c1b91 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props +++ b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file 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 8e103490149..a62bc53a922 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 @@ -676,12 +676,12 @@ - + + - diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 2f97db5e544..c666f2f3e54 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -116,6 +116,8 @@ Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs" /> + + 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 43030e53132..4d4f20e941f 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,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -11,10 +10,6 @@ - - - - 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 d3b17b79395..5f39ed504d4 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,8 +1,7 @@ true - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 @@ -91,32 +90,12 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + - - 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 9ad0a17ec74..2bfad93e778 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -65,4 +65,10 @@ + + + + + + \ No newline at end of file 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 9905b3157ee..f8b4eb6709a 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,7 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;netcoreapp3.0;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461;netcoreapp3.0 @@ -19,12 +18,8 @@ - - - - @@ -33,20 +28,23 @@ - + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -62,7 +60,4 @@ - - - \ 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 265879918e8..d51a2ae77f4 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -1,8 +1,7 @@ true - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 @@ -187,24 +186,16 @@ - - - - - - - - - - - @@ -213,7 +204,11 @@ + + + + @@ -229,6 +224,5 @@ - diff --git a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj index 2097721d5d4..35536edbef1 100644 --- a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj +++ b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent)-Windows_NT $(NoWarn);SYSLIB0003 @@ -23,4 +23,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Principal.Windows/Directory.Build.props b/src/libraries/System.Security.Principal.Windows/Directory.Build.props index 27a4a5522a2..33e65b7cb46 100644 --- a/src/libraries/System.Security.Principal.Windows/Directory.Build.props +++ b/src/libraries/System.Security.Principal.Windows/Directory.Build.props @@ -2,8 +2,6 @@ Microsoft - true - false true \ No newline at end of file diff --git a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj index a469aff9a61..fe63b0436d4 100644 --- a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj @@ -1,8 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461 true - true enable @@ -12,14 +11,10 @@ - - - - - - - + + + diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj index d4f8f3eac3d..d8193f00625 100644 --- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj +++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj @@ -1,9 +1,8 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp2.0-Unix;netcoreapp2.1-Windows_NT;netcoreapp2.1-Unix;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp2.0-Unix;netcoreapp2.1-Windows_NT;netcoreapp2.1-Unix;net461-Windows_NT true - true enable @@ -135,10 +134,8 @@ - - - - + diff --git a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj index 8a99afb50bf..cb45482460c 100644 --- a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj +++ b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj @@ -1,7 +1,7 @@ true - $(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT @@ -15,4 +15,7 @@ + + + \ No newline at end of file diff --git a/src/libraries/System.Security.Principal/Directory.Build.props b/src/libraries/System.Security.Principal/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Security.Principal/Directory.Build.props +++ b/src/libraries/System.Security.Principal/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj b/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj index d9b7db3e558..4f2d15aa3b6 100644 --- a/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj +++ b/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj @@ -1,6 +1,5 @@ - System.Security.Principal true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Security.SecureString/Directory.Build.props b/src/libraries/System.Security.SecureString/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Security.SecureString/Directory.Build.props +++ b/src/libraries/System.Security.SecureString/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj b/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj index 7d220aa8a52..c1ef027e6f6 100644 --- a/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj +++ b/src/libraries/System.Security.SecureString/src/System.Security.SecureString.csproj @@ -1,7 +1,5 @@ - System.Security.SecureString - System.Security.SecureString true $(NetCoreAppCurrent) enable 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 bca4baa304a..9c9fcf88914 100644 --- a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj @@ -1,8 +1,7 @@ - $(NetCoreAppCurrent);net461;netcoreapp2.1;netstandard2.0;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461;netcoreapp2.1;netstandard2.0 true - true @@ -14,13 +13,16 @@ + + + - - - - - - + + + + + + @@ -30,11 +32,4 @@ - - - - - - - \ 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 f996315dab7..302d11eb2fc 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT - true + $(NetCoreAppCurrent);netstandard2.0;net461-Windows_NT + true @@ -53,7 +53,16 @@ - + + + + + + + + + + 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 59a0a2db745..d85a1393b8d 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461-Windows_NT @@ -58,4 +58,10 @@ PreserveNewest + + + + + + \ 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 4e3eff24490..50d5af47646 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -1,6 +1,6 @@ - netstandard2.0;$(NetFrameworkCurrent);net461 + netstandard2.0;net461 enable @@ -11,8 +11,6 @@ - - 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 47dfe7649b4..10d0d7168bb 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -1,9 +1,8 @@ true - $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT true - true $(NoWarn);CA2249 enable @@ -74,14 +73,8 @@ - - - - - - - - + @@ -98,4 +91,14 @@ + + + + + + + + + + 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 d68e5e8dab4..8886ffe02e9 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 annotations @@ -37,4 +37,7 @@ + + + \ No newline at end of file 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 1fcc105e57b..2bf38334f76 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_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT @@ -10,6 +10,9 @@ - + + + + \ No newline at end of file diff --git a/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props b/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props +++ b/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file 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 ff67cc8cca7..532f6e7ebe4 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,17 +1,13 @@ enable - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 - - - - + \ 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 3ca2e7453ec..504f90a3241 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,10 +2,20 @@ true enable - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netstandard2.0-Windows_NT;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT - true + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netstandard2.0-Windows_NT;net461-Windows_NT true + + + + Data\CodePageNameMappings.csv + + Data\PreferredCodePageNames.csv + System\Text\EncodingTable.Data.cs + @@ -55,10 +65,14 @@ codepages.nlp - - + + + + + @@ -67,22 +81,5 @@ - - - - - - - - - - Data\CodePageNameMappings.csv - - Data\PreferredCodePageNames.csv - System\Text\EncodingTable.Data.cs - 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 353fe29ea30..0b05fa533b0 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,11 +1,14 @@ true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461-Windows_NT + + + \ No newline at end of file diff --git a/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props b/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props +++ b/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj b/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj index bc0555cf2c6..dd3dc2940a5 100644 --- a/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj +++ b/src/libraries/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj @@ -1,6 +1,5 @@ - System.Text.Encoding.Extensions true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Text.Encoding/Directory.Build.props b/src/libraries/System.Text.Encoding/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Text.Encoding/Directory.Build.props +++ b/src/libraries/System.Text.Encoding/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj index 16ab188781b..4f2d15aa3b6 100644 --- a/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj +++ b/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj @@ -1,6 +1,5 @@ - System.Text.Encoding true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Text.Encodings.Web/Directory.Build.props b/src/libraries/System.Text.Encodings.Web/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Text.Encodings.Web/Directory.Build.props +++ b/src/libraries/System.Text.Encodings.Web/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ 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 3de8b872e74..eff1dfbb548 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,7 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;net461 true true @@ -12,16 +11,12 @@ - - - + + + - - - - - - - + + \ 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 449759c379d..906f6d9dc25 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,8 +1,7 @@ true - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0;net461 true enable @@ -42,19 +41,18 @@ - + + - - - - - - - + + + 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 26f3b0dd17c..5ad0343d6c0 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 13.0 @@ -53,4 +53,7 @@ + + + diff --git a/src/libraries/System.Text.Json/Directory.Build.props b/src/libraries/System.Text.Json/Directory.Build.props index 749d7fc1c6b..ba1f965d83c 100644 --- a/src/libraries/System.Text.Json/Directory.Build.props +++ b/src/libraries/System.Text.Json/Directory.Build.props @@ -2,6 +2,5 @@ Open - true diff --git a/src/libraries/System.Text.Json/ref/System.Text.Json.cs b/src/libraries/System.Text.Json/ref/System.Text.Json.cs index 0de194ebde5..514e3bd8b53 100644 --- a/src/libraries/System.Text.Json/ref/System.Text.Json.cs +++ b/src/libraries/System.Text.Json/ref/System.Text.Json.cs @@ -184,7 +184,7 @@ namespace System.Text.Json } public static partial class JsonSerializer { -#if NETCOREAPP +#if NETCOREAPP && !NETCOREAPP3_0 private const System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes MembersAccessedOnRead = System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors | System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties; private const System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes MembersAccessedOnWrite = System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties; public static object? Deserialize(System.ReadOnlySpan utf8Json, [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(MembersAccessedOnRead)] System.Type returnType, System.Text.Json.JsonSerializerOptions? options = null) { throw null; } @@ -518,7 +518,7 @@ namespace System.Text.Json.Serialization public partial class JsonConverterAttribute : System.Text.Json.Serialization.JsonAttribute { protected JsonConverterAttribute() { } -#if NETCOREAPP +#if NETCOREAPP && !NETCOREAPP3_0 public JsonConverterAttribute([System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] System.Type converterType) { } [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] public System.Type? ConverterType { get { throw null; } } 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 b06efdcf9ac..e22a2d475c2 100644 --- a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj @@ -1,25 +1,29 @@ - $(NetCoreAppCurrent);netstandard2.0;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 enable - - - + + + - - - + - - + + + + + + + - + \ 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 64d2b0562b0..ca40e177744 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -1,9 +1,8 @@ true - $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461;$(NetFrameworkCurrent) + $(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461 true - true @@ -16,6 +15,8 @@ $(DefineConstants);BUILDING_INBOX_LIBRARY $(NoWarn);nullable + + netstandard2.0 @@ -214,46 +215,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj index 6edf36ca7a3..808880d9af6 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true @@ -146,10 +146,15 @@ - + + + + + + diff --git a/src/libraries/System.Text.RegularExpressions/Directory.Build.props b/src/libraries/System.Text.RegularExpressions/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Text.RegularExpressions/Directory.Build.props +++ b/src/libraries/System.Text.RegularExpressions/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index f323acb4be5..5313bf0d948 100644 --- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -1,6 +1,5 @@ - System.Text.RegularExpressions true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj index dc756043b94..20878cabf96 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -3,7 +3,7 @@ true $(NoWarn);xUnit2008 - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net48 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 a88ecaa24bc..561c79249b2 100644 --- a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj @@ -1,7 +1,6 @@ - netstandard2.0;net461;$(NetFrameworkCurrent) - true + netstandard2.0;net461 enable @@ -11,10 +10,6 @@ - - - - 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 e5398bcb532..3ca55d25515 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -1,7 +1,6 @@ - netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0;$(NetFrameworkCurrent)-Windows_NT - true + netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0 true enable @@ -44,16 +43,14 @@ - - - - - - + + + + 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 c60e1d656cd..5d41e0bac88 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_NT;$(NetFrameworkCurrent)-Windows_NT + $(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT + + + diff --git a/src/libraries/System.Threading.Channels/Directory.Build.props b/src/libraries/System.Threading.Channels/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Threading.Channels/Directory.Build.props +++ b/src/libraries/System.Threading.Channels/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ 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 4aace39265e..464fca7b6b6 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -1,26 +1,27 @@ - $(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0;netstandard2.1 + $(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0;netstandard2.1;net461 true enable - + - - - - + - - - + + + + \ 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 b52a5869a93..498f88004c8 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -1,7 +1,6 @@ - $(NetCoreAppCurrent);netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;net461 true enable @@ -31,8 +30,8 @@ - - + @@ -40,12 +39,12 @@ - + - - - + + 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 5c1178c3d1c..c67e5e5fed5 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -18,4 +18,7 @@ + + + diff --git a/src/libraries/System.Threading.Overlapped/Directory.Build.props b/src/libraries/System.Threading.Overlapped/Directory.Build.props index 0f058f12cba..33e65b7cb46 100644 --- a/src/libraries/System.Threading.Overlapped/Directory.Build.props +++ b/src/libraries/System.Threading.Overlapped/Directory.Build.props @@ -2,7 +2,6 @@ Microsoft - true true \ No newline at end of file diff --git a/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props b/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props +++ b/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file 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 915b6a275ea..7c65f89d1bf 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,13 +1,9 @@ - netstandard2.0;netstandard1.0;netstandard1.1 + netstandard2.0;netstandard1.0;netstandard1.1;net461 enable - - - - \ No newline at end of file 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 9aefb2928ff..ffb871269ee 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,7 +1,6 @@ - netstandard2.0;netstandard1.0;netstandard1.1;net461;$(NetFrameworkCurrent) - true + netstandard2.0;netstandard1.0;netstandard1.1;net461 enable @@ -61,27 +60,9 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + 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 64d15af718d..f8178221313 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);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 @@ -26,4 +26,7 @@ + + + diff --git a/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props index 749d7fc1c6b..ba1f965d83c 100644 --- a/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props +++ b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props @@ -2,6 +2,5 @@ Open - true diff --git a/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props b/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props +++ b/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true diff --git a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj index 0363727de45..3d0ccd82d99 100644 --- a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj +++ b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj @@ -1,7 +1,5 @@ - System.Threading.Tasks.Parallel - System.Threading.Tasks.Parallel $(DefineConstants);FEATURE_TRACING true $(NetCoreAppCurrent) diff --git a/src/libraries/System.Threading.Tasks/Directory.Build.props b/src/libraries/System.Threading.Tasks/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Threading.Tasks/Directory.Build.props +++ b/src/libraries/System.Threading.Tasks/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj index 1b8aa100783..4f2d15aa3b6 100644 --- a/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj +++ b/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj @@ -1,6 +1,5 @@ - System.Threading.Tasks true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Thread/Directory.Build.props b/src/libraries/System.Threading.Thread/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Threading.Thread/Directory.Build.props +++ b/src/libraries/System.Threading.Thread/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj index 7bde58cfb98..dd3dc2940a5 100644 --- a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj +++ b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj @@ -1,7 +1,5 @@ - System.Threading.Thread - Library true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.ThreadPool/Directory.Build.props b/src/libraries/System.Threading.ThreadPool/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Threading.ThreadPool/Directory.Build.props +++ b/src/libraries/System.Threading.ThreadPool/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj b/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj index 14a425e4885..dd3dc2940a5 100644 --- a/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj +++ b/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj @@ -1,6 +1,5 @@ - System.Threading.ThreadPool true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading.Timer/Directory.Build.props b/src/libraries/System.Threading.Timer/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Threading.Timer/Directory.Build.props +++ b/src/libraries/System.Threading.Timer/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj b/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj index 68aff5403a4..4f2d15aa3b6 100644 --- a/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj +++ b/src/libraries/System.Threading.Timer/src/System.Threading.Timer.csproj @@ -1,6 +1,5 @@ - System.Threading.Timer true $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Threading/Directory.Build.props b/src/libraries/System.Threading/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Threading/Directory.Build.props +++ b/src/libraries/System.Threading/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Threading/src/System.Threading.csproj b/src/libraries/System.Threading/src/System.Threading.csproj index 6b4aeb5e8a1..895b4582793 100644 --- a/src/libraries/System.Threading/src/System.Threading.csproj +++ b/src/libraries/System.Threading/src/System.Threading.csproj @@ -1,6 +1,5 @@ - System.Threading true true $(NetCoreAppCurrent) diff --git a/src/libraries/System.Transactions.Local/Directory.Build.props b/src/libraries/System.Transactions.Local/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Transactions.Local/Directory.Build.props +++ b/src/libraries/System.Transactions.Local/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file diff --git a/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj b/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj index b7a65a17fae..ce48f9db195 100644 --- a/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj +++ b/src/libraries/System.Transactions.Local/ref/System.Transactions.Local.csproj @@ -1,6 +1,5 @@ - Library $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj b/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj index dd777197997..1715d21528c 100644 --- a/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj +++ b/src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj @@ -33,6 +33,7 @@ + @@ -50,7 +51,4 @@ - - - diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs index 04a0cc861ba..5f1d14ec279 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.Forwards.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_0 && !NETFRAMEWORK [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Index))] [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Range))] diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs index b37545e6f47..a72e76090de 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.cs @@ -90,12 +90,12 @@ namespace System public bool Contains(System.Text.Rune value, System.StringComparison comparison) { throw null; } public bool Contains(System.Utf8String value) { throw null; } public bool Contains(System.Utf8String value, System.StringComparison comparison) { throw null; } -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_0 && !NETFRAMEWORK public static System.Utf8String Create(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public static System.Utf8String CreateFromRelaxed(System.ReadOnlySpan buffer) { throw null; } public static System.Utf8String CreateFromRelaxed(System.ReadOnlySpan buffer) { throw null; } -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_0 && !NETFRAMEWORK public static System.Utf8String CreateRelaxed(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public bool EndsWith(char value) { throw null; } @@ -168,7 +168,7 @@ namespace System public bool TryFindLast(System.Utf8String value, out System.Range range) { throw null; } public bool TryFindLast(System.Utf8String value, System.StringComparison comparisonType, out System.Range range) { throw null; } public static System.Utf8String UnsafeCreateWithoutValidation(System.ReadOnlySpan utf8Contents) { throw null; } -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_0 && !NETFRAMEWORK public static System.Utf8String UnsafeCreateWithoutValidation(int length, TState state, System.Buffers.SpanAction action) { throw null; } #endif public readonly partial struct ByteEnumerable : System.Collections.Generic.IEnumerable diff --git a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj index 4ef79b71fc4..eb5a1414f8c 100644 --- a/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj +++ b/src/libraries/System.Utf8String.Experimental/ref/System.Utf8String.Experimental.csproj @@ -3,25 +3,31 @@ true $(NoWarn);0809;0618 - netstandard2.0;netstandard2.1;netcoreapp3.0;$(NetCoreAppCurrent) + netstandard2.0;netstandard2.1;netcoreapp3.0;$(NetCoreAppCurrent);net461 enable - + - + - + - - + + + + + + + + @@ -30,10 +36,8 @@ - - - - - + + + \ No newline at end of file diff --git a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj index 016238e9a83..8b72b9161c5 100644 --- a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj +++ b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj @@ -1,8 +1,7 @@ true - $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;netcoreapp3.0;net461;$(NetFrameworkCurrent) - true + $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;netcoreapp3.0;net461 enable $(DefineContants);FEATURE_UTF8STRING @@ -17,7 +16,7 @@ - + - - - - - + + + + + + + + + - - + + + + + + + + + @@ -134,21 +145,10 @@ - - - - - - - - - - - - + diff --git a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj index 1edb4b7d68e..73efb5b00c8 100644 --- a/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj +++ b/src/libraries/System.Utf8String.Experimental/tests/System.Utf8String.Experimental.Tests.csproj @@ -2,11 +2,9 @@ true true - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + $(NetCoreAppCurrent);net461 true true - - true @@ -43,7 +41,13 @@ - + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.ValueTuple/Directory.Build.props b/src/libraries/System.ValueTuple/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.ValueTuple/Directory.Build.props +++ b/src/libraries/System.ValueTuple/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file diff --git a/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj b/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj index 7de77702d27..48439ada9ee 100644 --- a/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj +++ b/src/libraries/System.ValueTuple/ref/System.ValueTuple.csproj @@ -3,13 +3,13 @@ 4.0.3.0 - $(NetCoreAppCurrent);_$(NetFrameworkCurrent) + $(NetCoreAppCurrent) enable - + diff --git a/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj b/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj index 37b43aecf36..7a4c9970551 100644 --- a/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj +++ b/src/libraries/System.ValueTuple/src/System.ValueTuple.csproj @@ -2,7 +2,7 @@ true - $(NetCoreAppCurrent);_$(NetFrameworkCurrent) + $(NetCoreAppCurrent) enable diff --git a/src/libraries/System.Web.HttpUtility/Directory.Build.props b/src/libraries/System.Web.HttpUtility/Directory.Build.props index 2b9e2844e4e..bdcfca3b543 100644 --- a/src/libraries/System.Web.HttpUtility/Directory.Build.props +++ b/src/libraries/System.Web.HttpUtility/Directory.Build.props @@ -2,6 +2,5 @@ Open - true \ No newline at end of file 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 ebbd3e46f76..d8548ee597d 100644 --- a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj @@ -7,17 +7,17 @@ - - - - - + + + + + - - + + \ No newline at end of file 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 ea77d6793f7..7e4df72fa5e 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -2,7 +2,7 @@ SR.PlatformNotSupported_System_Windows_Extensions true - $(NetCoreAppCurrent)-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;$(NetCoreAppCurrent) + $(NetCoreAppCurrent)-Windows_NT;netcoreapp3.0-Windows_NT;$(NetCoreAppCurrent);netcoreapp3.0 true @@ -55,6 +55,9 @@ + + + @@ -63,7 +66,6 @@ - diff --git a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj index 7396a53455f..f41f912cb05 100644 --- a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj +++ b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj @@ -25,5 +25,7 @@ + + diff --git a/src/libraries/System.Xml.ReaderWriter/Directory.Build.props b/src/libraries/System.Xml.ReaderWriter/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Xml.ReaderWriter/Directory.Build.props +++ b/src/libraries/System.Xml.ReaderWriter/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj b/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj index e7413a35783..eccf2f839b9 100644 --- a/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj +++ b/src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj @@ -1,14 +1,11 @@ - System.Xml.ReaderWriter System.Xml true $(NetCoreAppCurrent) - - - + \ No newline at end of file diff --git a/src/libraries/System.Xml.XDocument/Directory.Build.props b/src/libraries/System.Xml.XDocument/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Xml.XDocument/Directory.Build.props +++ b/src/libraries/System.Xml.XDocument/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj b/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj index 6bfd8d595b0..f4c9ec075a8 100644 --- a/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj +++ b/src/libraries/System.Xml.XDocument/src/System.Xml.XDocument.csproj @@ -1,15 +1,12 @@ - System.Xml.XDocument System.Xml true $(NetCoreAppCurrent) - - - - + + \ No newline at end of file diff --git a/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props b/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props +++ b/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj b/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj index 27b08b9f75f..6ef3750484c 100644 --- a/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj +++ b/src/libraries/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj @@ -8,10 +8,8 @@ - - - - + + diff --git a/src/libraries/System.Xml.XPath/Directory.Build.props b/src/libraries/System.Xml.XPath/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Xml.XPath/Directory.Build.props +++ b/src/libraries/System.Xml.XPath/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj b/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj index c78bfe73a9d..8159a0e77d9 100644 --- a/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj +++ b/src/libraries/System.Xml.XPath/src/System.Xml.XPath.csproj @@ -1,13 +1,10 @@ - System.Xml.XPath true $(NetCoreAppCurrent) - - - + \ No newline at end of file diff --git a/src/libraries/System.Xml.XmlDocument/Directory.Build.props b/src/libraries/System.Xml.XmlDocument/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Xml.XmlDocument/Directory.Build.props +++ b/src/libraries/System.Xml.XmlDocument/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj b/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj index 7abca9d22ec..2700e39cf27 100644 --- a/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj +++ b/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj @@ -1,15 +1,11 @@ - System.Xml.XmlDocument - System.Xml.XmlDocument true true $(NetCoreAppCurrent) - - - + \ No newline at end of file diff --git a/src/libraries/System.Xml.XmlSerializer/Directory.Build.props b/src/libraries/System.Xml.XmlSerializer/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Xml.XmlSerializer/Directory.Build.props +++ b/src/libraries/System.Xml.XmlSerializer/Directory.Build.props @@ -2,6 +2,5 @@ Microsoft - true \ No newline at end of file diff --git a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj index d9aa0818fdf..8159a0e77d9 100644 --- a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj +++ b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj @@ -1,14 +1,10 @@ - System.Xml.XmlSerializer - System.Xml.XmlSerializer true $(NetCoreAppCurrent) - - - + \ No newline at end of file diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index 95fb67f15b8..2c2fd223869 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -6538,6 +6538,7 @@ "4.1.0.0": "4.3.0", "4.1.1.0": "4.4.0", "4.2.0.0": "4.5.0", + "4.2.0.1": "4.5.4", "4.2.1.0": "4.6.0" } }, diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index a624abf7878..94f5111179a 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -21,9 +21,6 @@ - - - diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj index 23a4041ff30..5cd55be973c 100644 --- a/src/libraries/pretest.proj +++ b/src/libraries/pretest.proj @@ -1,17 +1,16 @@ - - BuildAllProjects=true - - true true - + @@ -20,8 +19,8 @@ - - + BeforeTargets="Build" + Condition="'$(CreateIntermediateRunSettingsFile)' == 'true'" /> - - + - <_manualSharedFrameworkRuntimeFiles Include="System.Security.Cryptography.Native.OpenSsl.so" /> - <_manualSharedFrameworkRuntimeFiles Include="System.Security.Cryptography.Native.Apple.dylib" /> - <_manualSharedFrameworkRuntimeFiles Include="System.Security.Cryptography.Native.OpenSsl.dylib" /> - - - + + + + + - - + - - - + + + + + + - + + - - + - <_refPackLibFile Include="$(MicrosoftNetCoreAppRefPackRefDir)*.*"> - ref/$(NetCoreAppCurrent) - - <_runtimePackLibFiles Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.*"> + runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent) - - <_runtimePackNativeFiles Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)*.*"> + + runtimes/$(PackageRID)/native true - - - <_runtimePackNativeFiles Update="@(_runtimePackNativeFiles)" Condition="'%(FileName)%(Extension)' == 'System.Private.CoreLib.dll'" IsNative="" /> - - - - - + + + - - <_refPackLibFile> + true - - <_runtimePackLibFiles> + + true - - <_runtimePackNativeFiles> - true - + + + + + + + + + + + + - - - + RootAttributes="@(FrameworkListRootAttribute)" /> diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj index c13c1004438..c80789e51e5 100644 --- a/src/libraries/ref.proj +++ b/src/libraries/ref.proj @@ -1,24 +1,91 @@ + BuildAllProjects=true - + <_allRef Include="$(MSBuildThisFileDirectory)*\ref\*.csproj" + Exclude="@(ProjectExclusions)" /> + + + - + + - + + AfterTargets="Build" + Condition="'@(GeneratedShimProject)' != ''"> + + + + ref/$(NetCoreAppCurrent) + true + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/restore/Directory.Build.props b/src/libraries/restore/Directory.Build.props index 359dfd63da6..4cc238039b4 100644 --- a/src/libraries/restore/Directory.Build.props +++ b/src/libraries/restore/Directory.Build.props @@ -1,4 +1,4 @@ - + @@ -11,7 +11,6 @@ true false - netstandard2.0 - - - $(RefPath) - - - - - - - BinPlaceLib - $(RuntimePath) - - - BinPlaceLib - $(TestHostRuntimePath) - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libraries/restore/depproj.proj b/src/libraries/restore/depproj.proj deleted file mode 100644 index 7825325f923..00000000000 --- a/src/libraries/restore/depproj.proj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libraries/restore/netcoreapp/external.netcoreapp.depproj b/src/libraries/restore/netcoreapp/external.netcoreapp.depproj deleted file mode 100644 index 72e15fde6cd..00000000000 --- a/src/libraries/restore/netcoreapp/external.netcoreapp.depproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - Reference - false - true - netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1 - - - - - - - - - - - - diff --git a/src/libraries/restore/netfx/netfx.depproj b/src/libraries/restore/netfx/netfx.depproj deleted file mode 100644 index 7fcdb732906..00000000000 --- a/src/libraries/restore/netfx/netfx.depproj +++ /dev/null @@ -1,126 +0,0 @@ - - - - true - true - Reference - NETStandard.Library.NETFramework - 2.0.1-servicing-26011-01 - $(NuGetPackageRoot)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build - true - net45;net451;net46;net461;net462;net47;net471;net472 - - $(TargetFrameworks);$(NetCoreAppCurrent) - - - - $(NetFrameworkCurrent) - Microsoft.TargetingPack.NETFramework.v4.7.2 - - - - - <_ShortFrameworkIdentifier>$(TargetFramework.TrimEnd('.0123456789')) - <_ShortFrameworkVersion>$(TargetFramework.Substring($(_ShortFrameworkIdentifier.Length))) - - - - - v$(_ShortFrameworkVersion) - - - - - v$(_ShortFrameworkVersion[0]).0 - v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1]) - v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1]).$(_ShortFrameworkVersion[2]) - - - - - .NETStandard - .NETCoreApp - - - .NETFramework - .NETCoreApp - - - - Microsoft.TargetingPack.NETFramework.$(TargetFrameworkVersion) - - - - - - $(NetFxRefPath) - - - - - $(RefPath) - - - - - <_TargetingPackVersion>1.0.1 - <_TargetingPackVersion Condition="'$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.1' or '$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.2'">1.0.0 - - - - - $(_TargetingPackVersion) - - - 4.5.2 - - - 4.5.0 - - - 4.5.0 - - - $(NETStandardSupportPackageVersion) - - - - - - - - - - <_netStandardReference Condition="'$(TargetFramework)' != 'net461' and '$(TargetFramework)' != 'net462'" - Include="$(NETStandardSupportRoot)\net47\lib\*.dll" - Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net47\lib\%(FileName).dll')" /> - <_netStandardReference Condition="'$(TargetFramework)' != 'net461'" - Include="$(NETStandardSupportRoot)\net462\lib\*.dll" - Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net462\lib\%(FileName).dll')" /> - <_netStandardReference Include="$(NETStandardSupportRoot)\net461\lib\*.dll" - Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net461\lib\%(FileName).dll')" /> - - <_netStandardReference> - False - $(NETStandardSupportPackageId) - $(NETStandardSupportPackageVersion) - - - <_referenceByFileName Include="@(Reference->'%(FileName)%(Extension)')"> - %(Identity) - - <_netStandardReferenceByFileName Include="@(_netStandardReference->'%(FileName)%(Extension)')" /> - - <_remainingReferenceByFileName Include="@(_referenceByFileName)" Exclude="@(_netStandardReferenceByFileName)" /> - <_remainingReference Include="@(_remainingReferenceByFileName->'%(OriginalIdentity)')" /> - - - - - - diff --git a/src/libraries/restore/netstandard/external.netstandard.depproj b/src/libraries/restore/netstandard/external.netstandard.depproj deleted file mode 100644 index 1d80925bf17..00000000000 --- a/src/libraries/restore/netstandard/external.netstandard.depproj +++ /dev/null @@ -1,128 +0,0 @@ - - - $(TargetFramework.SubString(11)) - true - true - true - Reference - <_NETStandardTFMFolder Condition="'$(TargetFramework)' == 'netstandard2.0'">netstandard2.0 - netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0 - - - - - $(NETStandardLibraryVersion) - - - - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - - - 4.5.0 - - - 4.5.0 - - - 4.5.1 - - - 4.5.2 - - - 4.7.0 - - - - - - - $(RefPath) - - - - $(TestHostRootPath) - - - - - - <_NETStandard21RefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\netstandard2.1\ref - - - - - - <_NetStandard21Files - Include="$(_NETStandard21RefFolder)\*.dll" - Exclude="@(ExcludeNetStandard21Refs -> '$(_NETStandard21RefFolder)\%(Identity).dll')" /> - - - - - - - - - - <_NETStandardRefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\$(_NETStandardTFMFolder)\ref - - - - - - - - - - - - False - $(NETStandardLibraryPackage) - $(NETStandardLibraryVersion) - - - - diff --git a/src/libraries/restore/runtime/referenceFromRuntime.targets b/src/libraries/restore/runtime/referenceFromRuntime.targets deleted file mode 100644 index 2a013d8d05d..00000000000 --- a/src/libraries/restore/runtime/referenceFromRuntime.targets +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index b8cd8ce65ba..92ebdb6d285 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -6,7 +6,7 @@ false true false - netcoreapp3.0-Windows_NT;netcoreapp3.0-Unix;$(netcoreappCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser @@ -22,10 +22,6 @@ - - - - - - - - - cross/ - - - include/%(RecursiveDir) - - - - + - + Condition="'$(RuntimeFlavor)' == 'Mono'"> + + + + + + + @@ -109,10 +101,8 @@ - $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '_[^;]+;?', '')) $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '-[^;]+', '')) diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index d5729d8e5d7..92b7b688e77 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -18,7 +18,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -80,7 +80,8 @@ true - $(TestArchiveRuntimeRoot)test-runtime-$(BuildSettings).zip + $(TestArchiveRuntimeRoot)test-runtime-$(BuildSettings).zip $(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip @@ -144,7 +145,9 @@ + Condition="'$(TestPackages)' != 'true' and + '$(TargetsMobile)' != 'true' and + '$(TestArchiveRuntimeFile)' != ''"> diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index f5b2ab2489a..fecc281788d 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -136,7 +136,9 @@ so if we don't use "call", then we cause the parent script to exit, and anything after will not be executed. --> call RunTests.cmd --runtime-path %HELIX_CORRELATION_PAYLOAD% + $(HelixCommand) --runtime-path %HELIX_CORRELATION_PAYLOAD% ./RunTests.sh --runtime-path "$HELIX_CORRELATION_PAYLOAD" + $(HelixCommand) --runtime-path "$HELIX_CORRELATION_PAYLOAD" @@ -155,14 +157,15 @@ - + - + <_WorkItem Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" /> diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj index d275e0efeac..da102c54508 100644 --- a/src/libraries/shims/ApiCompat.proj +++ b/src/libraries/shims/ApiCompat.proj @@ -4,7 +4,9 @@ $(BuildTargetFramework) false - <_RunApiCompat>true + netcoreapp3.1 + microsoft.netcore.app.ref + 3.1.0 @@ -14,6 +16,11 @@ + + + + + @@ -28,14 +35,13 @@ - $(BuildTargetFrameworkRefPath.TrimEnd('\/')) + $(NetCoreAppCurrentRefPath.TrimEnd('\/')) $(ApiCompatArgs) --exclude-attributes "$(ApiCompatExcludeAttributeList)" $(ApiCompatArgs) --impl-dirs "$(ApiCompatImplementationDirs)" --baseline "$(ApiCompatBaselineIgnoreFile)" @@ -53,7 +59,7 @@ - + - @@ -100,8 +104,7 @@ - netcoreapp3.1 - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(PreviousNetCoreApp)')) + $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', '$(PreviousNetCoreAppPackageId)', '$(PreviousNetCoreAppPackageVersion)', 'ref', '$(PreviousNetCoreApp)')) <_previousNetCoreAppBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.PreviousNetCoreApp.txt <_previousNetCoreAppBaselineParam>--baseline "$(_previousNetCoreAppBaselineFile)" <_previousNetCoreAppBaselineParam Condition="'$(UpdatePreviousNetCoreAppBaseline)' == 'true'">> "$(_previousNetCoreAppBaselineFile)" diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props index d0835fdd9bb..55920bf3ba2 100644 --- a/src/libraries/shims/Directory.Build.props +++ b/src/libraries/shims/Directory.Build.props @@ -4,7 +4,8 @@ - true + true + true $(TargetFramework) @@ -16,8 +17,10 @@ to reference the latest packages. netstandard.dll doesn't need to do this since it has no dangling dependencies --> true - false true + net48 + $(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNetFrameworkReferenceAssembliesVersion)\build\.NETFramework\v4.8\ + $(NuGetPackageRoot)netstandard.library\$(NETStandardLibraryVersion)\build\netstandard2.1\ref\ diff --git a/src/libraries/shims/generated/Directory.Build.props b/src/libraries/shims/generated/Directory.Build.props index 2768718a10e..096ac688164 100644 --- a/src/libraries/shims/generated/Directory.Build.props +++ b/src/libraries/shims/generated/Directory.Build.props @@ -7,22 +7,37 @@ - + + $(NetCoreAppCurrent) + + + + + + + + + + + Include="$(NetCoreAppCurrentRefPath)*.dll" + Exclude="$(NetCoreAppCurrentRefPath)$(MSBuildProjectName).dll; + $(NetCoreAppCurrentRefPath)netstandard.dll; + $(NetCoreAppCurrentRefPath)Microsoft.Extensions.DependencyModel.dll" /> - + - - - $(NetCoreAppCurrent) - diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props index ee66f309890..4070e431ee5 100644 --- a/src/libraries/shims/manual/Directory.Build.props +++ b/src/libraries/shims/manual/Directory.Build.props @@ -17,8 +17,10 @@ - + diff --git a/src/libraries/shims/manual/System.Data.csproj b/src/libraries/shims/manual/System.Data.csproj index 417d9bf1d03..2f89b12251a 100644 --- a/src/libraries/shims/manual/System.Data.csproj +++ b/src/libraries/shims/manual/System.Data.csproj @@ -3,8 +3,7 @@ - - - + + diff --git a/src/libraries/src.proj b/src/libraries/src.proj index 91225466df0..c534a380309 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -2,41 +2,48 @@ BuildAllProjects=true - BuildWasmRuntimes - + <_allSrc Include="$(MSBuildThisFileDirectory)*\src\*.csproj" + Exclude="@(ProjectExclusions)" /> + + - - - - - - - + Condition="'$(DotNetBuildFromSource)' != 'true' and + '$(BuildingNETCoreAppVertical)' == 'true' and + '$(RunApiCompat)' != 'false'" /> - - - + + + + - - - + + + + AfterTargets="BuildNonNetCoreAppProjects" + Condition="'@(ManualShimProject)' != ''"> diff --git a/src/mono/wasm/wasm.targets b/src/mono/wasm/wasm.targets index 520dd9c7d7b..be87c207b15 100644 --- a/src/mono/wasm/wasm.targets +++ b/src/mono/wasm/wasm.targets @@ -1,48 +1,49 @@ - - - - $(ArtifactsObjDir)wasm/pinvoke-table.h - - - - - - - - - - - - - - - - - - - - + + + + + + + $(ArtifactsObjDir)wasm\pinvoke-table.h + + + + + + + + + + + - + - + + + diff --git a/tools-local/tasks/installer.tasks/installer.tasks.csproj b/tools-local/tasks/installer.tasks/installer.tasks.csproj index 356f22ac74e..368fe4c58d9 100644 --- a/tools-local/tasks/installer.tasks/installer.tasks.csproj +++ b/tools-local/tasks/installer.tasks/installer.tasks.csproj @@ -1,7 +1,7 @@ netstandard2.0 - $(TargetFrameworks);net46 + $(TargetFrameworks);net461 false false