diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2020-07-23 18:20:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 18:20:26 +0300 |
| commit | 809a06f45161ae686a06b9e9ccc2f45097b91657 (patch) | |
| tree | daa6d29750bc49c463679fc189ae2ecb6618438d | |
| parent | e8c4169b4fc4eb9a71f296b3bd2e96db16d32d35 (diff) | |
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)"
648 files changed, 2707 insertions, 3318 deletions
diff --git a/Build.proj b/Build.proj index dc4a15ab5f4..2041d3d4fcc 100644 --- a/Build.proj +++ b/Build.proj @@ -1,5 +1,9 @@ <Project Sdk="Microsoft.Build.Traversal"> + <PropertyGroup> + <TraversalGlobalProperties>BuildTargetFramework=$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))</TraversalGlobalProperties> + </PropertyGroup> + <!-- Subsets are already imported by Directory.Build.props. Reference the projects for traversal build. Ordering matters here. @@ -35,7 +39,7 @@ <Target Name="RestoreWithoutStaticGraph" BeforeTargets="Restore"> - <MSBuild Projects="@(LibrariesRestoreProject);@(DepprojProjectToBuild);@(PkgprojProjectToBuild);@(BundleProjectToBuild)" + <MSBuild Projects="@(DepprojProjectToBuild);@(PkgprojProjectToBuild);@(BundleProjectToBuild)" Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());RestoreUseStaticGraphEvaluation=false" Targets="Restore" /> </Target> diff --git a/Directory.Build.props b/Directory.Build.props index e8f9a65ba21..c4bcb9a6255 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -40,7 +40,7 @@ <!-- Installer specific, required during restore. --> <InstallerTasksOutputPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'installer.tasks'))</InstallerTasksOutputPath> <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'netstandard2.0', 'installer.tasks.dll'))</InstallerTasksAssemblyPath> - <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net46', 'installer.tasks.dll'))</InstallerTasksAssemblyPath> + <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net461', 'installer.tasks.dll'))</InstallerTasksAssemblyPath> <DocsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))</DocsDir> <ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))</ManPagesDir> 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: ``` <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461-Windows_NT</TargetFrameworks> <PropertyGroup> ``` -### Placeholder Target Frameworks -Placeholder Target Framework can be added to the `<TargetFrameworks>` 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: -``` -<PropertyGroup> - <TargetFrameworks>netstandard2.0;_net472</TargetFrameworks> -</PropertyGroup> -``` - ## 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 @@ +<Project> + <!-- Set PackageId to a temporary value to avoid NuGet restore cycle error NU1108: https://github.com/NuGet/Home/issues/6754 --> + <PropertyGroup> + <_PackageIdTemp>$(PackageId)</_PackageIdTemp> + <PackageId>$(PackageId)_temp</PackageId> + </PropertyGroup> + + <Target Name="_UpdatePackageId" + BeforeTargets="$(PackDependsOn)" > + <PropertyGroup> + <PackageId>$(_PackageIdTemp)</PackageId> + </PropertyGroup> + </Target> +</Project>
\ 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>$(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-'))))</TargetFramework> </PropertyGroup> - <PropertyGroup> - <RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)'))</RefPath> - </PropertyGroup> - <Import Project="$(MSBuildThisDirectory)targetframeworksuffix.props" Condition="'$(DesignTimeBuild)' == 'true'" /> <PropertyGroup> 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 @@ <NETCoreAppFramework>$(NetCoreAppCurrent)</NETCoreAppFramework> <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName> <NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName> - - <NetFrameworkCurrent>net472</NetFrameworkCurrent> <MinimiumSupportedWindowsPlatform>WINDOWS7.0</MinimiumSupportedWindowsPlatform> </PropertyGroup> 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 @@ <DefaultMonoSubsets Condition="'$(MonoEnableLLVM)' == 'true' and '$(MonoLLVMDir)' == ''">mono.llvm+</DefaultMonoSubsets> <DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib</DefaultMonoSubsets> - <DefaultLibrariesSubsets>libs.depprojs+libs.native+libs.ref+libs.src+libs.pretest+libs.packages</DefaultLibrariesSubsets> + <DefaultLibrariesSubsets>libs.native+libs.ref+libs.src+libs.pretest+libs.packages</DefaultLibrariesSubsets> <DefaultInstallerSubsets>corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles+installers+installer.tests</DefaultInstallerSubsets> <DefaultInstallerSubsets Condition="'$(RuntimeFlavor)' == 'Mono'">installer.pkgprojs</DefaultInstallerSubsets> @@ -95,7 +95,6 @@ <!-- Libs --> <SubsetName Include="Libs" Description="The libraries native part, refs and source assemblies, test infra and packages, but NOT the tests (use Libs.Tests to request those explicitly)" /> - <SubsetName Include="Libs.Depprojs" Description="The libraries upfront restore projects." /> <SubsetName Include="Libs.Native" Description="The native libraries used in the shared framework." /> <SubsetName Include="Libs.Ref" Description="The managed reference libraries." /> <SubsetName Include="Libs.Src" Description="The managed implementation libraries." /> @@ -177,12 +176,6 @@ </ItemGroup> <!-- Libraries sets --> - <ItemGroup Condition="$(_subset.Contains('+libs.depprojs+'))"> - <LibrariesRestoreProject Include="$(LibrariesProjectRoot)restore\depproj.proj"> - <AdditionalProperties Condition="'$(LibrariesConfiguration)' != ''">Configuration=$(LibrariesConfiguration)</AdditionalProperties> - </LibrariesRestoreProject> - </ItemGroup> - <ItemGroup Condition="$(_subset.Contains('+libs.native+'))"> <ProjectToBuild Include="$(LibrariesProjectRoot)Native\build-native.proj" Category="libs" /> </ItemGroup> 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 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20364.3"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20372.2"> <Uri>https://github.com/dotnet/arcade</Uri> <Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha> </Dependency> 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 @@ <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers> <UsingToolIbcOptimization>true</UsingToolIbcOptimization> <UsingToolXliff>false</UsingToolXliff> + <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies> <!-- Blob storage container that has the "Latest" channel to publish to. --> <ContainerName>dotnet</ContainerName> <ChecksumContainerName>$(ContainerName)</ChecksumContainerName> @@ -56,10 +57,10 @@ <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20364.3</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20364.3</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20364.3</MicrosoftDotNetGenFacadesVersion> - <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20364.3</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20367.6</MicrosoftDotNetXUnitExtensionsVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20364.3</MicrosoftDotNetXUnitConsoleRunnerVersion> <MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20364.3</MicrosoftDotNetBuildTasksPackagingVersion> - <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20364.3</MicrosoftDotNetRemoteExecutorVersion> + <MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20367.6</MicrosoftDotNetRemoteExecutorVersion> <MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20364.3</MicrosoftDotNetVersionToolsTasksVersion> <!-- Installer dependencies --> <MicrosoftNETCoreAppVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreAppVersion> @@ -69,7 +70,36 @@ <!-- CoreClr dependencies --> <MicrosoftNETCoreILAsmVersion>5.0.0-preview.8.20359.4</MicrosoftNETCoreILAsmVersion> <!-- Libraries dependencies --> + <SystemBuffersVersion>4.5.1</SystemBuffersVersion> + <SystemCollectionsVersion>4.3.0</SystemCollectionsVersion> + <SystemCollectionsConcurrentVersion>4.3.0</SystemCollectionsConcurrentVersion> + <SystemComponentModelAnnotationsVersion>4.7.0</SystemComponentModelAnnotationsVersion> + <SystemDataSqlClientVersion>4.8.1</SystemDataSqlClientVersion> + <SystemDiagnosticsContractsVersion>4.3.0</SystemDiagnosticsContractsVersion> + <SystemDiagnosticsDebugVersion>4.3.0</SystemDiagnosticsDebugVersion> + <SystemDiagnosticsTracingVersion>4.3.0</SystemDiagnosticsTracingVersion> + <SystemDynamicRuntimeVersion>4.3.0</SystemDynamicRuntimeVersion> + <SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion> + <SystemMemoryVersion>4.5.4</SystemMemoryVersion> + <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion> + <SystemNetPrimitivesVersion>4.3.1</SystemNetPrimitivesVersion> + <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion> + <SystemResourcesResourceManagerVersion>4.3.0</SystemResourcesResourceManagerVersion> + <SystemRuntimeVersion>4.3.1</SystemRuntimeVersion> + <SystemRuntimeExtensionsVersion>4.3.1</SystemRuntimeExtensionsVersion> + <SystemRuntimeInteropServicesVersion>4.3.0</SystemRuntimeInteropServicesVersion> + <SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion> + <SystemRuntimeSerializationPrimitivesVersion>4.3.0</SystemRuntimeSerializationPrimitivesVersion> + <SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion> + <SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion> + <SystemSecurityCryptographyPkcsVersion>4.7.0</SystemSecurityCryptographyPkcsVersion> + <SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion> <SystemTextJsonVersion>5.0.0-preview.4.20202.18</SystemTextJsonVersion> + <SystemThreadingVersion>4.3.0</SystemThreadingVersion> + <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion> + <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion> + <MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion> + <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion> <runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion> <!-- Runtime-Assets dependencies --> <SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20364.1</SystemComponentModelTypeConverterTestDataVersion> @@ -82,6 +112,7 @@ <SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20364.1</SystemWindowsExtensionsTestDataVersion> <!-- Standard dependencies --> <NETStandardLibraryVersion>2.2.0-prerelease.19564.1</NETStandardLibraryVersion> + <NetStandardLibrary20Version>2.0.3</NetStandardLibrary20Version> <!-- dotnet-optimization dependencies --> <optimizationwindows_ntx64IBCCoreFxVersion>99.99.99-master-20200228.3</optimizationwindows_ntx64IBCCoreFxVersion> <optimizationlinuxx64IBCCoreFxVersion>99.99.99-master-20200228.3</optimizationlinuxx64IBCCoreFxVersion> @@ -101,8 +132,6 @@ <RefOnlyMicrosoftBuildUtilitiesCoreVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildUtilitiesCoreVersion> <RefOnlyNugetProjectModelVersion>4.9.4</RefOnlyNugetProjectModelVersion> <RefOnlyNugetPackagingVersion>4.9.4</RefOnlyNugetPackagingVersion> - <!-- System.Data.SqlClient --> - <SystemDataSqlClientVersion>4.8.0</SystemDataSqlClientVersion> <!-- Testing --> <MicrosoftNETTestSdkVersion>16.8.0-preview-20200716-03</MicrosoftNETTestSdkVersion> <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20352.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion> 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 @@ <PropertyGroup> <ILLinkTasksDir>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NET_ILLink_Tasks)', 'tools'))</ILLinkTasksDir> <ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' == 'core'">$(ILLinkTasksDir)netcoreapp3.0/ILLink.Tasks.dll</ILLinkTasksPath> - <ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' != 'core'">$(ILLinkTasksDir)$(NetFrameworkCurrent)/ILLink.Tasks.dll</ILLinkTasksPath> + <ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' != 'core'">$(ILLinkTasksDir)net472/ILLink.Tasks.dll</ILLinkTasksPath> <ILLinkTrimAssemblyPath>$(IntermediateOutputPath)$(TargetName)$(TargetExt)</ILLinkTrimAssemblyPath> <ILLinkTrimAssemblySymbols>$(IntermediateOutputPath)$(TargetName).pdb</ILLinkTrimAssemblySymbols> <ILLinkTrimInputPath>$(IntermediateOutputPath)PreTrim/</ILLinkTrimInputPath> 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 @@ <Project> <PropertyGroup Condition="'$(BuildAllProjects)' == 'true' and - !$(BuildTargetFramework.StartsWith('netstandard'))"> - <AdditionalBuildTargetFrameworks Condition="!$(BuildTargetFramework.StartsWith('net45'))">$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks> - <AdditionalBuildTargetFrameworks Condition="!$(BuildTargetFramework.StartsWith('netcoreapp2.0')) and - !$(BuildTargetFramework.StartsWith('net4'))">$(AdditionalBuildTargetFrameworks);netstandard2.1</AdditionalBuildTargetFrameworks> + !$(BuildTargetFramework.StartsWith('netstandard')) and + !$(BuildTargetFramework.StartsWith('net4'))"> + <AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks> + <AdditionalBuildTargetFrameworks Condition="!$(BuildTargetFramework.StartsWith('netcoreapp2.0'))">$(AdditionalBuildTargetFrameworks);netstandard2.1</AdditionalBuildTargetFrameworks> </PropertyGroup> <PropertyGroup> 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 @@ -<Project> - <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <PrepareProjectReferencesDependsOn> - AddRuntimeProjectReference; - $(PrepareProjectReferencesDependsOn); - </PrepareProjectReferencesDependsOn> - <ResolveReferencesDependsOn> - AddRuntimeProjectReference; - $(ResolveReferencesDependsOn); - </ResolveReferencesDependsOn> - <CleanDependsOn> - AddRuntimeProjectReference; - $(CleanDependsOn) - </CleanDependsOn> - </PropertyGroup> - - <PropertyGroup> - <RuntimeProjectFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'restore', 'runtime', 'runtime.depproj'))</RuntimeProjectFile> - </PropertyGroup> - - <Target Name="AddRuntimeProjectReference" - Condition="'$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true' and '@(ReferenceFromRuntime)' != ''"> - <Error Text="ReferenceFromRuntime may not be used from reference assemblies." - Condition="'$(IsReferenceAssembly)' == 'true' and '$(AllowReferenceFromRuntime)' != 'true'" /> - - <ItemGroup> - <ProjectReference Include="$(RuntimeProjectFile)"> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - <OutputItemType>_referencePathFromRestoredRuntime</OutputItemType> - </ProjectReference> - </ItemGroup> - </Target> - - <Target Name="GetFilesFromRuntime" Returns="@(RuntimeFiles)" DependsOnTargets="GetFilesFromCoreClr;GetFilesFromMono"> - <ItemGroup> - <RuntimeFiles Include="@(RuntimeFiles)" /> - </ItemGroup> - </Target> - - <!-- - The check must use != Mono because we don't consistently set this value to CoreCLR - https://github.com/dotnet/runtime/issues/32884 - --> - <Target Name="GetFilesFromCoreCLR" - Condition="'$(RuntimeFlavor)' != 'Mono'" - Returns="@(RuntimeFiles)" - DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" /> - - <Target Name="GetFilesFromMono" - Condition="'$(RuntimeFlavor)' == 'Mono'" - Returns="@(RuntimeFiles)" - DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" /> - - <Target Name="FilterReferenceFromRuntime" - AfterTargets="ResolveProjectReferences" - Condition="'@(ReferenceFromRuntime)' != ''"> - - <Error Condition="'$(IsReferenceAssembly)' == 'true' and '$(AllowReferenceFromRuntime)' != 'true'" Text="ReferenceFromRuntime may not be used from reference assemblies." /> - - <MSBuild Projects="$(MSBuildProjectFile)" Targets="GetFilesFromRuntime" Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Output TaskParameter="TargetOutputs" ItemName="RuntimeFiles" /> - </MSBuild> - - <ItemGroup> - <_referencePathFromRuntime Include="@(RuntimeFiles)" Private="false" /> - <_referencePathFromRuntime Include="@(_referencePathFromRestoredRuntime)" Private="false" /> - <!-- If this is a test project, also use the $(RuntimePath) to find a @(ReferenceFromRuntime) assembly. --> - <_referencePathFromRuntime Include="@(ReferenceFromRuntime->'$(RuntimePath)%(Identity).dll')" Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'" /> - <!-- transform to filename in order to intersect --> - <_referencePathFromRuntimeByFileName Include="@(_referencePathFromRuntime->'%(FileName)')" Condition="'%(_referencePathFromRuntime.Extension)' == '.dll'" > - <ReferencePath>%(Identity)</ReferencePath> - </_referencePathFromRuntimeByFileName> - </ItemGroup> - - <RemoveDuplicates Inputs="@(_referencePathFromRuntimeByFileName)"> - <Output TaskParameter="Filtered" ItemName="_referencePathFromRuntimeByFileNameFiltered" /> - </RemoveDuplicates> - - <ItemGroup> - - <!-- intersect with ReferenceFromRuntime --> - <_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileNameFiltered)" - Condition="'@(_referencePathFromRuntimeByFileNameFiltered)' == '@(ReferenceFromRuntime)' and '%(Identity)' != ''"> - <Aliases>@(ReferenceFromRuntime->'%(Aliases)')</Aliases> - </_filteredReferencePathFromRuntimeByFileName> - - <_remainingReferenceFromRuntime Include="@(ReferenceFromRuntime)" Exclude="@(_filteredReferencePathFromRuntimeByFileName)" /> - - <!-- Fallback and check for native images for the references as well --> - <_remainingReferenceFromRuntimeWithNI Include="@(_remainingReferenceFromRuntime->'%(Identity).ni')"> - <OriginalReferenceFromRuntime>%(Identity)</OriginalReferenceFromRuntime> - </_remainingReferenceFromRuntimeWithNI> - - <_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileNameFiltered)" - Condition="'@(_referencePathFromRuntimeByFileNameFiltered)' == '@(_remainingReferenceFromRuntimeWithNI)' and '%(Identity)' != ''"> - <Aliases>@(_remainingReferenceFromRuntimeWithNI->'%(Aliases)')</Aliases> - </_filteredReferencePathFromRuntimeByFileName> - - <_missingReferenceFromRuntime Include="@(_remainingReferenceFromRuntimeWithNI)" Exclude="@(_filteredReferencePathFromRuntimeByFileName)" /> - - <!-- transform back to path --> - <!-- We are adding two items(with and without aliases) for references having Aliases. The major reason behind this to not use the Aliases for all the types in that reference. --> - <!-- We can't use a Reference item for both since only the first one will be kept. --> - <!-- Aliases provides no way to encode both an alias and a non-aliased reference : https://github.com/dotnet/roslyn/issues/42604 --> - <!-- Use ReferencePath for the second reference so it will still be passed to the compiler. --> - <Reference Include="@(_filteredReferencePathFromRuntimeByFileName->'%(ReferencePath)')" /> - <_aliasedReferencePathFromRuntime Include="@(_filteredReferencePathFromRuntimeByFileName->'%(ReferencePath)')" Condition="'%(_filteredReferencePathFromRuntimeByFileName.Aliases)' != ''" /> - <ReferencePath Include="@(_aliasedReferencePathFromRuntime)" Aliases=""/> - </ItemGroup> - - <Error Condition="'@(_missingReferenceFromRuntime)' != ''" - Text="Could not resolve ReferenceFromRuntime item(s) '%(_missingReferenceFromRuntime.OriginalReferenceFromRuntime)' from '$(RuntimeProjectFile)'." /> - </Target> - - <Target Name="RemoveAliasedReferenceFromRuntime" - AfterTargets="CoreCompile" - Condition="'@(_aliasedReferencePathFromRuntime)' != ''"> - <!-- SDK's GenerateBuildDependencyFile will break when they encounter two identical reference paths, fix by removing the aliased ones --> - <ItemGroup> - <ReferencePath Remove="@(_aliasedReferencePathFromRuntime)"/> - </ItemGroup> - </Target> - -</Project> 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 @@ <Project> <PropertyGroup> - <ContractDependencyPaths>$(RefPath)</ContractDependencyPaths> - <FrameworkPathOverride>$(RefPath)</FrameworkPathOverride> - <AssemblySearchPaths>$(AssemblySearchPaths);$(RefPath);{RawFileName}</AssemblySearchPaths> <!-- Disable RAR from transitively discovering dependencies for References --> <_FindDependencies>false</_FindDependencies> - <!-- - We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder - that exists to skip the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). - Need to set these after the common targets import. - --> - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories> - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths> - </PropertyGroup> - <PropertyGroup Condition="'$(IncludeDefaultReferences)' == ''"> - <IncludeDefaultReferences Condition="'$(MSBuildProjectExtension)' == '.csproj'">true</IncludeDefaultReferences> - <IncludeDefaultReferences Condition="'$(MSBuildProjectExtension)' == '.vbproj'">true</IncludeDefaultReferences> </PropertyGroup> - <Target Name="SetupDefaultReferences"> - <ItemGroup Condition="'$(IncludeDefaultReferences)' == 'true'"> - <!-- netstandard is a default reference whenever building for NETStandard or building an implementation assembly --> - <DefaultReference Condition="('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(IsReferenceAssembly)' != 'true') and Exists('$(RefPath)netstandard.dll')" Include="netstandard" /> - </ItemGroup> - </Target> - <Target Name="UpdateReferenceItems" DependsOnTargets="SetupDefaultReferences" BeforeTargets="AddReferencesDynamically"> - <ItemGroup> - <Reference Include="@(DefaultReference)" /> - </ItemGroup> - <ItemGroup> - <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to output --> - <Reference Condition="'%(Reference.Extension)' != '.dll'"> - <Private>false</Private> - </Reference> - </ItemGroup> - </Target> + <!-- netstandard is a default reference whenever building an implementation assembly for .NETCoreApp. --> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + '$(IsSourceProject)' == 'true'"> + <Reference Include="netstandard" + Private="false" /> + </ItemGroup> - <Target Name="AddDefaultTestReferences" BeforeTargets="SetupDefaultReferences" Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'"> - <ItemGroup> - <DefaultReferenceExclusions Include="@(ReferenceFromRuntime)"/> + <!-- If a CoreLib ProjectReference is present, make all P2P assets non transitive. --> + <ItemGroup Condition="'@(ProjectReference)' != '' and + @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))"> + <ProjectReference Update="@(ProjectReference)" + PrivateAssets="all" /> + </ItemGroup> - <!-- Reference everything in the targeting pack directory --> - <DefaultReferenceDirs Include="$(RefPath)" /> - <DefaultReferenceItems Include="%(DefaultReferenceDirs.Identity)/*.dll" /> + <!-- Project references shouldn't be copied to the output for non test apps. --> + <ItemDefinitionGroup Condition="'$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'"> + <ProjectReference> + <Private>false</Private> + </ProjectReference> + </ItemDefinitionGroup> - <DefaultReferenceExclusions> - <RefDir>%(DefaultReferenceDirs.Identity)</RefDir> - </DefaultReferenceExclusions> - <_defaultReferenceExclusionsFullPath Include="%(DefaultReferenceExclusions.RefDir)%(DefaultReferenceExclusions.Identity).dll" /> - - <!-- Ensure conflict resolution can see these references. --> - <Reference Include="%(DefaultReferenceItems.FullPath)" Private="false" /> + <!-- Filter out transitive P2Ps which should be excluded. --> + <Target Name="FilterTransitiveProjectReferences" + AfterTargets="IncludeTransitiveProjectReferences" + Condition="'$(DisableTransitiveProjectReferences)' != 'true' and + '@(DefaultReferenceExclusion)' != ''"> + <ItemGroup> + <_transitiveProjectReferenceWithExclusion Include="@(ProjectReference)"> + <Exclusion>%(DefaultReferenceExclusion.Identity)</Exclusion> + </_transitiveProjectReferenceWithExclusion> + <ProjectReference Remove="@(_transitiveProjectReferenceWithExclusion)" + Condition="'%(_transitiveProjectReferenceWithExclusion.NuGetPackageId)' == '%(_transitiveProjectReferenceWithExclusion.Exclusion)'" /> </ItemGroup> </Target> - <Target Name="RemoveConflictResolutionAssetsForTests" - AfterTargets="_HandlePackageFileConflicts" - DependsOnTargets="AddDefaultTestReferences" - Condition="'@(_defaultReferenceExclusionsFullPath)' != ''"> + <!-- Make shared framework assemblies not app-local (non private). --> + <Target Name="UpdateProjectReferencesWithPrivateAttribute" + AfterTargets="AssignProjectConfiguration" + BeforeTargets="PrepareProjectReferences" + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + ('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true') and + '@(ProjectReferenceWithConfiguration)' != ''"> <ItemGroup> - <Reference Remove="@(_defaultReferenceExclusionsFullPath)" /> + <ProjectReferenceWithConfiguration PrivateAssets="all" + Private="false" + Condition="$(NetCoreAppLibrary.Contains('$([System.IO.Path]::GetFileNameWithoutExtension('%(MSBuildSourceProjectFile)'));'))" /> </ItemGroup> </Target> - <Target Name="AddReferencesDynamically" BeforeTargets="PrepareForBuild" /> -</Project>
\ No newline at end of file +</Project> 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 @@ <Project> + <PropertyGroup> + <ContractDependencyPaths Condition="'$(DisableImplicitFrameworkReferences)' == 'true' and + '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">$(MicrosoftNetCoreAppRefPackRefDir)</ContractDependencyPaths> + <!-- Use implementation referencepath if no contract tfm is set. --> + <ContractDependencyPaths Condition="'$(ContractDependencyPaths)' == ''">$(ContractDependencyPaths);@(ReferencePath->'%(RelativeDir)'->Distinct())</ContractDependencyPaths> + </PropertyGroup> + <PropertyGroup Condition="'$(IsSourceProject)' == 'true'"> - <ContractProject Condition="'$(ContractProject)' == ''">$(LibrariesProjectRoot)$(MSBuildProjectName)/ref/$(MSBuildProjectName).csproj</ContractProject> + <ContractProject Condition="'$(ContractProject)' == ''">$(LibrariesProjectRoot)$(MSBuildProjectName)\ref\$(MSBuildProjectName).csproj</ContractProject> <HasMatchingContract Condition="'$(HasMatchingContract)' == '' and Exists('$(ContractProject)')">true</HasMatchingContract> - <ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == ''">$(RefPath)/$(MSBuildProjectName).dll</ContractAssemblyPath> + <ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == '' and + '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))">$(NetCoreAppCurrentRefPath)$(TargetFileName)</ContractAssemblyPath> + <ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == ''">$([MSBuild]::NormalizePath('$(BaseOutputPath)', 'ref', '$(TargetFramework)-$(Configuration)', '$(TargetFileName)'))</ContractAssemblyPath> <!-- Disable API compat if the project doesn't have reference assembly --> <RunApiCompat Condition="'$(HasMatchingContract)' != 'true'">false</RunApiCompat> @@ -10,8 +20,43 @@ <ItemGroup Condition="'$(HasMatchingContract)' == 'true'"> <ResolvedMatchingContract Condition="Exists('$(ContractAssemblyPath)')" Include="$(ContractAssemblyPath)" /> + <!-- If the contract doesn't exist in the default contract output path add a project reference to the contract project to resolve --> + <ProjectReference Condition="'@(ResolvedMatchingContract)' == ''" Include="$(ContractProject)"> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <OutputItemType>ResolvedMatchingContract</OutputItemType> + </ProjectReference> </ItemGroup> <!-- intentionally empty since we no longer need a target --> <Target Name="ResolveMatchingContract" /> + + <!-- Allow P2Ps that target a source project to build against the corresponding ref project. --> + <Target Name="AnnotateTargetPathWithTargetPlatformMonikerWithReferenceAssembly" + Condition="'$(HasMatchingContract)' == 'true'" + AfterTargets="GetTargetPathWithTargetPlatformMoniker"> + <ItemGroup> + <TargetPathWithTargetPlatformMoniker ReferenceAssembly="@(ResolvedMatchingContract)" /> + </ItemGroup> + </Target> + + <Target Name="HandleReferenceAssemblyAttributeForProjectReferences" + AfterTargets="ResolveProjectReferences" + BeforeTargets="FindReferenceAssembliesForReferences" + Condition="'@(ProjectReference)' != '' and '@(_ResolvedProjectReferencePaths)' != ''"> + <!-- If we have a ProjectReference to CoreLib, we need to compile against implementation assemblies. --> + <PropertyGroup Condition="@(_ResolvedProjectReferencePaths->AnyHaveMetadataValue('MSBuildSourceProjectFile', '$(CoreLibProject)'))"> + <CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies> + </PropertyGroup> + <!-- Clear the ReferenceAssembly attribute on resolved P2Ps that set SkipUseReferenceAssembly to true. --> + <ItemGroup> + <_resolvedP2PFiltered Include="@(ProjectReference)"> + <ProjectReferenceItemSpec>$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)'))</ProjectReferenceItemSpec> + <SkipUseReferenceAssembly>%(ProjectReference.SkipUseReferenceAssembly)</SkipUseReferenceAssembly> + </_resolvedP2PFiltered> + <_ResolvedProjectReferencePaths Update="@(_resolvedProjectReferenceFiltred)" + Condition="'%(_resolvedP2PFiltered.ProjectReferenceItemSpec)' == '%(_resolvedP2PFiltered.MSBuildSourceProjectFile)' and + '%(_resolvedP2PFiltered.SkipUseReferenceAssembly)' == 'true'" + ReferenceAssembly="" /> + </ItemGroup> + </Target> </Project>
\ 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 @@ <Project TreatAsLocalProperty="ExcludeRestorePackageImports"> <PropertyGroup> + <ToolSetCommonDirectory>$(RepoRoot)artifacts\toolset\Common\</ToolSetCommonDirectory> <RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation> <!-- Need to set ProjectAssetsFile to something so it doesn't get set to the Tools.proj assets file when we import the generated props --> <ProjectAssetsFile Condition="'$(ProjectAssetsFile)' == ''">unused</ProjectAssetsFile> 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 @@ +<Project> + <PropertyGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' and + '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))"> + <_UseLocalTargetingRuntimePack>true</_UseLocalTargetingRuntimePack> + <EnableTargetingPackDownload>false</EnableTargetingPackDownload> + </PropertyGroup> + + <!-- .NETCoreApp 2.x DisableImplicitAssemblyReferences support. --> + <Choose> + <When Condition="'$(DisableImplicitAssemblyReferences)' == 'true' and + '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))"> + <PropertyGroup> + <MicrosoftNetCoreAppRefPackRefDir>$(PkgMicrosoft_NETCore_App)\ref\$(_ShortFrameworkIdentifier)$(_ShortFrameworkVersion)\</MicrosoftNetCoreAppRefPackRefDir> + </PropertyGroup> + <ItemGroup> + <PackageReference Update="Microsoft.NETCore.App" + ExcludeAssets="all" + GeneratePathProperty="true" /> + </ItemGroup> + </When> + </Choose> + + <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. --> + <ItemGroup> + <Reference Update="@(Reference)"> + <Private Condition="'%(Reference.Extension)' != '.dll'">false</Private> + </Reference> + </ItemGroup> + + <!-- .NETCoreApp > 2.x DisableImplicitAssemblyReferences support. --> + <Target Name="RemoveFrameworkReferences" + BeforeTargets="_HandlePackageFileConflicts" + AfterTargets="ResolveTargetingPackAssets" + Condition="'$(DisableImplicitAssemblyReferences)' == 'true' and + '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.0'))"> + <PropertyGroup> + <MicrosoftNetCoreAppRefPackRefDir>%(ResolvedFrameworkReference.TargetingPackPath)\ref\$(_ShortFrameworkIdentifier)$(_ShortFrameworkVersion)\</MicrosoftNetCoreAppRefPackRefDir> + </PropertyGroup> + <ItemGroup> + <Reference Remove="@(Reference)" + Condition="'%(Reference.FrameworkReferenceName)' == '$(SharedFrameworkName)'" /> + </ItemGroup> + </Target> + + <!-- Add the resolved targeting pack to the assembly search path. --> + <Target Name="UseTargetingPackForAssemblySearchPaths" + BeforeTargets="ResolveAssemblyReferences; + DesignTimeResolveAssemblyReferences" + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + <PropertyGroup> + <AssemblySearchPaths>$(AssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</AssemblySearchPaths> + <DesignTimeAssemblySearchPaths>$(DesignTimeAssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</DesignTimeAssemblySearchPaths> + </PropertyGroup> + </Target> + + <!-- Use local targeting pack for NetCoreAppCurrent. --> + <Target Name="UpdateTargetingAndRuntimePack" + Condition="'$(_UseLocalTargetingRuntimePack)' == 'true'" + AfterTargets="ResolveFrameworkReferences"> + <ItemGroup> + <ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))" + NuGetPackageVersion="$(ProductVersion)" + PackageDirectory="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))" + Condition="'%(ResolvedTargetingPack.RuntimeFrameworkName)' == '$(SharedFrameworkName)' and + Exists('$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml')" /> + <ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)" + Condition="'%(ResolvedRuntimePack.FrameworkName)' == '$(SharedFrameworkName)'" /> + <ResolvedFrameworkReference TargetingPackPath="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))" + TargetingPackVersion="$(ProductVersion)" + Condition="'%(Identity)' == '$(SharedFrameworkName)'" /> + </ItemGroup> + </Target> + + <!-- Update the local targeting pack's version as it's written into the runtimeconfig.json file to select the shared framework. --> + <Target Name="UpdateRuntimeFrameworkVersion" + Condition="'$(_UseLocalTargetingRuntimePack)' == 'true'" + AfterTargets="ResolveTargetingPackAssets"> + <ItemGroup> + <RuntimeFramework Version="$(ProductVersion)" + Condition="'%(RuntimeFramework.FrameworkName)' == '$(SharedFrameworkName)'" /> + </ItemGroup> + </Target> + + <!-- Filter out conflicting implicit assembly references. --> + <Target Name="FilterImplicitAssemblyReferences" + Condition="'$(DisableImplicitAssemblyReferences)' != 'true'" + DependsOnTargets="ResolveProjectReferences" + AfterTargets="ResolveTargetingPackAssets"> + <ItemGroup> + <_targetingPackReferenceExclusion Include="$(TargetName)" /> + <_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->'%(Filename)')" /> + <_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" /> + </ItemGroup> + + <ItemGroup> + <_targetingPackReferenceWithExclusion Include="@(Reference)"> + <Exclusion>%(_targetingPackReferenceExclusion.Identity)</Exclusion> + </_targetingPackReferenceWithExclusion> + <Reference Remove="@(_targetingPackReferenceWithExclusion)" + Condition="'%(_targetingPackReferenceWithExclusion.ExternallyResolved)' == 'true' and '%(_targetingPackReferenceWithExclusion.Filename)' == '%(_targetingPackReferenceWithExclusion.Exclusion)'" /> + </ItemGroup> + </Target> +</Project>
\ 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 @@ <!-- Filter out failing (wrong framwork, platform, runtime or activeissue) tests --> <TestCaseFilter>$$TESTCASEFILTER$$</TestCaseFilter> <DotNetHostPath>$$DOTNETHOSTPATH$$</DotNetHostPath> - <EnvironmentVariables> - <!-- Use our self-built framework on .NET Framework --> - <DEVPATH>$$DEVPATH$$</DEVPATH> - </EnvironmentVariables> </RunConfiguration> <LoggerRunSettings> <Loggers> 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 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> <runtime> - <developmentMode developerInstallation="true" /> <UseRandomizedStringHashAlgorithm enabled="1" /> </runtime> </configuration>
\ 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 @@ <Project> <Target Name="Test" DependsOnTargets="GetProjectWithBestTargetFrameworks"> <MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)" - Targets="Test" - BuildInParallel="$(BuildInParallel)"> + Targets="Test"> + </MSBuild> + </Target> + <Target Name="VSTest" DependsOnTargets="GetProjectWithBestTargetFrameworks"> + <MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)" + Targets="VSTest"> </MSBuild> </Target> </Project>
\ 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)'))'))</RunSettingsFileContent> </PropertyGroup> 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 @@ <Project> <PropertyGroup> - <!-- Copies the app.config file to the OutDir. --> - <TestRuntimeConfigurationFile Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">$(MSBuildThisFileDirectory)netfx.exe.config</TestRuntimeConfigurationFile> - <!-- By default copy the test runtime config file for executable test projects (+ test support projects). --> - <GenerateRuntimeConfigurationFiles Condition="'$(IsTestProject)' == 'true' or '$(OutputType.ToLower())' == 'exe'">true</GenerateRuntimeConfigurationFiles> + <IsTestProjectOrExecutable Condition="'$(IsTestProject)' == 'true' or + '$(OutputType.ToLower())' == 'exe'">true</IsTestProjectOrExecutable> + <GenerateRuntimeConfigurationFiles Condition="'$(GenerateRuntimeConfigurationFiles)' == '' and + '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + '$(IsTestProjectOrExecutable)' == 'true'">true</GenerateRuntimeConfigurationFiles> + <GenerateAppConfigurationFile Condition="'$(IsTestProjectOrExecutable)' == 'true' and + '$(TargetFrameworkIdentifier)' == '.NETFramework'">true</GenerateAppConfigurationFile> + <AppConfig Condition="'$(GenerateAppConfigurationFile)' == 'true'">$(MSBuildThisFileDirectory)netfx.exe.config</AppConfig> + <!-- TODO: Change in RemoteExecutor --> + <RemoteClientAppConfigFile Condition="'$(GenerateAppConfigurationFile)' == 'true'">$(TargetPath).config</RemoteClientAppConfigFile> </PropertyGroup> - <ItemGroup Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'"> - <None Include="$(TestRuntimeConfigurationFile)" - Condition="Exists('$(TestRuntimeConfigurationFile)')" - Link="$(TargetName).exe.config" - CopyToOutputDirectory="PreserveNewest" - Visible="false" /> + <ItemGroup Condition="'$(IsTestProjectOrExecutable)' == 'true'"> <!-- Include deps.json and runtimeconfig.json in ContentWithTargetPath so they will be copied to the output folder of projects that reference this one. Tracking issue: https://github.com/dotnet/sdk/issues/1675 --> <ContentWithTargetPath Include="$(ProjectDepsFilePath)" - Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(GenerateDependencyFile)' == 'true'" + Condition="'$(GenerateDependencyFile)' == 'true'" CopyToOutputDirectory="PreserveNewest" TargetPath="$(ProjectDepsFileName)" /> <ContentWithTargetPath Include="$(ProjectRuntimeConfigFilePath)" - Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" + Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'" CopyToOutputDirectory="PreserveNewest" TargetPath="$(ProjectRuntimeConfigFileName)" /> </ItemGroup> - - <!-- - We disabled implicit framework references but still want to be treated as framework dependent: - 1. To have runtimeTargets in the deps file. - 2. To populate the framework node in the runtimeconfig's runtimeOptions - To do this we manually set the RuntimeFramework. - At that point restore and conflict resolution already happened therefore setting the item here has no side effects. - --> - <Target Name="_SetRuntimeFrameworksForTestAssemblies" - Condition="'$(SelfContained)' != 'true' and '$(MSBuildProjectExtension)' != '.depproj'" - BeforeTargets="GenerateBuildDependencyFile"> - <ItemGroup> - <RuntimeFramework Include="Microsoft.NETCore.App" Version="$(ProductVersion)" /> - </ItemGroup> - </Target> </Project>
\ 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 @@ </ItemGroup> </Target> - <Target Name="AddFrameworkReference"> - <ItemGroup> - <FrameworkReference Include="$(SharedFrameworkName)" /> - </ItemGroup> - </Target> - - <Target Name="UpdateRuntimePack" - DependsOnTargets="AddFrameworkReference;ResolveFrameworkReferences"> - <ItemGroup> - <ResolvedRuntimePack Update="@(ResolvedRuntimePack)" PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)" /> - </ItemGroup> - </Target> - <Target Name="PublishTestAsSelfContained" Condition="'$(IsCrossTargetingBuild)' != 'true'" AfterTargets="Build" - DependsOnTargets="UpdateRuntimePack;Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" /> + DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" /> </Project> 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 @@ <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier> <SelfContained>true</SelfContained> - <EnableTargetingPackDownload>false</EnableTargetingPackDownload> - <PlatformManifestFile /> </PropertyGroup> <!-- Provide runtime options to Mono (interpreter, aot, debugging, etc) --> 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 @@ <RunScriptHost Condition="'$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost> </PropertyGroup> - <!-- Set env variable to use the local netfx assemblies instead of the ones in the GAC. --> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> - <RunScriptCommands Include="set DEVPATH=%RUNTIME_PATH%" /> - </ItemGroup> - <PropertyGroup> <ArchiveTestsAfterTargets>PrepareForRun</ArchiveTestsAfterTargets> @@ -96,7 +91,10 @@ <Target Name="RunTests"> <PropertyGroup> - <RunTestsCommand>"$(RunScriptOutputPath)" --runtime-path "$(TestHostRootPath.TrimEnd('\/'))"</RunTestsCommand> + <RunTestsCommand>"$(RunScriptOutputPath)"</RunTestsCommand> + <!-- Use runtime path only for the live built shared framework (NetCoreAppCurrent). --> + <RunTestsCommand Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))">$(RunTestsCommand) --runtime-path "$(TestHostRootPath.TrimEnd('\/'))"</RunTestsCommand> <RunTestsCommand Condition="'$(TestRspFile)' != '' and '$(RuntimeFlavor)' != 'Mono'">$(RunTestsCommand) --rsp-file "$(TestRspFile)"</RunTestsCommand> <RunTestsCommand Condition="'$(TargetsMobile)' == 'true'">"$(RunScriptOutputPath)" $(AssemblyName) $(TargetArchitecture)</RunTestsCommand> <RunTestsCommand Condition="'$(TargetOS)' == 'Browser'">"$(RunScriptOutputPath)" $(JSEngine) $(AssemblyName).dll $(_withoutCategories.Replace(';', ' -notrait category='))</RunTestsCommand> 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 @@ <!-- Overwrite the runner config file with the app local one. --> <Target Name="OverwriteDesktopTestRunnerConfigs" - Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true' and '$(TargetFrameworkIdentifier)' == '.NETFramework'" + Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and + '$(GenerateAppConfigurationFile)' == 'true' and + '@(AppConfigWithTargetPath)' != ''" AfterTargets="CopyFilesToOutputDirectory"> - <ItemGroup> - <_testRunnerConfigSourceFile Include="$(TargetDir)$(TargetName).exe.config" /> <_testRunnerConfigDestFile Include="$(TargetDir)xunit.console.exe.config" /> </ItemGroup> - <Copy SourceFiles="@(_testRunnerConfigSourceFile)" - Condition="'@(_testRunnerConfigSourceFile)' != ''" + <Copy SourceFiles="@(AppConfigWithTargetPath)" DestinationFiles="@(_testRunnerConfigDestFile)" SkipUnchangedFiles="true" /> - </Target> <!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. --> 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 @@ <Project> + <ItemGroup> + <!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. --> + <PackageReference Include="NETStandard.Library" + Version="$(NetStandardLibrary20Version)" + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> + </ItemGroup> + <!-- Run target (F5) support. --> <PropertyGroup> <RunWorkingDirectory>$(OutDir)</RunWorkingDirectory> 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</_RexcepFilePath> <_ILLinkDescriptorsIntermediatePath>$(IntermediateOutputPath)ILLink.Descriptors.Combined.xml</_ILLinkDescriptorsIntermediatePath> <_ILLinkTasksToolsDir>$(PkgMicrosoft_NET_ILLink_Tasks)/tools</_ILLinkTasksToolsDir> - <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/$(NetFrameworkCurrent)/</_ILLinkTasksDir> + <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/net472/</_ILLinkTasksDir> <_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp3.0/</_ILLinkTasksDir> <_ILLinkTasksPath>$(_ILLinkTasksDir)ILLink.Tasks.dll</_ILLinkTasksPath> </PropertyGroup> 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<byte> 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<char> 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. --> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\AdminHelpers.cs" /> @@ -63,4 +63,13 @@ <PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" /> <PackageReference Include="xunit.assert" Version="$(XUnitVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <!-- Upgrade the NetStandard.Library transitive xunit dependency to avoid 1.x NS dependencies. --> + <PackageReference Include="NETStandard.Library" Version="$(NetStandardLibrary20Version)" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" PrivateAssets="all" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" PrivateAssets="all" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + </ItemGroup> </Project> 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 @@ <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot> </PropertyGroup> <Import Project="..\..\Directory.Build.props" /> + <Import Project="NetCoreAppLibrary.props" /> <PropertyGroup Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))"> <IsAspNetCoreApp>true</IsAspNetCoreApp> @@ -10,14 +11,11 @@ <PropertyGroup> <BeforeTargetFrameworkInferenceTargets>$(RepositoryEngineeringDir)BeforeTargetFrameworkInference.targets</BeforeTargetFrameworkInferenceTargets> - <ToolSetCommonDirectory>$(RepoRoot)artifacts\toolset\Common\</ToolSetCommonDirectory> <IsSourceProject>$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))</IsSourceProject> <IsReferenceAssembly Condition="'$(IsReferenceAssembly)' == '' and ($(MSBuildProjectFullPath.Contains('\ref\')) or $(MSBuildProjectFullPath.Contains('/ref/')))">true</IsReferenceAssembly> <LanguageTargets Condition="'$(MSBuildProjectExtension)' == '.depproj'">$(RepositoryEngineeringDir)depProj.common.targets</LanguageTargets> <RuntimeGraph>$(LibrariesProjectRoot)OSGroups.json</RuntimeGraph> - <BuildTargetFramework>$(NetCoreAppCurrent)</BuildTargetFramework> <ShouldUnsetParentConfigurationAndPlatform>false</ShouldUnsetParentConfigurationAndPlatform> - <AdditionalBuildTargetFrameworks Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(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</AdditionalBuildTargetFrameworks> <!-- Remove once is fixed: https://github.com/dotnet/roslyn/issues/42344 --> <GeneratePlatformNotSupportedAssemblyHeaderFile>$(RepositoryEngineeringDir)LicenseHeader.txt</GeneratePlatformNotSupportedAssemblyHeaderFile> </PropertyGroup> @@ -40,10 +38,13 @@ the build system to use browser/ios/android as the RuntimeOS for produced package RIDs. --> <RuntimeOS Condition="'$(TargetsMobile)' == 'true'">$(TargetOS.ToLowerInvariant())</RuntimeOS> - <!-- Initialize BuildSettings from the individual properties if it wasn't already explicitly set --> - <Configuration Condition="'$(Configuration)'==''">Debug</Configuration> - <BuildTargetFramework Condition="'$(BuildAllProjects)' != 'true' and '$(TargetFramework)' != ''">$(TargetFramework)</BuildTargetFramework> - <BuildSettings Condition="'$(BuildSettings)' == ''">$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)</BuildSettings> + <!-- Initialize BuildSettings from the individual properties. --> + <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> + <BuildTargetFramework Condition="'$(BuildTargetFramework)' == '' and '$(TargetFramework)' != ''">$(TargetFramework)</BuildTargetFramework> + <!-- Build all .NET Framework configurations when net48 is passed in. This is for convenience. --> + <AdditionalBuildTargetFrameworks Condition="'$(BuildTargetFramework)' == 'net48'">net45;net451;net452;net46;net461;net462;net47;net471;net472</AdditionalBuildTargetFrameworks> + <AdditionalBuildTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true' and '$(BuildAllProjects)' == 'true'">$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks> + <BuildSettings>$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)</BuildSettings> </PropertyGroup> <!-- Define test projects and companions --> @@ -142,11 +143,10 @@ <PackageRID Condition="'$(PackageRID)' == ''">$(RuntimeOS)-$(TargetArchitecture)</PackageRID> </PropertyGroup> - <!-- set properties for each vertical --> <PropertyGroup> - <BuildingNETCoreAppVertical Condition="'$(BuildingNETCoreAppVertical)' == '' and ('$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETCoreAppVertical> - <BuildingNETFxVertical Condition="'$(BuildingNETFxVertical)' == '' and ('$(BuildTargetFramework)' == '$(NetFrameworkCurrent)' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETFxVertical> - <BinPlaceNETCoreAppPackage Condition="'$(BuildingNETCoreAppVertical)' == 'true'">true</BinPlaceNETCoreAppPackage> + <BuildingNETCoreAppVertical Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or + '$(BuildAllConfigurations)' == 'true'">true</BuildingNETCoreAppVertical> + <BinPlaceTestSharedFramework Condition="'$(BuildingNETCoreAppVertical)' == 'true'">true</BinPlaceTestSharedFramework> </PropertyGroup> <!-- @@ -216,13 +216,7 @@ <!-- Disable some standard properties for building our projects --> <PropertyGroup> - <NoStdLib>true</NoStdLib> - <NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib> - <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences> - <CopyNuGetImplementations>false</CopyNuGetImplementations> <DisableImplicitConfigurationDefines>true</DisableImplicitConfigurationDefines> - <!-- Don't reference implicit framework packages, all projects in this repo must be explicit --> - <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <!-- We can't generate an apphost without restoring the targeting pack. --> <UseAppHost>false</UseAppHost> </PropertyGroup> @@ -238,14 +232,7 @@ <EnableAnalyzers Condition="'$(EnableAnalyzers)' == '' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' != '.ilproj'">true</EnableAnalyzers> </PropertyGroup> - <!-- Set up some common paths --> - <PropertyGroup> - <CommonPathRoot>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common'))</CommonPathRoot> - <CommonPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'src'))</CommonPath> - <CommonTestPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests'))</CommonTestPath> - </PropertyGroup> - - <!-- Set up the default output and intermediate paths --> + <!-- Set up common paths --> <PropertyGroup> <!-- Microsoft.NET.TargetFrameworkInference.targets appends the TargetFramework. @@ -253,11 +240,8 @@ --> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> - <RuntimePath Condition="'$(RuntimePath)' == ''">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(BuildSettings)'))</RuntimePath> - <BuildTargetFrameworkRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(BuildTargetFramework)'))</BuildTargetFrameworkRefPath> - <NetStandard20RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.0'))</NetStandard20RefPath> - <NetStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.1'))</NetStandard21RefPath> - <NetFxRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetFrameworkCurrent)'))</NetFxRefPath> + <NetCoreAppCurrentRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetCoreAppCurrent)'))</NetCoreAppCurrentRefPath> + <NetCoreAppCurrentRuntimePath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)'))</NetCoreAppCurrentRuntimePath> <!-- System.Private.CoreLib --> <CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'src', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject> @@ -280,6 +264,7 @@ <ASPNETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\aspnetcoreapp\lib</ASPNETCoreAppPackageRuntimePath> <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildSettings)'))</TestHostRootPath> + <NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', '$(SharedFrameworkName)', '$(ProductVersion)'))</NETCoreAppTestSharedFrameworkPath> <MicrosoftNetCoreAppRefPackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref'))</MicrosoftNetCoreAppRefPackDir> <MicrosoftNetCoreAppRefPackRefDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRefPackRefDir> @@ -292,7 +277,9 @@ <VersionFileForPackages Condition="'$(VersionFileForPackages)' == ''">$(ArtifactsObjDir)version.txt</VersionFileForPackages> - <AdditionalBuildTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true' and '$(BuildAllProjects)' == 'true'">$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks> + <CommonPathRoot>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common'))</CommonPathRoot> + <CommonPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'src'))</CommonPath> + <CommonTestPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests'))</CommonTestPath> </PropertyGroup> <!-- Import it at the end of the props file to override the OutputPath for reference assemblies and use common directory props --> @@ -308,23 +295,6 @@ <EnableDefaultItems>false</EnableDefaultItems> </PropertyGroup> - <PropertyGroup Condition="'$(BuildAllConfigurations)' != 'true'"> - <!-- We add extra binplacing for the test shared framework until we can get hardlinking with the runtime directory working on all platforms --> - <BinPlaceTestSharedFramework Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">true</BinPlaceTestSharedFramework> - <BinPlaceNETFXRuntime Condition="'$(BuildTargetFramework)' == '$(NetFrameworkCurrent)'">true</BinPlaceNETFXRuntime> - - <NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(ProductVersion)'))</NETCoreAppTestSharedFrameworkPath> - - <TestHostRuntimePath Condition="'$(BinPlaceTestSharedFramework)' == 'true'">$(NETCoreAppTestSharedFrameworkPath)</TestHostRuntimePath> - <TestHostRuntimePath Condition="'$(BinPlaceNETFXRuntime)' == 'true'">$(TestHostRootPath)</TestHostRuntimePath> - - <PlatformManifestFile Condition="'$(BinPlaceTestSharedFramework)' == 'true'">$(TestHostRuntimePath)PlatformManifest.txt</PlatformManifestFile> - </PropertyGroup> - - <ItemGroup Condition="'$(PlatformManifestFile)' != '' and ('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true')"> - <PackageConflictPlatformManifests Include="$(PlatformManifestFile)" /> - </ItemGroup> - <ItemGroup Condition="'$(IsTestProject)' == 'true'"> <ProjectReference Include="$(CommonTestPath)TestUtilities\TestUtilities.csproj" /> </ItemGroup> @@ -354,22 +324,6 @@ <CoverageIncludeDirectory Include="shared\Microsoft.NETCore.App\$(ProductVersion)" /> </ItemGroup> - <ItemDefinitionGroup Condition="'$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'"> - <!-- Project references for non-test assemblies should never be copied to the output. --> - <ProjectReference> - <Private>false</Private> - </ProjectReference> - </ItemDefinitionGroup> - - <!-- - The Utf8String package is experimental. We don't want tests to inadvertently take a dependency on this - feature unless they explicitly opt in to it. (Source projects explicitly reference their dependencies, - so they can't inadvertently take a dependency on it.) - --> - <ItemGroup Condition="('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true') and '$(IncludeUtf8StringAsmRef)' != 'true'"> - <DefaultReferenceExclusions Include="System.Utf8String.Experimental" /> - </ItemGroup> - <PropertyGroup> <CLSCompliant Condition="'$(CLSCompliant)' == '' and ('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true')">false</CLSCompliant> <CLSCompliant Condition="'$(CLSCompliant)' == ''">true</CLSCompliant> 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 @@ <Project InitialTargets="UpdateProjectReferencesWithAttributes"> - <PropertyGroup> - <RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)'))</RefPath> - </PropertyGroup> <Import Project="..\..\Directory.Build.targets" /> @@ -17,6 +14,22 @@ <WarningsAsErrors Condition="'$(WarningsAsErrors)' == 'NU1605'" /> <!-- Set the documentation output file globally. --> <DocumentationFile Condition="'$(IsSourceProject)' == 'true' and '$(DocumentationFile)' == '' and '$(MSBuildProjectExtension)' != '.vbproj'">$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile> + <IsNETCoreAppSrc Condition="'$(IsNETCoreAppSrc)' == '' and + '$(IsSourceProject)' == 'true' and + $(NetCoreAppLibrary.Contains('$(AssemblyName);'))">true</IsNETCoreAppSrc> + <IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == '' and + '$(IsReferenceAssembly)' == 'true' and + $(NetCoreAppLibrary.Contains('$(AssemblyName);')) and + !$(NetCoreAppLibraryNoReference.Contains('$(AssemblyName);'))">true</IsNETCoreAppRef> + <!-- By default, disable implicit framework references for NetCoreAppCurrent libraries. --> + <DisableImplicitFrameworkReferences Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)')) and + ('$(IsNETCoreAppRef)' == 'true' or '$(IsNETCoreAppSrc)' == 'true')">true</DisableImplicitFrameworkReferences> + <!-- Disable implicit assembly references for .NETCoreApp refs and sources. --> + <DisableImplicitAssemblyReferences Condition="'$(DisableImplicitAssemblyReferences)' == '' and + '$(DisableImplicitFrameworkReferences)' != 'true' and + '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + ('$(IsReferenceAssembly)' == 'true' or '$(IsSourceProject)' == 'true')">true</DisableImplicitAssemblyReferences> </PropertyGroup> <PropertyGroup> @@ -41,21 +54,18 @@ <Import Project="$(RepositoryEngineeringDir)versioning.targets" /> - <!-- Corefx-specific binplacing properties --> + <!-- Libraries-specific binplacing properties --> <PropertyGroup> <IsRuntimeAssembly Condition="'$(IsRuntimeAssembly)'=='' and '$(IsReferenceAssembly)' != 'true' and '$(BinPlaceRef)' != 'true' and '$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'">true</IsRuntimeAssembly> <!-- Try to determine if this is a simple library without a ref project. https://github.com/dotnet/corefx/issues/14291 is tracking cleaning this up --> <IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and '$(IsRuntimeAssembly)' == 'true' and Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)') and !Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)/ref') and !$(MSBuildProjectName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly> - <IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == ''">$(IsNETCoreApp)</IsNETCoreAppRef> - <IsNetFxNETStandardRef Condition="'$(IsNetFxNETStandardRef)' == ''">$(IsNetFxNETStandard)</IsNetFxNETStandardRef> <BinPlaceRef Condition="'$(BinPlaceRef)' == '' and ('$(IsReferenceAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef> <BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' and ('$(IsRuntimeAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime> <BinPlaceForTargetVertical Condition="'$(BinPlaceForTargetVertical)' == ''">true</BinPlaceForTargetVertical> - <AllTargetFrameworks>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);</AllTargetFrameworks> </PropertyGroup> - + <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))"> <!-- Microsoft.Extensions are not yet using the doc-file package --> <BinPlaceItem Include="$(DocumentationFile)" /> @@ -63,74 +73,52 @@ <ItemGroup Condition="'@(BinPlaceTargetFrameworks)' == ''"> <!-- binplace to directories for the target vertical --> - <BinPlaceTargetFrameworks Include="$(BuildTargetFramework)-$(TargetOS)" Condition="'$(BinPlaceForTargetVertical)' == 'true'"> - <NativePath>$(RuntimePath)</NativePath> - <RefPath>$(BuildTargetFrameworkRefPath)</RefPath> - <RuntimePath>$(RuntimePath)</RuntimePath> + <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)" + Condition="'$(BinPlaceForTargetVertical)' == 'true'"> + <NativePath>$(NetCoreAppCurrentRuntimePath)</NativePath> + <RefPath>$(NetCoreAppCurrentRefPath)</RefPath> + <RuntimePath>$(NetCoreAppCurrentRuntimePath)</RuntimePath> </BinPlaceTargetFrameworks> + <!-- binplace to directories for packages --> - <BinPlaceTargetFrameworks Condition="'$(IsNETCoreApp)' == 'true' and '$(BuildingNETCoreAppVertical)' == 'true'" Include="$(NetCoreAppCurrent)-$(TargetOS)"> - <PackageFileNativePath>$(NETCoreAppPackageRuntimePath)</PackageFileNativePath> + <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)" + Condition="'$(BuildingNETCoreAppVertical)' == 'true'"> + <PackageFileNativePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppPackageRuntimePath)</PackageFileNativePath> <PackageFileRefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(NETCoreAppPackageRefPath)</PackageFileRefPath> - <PackageFileRuntimePath>$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath> - <NativePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture)</NativePath> - <RefPath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true' and '$(IsNETCoreAppRef)' == 'true'">$(RefRootPath)microsoft.netcore.app\$(Configuration)</RefPath> - <RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture)</RuntimePath> + <PackageFileRuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath> + <NativePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture)</NativePath> + <RefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(RefRootPath)microsoft.netcore.app\$(Configuration)</RefPath> + <RuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture)</RuntimePath> <!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly --> - <SetProperties Condition="'$(BinPlaceRuntime)' == 'true' and '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties> + <SetProperties Condition="'$(IsNETCoreAppSrc)' == 'true' and + '$(BinPlaceRuntime)' == 'true' and + '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties> </BinPlaceTargetFrameworks> - <BinPlaceTargetFrameworks Condition="'$(IsAspNetCoreApp)' == 'true'" Include="$(NetCoreAppCurrent)"> + <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)" + Condition="'$(IsAspNetCoreApp)' == 'true'"> <RuntimePath>$(ASPNETCoreAppPackageRuntimePath)</RuntimePath> <RefPath>$(ASPNETCoreAppPackageRefPath)</RefPath> </BinPlaceTargetFrameworks> <!-- Setup the shared framework directory for testing --> - <BinPlaceTargetFrameworks Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="$(NetCoreAppCurrent)-$(TargetOS)"> - <NativePath>$(NETCoreAppTestSharedFrameworkPath)</NativePath> - <RuntimePath>$(NETCoreAppTestSharedFrameworkPath)</RuntimePath> - </BinPlaceTargetFrameworks> - <BinPlaceTargetFrameworks Condition="'$(BinPlaceNETFXRuntime)' == 'true'" Include="$(NetFrameworkCurrent)-Windows_NT"> - <NativePath>$(TestHostRootPath)</NativePath> - <RuntimePath>$(TestHostRootPath)</RuntimePath> + <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)" + Condition="'$(BinPlaceTestSharedFramework)' == 'true'"> + <NativePath >$(NETCoreAppTestSharedFrameworkPath)</NativePath> + <RuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppTestSharedFrameworkPath)</RuntimePath> </BinPlaceTargetFrameworks> - <!-- Microsoft.NetCore.App.Ref targeting pack --> - <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)"> - <RefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(MicrosoftNetCoreAppRefPackRefDir)</RefPath> - </BinPlaceTargetFrameworks> - - <!-- Microsoft.NetCore.App.Runtime targeting pack --> + <!-- Microsoft.NetCore.App.Ref and Microsoft.NetCore.App.Runtime targeting packs --> <BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)"> <NativePath>$(MicrosoftNetCoreAppRuntimePackNativeDir)</NativePath> - <RuntimePath>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</RuntimePath> - </BinPlaceTargetFrameworks> - - <!-- binplace targeting packs which may be different from Build TargetFramework --> - <BinPlaceTargetFrameworks Include="netstandard2.0"> - <RefPath>$(NetStandard20RefPath)</RefPath> - </BinPlaceTargetFrameworks> - <BinPlaceTargetFrameworks Include="netstandard2.1"> - <RefPath>$(NetStandard21RefPath)</RefPath> - </BinPlaceTargetFrameworks> - <!-- some libraries that produce packages will remain targeting netcoreapp2.0 --> - <BinPlaceTargetFrameworks Condition="'$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp2.0"> - <RefPath>$(RefRootPath)netcoreapp2.0/</RefPath> - </BinPlaceTargetFrameworks> - <AllTargetFrameworkList Include="$(AllTargetFrameworks)"/> - <!-- for BuildAllConfigurations make sure all refpaths are created. --> - <BinPlaceTargetFrameworks Condition="'$(BuildAllConfigurations)' == 'true'" Include="@(AllTargetFrameworkList)"> - <RefPath>$(RefRootPath)%(Identity)/</RefPath> - </BinPlaceTargetFrameworks> - <!-- for BuildAllConfigurations make sure runtimepaths are created for all vertical target frameworks. --> - <BinPlaceTargetFrameworks Condition="'$(BuildAllConfigurations)' == 'true' and ('$(BinPlaceForTargetVertical)' == 'true' or ('$(TargetFramework)' != '$(NetCoreAppCurrent)' and '$(TargetFrameworkSuffix)' == ''))" Include="$(NetCoreAppCurrent)-$(TargetOS)"> - <NativePath>$(ArtifactsBinDir)runtime/%(Identity)-$(Configuration)-$(TargetArchitecture)</NativePath> - <RuntimePath>$(ArtifactsBinDir)runtime/%(Identity)-$(Configuration)-$(TargetArchitecture)</RuntimePath> + <RefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(MicrosoftNetCoreAppRefPackRefDir)</RefPath> + <RuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</RuntimePath> </BinPlaceTargetFrameworks> <BinPlaceTargetFrameworks Include="@(AdditionalBinPlaceTargetFrameworks)" /> </ItemGroup> <Import Project="$(RepositoryEngineeringDir)codeOptimization.targets" /> + <Import Project="$(RepositoryEngineeringDir)targetingpacks.targets" /> <Import Project="$(RepositoryEngineeringDir)references.targets" /> <Import Project="$(RepositoryEngineeringDir)resolveContract.targets" /> <Import Project="$(RepositoryEngineeringDir)testing\tests.targets" Condition="'$(EnableTestSupport)' == 'true'" /> @@ -141,9 +129,9 @@ <Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.targets" /> <Import Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" Condition="'$(DisableProjectRestore)' == 'true'" /> - <Import Project="$(RepositoryEngineeringDir)referenceFromRuntime.targets" /> <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(IsSourceProject)' == 'true'" /> <Import Project="$(RepositoryEngineeringDir)notSupported.SourceBuild.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" /> + <Import Project="$(RepositoryEngineeringDir)AvoidRestoreCycleOnSelfReference.targets" Condition="'$(AvoidRestoreCycleOnSelfReference)' == 'true'" /> <ItemGroup Condition="'$(IsSourceProject)' == 'true' or '$(IsReferenceAssembly)' == 'true' or '$(IsPartialFacadeAssembly)' == 'true'"> <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" /> @@ -193,6 +181,7 @@ '$(Configuration)' != '$(CoreCLRConfiguration)'">Configuration=$(CoreCLRConfiguration)</SetConfiguration> <SetConfiguration Condition="'$(RuntimeFlavor)' == 'Mono' and '$(Configuration)' != '$(MonoConfiguration)'">Configuration=$(MonoConfiguration)</SetConfiguration> + <Private>false</Private> </ProjectReference> </ItemGroup> </Target> @@ -200,7 +189,9 @@ <!-- Used for packaging --> <Target Name="IsNotNetCoreAppProject" Returns="@(IsNotNetCoreAppProjectResult)"> <ItemGroup> - <IsNotNetCoreAppProjectResult Condition="'$(IsNetCoreApp)' != 'true'" Include="$(MSBuildProjectName)" Version="$(PackageVersion)" /> + <IsNotNetCoreAppProjectResult Include="$(MSBuildProjectName)" + Version="$(PackageVersion)" + Condition="!$(NetCoreAppLibrary.Contains('$(MSBuildProjectName);'))" /> </ItemGroup> </Target> @@ -222,6 +213,19 @@ <Target Name="GetDocumentationFile" Returns="$(DocumentationFile)"/> + <!-- + Do not clean binplace assets in the ref targeting pack to avoid incremental build failures + when the SDK tries to resolve the assets from the FrameworkList. + --> + <Target Name="RemoveTargetingPackIncrementalClean" + Condition="'@(AdditionalCleanDirectories)' != ''" + BeforeTargets="IncrementalCleanAdditionalDirectories; + CleanAdditionalDirectories"> + <ItemGroup> + <AdditionalCleanDirectories Remove="@(AdditionalCleanDirectories)" Condition="'%(Identity)' == '$(MicrosoftNetCoreAppRefPackRefDir)'" /> + </ItemGroup> + </Target> + <!-- Adds Nullable annotation attributes to netstandard <= 2.0 builds --> <Choose> <When Condition="'$(Nullable)' != '' and ($(TargetFramework.StartsWith('netstandard1')) or '$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('netcoreapp2')) or '$(TargetFrameworkIdentifier)' == '.NETFramework')"> @@ -233,7 +237,6 @@ <PropertyGroup> <ExcludeFromPackage Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' and '$(ExcludeCurrentNetCoreAppFromPackage)' == 'true'">true</ExcludeFromPackage> - <ExcludeFromPackage Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)' and '$(ExcludeCurrentFullFrameworkFromPackage)' == 'true'">true</ExcludeFromPackage> </PropertyGroup> <!-- Adds System.Runtime.Versioning*Platform* annotation attributes to < .NET 5 builds --> @@ -253,7 +256,7 @@ </ItemGroup> <PropertyGroup> - <SkipLocalsInit Condition="'$(SkipLocalsInit)' == '' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' == '.csproj' and '$(IsNETCoreApp)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'">true</SkipLocalsInit> + <SkipLocalsInit Condition="'$(SkipLocalsInit)' == '' and '$(MSBuildProjectExtension)' == '.csproj' and '$(IsNETCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'">true</SkipLocalsInit> </PropertyGroup> <!--Instructs compiler not to emit .locals init, using SkipLocalsInitAttribute.--> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>Microsoft.CSharp</AssemblyName> - <RootNamespace>Microsoft.CSharp</RootNamespace> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> <NoWarn>$(NoWarn);nullable</NoWarn> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks> <!-- We wish to test operations that would result in "Operator '-' cannot be applied to operands of type 'ushort' and 'EnumArithmeticTests.UInt16Enum'" @@ -37,4 +37,7 @@ <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Compile Include="AccessTests.netcoreapp.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <Reference Include="Microsoft.CSharp" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj index 9acca8dfc99..4da74c9647f 100644 --- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj +++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj @@ -2,8 +2,7 @@ <PropertyGroup> <AssemblyName>Microsoft.Diagnostics.Tracing.EventSource</AssemblyName> <DefineConstants>$(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;TARGET_WINDOWS</DefineConstants> - <TargetFrameworks>$(NetFrameworkCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>net461-Windows_NT</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <PropertyGroup> @@ -70,8 +69,4 @@ <Compile Include="..\..\System.Private.CoreLib\src\System\Diagnostics\Tracing\TraceLogging\TraceLoggingTypeInfo.cs" /> <Compile Include="..\..\System.Private.CoreLib\src\System\Diagnostics\Tracing\TraceLogging\TypeAnalysis.cs" /> </ItemGroup> - <ItemGroup> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj index 050d2b686d0..b2043931b9a 100644 --- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj +++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <DefineConstants>$(DefineConstants);USE_MDT_EVENTSOURCE</DefineConstants> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>net461-Windows_NT</TargetFrameworks> </PropertyGroup> <PropertyGroup> <SDTTestDir>..\..\System.Diagnostics.Tracing\tests</SDTTestDir> @@ -36,5 +36,6 @@ </ItemGroup> <ItemGroup> <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(TraceEventVersion)" /> + <ProjectReference Include="..\src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj index ffcb96718ce..1ef4e9bf60e 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Caching.Abstractions.cs" /> diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj index 3ba2a9af6d4..6e49dfd659d 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj @@ -1,16 +1,12 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Primitives" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj index e971c59c800..d62099807bb 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj @@ -1,13 +1,14 @@ -<!-- This file is automatically generated. --> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> -<ItemGroup> + <ItemGroup> <Compile Include="Microsoft.Extensions.Caching.Memory.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Caching.Abstractions\ref\Microsoft.Extensions.Caching.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Caching.Abstractions\ref\Microsoft.Extensions.Caching.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Caching.Abstractions" /> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="Microsoft.Extensions.Options" /> - <Reference Include="Microsoft.Extensions.Primitives" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Caching.Abstractions\src\Microsoft.Extensions.Caching.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -10,7 +10,11 @@ Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs" /> <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs" Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.Caching.Memory" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\src\Microsoft.Extensions.Caching.Memory.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.Abstractions.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> + <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Compile Include="*.cs" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - <ItemGroup> - <Reference Include="Microsoft.Extensions.Primitives" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.ValueTuple" /> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.Binder.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -13,7 +13,8 @@ </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Binder" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Binder.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.CommandLine.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework);net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -15,7 +15,9 @@ </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.CommandLine" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.CommandLine.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -15,7 +15,9 @@ </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <Reference Include="Microsoft.Extensions.FileProviders.Physical" /> - <Reference Include="Microsoft.Extensions.Primitives" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -12,6 +12,7 @@ <ItemGroup> <PackageReference Include="Moq" Version="$(MoqVersion)" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.Ini.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" /> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -15,7 +15,8 @@ </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Ini" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Ini.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.Json.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> - <ProjectReference Include="..\..\System.Text.Json\ref\System.Text.Json.csproj" /> - <Reference Include="System.Threading.Tasks.Extensions" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\ref\System.Text.Json.csproj" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" /> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Text.Json" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -15,8 +15,9 @@ </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" /> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.UserSecrets.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration.Json" /> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <Reference Include="Microsoft.Extensions.FileProviders.Physical" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Runtime" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj" /> </ItemGroup> <ItemGroup> @@ -23,11 +19,4 @@ <Content Include="build\netstandard2.0\$(MSBuildProjectName).targets" PackagePath="%(Identity)" /> </ItemGroup> - <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration.Json" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> - </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.UserSecrets" /> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.UserSecrets.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> <ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.Xml.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> - <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" /> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <Reference Include="System.Security.Cryptography.Xml" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Xml\src\System.Security.Cryptography.Xml.csproj" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml" /> <Reference Include="System.Security" /> </ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -22,13 +22,18 @@ Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\RuntimeFrameworks.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TestPlatformHelper.cs" Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TestPlatformHelper.cs" /> </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Xml" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Xml.csproj" SkipUseReferenceAssembly="true" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.Security" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Primitives" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -11,6 +11,15 @@ </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.CommandLine\src\Microsoft.Extensions.Configuration.CommandLine.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.EnvironmentVariables\src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Ini\src\Microsoft.Extensions.Configuration.Ini.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.UserSecrets\src\Microsoft.Extensions.Configuration.UserSecrets.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Xml\src\Microsoft.Extensions.Configuration.Xml.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> @@ -11,7 +11,9 @@ <ItemGroup> <PackageReference Include="Moq" Version="$(MoqVersion)" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <DefineConstants>$(DefineConstants);ActivatorUtilities_In_DependencyInjection</DefineConstants> <EnableDefaultItems>true</EnableDefaultItems> <Nullable>enable</Nullable> @@ -19,10 +18,4 @@ Link="Common\src\Extensions\ActivatorUtilities\ObjectFactory.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - <Reference Include="System" /> - </ItemGroup> - </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.DependencyInjection.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> - <Reference Include="System.Threading.Tasks.Extensions" /> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'"> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks> <!-- Debug IL generation --> <ILEmitBackendSaveAssemblies>False</ILEmitBackendSaveAssemblies> </PropertyGroup> @@ -15,36 +14,6 @@ </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0'"> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> - <Reference Include="System.Threading.Tasks.Extensions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Diagnostics.Tracing" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.Reflection.Emit.ILGeneration" /> - <Reference Include="System.Reflection.Emit.Lightweight" /> - <Reference Include="System.Reflection.Primitives" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - </ItemGroup> - - <ItemGroup> <Compile Include="**\*.cs" /> <Compile Remove="ServiceLookup\ILEmit\**\*.cs" /> @@ -56,4 +25,28 @@ Link="Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.ComponentModel" /> + <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Linq.Expressions" /> + <Reference Include="System.Reflection.Emit.ILGeneration" /> + <Reference Include="System.Reflection.Emit.Lightweight" /> + <Reference Include="System.Reflection.Primitives" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Threading" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> + </ItemGroup> + </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <NoWarn>$(NoWarn);CS8002</NoWarn> - <SignAssembly Condition="$(TargetFramework.StartsWith('net4'))">false</SignAssembly> + </PropertyGroup> + + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> + <PropertyGroup> + <SignAssembly Condition="'$(TargetFramework)' == 'net461'">false</SignAssembly> </PropertyGroup> <ItemGroup> @@ -16,8 +20,8 @@ </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection.Abstractions" Aliases="DIAbstractions" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" SkipUseReferenceAssembly="true" /> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1"/> <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="2.1.0"/> @@ -29,4 +33,15 @@ <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="2.1.3" /> </ItemGroup> + <!-- Include these transitive dependencies to overrule NuGet's ProjectReference over PackageReferene behavior: https://github.com/NuGet/Home/issues/9354. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <PackageReference Include="Microsoft.Win32.Primitives" Version="$(MicrosoftWin32PrimitivesVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" /> + <PackageReference Include="System.Runtime.Extensions" Version="$(SystemRuntimeExtensionsVersion)" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesVersion)" /> + <PackageReference Include="System.Collections" Version="$(SystemCollectionsVersion)" /> + <PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" /> + </ItemGroup> + </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -14,12 +14,9 @@ </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection.Abstractions" Aliases="DIAbstractions" /> - </ItemGroup> - - <ItemGroup> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="..\..\src\Microsoft.Extensions.DependencyInjection.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.DependencyModel.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <PropertyGroup> @@ -19,16 +18,15 @@ </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> <Reference Include="System.Runtime" /> <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net461'" /> </ItemGroup> + <ItemGroup> - <Reference Include="System.Buffers" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Text.Json" /> - <Reference Include="System.Text.Encodings.Web" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj" /> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <DefaultItemExcludes>$(DefaultItemExcludes);nonentrypointassembly\*</DefaultItemExcludes> <!-- Needed for .NET Framework. --> <GenerateDependencyFile>true</GenerateDependencyFile> </PropertyGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyModel" /> - - <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" /> <PackageReference Include="FluentAssertions" Version="4.19.4" /> - <PackageReference Include="Moq" Version="$(MoqVersion)" /> + <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" /> <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-003121" /> + <PackageReference Include="Moq" Version="$(MoqVersion)" /> <!-- Upgrade the transitive dependency's version to avoid PackageTargetFallback on .NETCoreApp. --> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + <ProjectReference Include="..\src\Microsoft.Extensions.DependencyModel.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="nonentrypointassembly\nonentrypointassembly.csproj" /> + </ItemGroup> </Project> 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 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFrameworks>netstandard2.0</TargetFrameworks> + <EnableDefaultItems>true</EnableDefaultItems> + </PropertyGroup> + +</Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.FileProviders.Abstractions.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -13,13 +12,8 @@ </ItemGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.FileSystemGlobbing" /> - <Reference Include="Microsoft.Extensions.Primitives" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.FileProviders.Composite.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <Reference Include="Microsoft.Extensions.Primitives" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <RootNamespace>Microsoft.Extensions.FileProviders.Composite</RootNamespace> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> <PackageReference Include="Moq" Version="$(MoqVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Composite\src\Microsoft.Extensions.FileProviders.Composite.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.FileProviders.Physical.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> - <PropertyGroup> - <!-- Ensure Assemblies are first resolved via targeting pack when targeting net461 --> - <AssemblySearchPaths Condition="'$(TargetFramework)' == 'net461'">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths)</AssemblySearchPaths> - </PropertyGroup> - <ItemGroup> <Compile Include="$(CommonPath)Extensions\EmptyDisposable.cs" Link="Common\src\Extensions\EmptyDisposable.cs" /> @@ -21,17 +15,14 @@ </ItemGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <Reference Include="Microsoft.Extensions.FileSystemGlobbing" /> - <Reference Include="Microsoft.Extensions.Primitives" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <!-- For IncrementalHash --> - <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" Condition="'$(TargetFramework)' == 'net461'" /> + <!-- For IncrementalHash --> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <RootNamespace>Microsoft.Extensions.FileProviders.Physical</RootNamespace> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -15,7 +15,7 @@ <ItemGroup> <PackageReference Include="Moq" Version="$(MoqVersion)" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.FileProviders.Physical" /> + <ProjectReference Include="..\src\Microsoft.Extensions.FileProviders.Physical.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.FileSystemGlobbing.cs" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -11,10 +10,4 @@ Link="Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - </ItemGroup> - </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> + <ItemGroup> + <ProjectReference Include="..\src\Microsoft.Extensions.FileSystemGlobbing.csproj" /> + </ItemGroup> + </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <OutputType>Exe</OutputType> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <OutputType>Exe</OutputType> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <OutputType>Exe</OutputType> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <OutputType>Exe</OutputType> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <OutputType>Exe</OutputType> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <OutputType>Exe</OutputType> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks> <NoWarn>$(NoWarn);CS0618</NoWarn> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> - </ItemGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Hosting.Abstractions.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + '$(TargetFramework)' == 'net461'"> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <RootNamespace>Microsoft.Extensions.Hosting</RootNamespace> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Runtime" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or $(TargetFramework.StartsWith('net4'))"> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> - <Reference Include="System.Threading.Tasks.Extensions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <NoWarn>$(NoWarn);CS0618</NoWarn> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Hosting.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Hosting.Abstractions\ref\Microsoft.Extensions.Hosting.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Hosting.Abstractions\ref\Microsoft.Extensions.Hosting.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> - </PropertyGroup> - <PropertyGroup> - <!-- Ensure Assemblies are first resolved via targeting pack when targeting net461 --> - <AssemblySearchPaths Condition="'$(TargetFramework)' == 'net461'">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths)</AssemblySearchPaths> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Hosting.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration.Binder" /> - <Reference Include="Microsoft.Extensions.Configuration.CommandLine" /> - <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> - <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" /> - <Reference Include="Microsoft.Extensions.Configuration.Json" /> - <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" /> - <Reference Include="Microsoft.Extensions.DependencyInjection" /> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.FileProviders.Physical" /> - <Reference Include="Microsoft.Extensions.Logging" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging.Console" /> - <Reference Include="Microsoft.Extensions.Logging.Configuration" /> - <Reference Include="Microsoft.Extensions.Logging.Debug" /> - <Reference Include="Microsoft.Extensions.Logging.EventSource" /> - <Reference Include="Microsoft.Extensions.Logging.EventLog" /> - <Reference Include="Microsoft.Extensions.Options" /> - <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Console" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.Threading" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.CommandLine\src\Microsoft.Extensions.Configuration.CommandLine.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.EnvironmentVariables\src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.UserSecrets\src\Microsoft.Extensions.Configuration.UserSecrets.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Hosting.Abstractions\src\Microsoft.Extensions.Hosting.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Configuration\src\Microsoft.Extensions.Logging.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Console\src\Microsoft.Extensions.Logging.Console.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Debug\src\Microsoft.Extensions.Logging.Debug.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.EventLog\src\Microsoft.Extensions.Logging.EventLog.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.EventSource\src\Microsoft.Extensions.Logging.EventSource.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR $(TargetFramework.StartsWith('net4'))"> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> - <Reference Include="System.Threading.Tasks.Extensions" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> <Reference Include="System.Runtime" /> <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net461'" /> </ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -24,4 +24,8 @@ <ProjectReference Include="..\TestApp\Microsoft.Extensions.Hosting.TestApp.csproj" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.Net.Http" /> + </ItemGroup> + </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <OutputType>Exe</OutputType> </PropertyGroup> + + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.CommandLine\src\Microsoft.Extensions.Configuration.CommandLine.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.EnvironmentVariables\src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Hosting\src\Microsoft.Extensions.Hosting.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Console\src\Microsoft.Extensions.Logging.Console.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -12,6 +12,8 @@ <ItemGroup> <PackageReference Include="Moq" Version="$(MoqVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Hosting\src\Microsoft.Extensions.Hosting.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> -<ItemGroup> + <ItemGroup> <Compile Include="Microsoft.Extensions.Http.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.Net.Http" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> - <PropertyGroup> - <!-- Ensure Assemblies are first resolved via targeting pack when targeting net461 --> - <AssemblySearchPaths Condition="'$(TargetFramework)' == 'net461'">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths)</AssemblySearchPaths> - </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)Extensions\NonCapturingTimer\NonCapturingTimer.cs" @@ -20,17 +15,14 @@ </ItemGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="Microsoft.Extensions.Options" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> <Reference Include="System.Net.Http" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -24,7 +24,12 @@ <ItemGroup> <PackageReference Include="Moq" Version="$(MoqVersion)" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.Http" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Http.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.Net.Http" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.Abstractions.cs" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -15,9 +14,4 @@ Link="Common\src\Extensions\Logging\NullScope.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - </ItemGroup> - </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.Configuration.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> @@ -11,24 +12,15 @@ Link="Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration.Binder" /> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="Microsoft.Extensions.Options" /> - <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.Console.cs" /> - <ProjectReference Include="..\..\System.Text.Json\ref\System.Text.Json.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\ref\System.Text.Json.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> </Project> 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,25 +1,14 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <Nullable>annotations</Nullable> <DefineConstants>$(DefineConstants);NO_SUPPRESS_GC_TRANSITION</DefineConstants> - </PropertyGroup> - <PropertyGroup> - <!-- Ensure Assemblies are first resolved via targeting pack when targeting net461 --> - <AssemblySearchPaths Condition="'$(TargetFramework)' == 'net461'">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths)</AssemblySearchPaths> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.Console" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.Threading.Thread" /> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs" Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs" /> @@ -39,33 +28,23 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Buffers" /> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Text.Json" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging.Configuration" /> - <Reference Include="Microsoft.Extensions.Options" /> - <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions" /> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Configuration\src\Microsoft.Extensions.Logging.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.ValueTuple" /> - <Reference Include="System.Runtime" /> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net461'" /> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" Condition="'$(TargetFramework)' == 'net461'" /> + <Reference Include="System.Runtime" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <TestRuntime>true</TestRuntime> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Logging.Console" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Logging.Console.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.Debug.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs" Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs" /> @@ -17,14 +15,9 @@ </ItemGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.EventLog.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> - - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Diagnostics.EventLog" /> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs" Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs" /> @@ -29,10 +15,14 @@ </ItemGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="Microsoft.Extensions.Options" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + + <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.EventSource.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> @@ -12,32 +13,21 @@ Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs" /> <Compile Include="$(CommonPath)Extensions\Logging\NullScope.cs" Link="Common\src\Extensions\Logging\NullScope.cs" /> - - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="Microsoft.Extensions.Options" /> - <Reference Include="Microsoft.Extensions.Primitives" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Text.Json" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Diagnostics.Tracing" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR $(TargetFramework.StartsWith('net4'))"> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> - <ReferenceFromRuntime Include="Microsoft.Extensions.Logging.EventSource" /> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Logging.EventSource.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> + </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.TraceSource.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> @@ -15,34 +16,21 @@ Link="Common\src\Extensions\Logging\NullScope.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup> - <Reference Include="Microsoft.Extensions.DependencyInjection" /> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Logging.Abstractions" /> - <Reference Include="Microsoft.Extensions.Options" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR $(TargetFramework.StartsWith('net4'))"> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> - </ItemGroup> - - <ItemGroup> - <Reference Include="System.Diagnostics.DiagnosticSource" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.ValueTuple" /> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -18,10 +18,21 @@ Link="tests\DI.Common\Common\src\TestLogger.cs" /> <Compile Include="..\DI.Common\Common\src\TestLoggerFactory.cs" Link="tests\DI.Common\Common\src\TestLoggerFactory.cs" /> + </ItemGroup> + + <ItemGroup> <PackageReference Include="Moq" Version="$(MoqVersion)" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.Logging.Abstractions" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.Logging.Console" /> - <ReferenceFromRuntime Include="Microsoft.Extensions.Logging.EventLog" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Console\src\Microsoft.Extensions.Logging.Console.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.EventLog\src\Microsoft.Extensions.Logging.EventLog.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Debug\src\Microsoft.Extensions.Logging.Debug.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.TraceSource\src\Microsoft.Extensions.Logging.TraceSource.csproj" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> @@ -18,4 +18,9 @@ <Compile Include="..\src\XunitLoggerProvider.cs" Link="tests\DI.Common\Common\src\XunitLoggerProvider.cs" /> </ItemGroup> + + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Options.ConfigurationExtensions.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.Configuration.Abstractions" /> - <Reference Include="Microsoft.Extensions.Configuration.Binder" /> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Options" /> - <Reference Include="Microsoft.Extensions.Primitives" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Options.DataAnnotations.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Options" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.ComponentModel.Annotations" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Runtime" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> + <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> <Reference Include="System.ComponentModel.DataAnnotations" /> </ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> - <Reference Include="System.ComponentModel.Annotations" /> - </ItemGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Options.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> + <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> - <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <Reference Include="Microsoft.Extensions.Primitives" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR $(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.ComponentModel.Annotations" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> + <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + <Reference Include="System.ComponentModel.DataAnnotations" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options.DataAnnotations\src\Microsoft.Extensions.Options.DataAnnotations.csproj" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.ComponentModel.DataAnnotations" /> + </ItemGroup> + </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> - <Reference Include="System.Memory" /> - </ItemGroup> <ItemGroup> <Compile Include="Microsoft.Extensions.Primitives.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + '$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> + <!-- Use targeting pack references instead of granular ones in the project file. --> + <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> + <ItemGroup> <Compile Include="$(CommonPath)Extensions\HashCodeCombiner\HashCodeCombiner.cs" Link="Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs" /> @@ -20,23 +22,11 @@ <Compile Include="StringValues.cs" /> <Compile Include="ThrowHelper.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND !$(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Tasks" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR $(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> </ItemGroup> + </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);net472</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> </PropertyGroup> <ItemGroup> <PackageReference Include="Moq" Version="$(MoqVersion)" /> + <ProjectReference Include="..\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>false</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>Microsoft.IO.Redist</AssemblyName> - <TargetFrameworks>$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>net472</TargetFrameworks> <DefineConstants>$(DefineConstants);MS_IO_REDIST</DefineConstants> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ClsCompliant>false</ClsCompliant> @@ -196,12 +195,8 @@ <Compile Include="Microsoft\IO\StringExtensions.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.ValueTuple" /> - <Reference Include="System.Buffers" /> - <Reference Include="System.Memory" /> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> <ItemGroup> <Folder Include="Microsoft\IO\Enumeration\" /> 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 @@ <PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion> <AssemblyVersion>10.0.6.0</AssemblyVersion> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Compile Include="Microsoft\VisualBasic\VBMath.vb" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="Microsoft.Win32.Registry" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.Collections.Specialized" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="AssemblyAttributes.cs" /> @@ -50,4 +50,8 @@ <Compile Include="UtilsTests.cs" /> <Compile Include="VBMathTests.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj" /> + <Reference Include="Microsoft.VisualBasic" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> <Compile Include="Microsoft.Win32.Registry.AccessControl.cs" /> <Compile Include="Microsoft.Win32.Registry.AccessControl.Forwards.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> <ProjectReference Include="..\..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" /> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <TargetFrameworks>netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -10,17 +9,11 @@ <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_RegistryAccessControl</GeneratePlatformNotSupportedAssemblyMessage> <OmitResources Condition="$(TargetFramework.StartsWith('net4'))">true</OmitResources> </PropertyGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Security.AccessControl" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetsWindows)' != 'true'"> - <Reference Include="System.Resources.ResourceManager" /> - </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> <Compile Include="Microsoft\Win32\RegistryAclExtensions.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))"> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="RegistryAclExtensionsTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> <IsWindowsSpecific>true</IsWindowsSpecific> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;$(NetFrameworkCurrent);net461</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -10,9 +10,6 @@ <ItemGroup> <Compile Include="Microsoft.Win32.Registry.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);$(NetFrameworkCurrent)-Windows_NT;netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <NoWarn>$(NoWarn);CA2249</NoWarn> <Nullable>enable</Nullable> </PropertyGroup> @@ -74,10 +73,11 @@ <Compile Include="Microsoft\Win32\SafeHandles\SafeRegistryHandle.FileSystem.cs" /> <Compile Include="System\Security\AccessControl\RegistrySecurity.FileSystem.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Buffers" /> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Debug" /> @@ -87,7 +87,11 @@ <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" @@ -56,4 +56,7 @@ <Compile Include="TestData.cs" /> <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\Microsoft.Win32.Registry.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;$(NetFrameworkCurrent);net461</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -10,8 +10,4 @@ <ItemGroup> <Compile Include="Microsoft.Win32.SystemEvents.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> </Project>
\ 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp3.0-Windows_NT;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp3.0-Windows_NT;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -118,14 +117,13 @@ <Compile Include="$(CoreLibSharedDir)System\Runtime\InteropServices\SuppressGCTransitionAttribute.cs" Link="System\Runtime\InteropServices\SuppressGCTransitionAttribute.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp'))"> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp'))"> <Reference Include="System.Collections" /> <Reference Include="System.ComponentModel.EventBasedAsync" /> <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.ComponentModel.TypeConverter" + Condition="$(TargetFramework.StartsWith('netcoreapp2.0'))" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Tools" /> <Reference Include="System.Resources.ResourceManager" /> @@ -135,7 +133,4 @@ <Reference Include="System.Threading" /> <Reference Include="System.Threading.Thread" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp2.0'))"> - <Reference Include="System.ComponentModel.TypeConverter" /> - </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" @@ -29,4 +29,7 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\Microsoft.Win32.SystemEvents.csproj" /> + </ItemGroup> </Project> 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 @@ </ItemGroup> <ItemGroup> - <ReferenceFromRuntime Include="dotnet-Microsoft.XmlSerializer.Generator"> - <!-- Copy this to our test output directory and run from there. - This is required so that we can stage the application with a custom runtimeconfig that lets it run on the test shared framework. --> - <Private>true</Private> - </ReferenceFromRuntime> + <ProjectReference Include="..\src\Microsoft.XmlSerializer.Generator.csproj" /> </ItemGroup> <!-- This target runs before binplacing as it needs to provide a test assembly to binplace, and depends on CopyFilesToOutputDirectory diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index b0551571adf..28dc8184f01 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -1,9 +1,4 @@ -<Project> - <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" /> - - <!-- Target that builds all the native binaries in the Native folder --> - <Target Name="Build" DependsOnTargets="BuildNativeUnix;BuildNativeWindows" /> - +<Project Sdk="Microsoft.Build.Traversal"> <PropertyGroup> <!-- Hardcode version paths in a global location. --> <NativeVersionFile Condition="'$(TargetOS)' == 'Windows_NT'">$(ArtifactsObjDir)_version.h</NativeVersionFile> @@ -11,9 +6,14 @@ <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS)</_BuildNativeArgs> </PropertyGroup> + <ItemGroup> + <ProjectReference Include="native-binplace.proj" + Condition="'$(BuildingNETCoreAppVertical)' == 'true'" /> + </ItemGroup> + <Target Name="BuildNativeUnix" + BeforeTargets="Build" Condition="'$(TargetOS)' != 'Windows_NT'"> - <PropertyGroup> <!-- MSBuildNodeCount should a good approximation for how many procs to use for native build, if we find that doesn't work @@ -32,20 +32,16 @@ <_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessCountArg)$(_PortableBuildArg)$(_CrossBuildArg)$(_BuildNativeCompilerArg)$(_CMakeArgs) $(Compiler)</_BuildNativeUnixArgs> </PropertyGroup> - <Message Text="$(MSBuildProjectDirectory)/build-native.sh $(_BuildNativeUnixArgs)" Importance="High"/> - <Exec Command=""$(MSBuildProjectDirectory)/build-native.sh" $(_BuildNativeUnixArgs)" /> - + <Message Text="$(MSBuildThisFileDirectory)build-native.sh $(_BuildNativeUnixArgs)" Importance="High"/> + <Exec Command=""$(MSBuildThisFileDirectory)build-native.sh" $(_BuildNativeUnixArgs)" /> </Target> - <!-- We don't have any native components when building for netfx. --> <Target Name="BuildNativeWindows" - Condition="'$(TargetOS)' == 'Windows_NT' and !$(TargetFramework.StartsWith('net4'))"> - + BeforeTargets="Build" + Condition="'$(TargetOS)' == 'Windows_NT' and + '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'"> <!-- Run script that invokes Cmake to create VS files, and then calls msbuild to compile them --> - <Message Text=""$(MSBuildProjectDirectory)\build-native.cmd" $(_BuildNativeArgs)" Importance="High"/> - <Exec Command=""$(MSBuildProjectDirectory)\build-native.cmd" $(_BuildNativeArgs)" /> - + <Message Text=""$(MSBuildThisFileDirectory)build-native.cmd" $(_BuildNativeArgs)" Importance="High"/> + <Exec Command=""$(MSBuildThisFileDirectory)build-native.cmd" $(_BuildNativeArgs)" /> </Target> - - <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" /> </Project> 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 @@ <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" /> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <TargetFramework>$(BuildTargetFramework)</TargetFramework> <BinPlaceRuntime>false</BinPlaceRuntime> <BinPlaceNative>true</BinPlaceNative> + <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> </PropertyGroup> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" /> @@ -22,10 +23,6 @@ <BinPlaceItem Include="$(NativeBinDir)*.dbg" /> <BinPlaceItem Include="$(NativeBinDir)*.dylib" /> <BinPlaceItem Include="$(NativeBinDir)*.dwarf" /> - <BinPlaceItem Condition="'$(TargetOS)' == 'Browser'" Include="$(NativeBinDir)dotnet.js" /> - <BinPlaceItem Condition="'$(TargetOS)' == 'Browser'" Include="$(NativeBinDir)dotnet.wasm" /> - <BinPlaceItem Condition="'$(TargetOS)' == 'Browser'" Include="$(NativeBinDir)dotnet.timezones.blat" /> - <BinPlaceItem Condition="'$(TargetOS)' == 'Browser'" Include="$(NativeBinDir)icudt.dat" /> <FileWrites Include="@(BinPlaceItem)" /> </ItemGroup> </Target> 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 @@ +<Project> + <PropertyGroup> + <!-- The trailing semicolon is important for each entry! --> + <NetCoreAppLibrary> + 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; + </NetCoreAppLibrary> + <NetCoreAppLibraryNoReference> + 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; + </NetCoreAppLibraryNoReference> + </PropertyGroup> + <!-- Make NetCoreAppLibrary available as an item. --> + <ItemGroup> + <NetCoreAppLibrary Include="$(NetCoreAppLibrary)" /> + </ItemGroup> +</Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.AppContext</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -10,10 +9,6 @@ <ItemGroup> <Compile Include="System.CodeDom.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> <ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);CODEDOM</DefineConstants> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -129,8 +128,4 @@ <Compile Include="System\Collections\Specialized\FixedStringLookup.cs" /> <Compile Include="$(CommonPath)System\CSharpHelpers.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\CodeDom\CodeAttributeDeclarationCollectionTests.cs" /> @@ -110,4 +110,7 @@ <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs" Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <ProjectReference Include="..\src\System.CodeDom.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Collections.Concurrent</AssemblyName> - <RootNamespace>System.Collections.Concurrent</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> @@ -23,8 +21,8 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="$(CoreLibProject)" /> - <ProjectReference Include="..\..\System.Collections\src\System.Collections.csproj" /> - <ProjectReference Include="..\..\System.Diagnostics.Tracing\src\System.Diagnostics.Tracing.csproj" /> - <ProjectReference Include="..\..\System.Threading\src\System.Threading.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\src\System.Collections.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.Tracing\src\System.Diagnostics.Tracing.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Threading\src\System.Threading.csproj" /> </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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<TSource> ToImmutableHashSet<TSource>(this System.Collections.Immutable.ImmutableHashSet<TSource>.Builder builder) { throw null; } } - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK public sealed partial class ImmutableHashSet<T> : System.Collections.Generic.ICollection<T>, System.Collections.Generic.IEnumerable<T>, System.Collections.Generic.IReadOnlyCollection<T>, System.Collections.Generic.ISet<T>, System.Collections.Generic.IReadOnlySet<T>, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet<T> #else public sealed partial class ImmutableHashSet<T> : System.Collections.Generic.ICollection<T>, System.Collections.Generic.IEnumerable<T>, System.Collections.Generic.IReadOnlyCollection<T>, System.Collections.Generic.ISet<T>, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Immutable.IImmutableSet<T> @@ -916,7 +916,7 @@ namespace System.Collections.Immutable public static System.Collections.Immutable.ImmutableSortedSet<TSource> ToImmutableSortedSet<TSource>(this System.Collections.Immutable.ImmutableSortedSet<TSource>.Builder builder) { throw null; } } - #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 + #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !NETSTANDARD2_0 && !NETFRAMEWORK public sealed partial class ImmutableSortedSet<T> : System.Collections.Generic.ICollection<T>, System.Collections.Generic.IEnumerable<T>, System.Collections.Generic.IList<T>, System.Collections.Generic.IReadOnlyCollection<T>, System.Collections.Generic.IReadOnlyList<T>, System.Collections.Generic.ISet<T>, System.Collections.Generic.IReadOnlySet<T>, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet<T> #else public sealed partial class ImmutableSortedSet<T> : System.Collections.Generic.ICollection<T>, System.Collections.Generic.IEnumerable<T>, System.Collections.Generic.IList<T>, System.Collections.Generic.IReadOnlyCollection<T>, System.Collections.Generic.IReadOnlyList<T>, System.Collections.Generic.ISet<T>, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IList, System.Collections.Immutable.IImmutableSet<T> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -12,16 +12,17 @@ <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Collections" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or + '$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <!-- Include these transitive dependencies to overrule NuGet's ProjectReference over PackageReferene behavior. --> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Runtime.InteropServices" /> + <PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'"> - <Reference Include="System.Memory" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard1.0'"> + <PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" /> + <PackageReference Include="System.Collections" Version="$(SystemCollectionsVersion)" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.0;netstandard1.3;netstandard2.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -88,13 +87,13 @@ <Compile Include="Validation\ValidatedNotNullAttribute.cs" /> <Compile Include="$(CommonPath)System\Runtime\Versioning\NonVersionableAttribute.cs" Link="Common\System\Runtime\Versioning\NonVersionableAttribute.cs" /> + <None Include="Interfaces.cd" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' or '$(TargetFramework)' == 'netstandard1.3'"> <Compile Include="$(CommonPath)System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" Link="System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" /> </ItemGroup> - <ItemGroup> - <None Include="Interfaces.cd" /> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Contracts" /> <Reference Include="System.Diagnostics.Debug" /> @@ -104,22 +103,14 @@ <Reference Include="System.Resources.ResourceManager" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> - <Reference Include="System.AppContext" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Threading" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'"> - <Reference Include="System.Memory" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Memory" /> - <Reference Include="netstandard" /> - <Reference Include="System.Core" /> + <ItemGroup> + <PackageReference Include="System.Diagnostics.Contracts" Condition="$(TargetFramework.StartsWith('netstandard1.'))" Version="$(SystemDiagnosticsContractsVersion)" /> + <PackageReference Include="System.Memory" Condition="'$(TargetFramework)' == 'netstandard1.3' or + '$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Runtime.InteropServices" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="$(SystemRuntimeInteropServicesVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <NoWarn>0436</NoWarn> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> - <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs" Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)'" + <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs" Condition="'$(TargetFramework)' == 'net461'" Link="Common\System\Collections\DictionaryExtensions.cs" /> <Compile Include="BadHasher.cs" /> <Compile Include="EverythingEqual.cs" /> @@ -77,8 +77,7 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. --> - <DefaultReferenceExclusions Include="System.Collections.Immutable" /> - <ReferenceFromRuntime Include="System.Collections.Immutable" /> + <ProjectReference Include="..\src\System.Collections.Immutable.csproj" SkipUseReferenceAssembly="true" /> <Compile Include="ImmutableListTestBase.cs" /> <Compile Include="ImmutableListTest.cs" /> <Compile Include="ImmutableListBuilderTest.cs" /> @@ -96,4 +95,7 @@ <Compile Include="ImmutableSortedSetBuilderTest.nonnetstandard.cs" /> <Compile Include="ImmutableSortedDictionaryTest.nonnetstandard.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="..\src\System.Collections.Immutable.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.Collections.NonGeneric</RootNamespace> - <AssemblyName>System.Collections.NonGeneric</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.Collections.Specialized</RootNamespace> - <AssemblyName>System.Collections.Specialized</AssemblyName> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Collections</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\ComponentModel\DataAnnotations\AssociatedMetadataTypeTypeDescriptionProviderTests.cs" /> @@ -42,4 +42,7 @@ <Compile Include="System\ComponentModel\DataAnnotations\ValidationResultTests.cs" /> <Compile Include="System\ComponentModel\DataAnnotations\ValidatorTests.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <Reference Include="System.ComponentModel.DataAnnotations" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.ComponentModel.Composition.Registration</AssemblyName> <TargetFrameworks>netstandard2.1</TargetFrameworks> </PropertyGroup> <ItemGroup> @@ -25,7 +24,7 @@ Link="Common\System\Composition\Diagnostics\TraceWriter.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.ComponentModel.Composition" /> - <Reference Include="System.Reflection.Context" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Context\src\System.Reflection.Context.csproj" /> </ItemGroup> </Project> 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 @@ <Compile Include="System\ComponentModel\Composition\Registration\RegistrationBuilderTests.cs" /> <Compile Include="System\ComponentModel\Composition\Registration\RegistrationContextUnitTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.ComponentModel.Composition.Registration.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;_net461</TargetFrameworks> + <TargetFrameworks>netstandard2.0</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace /> - <!-- CommonStrings needs RootNamespace to be empty --> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0;_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -214,4 +212,4 @@ <Reference Include="System.Threading.Thread" /> <Reference Include="System.Text.Encoding.Extensions" /> </ItemGroup> -</Project> +</Project>
\ 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 @@ <ItemGroup> <Compile Include="TestClass.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj" /> + </ItemGroup> </Project>
\ 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 @@ -5,11 +5,6 @@ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. --> - <DefaultReferenceExclusions Include="System.ComponentModel.Composition" /> - <ReferenceFromRuntime Include="System.ComponentModel.Composition" /> - </ItemGroup> - <ItemGroup> <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs" Link="Common\System\IO\TempDirectory.cs" /> <Compile Include="$(CommonTestPath)System\IO\TempFile.cs" @@ -171,10 +166,11 @@ <Compile Include="System\UnitTesting\TestServices.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj"> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - <OutputItemType>content</OutputItemType> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </ProjectReference> + <ProjectReference Include="System.ComponentModel.Composition.Noop.Assembly/System.ComponentModel.Composition.Noop.Assembly.csproj" + ReferenceOutputAssembly="false" + OutputItemType="content" + CopyToOutputDirectory="PreserveNewest" /> + <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. --> + <ProjectReference Include="..\src\System.ComponentModel.Composition.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.ComponentModel.EventBasedAsync</RootNamespace> - <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.ComponentModel.Primitives</RootNamespace> - <AssemblyName>System.ComponentModel.Primitives</AssemblyName> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.ComponentModel.TypeConverter</RootNamespace> - <AssemblyName>System.ComponentModel.TypeConverter</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.ComponentModel</RootNamespace> - <AssemblyName>System.ComponentModel</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Composition.AttributedModel</AssemblyName> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\Composition\Convention\AttributedModelProvider.cs" /> @@ -19,7 +17,4 @@ <Compile Include="System\Composition\SharedAttribute.cs" /> <Compile Include="System\Composition\SharingBoundaryAttribute.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="SharingBoundaryAttributeTests.cs" /> @@ -15,4 +15,10 @@ <Compile Include="ExportMetadataAttributeTests.cs" /> <Compile Include="ExportAttributeTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Composition.AttributedModel.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Composition.Convention</AssemblyName> - <RootNamespace> - </RootNamespace> - <!-- CommonStrings needs RootNamespace to be empty --> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\Composition\Convention\ConventionBuilder.cs" /> @@ -26,10 +21,6 @@ Link="Common\System\Composition\Diagnostics\TraceWriter.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Composition.Convention.Tests</AssemblyName> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="AttributedModelConventionExtensions.cs" /> @@ -16,4 +15,8 @@ <Compile Include="PartBuilderOfTTests.cs" /> <Compile Include="PartBuilderTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="../src/System.Composition.Convention.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.TypedParts\src\System.Composition.TypedParts.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Composition.Hosting</AssemblyName> - <RootNamespace> - </RootNamespace> - <!-- CommonStrings needs RootNamespace to be empty --> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\Composition\Hosting\CompositionHost.cs" /> @@ -36,12 +31,9 @@ <Compile Include="System\Composition\Hosting\Util\SmallSparseInitonlyArray.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Composition.Runtime\src\System.Composition.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Runtime\src\System.Composition.Runtime.csproj" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - <Reference Include="System" /> <Reference Include="System.ComponentModel.Composition" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\Composition\Hosting\Core\CompositionDependencyTests.cs" /> @@ -12,4 +12,10 @@ <Compile Include="System\Composition\Hosting\Core\LifetimeContextTests.cs" /> <Compile Include="System\Composition\Hosting\Core\ExportDescriptorTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Composition.Hosting.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.ComponentModel.Composition" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <RootNamespace>System.Composition</RootNamespace> - <AssemblyName>System.Composition.Runtime</AssemblyName> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\Composition\CompositionContext.cs" /> @@ -14,9 +12,4 @@ <Compile Include="System\Composition\Hosting\Core\CompositionContract.cs" /> <Compile Include="System\Composition\Runtime\Util\Formatters.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - <Reference Include="System" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\Composition\Hosting\Core\CompositionContractTests.cs" /> @@ -10,4 +10,10 @@ <Compile Include="System\Composition\ExportFactoryTests.cs" /> <Compile Include="System\Composition\ExportTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Composition.Runtime.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <RootNamespace>System.Composition</RootNamespace> - <AssemblyName>System.Composition.TypedParts</AssemblyName> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\Composition\CompositionContextExtensions.cs" /> @@ -31,12 +29,8 @@ Link="Common\System\Numerics\Hashing\HashHelpers.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" /> - <ProjectReference Include="..\..\System.Composition.Hosting\src\System.Composition.Hosting.csproj" /> - <ProjectReference Include="..\..\System.Composition.Runtime\src\System.Composition.Runtime.csproj" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Hosting\src\System.Composition.Hosting.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Runtime\src\System.Composition.Runtime.csproj" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="ContainerConfigurationTests.cs" /> @@ -8,4 +8,12 @@ Link="Common\System\Diagnostics\DebuggerAttributes.cs" /> <Compile Include="ReflectionTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Composition.TypedParts.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Convention\src\System.Composition.Convention.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <!-- S.C.DataAnnotations targeting .NET Framework isn't live built anymore. --> + <Reference Include="System.ComponentModel.DataAnnotations" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>Microsoft.Composition.Demos.ExtendedCollectionImports</AssemblyName> - <TargetFrameworks>netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Dictionaries\DictionaryExportDescriptorProvider.cs" /> @@ -10,4 +9,7 @@ <Compile Include="OrderedCollections\OrderedImportManyExportDescriptorProvider.cs" /> <Compile Include="KeyByMetadataAttribute.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.TypedParts\src\System.Composition.TypedParts.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <RootNamespace>System.Composition.Lightweight.UnitTests</RootNamespace> - <AssemblyName>System.Composition.Tests</AssemblyName> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="ActivationEventOrderingTests.cs" /> @@ -36,7 +35,11 @@ <Compile Include="Util\AssertX.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Convention\src\System.Composition.Convention.csproj" /> <ProjectReference Include="Microsoft.Composition.Demos.ExtendedCollectionImports\Microsoft.Composition.Demos.ExtendedCollectionImports.csproj" /> <ProjectReference Include="TestLibrary\TestLibrary.csproj" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.ComponentModel.Composition" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="TestClass.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <NoWarn>$(NoWarn);CS0618</NoWarn> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -15,11 +14,6 @@ <ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Configuration" /> - <Reference Include="System.Core" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Xml" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -251,15 +250,10 @@ Link="Common\System\IO\TempFileCollection.cs" /> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> - <Reference Include="System.Security.Cryptography.ProtectedData" /> - <Reference Include="System.Security.Permissions" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" /> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> <Reference Include="System.Configuration" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Xml" /> </ItemGroup> </Project> 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 @@ <TestDisableAppDomain>true</TestDisableAppDomain> <TestDisableParallelization>true</TestDisableParallelization> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs" @@ -105,4 +105,10 @@ <Compile Include="System\Configuration\ValidatiorUtilsTests.cs" /> <Compile Include="System\Drawing\Configuration\SystemDrawingSectionTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Configuration.ConfigurationManager.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.Configuration" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Data.Common</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs" Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs" /> </ItemGroup> + <!-- S.D.SqlClient isn't live built anymore. --> <ItemGroup> <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" /> </ItemGroup> 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 @@ <!-- AssemblyVersion is frozen to that which originally shipped in 2.1 --> <AssemblyVersion>4.0.0.0</AssemblyVersion> <StrongNameKeyId>ECMA</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Data.DataSetExtensions</AssemblyName> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;$(NetFrameworkCurrent);net461</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -9,9 +9,4 @@ <ItemGroup> <Compile Include="System.Data.Odbc.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Data" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(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</TargetFrameworks> + <TargetFrameworks>$(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</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <NoWarn>$(NoWarn);CA2249</NoWarn> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -126,12 +125,16 @@ <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" Link="Common\Interop\Windows\Interop.Libraries.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <Reference Include="mscorlib" /> - <Reference Include="System.Data" /> + <ItemGroup> + <EmbeddedResource Include="Resources\System.Data.Odbc.OdbcMetaData.xml"> + <LogicalName>System.Data.Odbc.OdbcMetaData.xml</LogicalName> + </EmbeddedResource> + </ItemGroup> + <ItemGroup> + <None Include="DatabaseSetupInstructions.md" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> - <Reference Include="Microsoft.Win32.Registry" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp2.0'))"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Collections.Specialized" /> @@ -148,10 +151,9 @@ <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> <Reference Include="System.Security.Claims" /> <Reference Include="System.Security.Principal" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Text.Encoding.CodePages" /> <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Text.RegularExpressions" /> <Reference Include="System.Threading" /> @@ -160,18 +162,13 @@ <Reference Include="System.Threading.ThreadPool" /> <Reference Include="System.Threading.Timer" /> <Reference Include="System.Transactions" /> - <Reference Include="System.Xml.ReaderWriter" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp2.0'))"> <Reference Include="System.Transactions.Local" /> + <Reference Include="System.Xml.ReaderWriter" /> </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\System.Data.Odbc.OdbcMetaData.xml"> - <LogicalName>System.Data.Odbc.OdbcMetaData.xml</LogicalName> - </EmbeddedResource> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <Reference Include="System.Text.Encoding.CodePages" /> </ItemGroup> - <ItemGroup> - <None Include="DatabaseSetupInstructions.md" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp2.0'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);TargetsWindows</DefineConstants> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="DependencyCheckTest.cs" /> @@ -39,4 +39,7 @@ <ItemGroup Condition="'$(TargetsWindows)' != 'true'"> <Compile Include="ConnectionStrings.Unix.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.Data.Odbc.csproj" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <NoWarn>$(NoWarn);0618</NoWarn> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -13,9 +12,6 @@ <Compile Condition="!$(TargetFramework.StartsWith('net4'))" Include="System.Data.OleDb.Manual.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Data" /> <Reference Include="System.Transactions" /> </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -96,15 +95,11 @@ <LogicalName>System.Data.OleDb.OleDbMetaData.xml</LogicalName> </EmbeddedResource> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Data" /> - </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Configuration.ConfigurationManager" /> - <Reference Include="System.Diagnostics.PerformanceCounter" /> - <Reference Include="System.Security.Principal.Windows" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.PerformanceCounter\src\System.Diagnostics.PerformanceCounter.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Helpers.cs" /> @@ -12,4 +12,11 @@ <Compile Include="OleDbDataReaderTests.cs" /> <Compile Include="OleDbParameterTests.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.Data.OleDb.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net461'))"> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data.DataSetExtensions" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Diagnostics.Contracts</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Diagnostics.Debug</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <RootNamespace>System.Diagnostics.Tests</RootNamespace> <IgnoreArchitectureMismatches>true</IgnoreArchitectureMismatches> <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch> - <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix</TargetFrameworks> <TestRuntime>true</TestRuntime> </PropertyGroup> <ItemGroup> - <DefaultReferenceExclusions Include="System.Diagnostics.Debug" /> - <DefaultReferenceExclusions Include="System.Runtime.Extensions" /> - <ProjectReference Include="$(CoreLibProject)" Private="false" /> - <ReferenceFromRuntime Include="System.Runtime" /> - <ReferenceFromRuntime Include="System.Threading" /> + <DefaultReferenceExclusion Include="System.Diagnostics.Debug" /> + <DefaultReferenceExclusion Include="System.Runtime.Extensions" /> + <ProjectReference Include="$(CoreLibProject)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\src\System.Runtime.csproj; + $(LibrariesProjectRoot)System.Threading\src\System.Threading.csproj" + SkipUseReferenceAssembly="true" /> </ItemGroup> <ItemGroup> <Compile Include="DebugTests.cs" /> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard1.1;netstandard1.3;net45;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;netstandard1.1;netstandard1.3;net45</TargetFrameworks> <CLSCompliant>false</CLSCompliant> <Nullable>enable</Nullable> + <AvoidRestoreCycleOnSelfReference>true</AvoidRestoreCycleOnSelfReference> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -15,21 +15,9 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.1'"> <Compile Include="System.Diagnostics.DiagnosticSourceActivity.cs" /> - <Reference Include="System.Memory" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'net45' or '$(TargetFramework)' == '$(NetFrameworkCurrent)'"> - <Reference Include="mscorlib" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'net45'"> <Reference Include="System.Runtime" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)'"> - <Reference Include="netstandard" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3'"> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ 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 @@ <CLSCompliant>false</CLSCompliant> <NoWarn>$(NoWarn);SA1205</NoWarn> <Nullable>enable</Nullable> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.1;netstandard1.3;net45;net46;netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.1;netstandard1.3;net45;net46;netstandard2.0</TargetFrameworks> + <AvoidRestoreCycleOnSelfReference>true</AvoidRestoreCycleOnSelfReference> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -45,8 +45,6 @@ <Compile Include="System\Diagnostics\ActivityListener.cs" /> <Compile Include="System\Diagnostics\ActivitySource.cs" /> <Compile Include="System\Diagnostics\DiagnosticSourceActivity.cs" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> <None Include="ActivityUserGuide.md" /> </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' == '$(NetCoreAppCurrent)'"> @@ -60,8 +58,6 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'net45'"> <Compile Include="System\Diagnostics\Activity.Current.net45.cs" /> - <TargetingPackReference Include="System" /> - <TargetingPackReference Include="System.Runtime.Remoting" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'"> <Compile Include="System\Diagnostics\Activity.DateTime.corefx.cs" /> @@ -78,26 +74,24 @@ </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> <Compile Include="System\Diagnostics\HttpHandlerDiagnosticListener.cs" /> + <Compile Include="AssemblyInfo.netfx.cs" /> + <Compile Include="System\Diagnostics\Activity.DateTime.netfx.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' != '$(NetFrameworkCurrent)'"> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Tracing" /> + <Reference Include="System.Memory" /> <Reference Include="System.Reflection" /> <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.CompilerServices.Unsafe" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Threading" /> <Reference Include="System.Resources.ResourceManager" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> - <Reference Include="System.AppContext" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Compile Include="AssemblyInfo.netfx.cs" /> - <Compile Include="System\Diagnostics\Activity.DateTime.netfx.cs" /> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.1' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net48-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> <Compile Include="DiagnosticSourceEventSourceBridgeTests.cs" /> @@ -18,4 +18,8 @@ <Compile Include="$(CommonTestPath)System\Net\Configuration.cs" Link="Common\System\Net\Configuration.cs" /> <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs" Link="Common\System\Net\Configuration.Http.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> + <ProjectReference Include="..\src\System.Diagnostics.DiagnosticSource.csproj" /> + <Reference Include="System.Net.Http" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetFrameworkCurrent);net461;netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -11,13 +11,6 @@ </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> <ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;net461;netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;net461;netstandard2.0</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -99,14 +98,11 @@ <Compile Include="$(CommonPath)System\Diagnostics\NetFrameworkUtils.cs" Link="Common\System\Diagnostics\NetFrameworkUtils.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp2.0'))"> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Threading.AccessControl\src\System.Threading.AccessControl.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="Microsoft.Win32.Registry" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Specialized" /> <Reference Include="System.ComponentModel" /> @@ -121,12 +117,13 @@ <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Threading" /> - <Reference Include="System.Threading.AccessControl" /> <Reference Include="System.Threading.Tasks" /> <Reference Include="System.Threading.Thread" /> <Reference Include="System.Threading.ThreadPool" /> <Reference Include="System.Threading.Overlapped" /> </ItemGroup> + <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="EventInstanceTests.cs" /> @@ -22,4 +22,7 @@ <Compile Include="System\Diagnostics\Reader\EventLogWatcherTests.cs" /> <Compile Include="System\Diagnostics\Reader\ProviderMetadataTests.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.Diagnostics.EventLog.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Diagnostics.FileVersionInfo</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> @@ -47,8 +46,7 @@ <Reference Include="System.Runtime.InteropServices" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> - <ProjectReference Include="../../System.Reflection.Metadata/src/System.Reflection.Metadata.csproj" /> <Reference Include="System.Collections.Immutable" /> - <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Reflection.Metadata" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Exe</OutputType> - <TargetExt>.dll</TargetExt> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -10,9 +10,4 @@ <ItemGroup> <Compile Include="System.Diagnostics.PerformanceCounter.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -123,20 +121,16 @@ <Compile Include="$(CommonPath)System\Diagnostics\NetFrameworkUtils.cs" Link="Common\System\Diagnostics\NetFrameworkUtils.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <Reference Include="Microsoft.Win32.Registry" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp2.0'))"> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Buffers" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.ComponentModel.Primitives" /> <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Configuration.ConfigurationManager" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Process" /> <Reference Include="System.Diagnostics.Tools" /> @@ -148,9 +142,12 @@ <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Security.Claims" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Security.Principal" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Thread" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('netcoreapp2.0'))"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <Win32Resource>provider.res</Win32Resource> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="PerformanceCounterTests.cs" /> @@ -18,9 +17,10 @@ <Compile Include="PerformanceDataTests.cs" /> </ItemGroup> <ItemGroup> - <Content Include="provider.man"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> + <Content Include="provider.man" CopyToOutputDirectory="Always" /> <None Include="provider.res" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.Diagnostics.PerformanceCounter.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <DefineConstants>$(DefineConstants);FEATURE_REGISTRY</DefineConstants> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS</TargetFrameworks> @@ -325,8 +324,8 @@ <Compile Include="System\Diagnostics\ProcessThread.UnknownUnix.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="Microsoft.Win32.Registry" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Collections.NonGeneric" /> 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 @@ <Compile Include="DelegateSynchronizeInvoke.cs" /> <Compile Include="Helpers.cs" /> <Compile Include="Interop.cs" /> - <Compile Include="Interop.Unix.cs" Condition="'$(TargetsWindows)' != 'true'" /> <Compile Include="ProcessCollectionTests.cs" /> <Compile Include="ProcessModuleTests.cs" /> <Compile Include="ProcessStandardConsoleTests.cs" /> @@ -39,9 +38,14 @@ Link="System\PasteArguments.Windows.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true' or '$(TargetsBrowser)' == 'true'"> + <Compile Include="Interop.Unix.cs" /> <Compile Include="ProcessTests.Unix.cs" /> <Compile Include="ProcessThreadTests.Unix.cs" /> <Compile Include="$(CoreLibSharedDir)System\PasteArguments.Unix.cs" Link="System\PasteArguments.Unix.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Diagnostics.StackTrace</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <Nullable>enable</Nullable> @@ -24,14 +23,12 @@ <Compile Include="System\Diagnostics\SymbolStore\SymLanguageVendor.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.IO.FileSystem" /> - <ProjectReference Include="..\..\System.Collections.Concurrent\src\System.Collections.Concurrent.csproj" /> - <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" /> - <ProjectReference Include="..\..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" /> - <ProjectReference Include="..\..\System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CoreLibProject)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Concurrent\src\System.Collections.Concurrent.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\src\System.Runtime.csproj" /> + <Reference Include="System.IO.FileSystem" /> </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Diagnostics.Tools</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ -29,16 +29,14 @@ <Compile Include="System\Diagnostics\SwitchLevelAttribute.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.IO.FileSystem" /> - <ProjectReference Include="..\..\System.Collections\src\System.Collections.csproj" /> - <ProjectReference Include="..\..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj" /> - <ProjectReference Include="..\..\System.Collections.Specialized\src\System.Collections.Specialized.csproj " /> - <ProjectReference Include="..\..\System.ComponentModel.Primitives\src\System.ComponentModel.Primitives.csproj " /> - <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" /> - <ProjectReference Include="..\..\System.Threading\src\System.Threading.csproj" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CoreLibProject)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\src\System.Collections.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Specialized\src\System.Collections.Specialized.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Primitives\src\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\src\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Threading\src\System.Threading.csproj" /> + <Reference Include="System.IO.FileSystem" /> </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Diagnostics.Tracing</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE</DefineConstants> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <NoWarn>$(NoWarn);CA2249</NoWarn> </PropertyGroup> @@ -91,24 +91,26 @@ Link="Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.DirectoryServices" /> - <Reference Include="System.DirectoryServices.Protocols" /> - <Reference Include="System.Configuration.ConfigurationManager" /> - <Reference Include="System.IO.FileSystem.AccessControl" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.Collections.Specialized" /> <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.ComponentModel.TypeConverter" + Condition="'$(TargetFramework)' == 'netcoreapp2.0'" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Net.Primitives" /> <Reference Include="System.Net.Security" /> <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Security.Claims" /> @@ -119,7 +121,4 @@ <Reference Include="System.Threading.Thread" /> <Reference Include="System.Xml.ReaderWriter" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'"> - <Reference Include="System.ComponentModel.TypeConverter" /> - </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="ComputerPrincipalTest.cs" /> @@ -18,4 +18,14 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.DirectoryServices.AccountManagement.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <Reference Include="System.DirectoryServices" /> + <Reference Include="System.DirectoryServices.AccountManagement" /> + <Reference Include="System.DirectoryServices.Protocols" /> + </ItemGroup> </Project>
\ 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;$(NetCoreAppCurrent)-OSX;netcoreapp2.0-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp2.0-Linux;netstandard2.0;_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp2.0-Windows_NT;$(NetCoreAppCurrent)-OSX;netcoreapp2.0-OSX;$(NetCoreAppCurrent)-Linux;netcoreapp2.0-Linux;netstandard2.0</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -81,13 +81,13 @@ </Compile> </ItemGroup> <ItemGroup> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.Collections.Specialized" /> + <Reference Include="System.ComponentModel.Primitives" /> <Reference Include="System.ComponentModel.TypeConverter" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Net.Primitives" /> @@ -103,7 +103,4 @@ <Reference Include="System.Threading.Tasks.Extensions" /> <Reference Include="System.Xml.ReaderWriter" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.Primitives" /> - </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="BerConverterTests.cs" /> @@ -56,4 +56,12 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <Reference Include="System.DirectoryServices" /> + <Reference Include="System.DirectoryServices.Protocols" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>netstandard2.0</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System.DirectoryServices.cs" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -137,18 +137,18 @@ <Compile Include="Interop\UnsafeNativeMethods.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.IO.FileSystem.AccessControl" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Permissions" /> - <Reference Include="System.Security.Principal.Windows" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'"> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections.Specialized" /> <Reference Include="System.ComponentModel" /> 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 @@ <PropertyGroup> <!-- SYSLIB0003: CAS is obsolete, but we still have tests referencing it --> <NoWarn>$(NoWarn);SYSLIB0003</NoWarn> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\DirectoryServices\ActiveDirectorySecurityTests.cs" /> @@ -31,4 +31,10 @@ <Compile Include="System\DirectoryServices\DirectoryServicesTests.Windows.cs" /> <Compile Include="System\DirectoryServices\ActiveDirectoryComInterop.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.DirectoryServices.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <Reference Include="System.DirectoryServices" /> + </ItemGroup> </Project> 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 @@ <LogicalName>placeholder.ico</LogicalName> </EmbeddedResource> </ItemGroup> - <!-- References --> + <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj" /> + </ItemGroup> <ItemGroup> <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Condition="'$(TargetsWindows)' == 'true'" Include="Microsoft.Win32.SystemEvents" /> <Reference Include="System.Buffers" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> - <IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> @@ -106,4 +105,10 @@ <LogicalName>System.Drawing.Tests.Icon_toolboxBitmapAttributeTest</LogicalName> </EmbeddedResource> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.Drawing.Common.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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,22 +1,11 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <OutputType>Library</OutputType> <RootNamespace>System.Drawing</RootNamespace> - <AssemblyName>System.Drawing.Primitives</AssemblyName> <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS</DefineConstants> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> - <Reference Include="System.Collections" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="Microsoft.Win32.SystemEvents" /> - </ItemGroup> - <ItemGroup> <Compile Include="System\Drawing\KnownColorNames.cs" /> <Compile Include="System\Drawing\Point.cs" /> <Compile Include="System\Drawing\PointF.cs" /> @@ -46,4 +35,13 @@ <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.Win32SystemColors.cs" Link="Common\Interop\Windows\User32\Interop.Win32SystemColors.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj" /> + <Reference Include="System.Collections" /> + <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.ObjectModel" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Dynamic.Runtime</AssemblyName> - <RootNamespace>System.Dynamic.Runtime</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> <Compile Include="System.Formats.Asn1.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Memory" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs"> @@ -48,13 +47,11 @@ <Compile Include="System\Formats\Asn1\UniversalTagNumber.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Buffers" /> - <Reference Include="System.Memory" /> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Numerics" /> - <Reference Include="System.ValueTuple" /> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" Condition="'$(TargetFramework)' == 'net461'" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Asn1TagTests.cs" /> @@ -52,4 +52,8 @@ <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link> </Compile> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="..\src\System.Formats.Asn1.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" /> + </ItemGroup> </Project> 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 @@ <Compile Include="System.Formats.Cbor.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Runtime.Numerics\ref\System.Runtime.Numerics.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Numerics\ref\System.Runtime.Numerics.csproj" /> </ItemGroup> </Project> 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 @@ <Compile Include="CborRoundtripTests.cs" /> <Compile Include="CoseKeyHelpers.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Formats.Cbor.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Globalization.Calendars</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Globalization</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>ECMA</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.Compression.Brotli</AssemblyName> - <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>ECMA</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.Compression.ZipFile</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>ECMA</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.Compression</AssemblyName> - <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> <IsWindowsSpecific>true</IsWindowsSpecific> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;$(NetFrameworkCurrent);net461</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -11,9 +10,6 @@ <ItemGroup> <Compile Include="System.IO.FileSystem.AccessControl.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -99,27 +98,26 @@ <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> <Compile Include="System\IO\FileSystemAclExtensions.net46.cs" /> </ItemGroup> - <!-- Reference includes --> - <ItemGroup Condition="'$(TargetsWindows)' == 'true' and !$(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Buffers" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Threading.Tasks" /> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <Reference Include="System.Buffers" Condition="'$(TargetsWindows)' == 'true'" /> + <Reference Include="System.Collections" Condition="'$(TargetsWindows)' == 'true'" /> <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.IO.FileSystem" /> + <Reference Include="System.Memory" Condition="'$(TargetsWindows)' == 'true'" /> <Reference Include="System.Resources.ResourceManager" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.Handles" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> + <Reference Include="System.Runtime.InteropServices" Condition="'$(TargetsWindows)' == 'true'" /> + <Reference Include="System.Threading.Tasks" Condition="'$(TargetsWindows)' == 'true'" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="DirectoryObjectSecurityTests.cs" /> @@ -14,4 +14,13 @@ <Compile Include="FileSystemSecurityTests.cs" /> <Compile Include="Helpers.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.IO.FileSystem.AccessControl.csproj" SkipUseReferenceAssembly="true" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.DirectoryServices" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.FileSystem.Primitives</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.FileSystem</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Reference Include="System.Runtime" /> </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> - <Reference Include="System.IO.FileSystem.AccessControl" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> </ItemGroup> </Project> 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 @@ <Compile Include="System\IO\IsolatedStorage\TestHelper.cs" /> <Compile Include="System\IO\IsolatedStorage\RemoveTests.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.MemoryMappedFiles</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard1.3;net46;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;netstandard1.3;net46</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -15,15 +14,7 @@ <Compile Include="System.IO.Packaging.Serialization.cs" /> <Compile Include="System.IO.Packaging.PackUriScheme.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)' or '$(TargetFramework)' == 'net46'"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> <Reference Include="WindowsBase" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> - <Reference Include="System.Collections" /> - <Reference Include="System.IO" /> - <Reference Include="System.IO.FileSystem.Primitives" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>netstandard2.0;net46;netstandard1.3;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net46;netstandard1.3</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -10,22 +9,6 @@ <DefineConstants Condition="'$(TargetFramework)' != 'netstandard1.3'">$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants> <IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> - <Reference Include="System.AppContext" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Globalization" /> - <Reference Include="System.IO" /> - <Reference Include="System.IO.Compression" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.IO.FileSystem.Primitives" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Threading.Tasks" /> - <Reference Include="System.Text.Encoding" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="System\IO\Packaging\CompressionOption.cs" /> <Compile Include="System\IO\Packaging\ContentType.cs" /> @@ -57,7 +40,6 @@ <Compile Condition="'$(TargetFramework)' != 'netstandard1.3'" Include="System\IO\Packaging\PackUriHelper.PackUriScheme.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> <Reference Include="WindowsBase" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net48-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Tests.cs" /> </ItemGroup> <ItemGroup> <PackageReference Include="System.IO.Packaging.TestData" Version="$(SystemIOPackagingTestDataVersion)" /> + <ProjectReference Include="..\src\System.IO.Packaging.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))"> + <Reference Include="WindowsBase" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> + <ExcludeFromPackage Condition="'$(TargetFramework)' == 'net461'">true</ExcludeFromPackage> <!-- We only plan to use this ref in netcoreapp. For all other netstandard compatible frameworks we should use the lib asset instead. --> <PackageTargetFramework>netcoreapp2.0</PackageTargetFramework> @@ -10,8 +11,8 @@ <Compile Include="System.IO.Pipelines.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Buffers" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Threading.Tasks.Extensions" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -46,11 +45,14 @@ <Compile Include="System\IO\Pipelines\ThreadPoolScheduler.netstandard.cs" /> <Compile Include="System\IO\Pipelines\CancellationTokenExtensions.netstandard.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or + '$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="System.Buffers" /> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Debug" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. --> - <DefaultReferenceExclusions Include="System.IO.Pipelines" /> - <ReferenceFromRuntime Include="System.IO.Pipelines" /> - </ItemGroup> <ItemGroup> <Compile Include="Infrastructure\HeapBufferPool.cs" /> <Compile Include="Infrastructure\DisposeTrackingBufferPool.cs" /> @@ -49,4 +44,11 @@ <Compile Include="PipeWriterStreamTests.nonnetstandard.cs" /> <Compile Include="PipeReaderStreamTests.nonnetstandard.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. --> + <ProjectReference Include="..\src\System.IO.Pipelines.csproj" SkipUseReferenceAssembly="true" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="..\src\System.IO.Pipelines.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> <IsWindowsSpecific>true</IsWindowsSpecific> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.Pipes.AccessControl</AssemblyName> - <IncludeDefaultReferences>false</IncludeDefaultReferences> - <IsPartialFacadeAssembly Condition="'$(TargetsWindows)' == 'true'">true</IsPartialFacadeAssembly> - <OmitResources Condition="'$(TargetsWindows)' == 'true'">true</OmitResources> - <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> + <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> + <OmitResources Condition="'$(TargetsWindows)' == 'true'">true</OmitResources> + <IsPartialFacadeAssembly Condition="'$(TargetsWindows)' == 'true'">true</IsPartialFacadeAssembly> </PropertyGroup> <ItemGroup> <Reference Include="System.Runtime" /> </ItemGroup> - <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> - <ProjectReference Include="..\..\System.IO.Pipes\src\System.IO.Pipes.csproj" /> - <ProjectReference Include="..\..\System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + <!-- Include src projects during restore as TargetsWindows isn't set. --> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' or '$(MSBuildRestoreSessionId)' != ''"> + <ProjectReference Include="$(LibrariesProjectRoot)System.IO.Pipes\src\System.IO.Pipes.csproj" SkipUseReferenceAssembly="true" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)' != 'true'"> + <!-- Referencing the ref project directly as the src project doesn't have a RID less configuration. --> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> <Reference Include="System.IO.Pipes" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> </ItemGroup> </Project> 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 @@ <Compile Include="PipeTest.AclExtensions.cs" /> <Compile Include="..\..\System.IO.Pipes\tests\PipeTestBase.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.IO.Pipes.AccessControl.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.Pipes</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <OmitTransitiveCompileReferences>true</OmitTransitiveCompileReferences> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks> @@ -183,10 +182,11 @@ <Reference Include="System.Threading" /> <Reference Include="System.Threading.Overlapped" /> </ItemGroup> - <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> + <!-- Include src projects during restore as TargetsWindows isn't set. --> + <ItemGroup Condition="'$(TargetsWindows)' == 'true' or '$(MSBuildRestoreSessionId)' != ''"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Security.Claims" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true' or '$(TargetsBrowser)' == 'true'"> 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 @@ <Compile Include="NamedPipeTests\NamedPipeTest.RunAsClient.Unix.cs" /> <Compile Include="NativeOverlapped.unix.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.AccountManagement\src\System.DirectoryServices.AccountManagement.csproj" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -10,8 +9,4 @@ <ItemGroup> <Compile Include="System.IO.Ports.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> </Project>
\ 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>$(DefineConstants);NOSPAN;SERIAL_PORTS</DefineConstants> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> <Nullable>annotations</Nullable> - <TargetFrameworks>netstandard2.0-Windows_NT;netstandard2.0-Linux;netstandard2.0-OSX;netstandard2.0;net461-Windows_NT;netstandard2.0-FreeBSD;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0-Windows_NT;netstandard2.0-Linux;netstandard2.0-OSX;netstandard2.0;net461-Windows_NT;netstandard2.0-FreeBSD</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -134,28 +133,8 @@ <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Threading.Tasks" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true'"> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="System.Collections" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))"> + <ProjectReference Condition="'$(TargetsWindows)' == 'true'" Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-FreeBSD;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-FreeBSD;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> @@ -117,4 +117,11 @@ <ItemGroup> <Folder Include="Legacy\Manual\" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + <ProjectReference Include="..\src\System.IO.Ports.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO.UnmanagedMemoryStream</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.IO</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <FeatureInterpret>true</FeatureInterpret> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> - </PropertyGroup> - <PropertyGroup> <IsInterpreting>false</IsInterpreting> <DefineConstants> $(DefineConstants);FEATURE_DLG_INVOKE;FEATURE_FAST_CREATE</DefineConstants> <DefineConstants Condition=" '$(IsInterpreting)' != 'true' ">$(DefineConstants);FEATURE_COMPILE</DefineConstants> 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 @@ -7,10 +7,6 @@ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <DefaultReferenceExclusions Include="System.Linq.Expressions" /> - <ReferenceFromRuntime Include="System.Linq.Expressions" /> - </ItemGroup> - <ItemGroup> <AssembliesBeingTested Include="Microsoft.CSharp" /> </ItemGroup> <ItemGroup> @@ -246,5 +242,6 @@ </ItemGroup> <ItemGroup> <PackageReference Include="xunit.extensibility.execution" Version="$(XUnitVersion)" /> + <ProjectReference Include="..\src\System.Linq.Expressions.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Linq.Parallel</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Linq.Queryable</AssemblyName> - <RootNamespace>System.Linq.Queryable</RootNamespace> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Linq</AssemblyName> - <RootNamespace>System.Linq</RootNamespace> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> - <ItemGroup> - <ContractProject Include="..\ref\System.Linq.csproj"> - <BuildTargetFramework>$(NetCoreAppCurrent)</BuildTargetFramework> - </ContractProject> - </ItemGroup> <ItemGroup> <!-- Optimize for speed --> <Compile Include="System\Linq\AppendPrepend.SpeedOpt.cs" /> <Compile Include="System\Linq\Concat.SpeedOpt.cs" /> 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 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>$(NoWarn);0618</NoWarn> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -60,11 +60,11 @@ <Compile Include="System\Management\InteropClasses\WMIInterop.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.CodeDom" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.CodeDom\src\System.CodeDom.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'"> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" /> + <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.Collections.Specialized" /> <Reference Include="System.ComponentModel.Primitives" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="MofHelpers\MofCollection.cs" /> @@ -23,4 +23,10 @@ <LogicalName>CleanUp.mof</LogicalName> </EmbeddedResource> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.Management.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <Reference Include="System.Management" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <IncludePartialFacadeTests>true</IncludePartialFacadeTests> <TestRuntime>true</TestRuntime> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> @@ -15,4 +15,7 @@ <ItemGroup> <ProjectReference Include="..\..\System.Text.Json\ref\System.Text.Json.csproj" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.Net.Http" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;$(NetCoreAppCurrent);net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> - <PropertyGroup> - <!-- Ensure Assemblies are first resolved via targeting pack when targeting net461 --> - <AssemblySearchPaths Condition="'$(TargetFramework)' == 'net461'">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths)</AssemblySearchPaths> - </PropertyGroup> <ItemGroup> <Compile Include="System\Net\Http\Json\HttpClientJsonExtensions.Get.cs" /> <Compile Include="System\Net\Http\Json\HttpClientJsonExtensions.Post.cs" /> @@ -18,26 +13,31 @@ <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Compile Include="System\Net\Http\Json\HttpContentJsonExtensions.netcoreapp.cs" /> <Compile Include="System\Net\Http\Json\JsonContent.netcoreapp.cs" /> - <Reference Include="System.Net.Mail" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Runtime" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR $(TargetFramework.StartsWith('net4'))"> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> <Compile Include="System\ArraySegmentExtensions.netstandard.cs" /> <Compile Include="System\Net\Http\Json\HttpContentJsonExtensions.netstandard.cs" /> <Compile Include="System\Net\Http\Json\TranscodingReadStream.cs" /> <Compile Include="System\Net\Http\Json\TranscodingWriteStream.cs" /> - <Reference Include="System.Buffers" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Memory" /> + <Reference Include="System.Net.Mail" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Net.Primitives" /> + <Reference Include="System.Runtime" /> <Reference Include="System.Text.Json" /> <Reference Include="System.Threading.Tasks.Extensions" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> + </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Net.Http" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="HttpClientJsonExtensionsTests.cs" /> @@ -29,4 +29,8 @@ <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <Reference Include="System.Net.Http" /> + <ProjectReference Include="..\..\src\System.Net.Http.Json.csproj" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="TranscodingReadStreamTests.cs" /> <Compile Include="TranscodingWriteStreamTests.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> <Compile Include="..\..\src\System\ArraySegmentExtensions.netstandard.cs" Link="ProductionCode\System\ArraySegmentExtensions.netstandard.cs" /> </ItemGroup> @@ -16,4 +16,7 @@ <Compile Include="..\..\src\System\Net\Http\Json\TranscodingWriteStream.cs" Link="ProductionCode\System\Net\Http\Json\TranscodingWriteStream.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="..\..\src\System.Net.Http.Json.csproj" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> - <PropertyGroup> - <!-- Ensure Assemblies are first resolved via targeting pack when targeting net461 --> - <AssemblySearchPaths Condition="'$(TargetFramework)' == 'net461'">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.6.1\1.0.1\lib\net461\;$(AssemblySearchPaths)</AssemblySearchPaths> - </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Http.WinHttpHandler.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Net.Http" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> - <TargetFrameworks>netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0-Windows_NT;netstandard2.0;net461-Windows_NT</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);WINHTTPHANDLER_DLL</DefineConstants> <Nullable>enable</Nullable> @@ -87,14 +85,10 @@ Link="Common\System\Net\Logging\NetEventSource.Common.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Buffers" /> - <Reference Include="System.Diagnostics.DiagnosticSource" /> - <Reference Include="System.Memory" /> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Net.Http" /> - <Reference Include="netstandard" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net48-Windows_NT</TargetFrameworks> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> <DefineConstants>$(DefineConstants);WINHTTPHANDLER_TEST</DefineConstants> <LangVersion>8.0</LangVersion> @@ -141,5 +141,14 @@ <ItemGroup> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> <PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" /> + <ProjectReference Include="..\..\src\System.Net.Http.WinHttpHandler.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))"> + <Reference Include="System.DirectoryServices.Protocols" /> + <Reference Include="System.Net.Http" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Net.Http.Json\src\System.Net.Http.Json.csproj" /> </ItemGroup> </Project>
\ 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 @@ <Nullable>annotations</Nullable> </PropertyGroup> <ItemGroup> - <DefaultReferenceExclusions Include="System.Net.Http.WinHttpHandler" /> + <DefaultReferenceExclusion Include="System.Net.Http.WinHttpHandler" /> </ItemGroup> <ItemGroup Condition=" '$(TargetsWindows)' == 'true' "> <Compile Include="$(CommonTestPath)System\Net\SslProtocolSupport.cs" diff --git a/src/libraries/System.Net.Http/Directory.Build.props b/src/libraries/System.Net.Http/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.Http/Directory.Build.props +++ b/src/libraries/System.Net.Http/Directory.Build.props @@ -2,6 +2,5 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <OutputType>Library</OutputType> - <AssemblyName>System.Net.Http</AssemblyName> <WindowsRID>win</WindowsRID> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);HTTP_DLL</DefineConstants> @@ -666,6 +664,7 @@ <Compile Include="System\Net\Http\BrowserHttpHandler\BrowserHttpHandler.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> @@ -691,20 +690,22 @@ <Reference Include="System.Security.Cryptography.Primitives" /> <Reference Include="System.Security.Cryptography.X509Certificates" /> <Reference Include="System.Security.Principal" Condition="'$(TargetsWindows)' == 'true'" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Channels" /> <Reference Include="System.IO.Compression.Brotli" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj" /> <Reference Include="System.Console" Condition="'$(Configuration)' == 'Debug'" /> <Reference Include="System.Diagnostics.StackTrace" /> <Reference Include="System.IO.FileSystem" /> <Reference Include="System.Security.Cryptography.Algorithms" /> <Reference Include="System.Security.Cryptography.Encoding" /> - <Reference Include="System.Security.Cryptography.OpenSsl" /> <Reference Include="System.Security.Cryptography.Primitives" /> </ItemGroup> + <ItemGroup Condition=" '$(TargetsBrowser)' == 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" /> + </ItemGroup> <ItemGroup> <Content Include="msquic.dll" Condition="Exists('msquic.dll')"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 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 @@ -282,11 +282,12 @@ Link="Common\System\Net\Http\HuffmanEncoder.cs" /> </ItemGroup> <ItemGroup> - <PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" /> - </ItemGroup> - <ItemGroup> <EmbeddedResource Include="SelectedSitesTest.txt"> <Link>SelectedSitesTest.txt</Link> </EmbeddedResource> </ItemGroup> + <ItemGroup> + <PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj" /> + </ItemGroup> </Project>
\ 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 @@ </PropertyGroup> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> <ItemGroup> - <DefaultReferenceExclusions Include="System.Net.Http" /> - <DefaultReferenceExclusions Include="System.Net.Mail" /> + <DefaultReferenceExclusion Include="System.Net.Http" /> + <DefaultReferenceExclusion Include="System.Net.Mail" /> </ItemGroup> <ItemGroup> <Compile Include="$(CommonPath)System\HexConverter.cs" diff --git a/src/libraries/System.Net.HttpListener/Directory.Build.props b/src/libraries/System.Net.HttpListener/Directory.Build.props index e912bb862bf..1db5968484c 100644 --- a/src/libraries/System.Net.HttpListener/Directory.Build.props +++ b/src/libraries/System.Net.HttpListener/Directory.Build.props @@ -2,7 +2,6 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Nullable>annotations</Nullable> </PropertyGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> @@ -28,14 +29,10 @@ <Reference Include="System.Security.Cryptography.Primitives" /> <Reference Include="System.Security.Cryptography.X509Certificates" /> <Reference Include="System.Security.Principal" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Overlapped" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsWindows)' == 'true'"> - <Reference Include="System.Memory" /> - </ItemGroup> <ItemGroup> <Compile Include="System\Net\BoundaryType.cs" /> <Compile Include="System\Net\EntitySendFormat.cs" /> 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 @@ <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetsOSX)'=='true'"> - <TestCommandLines Include="ulimit -n 7000" /> - </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> @@ -244,10 +245,6 @@ <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Security.Claims" /> <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Threading" /> </ItemGroup> - <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> - <Reference Include="System.Memory" /> - </ItemGroup> </Project> 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 @@ <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.Net.NetworkInformation" /> - </ItemGroup> </Project>
\ 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 @@ <Compile Include="SmtpDateTimeTest.cs" /> <Compile Include="WriteStateInfoTest.cs" /> </ItemGroup> - <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> - <ItemGroup> - <DefaultReferenceExclusions Include="System.Net.Mail" /> - </ItemGroup> <ItemGroup> <Compile Include="..\..\src\System\Net\Base64Stream.cs" Link="ProductionCode\Base64Stream.cs" /> @@ -264,4 +260,9 @@ <Compile Include="$(CommonPath)Interop\Windows\Interop.UNICODE_STRING.cs" Link="Common\Interop\Windows\Interop.UNICODE_STRING.cs" /> </ItemGroup> + <ItemGroup> + <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> + <DefaultReferenceExclusion Include="System.Net.Mail" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.NameResolution</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> <Nullable>enable</Nullable> @@ -113,6 +112,7 @@ <Compile Include="System\Net\Dns.Browser.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Tracing" /> @@ -123,7 +123,6 @@ <Reference Include="System.Runtime.Handles" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Security.Claims" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Overlapped" /> <Reference Include="System.Threading.ThreadPool" /> 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 @@ </PropertyGroup> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> <ItemGroup> - <DefaultReferenceExclusions Include="System.Net.NameResolution" /> + <DefaultReferenceExclusion Include="System.Net.NameResolution" /> </ItemGroup> <ItemGroup> <Compile Include="..\..\src\System\Net\IPHostEntry.cs" diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj index 7e3f969094b..747b30730e0 100644 --- a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj @@ -10,7 +10,7 @@ </PropertyGroup> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> <ItemGroup> - <DefaultReferenceExclusions Include="System.Net.NameResolution" /> + <DefaultReferenceExclusion Include="System.Net.NameResolution" /> </ItemGroup> <ItemGroup> <Compile Include="..\..\src\System\Net\IPHostEntry.cs" diff --git a/src/libraries/System.Net.NetworkInformation/Directory.Build.props b/src/libraries/System.Net.NetworkInformation/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Net.NetworkInformation/Directory.Build.props +++ b/src/libraries/System.Net.NetworkInformation/Directory.Build.props @@ -2,6 +2,5 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.NetworkInformation</AssemblyName> - <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-FreeBSD</TargetFrameworks> <Nullable>enable</Nullable> @@ -193,6 +191,7 @@ <Compile Include="System\Net\NetworkInformation\NetworkAddressChange.UnknownUnix.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Tracing" /> @@ -203,7 +202,6 @@ <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Security.Claims" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Overlapped" /> <Reference Include="System.Threading.ThreadPool" /> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.Ping</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.Primitives</AssemblyName> - <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ILLinkKeepDepAttributes>false</ILLinkKeepDepAttributes> <!-- See comments in Cookie.cs --> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> 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 @@ <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs" Link="Common\System\Diagnostics\Tracing\TestEventListener.cs" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.Memory" /> - </ItemGroup> </Project>
\ 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 @@ </PropertyGroup> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> <ItemGroup> - <DefaultReferenceExclusions Include="System.Net.Primitives" /> + <DefaultReferenceExclusion Include="System.Net.Primitives" /> </ItemGroup> <ItemGroup> <Compile Include="..\..\src\System\Net\Sockets\AddressFamily.cs" diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj index aefbc4c814f..4619f2a57ad 100644 --- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj @@ -12,7 +12,7 @@ </PropertyGroup> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> <ItemGroup> - <DefaultReferenceExclusions Include="System.Net.Primitives" /> + <DefaultReferenceExclusion Include="System.Net.Primitives" /> </ItemGroup> <ItemGroup> <Compile Include="CookieInternalTest.cs" /> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.Net.Requests</RootNamespace> - <AssemblyName>System.Net.Requests</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> <Nullable>enable</Nullable> @@ -85,6 +83,7 @@ <Compile Include="System\Net\WebExceptionPal.Unix.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> @@ -103,7 +102,6 @@ <Reference Include="System.Security.Claims" /> <Reference Include="System.Security.Cryptography.X509Certificates" /> <Reference Include="System.Security.Principal" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Thread" /> </ItemGroup> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <ItemGroup> <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> + <ProjectReference Include="..\..\System.Memory\ref\System.Memory.csproj" /> <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.Memory" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.Security</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS</TargetFrameworks> <!-- This is needed so that code for TlsCipherSuite will have no namespace (causes compile errors) when used within T4 template --> @@ -345,6 +344,7 @@ <Compile Include="System\Net\Security\CipherSuitesPolicyPal.OSX.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> @@ -361,15 +361,14 @@ <Reference Include="System.Security.Cryptography.Encoding" /> <Reference Include="System.Security.Cryptography.X509Certificates" /> <Reference Include="System.Security.Principal" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.ThreadPool" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj" /> <Reference Include="System.Console" Condition="'$(Configuration)' == 'Debug'" /> <Reference Include="System.Diagnostics.StackTrace" /> <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.OpenSsl" /> <Reference Include="System.Security.Cryptography.Primitives" /> </ItemGroup> </Project> 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 @@ </ItemGroup> <ItemGroup> <PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> </ItemGroup> </Project> 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 @@ <Compile Include="$(CommonPath)System\Net\InternalException.cs" Link="ProductionCode\Common\System\Net\InternalException.cs" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Threading" /> - </ItemGroup> -</Project> +</Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.Sockets</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> <Nullable>enable</Nullable> @@ -302,6 +301,7 @@ Link="Common\Interop\Unix\System.Native\Interop.Write.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> @@ -315,7 +315,6 @@ <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> <Reference Include="System.Security.Claims" /> - <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Overlapped" /> <Reference Include="System.Threading.ThreadPool" /> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.WebHeaderCollection</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ </PropertyGroup> <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. --> <ItemGroup> - <DefaultReferenceExclusions Include="System.Configuration" /> + <DefaultReferenceExclusion Include="System.Configuration" /> </ItemGroup> <ItemGroup> <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs" diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj index 4c1d519edd7..7a11f13532c 100644 --- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj +++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/ref/System.Net.WebSockets.WebSocketProtocol.csproj @@ -1,12 +1,12 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> <Compile Include="System.Net.WebSockets.WebSocketProtocol.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Memory" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.WebSockets.WebSocketProtocol</AssemblyName> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp2.1;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp2.1;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -21,27 +19,30 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or $(TargetFramework.StartsWith('net4'))"> <Compile Include="System\Net\WebSockets\ManagedWebSocketExtensions.netstandard.cs" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.Memory" /> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or + '$(TargetFramework)' == 'netcoreapp2.1'"> <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Buffers" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Memory" /> <Reference Include="System.Net.WebSockets" /> <Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Resources.ResourceManager" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Tasks" /> <Reference Include="System.Threading.Tasks.Extensions" /> <Reference Include="System.Threading.Timer" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketCreateTest.cs" @@ -13,4 +13,7 @@ Link="Common\System\Net\HttpKnownHeaderNames.cs" /> <Compile Include="WebSocketProtocolTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Net.WebSockets.WebSocketProtocol.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Net.WebSockets</AssemblyName> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard1.1</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.1;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> - <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> - <PropertyGroup> - <ExcludeFromPackage Condition="'$(TargetFramework)' == 'netstandard2.0'">true</ExcludeFromPackage> - </PropertyGroup> <ItemGroup> <Compile Include="System.Numerics.Tensors.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Collections" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>netstandard2.0;netstandard1.1;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;netstandard1.1;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -19,18 +18,6 @@ <Compile Include="System\Numerics\Tensors\Tensor.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Collections" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>True</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> - </PropertyGroup> - <PropertyGroup> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="NativeMemory.cs" /> @@ -34,8 +32,7 @@ </ItemGroup> <ItemGroup> <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. --> - <DefaultReferenceExclusions Include="System.Numerics.Tensors" /> - <ReferenceFromRuntime Include="System.Numerics.Tensors" /> + <ProjectReference Include="..\src\System.Numerics.Tensors.csproj" SkipUseReferenceAssembly="true" /> </ItemGroup> <ItemGroup> <!-- enable the TextTemplating extension --> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.ObjectModel</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Private.DataContractSerialization</AssemblyName> - <RootNamespace>System.Private.DataContractSerialization</RootNamespace> <NoWarn>$(NoWarn);1634;1691;649</NoWarn> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DebugSymbols>true</DebugSymbols> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Private.Uri</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Private.Xml.Linq</AssemblyName> <RootNamespace>System.Xml</RootNamespace> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> <Compile Include="$(CommonPath)System\Collections\Generic\EnumerableHelpers.cs" Link="Common\System\Collections\Generic\EnumerableHelpers.cs" /> <Compile Include="$(CommonPath)System\Text\StringBuilderCache.cs" @@ -43,6 +41,7 @@ <Compile Include="System\Xml\XPath\XObjectExtensions.cs" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" /> <Reference Include="System.Collections" /> <Reference Include="System.Linq" /> <Reference Include="System.ObjectModel" /> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Private.Xml</AssemblyName> <RootNamespace>System.Xml</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);FEATURE_COMPILED_XSL</DefineConstants> 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 @@ <Compile Include="XmlWriterTestCaseBase.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)System\Xml\XmlDiff\XmlDiff.csproj" /> + <PackageReference Include="xunit.extensibility.execution" Version="$(XUnitVersion)" /> <ProjectReference Include="$(CommonTestPath)System\Xml\ModuleCore\ModuleCore.csproj" /> <ProjectReference Include="$(CommonTestPath)System\Xml\XmlCoreTest\XmlCoreTest.csproj" /> - </ItemGroup> - <ItemGroup> - <PackageReference Include="xunit.extensibility.execution" Version="$(XUnitVersion)" /> + <ProjectReference Include="$(CommonTestPath)System\Xml\XmlDiff\XmlDiff.csproj" /> </ItemGroup> </Project>
\ 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 @@ <ItemGroup> <Compile Include="System.Reflection.Context.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Reflection" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard1.1;netstandard2.1</TargetFrameworks> + <TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.1</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -64,9 +64,4 @@ <Compile Include="System\Reflection\Context\Virtual\VirtualPropertyInfo.PropertySetter.cs" /> <Compile Include="System\Reflection\Context\Virtual\VirtualReturnParameter.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Reflection" /> - <Reference Include="System.Resources.ResourceManager" /> - </ItemGroup> </Project>
\ 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 @@ <SubType>Designer</SubType> </EmbeddedResource> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Reflection.Context.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Reflection.Emit.ILGeneration</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Reflection.Emit.Lightweight</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Reflection.Extensions</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLSCompliant>false</CLSCompliant> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.1;netstandard2.0</TargetFrameworks> - <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> @@ -14,11 +13,11 @@ <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> + <!-- Include these transitive dependencies to overrule NuGet's ProjectReference over PackageReferene behavior. --> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'"> - <Reference Include="System.IO" /> - <Reference Include="System.Reflection.Primitives" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Text.Encoding" /> + <PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" /> + <PackageReference Include="System.Collections" Version="$(SystemCollectionsVersion)" /> + <PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj" /> 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 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefaultLanguage>en-US</DefaultLanguage> <CLSCompliant>false</CLSCompliant> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.1;netstandard2.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -249,9 +248,9 @@ <Compile Include="System\Reflection\Throw.cs" /> <Compile Include="System\Reflection\System.Reflection.cs" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> + <Reference Include="System.Collections.Immutable" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.IO" /> <Reference Include="System.IO.Compression" /> @@ -266,12 +265,10 @@ <Reference Include="System.Text.Encoding" /> <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Threading" /> - <Reference Include="System.IO.MemoryMappedFiles" Condition="'$(TargetFramework)' != 'netstandard1.1'" /> - <Reference Include="System.Buffers" Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'" /> + <Reference Include="System.IO.MemoryMappedFiles" /> + <Reference Include="System.Buffers" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> + <ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> </ItemGroup> </Project> 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 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <ExternallyShipping>false</ExternallyShipping> <NoWarn>436</NoWarn> <!-- Type conflicts on "Interop" due to InternalsVisibleTo access --> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" @@ -132,7 +132,11 @@ </ItemGroup> <ItemGroup> <!-- Some internal types are needed, so we reference the implementation assembly, rather than the reference assembly. --> - <DefaultReferenceExclusions Include="System.Reflection.Metadata" /> - <ReferenceFromRuntime Include="System.Reflection.Metadata" /> + <ProjectReference Include="..\src\System.Reflection.Metadata.csproj" SkipUseReferenceAssembly="true" /> + </ItemGroup> + <!-- For IncrementalHash --> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" /> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> 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 @@ <RootNamespace>System.Reflection</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- Only the netcoreapp version supports the new reflection apis (IsSZArray, etc.) --> - <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -146,7 +145,8 @@ <Compile Include="System\Reflection\TypeLoading\Types\RoType.TypeClassification.cs" /> <Compile Include="System\Reflection\TypeLoading\Types\RoWrappedType.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or + '$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Collections.Immutable" /> @@ -160,9 +160,10 @@ <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Threading" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) or + $(TargetFramework.StartsWith('net4'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <!-- The GAC is obsolete, but there are unit tests still referencing it --> <NoWarn>$(NoWarn);SYSLIB0005</NoWarn> </PropertyGroup> @@ -71,4 +71,7 @@ <Compile Include="src\TestUtils\TestUtils.JittedRuntimes.cs" /> <Compile Include="src\TestUtils\TypeWrapper.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Reflection.MetadataLoadContext.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Reflection.Primitives</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Reflection.TypeExtensions</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Reflection</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> - </PropertyGroup> - <PropertyGroup> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System.Resources.Extensions.cs" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <DefineConstants>$(DefineConstants);RESOURCES_EXTENSIONS</DefineConstants> <Nullable>annotations</Nullable> </PropertyGroup> - <PropertyGroup> - </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)System\Resources\ResourceWriter.cs" Link="System\Resources\Extensions\ResourceWriter.cs" /> @@ -31,11 +28,7 @@ Link="System\Numerics\Hashing\HashHelpers.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Memory" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> <PropertyGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461</TargetFrameworks> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> </PropertyGroup> <ItemGroup> @@ -16,7 +16,16 @@ </ItemGroup> <ItemGroup> <PackageReference Include="System.Drawing.Common.TestData" Version="$(SystemDrawingCommonTestDataVersion)" /> + <ProjectReference Include="..\src\System.Resources.Extensions.csproj" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Common\src\System.Drawing.Common.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Windows.Extensions\src\System.Windows.Extensions.csproj" Condition="'$(TargetsWindows)' == 'true'" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" /> + </ItemGroup> + <!-- use the following target to regenerate the test resources file This is done from a test application and checked in so that we don't run product code during the build --> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Resources.Reader</AssemblyName> <RootNamespace>System.Resources</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Resources.ResourceManager</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <BinPlaceSatelliteAssemblies>true</BinPlaceSatelliteAssemblies> <TestRuntime>true</TestRuntime> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="MissingManifestResourceExceptionTests.cs" /> @@ -56,6 +56,9 @@ CopyToOutputDirectory="PreserveNewest" Visible="false" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Common\src\System.Drawing.Common.csproj" /> + </ItemGroup> <!-- MSBuild on .NET Core doesn't support non-string resources. See https://github.com/Microsoft/msbuild/issues/2221 Workaround this for now by invoking the desktop resgen.exe on Windows manually to regenerate the resource files. diff --git a/src/libraries/System.Resources.Writer/Directory.Build.props b/src/libraries/System.Resources.Writer/Directory.Build.props index 465e1110d6b..63f02a0f817 100644 --- a/src/libraries/System.Resources.Writer/Directory.Build.props +++ b/src/libraries/System.Resources.Writer/Directory.Build.props @@ -2,6 +2,5 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj b/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj index 0fa1c8767e1..b910ab24e06 100644 --- a/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj +++ b/src/libraries/System.Resources.Writer/src/System.Resources.Writer.csproj @@ -1,7 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <AssemblyName>System.Resources.Writer</AssemblyName> <RootNamespace>System.Resources</RootNamespace> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index ed97af3ad85..6a6d9a6a5b3 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -1,8 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.Caching</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>netstandard2.0;netstandard2.0-Windows_NT;_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard2.0-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System\Runtime\Caching\_shims.cs" /> @@ -63,6 +62,6 @@ <Compile Include="System\Runtime\Caching\PhysicalMemoryMonitor.Unix.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="System.Configuration.ConfigurationManager" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj index 8259713ac20..84c491d6bfb 100644 --- a/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj +++ b/src/libraries/System.Runtime.Caching/tests/System.Runtime.Caching.Tests.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net48-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="AdditionalCacheTests\AdditionalCacheTests.cs" /> @@ -12,4 +12,10 @@ <Compile Include="System.Runtime.Caching\ObjectCacheTest.cs" /> <Compile Include="System.Runtime.Caching\MemoryCacheTest.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="..\src\System.Runtime.Caching.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))"> + <Reference Include="System.Runtime.Caching" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props b/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props index 5f6e490332e..e8d65546d0c 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props @@ -2,6 +2,5 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj index a0fa82e4ab5..ebe1f4af985 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj @@ -3,14 +3,10 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLSCompliant>false</CLSCompliant> <Nullable>enable</Nullable> - <TargetFrameworks>netstandard2.0;netstandard1.0;netstandard2.1;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;netstandard1.0;netstandard2.1;net45;net461</TargetFrameworks> + <ExcludeFromPackage Condition="'$(TargetFramework)' == 'net45'">true</ExcludeFromPackage> </PropertyGroup> <ItemGroup> <Compile Include="System.Runtime.CompilerServices.Unsafe.cs" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj index 2f53801cd40..e019c46d269 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj @@ -10,14 +10,23 @@ <IncludePath>include\$(TargetFramework)</IncludePath> <IncludePath Condition="$(TargetFramework.StartsWith('net4'))">include\netfx</IncludePath> <IlasmFlags>$(IlasmFlags) -INCLUDE=$(IncludePath) -DEBUG=$(DebugOptimization)</IlasmFlags> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0;netstandard1.0;net45;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp2.0;netstandard1.0;net45</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> </PropertyGroup> - <ItemGroup> - <Reference Include="System.Runtime" /> <Compile Include="System.Runtime.CompilerServices.Unsafe.il" /> - <ILResourceReference Include="$(Refpath)\$(TargetFileName)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or + '$(TargetFramework)' == 'netcoreapp2.0'"> + <Reference Include="System.Runtime" /> + </ItemGroup> + + <!-- Decompile the ILResourceReference to get native resources. --> + <Target Name="SetILResourceReference" + BeforeTargets="DisassembleIlasmResourceFile" + Condition="'@(ResolvedMatchingContract)' != ''"> + <ItemGroup> + <ILResourceReference Include="@(ResolvedMatchingContract)" /> + </ItemGroup> + </Target> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="UnsafeTests.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <ProjectReference Include="..\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.CompilerServices.VisualC</AssemblyName> <Nullable>enable</Nullable> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.Extensions</AssemblyName> - <OutputType>Library</OutputType> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" /> - <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CoreLibProject)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Uri\src\System.Private.Uri.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\src\System.Runtime.csproj" /> </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.Handles</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.InteropServices.JavaScript</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser</TargetFrameworks> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Browser</TargetFrameworks> <TestRuntime>true</TestRuntime> </PropertyGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetsBrowser)' == 'true'"> + <ItemGroup> <Compile Include="System\Runtime\InteropServices\JavaScript\JavaScriptTests.cs" /> <Compile Include="System\Runtime\InteropServices\JavaScript\DataViewTests.cs" /> <Compile Include="System\Runtime\InteropServices\JavaScript\TypedArrayTests.cs" /> @@ -16,4 +16,8 @@ <Compile Include="System\Runtime\InteropServices\JavaScript\MarshalTests.cs" /> <Compile Include="System\Runtime\InteropServices\JavaScript\HelperMarshal.cs" /> </ItemGroup> + <ItemGroup> + <!-- Part of the shared framework but not exposed. --> + <ProjectReference Include="..\src\System.Runtime.InteropServices.JavaScript.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.InteropServices</AssemblyName> - <OutputType>Library</OutputType> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Project> <Import Project="..\Directory.Build.props" /> <PropertyGroup> - <IsNETCoreApp>true</IsNETCoreApp> <StrongNameKeyId>Open</StrongNameKeyId> </PropertyGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.Loader</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Compile Include="DefaultLoadContextTest.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="../System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj"> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - <OutputItemType>content</OutputItemType> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </ProjectReference> + <ProjectReference Include="../System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj" + ReferenceOutputAssembly="false" + OutputItemType="content" + CopyToOutputDirectory="PreserveNewest" /> </ItemGroup> <Target Name="RenameTestAssembly" AfterTargets="PrepareForRun"> <Move SourceFiles="$(OutDir)System.Runtime.Loader.Noop.Assembly.dll" DestinationFiles="$(OutDir)System.Runtime.Loader.Noop.Assembly_test.dll" /> 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 @@ <Compile Include="RefEmitLoadContextTest.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="../System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj"> - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> - <OutputItemType>content</OutputItemType> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </ProjectReference> + <ProjectReference Include="../System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj" + ReferenceOutputAssembly="false" + OutputItemType="content" + CopyToOutputDirectory="PreserveNewest" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <RootNamespace>System.Numerics</RootNamespace> - <AssemblyName>System.Runtime.Numerics</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.Serialization.Formatters</AssemblyName> - <RootNamespace>System.Runtime.Serialization.Formatters</RootNamespace> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser</TargetFrameworks> <Nullable>enable</Nullable> <!-- When we replace implementations with PNSE, need to suppress some "field is never assigned to" warnings. --> @@ -76,10 +74,10 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="$(CoreLibProject)" /> - <ProjectReference Include="..\..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> - <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Collections\src\System.Collections.csproj" /> - <ProjectReference Include="..\..\System.Collections.Concurrent\src\System.Collections.Concurrent.csproj" /> - <ProjectReference Include="..\..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\src\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\src\System.Collections.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Concurrent\src\System.Collections.Concurrent.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <TestRuntime>true</TestRuntime> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="BinaryFormatterTestData.cs" /> @@ -29,14 +29,38 @@ <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs" Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <Compile Include="$(CommonPath)System\Collections\Generic\ReferenceEqualityComparer.cs" Link="Common\System\Collections\Generic\ReferenceEqualityComparer.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Text.Json" /> - </ItemGroup> <ItemGroup> <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <!-- S.D.SqlClient isn't live built anymore. --> + <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.CodeDom\src\System.CodeDom.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Data.Odbc\src\System.Data.Odbc.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.AccountManagement\src\System.DirectoryServices.AccountManagement.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Common\src\System.Drawing.Common.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.IO.Packaging\src\System.IO.Packaging.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Threading.Channels\src\System.Threading.Channels.csproj" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.ComponentModel.Composition" /> + <Reference Include="System.ComponentModel.DataAnnotations" /> + <Reference Include="System.Configuration" /> + <Reference Include="System.DirectoryServices" /> + <Reference Include="System.DirectoryServices.AccountManagement" /> + <Reference Include="System.DirectoryServices.Protocols" /> + <Reference Include="System.Transactions" /> + <Reference Include="WindowsBase" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.Serialization.Json</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> - </ItemGroup> - <ItemGroup> <Reference Include="System.Runtime" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.Serialization.Primitives</AssemblyName> - <RootNamespace>System.Runtime.Serialization.Primitives</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime.Serialization.Xml</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> - </ItemGroup> - <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Serialization.Primitives" /> </ItemGroup> 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 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> + <ItemGroup> + <PackageReference Include="xunit" Version="$(XUnitVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Xml\src\System.Security.Cryptography.Xml.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Compile Include="$(TestSourceFolder)..\SerializationTestTypes\SelfRefAndCycles.cs" Link="SerializationTestTypes\SelfRefAndCycles.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.CodeDom\src\System.CodeDom.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Compile Include="SerializationTestTypes\SampleTypes.cs" /> <Compile Include="SerializationTestTypes\SelfRefAndCycles.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.CodeDom\src\System.CodeDom.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Runtime</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> @@ -13,9 +12,7 @@ <Compile Include="System.Runtime.Typeforwards.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="$(CoreLibProject)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Uri\src\System.Private.Uri.csproj" /> </ItemGroup> </Project> 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" /> </ItemGroup> <ItemGroup> + <PackageReference Include="Moq" Version="$(MoqVersion)" /> <ProjectReference Include="TestLoadAssembly\TestLoadAssembly.csproj" /> <ProjectReference Include="TestCollectibleAssembly\TestCollectibleAssembly.csproj" /> <ProjectReference Include="TestModule\System.Reflection.TestModule.ilproj" /> <ProjectReference Include="TestStructs\System.TestStructs.ilproj" /> <ProjectReference Include="$(CommonTestPath)TestUtilities.Unicode\TestUtilities.Unicode.csproj" /> - </ItemGroup> - <ItemGroup> - <PackageReference Include="Moq" Version="$(MoqVersion)" /> + <!-- Used during reflection in tests. --> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Threading.AccessControl\src\System.Threading.AccessControl.csproj" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> <IsWindowsSpecific>true</IsWindowsSpecific> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -12,14 +11,11 @@ <ItemGroup> <Compile Include="System.Security.AccessControl.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT;netcoreapp2.0-Windows_NT;netstandard2.0</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -11,9 +10,6 @@ <IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly> <GeneratePlatformNotSupportedAssemblyMessage Condition="$(TargetFramework.StartsWith('netstandard'))">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp2.0'))"> <Compile Include="System\Security\AccessControl\ACE.cs" /> <Compile Include="System\Security\AccessControl\ACL.cs" /> @@ -82,19 +78,20 @@ <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.DuplicateTokenEx_SafeTokenHandle.cs" Link="Common\Interop\Interop.DuplicateTokenEx_SafeTokenHandle.cs" /> </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Security.Principal.Windows" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp2.0'))"> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp2.0'))"> <Reference Include="System.Collections" /> + <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Thread" /> <Reference Include="Microsoft.Win32.Primitives" /> </ItemGroup> + <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <UnsupportedPlatforms>Linux;NetBSD;OSX</UnsupportedPlatforms> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Ace\Ace.Common.Tests.cs" /> @@ -68,4 +67,7 @@ <Compile Include="SystemAcl\SystemAcl_SetAudit.cs" /> <Compile Include="Utils.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Security.Claims</AssemblyName> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Compile Include="AesGcmTests.cs" /> <Compile Include="HKDFTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> <IsWindowsSpecific>true</IsWindowsSpecific> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461;net462;net47;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461;net462;net47</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -17,18 +16,14 @@ <ItemGroup> <Compile Include="System.Security.Cryptography.Cng.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> - <Reference Include="System.Runtime" /> <Reference Include="System.IO" /> + <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Handles" /> <Reference Include="System.Security.Cryptography.Algorithms" /> <Reference Include="System.Security.Cryptography.Primitives" /> 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <GenFacadesIgnoreMissingTypes Condition="'$(TargetFramework)' == 'net461'">true</GenFacadesIgnoreMissingTypes> - <TargetFrameworks>$(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</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;net462-Windows_NT;net47-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -355,18 +354,17 @@ <ItemGroup> <None Include="@(AsnXml)" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Formats.Asn1\src\System.Formats.Asn1.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp3.0'))"> <Reference Include="System.Buffers" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Tools" /> <Reference Include="System.Linq" /> - <Reference Include="System.Formats.Asn1" /> <Reference Include="System.Memory" /> <Reference Include="System.Resources.ResourceManager" /> <Reference Include="System.Runtime" /> @@ -380,4 +378,11 @@ <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Threading" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <!-- Ref assembly for netstandard2.0 isn't live built anymore. --> + <PackageDownload Include="$(MSBuildProjectName)" Version="[$(SystemSecurityCryptographyCngVersion)]" /> + <ResolvedMatchingContract Include="$(NuGetPackageRoot)$(MSBuildProjectName.ToLowerInvariant())\$(SystemSecurityCryptographyCngVersion)\ref\$(TargetFramework)\$(MSBuildProjectName).dll" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <DefineConstants>$(DefineConstants);TESTING_CNG_IMPLEMENTATION</DefineConstants> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net47-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="CreateTests.cs" /> @@ -165,4 +165,8 @@ <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs" Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Security.Cryptography.Csp</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs" Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Security.Cryptography.Encoding</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;net47;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;net47</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -17,19 +16,15 @@ <Compile Include="System.Security.Cryptography.OpenSsl.netcoreapp.cs" Condition="'$(TargetFramework)' == 'netcoreapp3.0' OR '$(TargetFramework)' == '$(NetCoreAppCurrent)'" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> + <Reference Include="System.IO" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Handles" /> - <Reference Include="System.IO" /> <Reference Include="System.Security.Cryptography.Algorithms" /> <Reference Include="System.Security.Cryptography.Primitives" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;netstandard2.0;net47;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);netcoreapp3.0-Unix;netcoreapp3.0;netstandard2.0;net47</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -108,13 +107,14 @@ <Compile Include="$(CommonPath)System\Security\Cryptography\RsaPaddingProcessor.cs" Link="Common\System\Security\Cryptography\RsaPaddingProcessor.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND !$(TargetFramework.StartsWith('net4'))"> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp3.0'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Formats.Asn1\src\System.Formats.Asn1.csproj" /> <Reference Include="System.Buffers" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.Formats.Asn1" /> <Reference Include="System.Memory" /> <Reference Include="System.Resources.ResourceManager" /> <Reference Include="System.Runtime" /> @@ -129,7 +129,10 @@ </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> <SuppressPackageTargetFrameworkCompatibility Include="net461" /> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> + <!-- Ref assembly for netstandard2.0 isn't live built anymore. --> + <PackageDownload Include="$(MSBuildProjectName)" Version="[$(SystemSecurityCryptographyOpenSslVersion)]" /> + <ResolvedMatchingContract Include="$(NuGetPackageRoot)$(MSBuildProjectName.ToLowerInvariant())\$(SystemSecurityCryptographyOpenSslVersion)\ref\$(TargetFramework)\$(MSBuildProjectName).dll" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <UnsupportedPlatforms>Windows_NT</UnsupportedPlatforms> <TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> </PropertyGroup> <ItemGroup> @@ -127,4 +126,8 @@ Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs" /> <Compile Include="SafeEvpPKeyHandleTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj" /> + <ProjectReference Include="..\src\System.Security.Cryptography.OpenSsl.csproj" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly> - <!-- Currently the netstandard build is locked to the $(NetFrameworkCurrent) API --> + <!-- Currently the netstandard build is locked to the net472 API --> <AssemblyVersion Condition="$(TargetFramework.StartsWith('netstandard'))">4.0.4.0</AssemblyVersion> </PropertyGroup> <ItemGroup> @@ -16,17 +15,15 @@ <Compile Include="System.Security.Cryptography.Pkcs.netcoreapp.cs" Condition="!$(TargetFramework.StartsWith('net4'))" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Security" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Csp\ref\System.Security.Cryptography.Csp.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Encoding\ref\System.Security.Cryptography.Encoding.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Csp\ref\System.Security.Cryptography.Csp.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Encoding\ref\System.Security.Cryptography.Encoding.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="System.Runtime" /> 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 @@ <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> <NoWarn>$(NoWarn);CA5384</NoWarn> <Nullable>enable</Nullable> - <TargetFrameworks>$(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</TargetFrameworks> + <TargetFrameworks>$(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</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly> <OmitResources Condition="$(TargetFramework.StartsWith('net4'))">true</OmitResources> - <!-- Currently the netstandard build is locked to the $(NetFrameworkCurrent) API --> + <!-- Currently the netstandard build is locked to the net472 API --> <AssemblyVersion Condition="$(TargetFramework.StartsWith('netstandard'))">4.0.4.0</AssemblyVersion> - </PropertyGroup> - <PropertyGroup> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsBrowser)' == 'true'">SR.SystemSecurityCryptographyPkcs_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> <Import Project="$(CommonPath)System\Security\Cryptography\Asn1\AsnXml.targets" Condition="'$(IsPartialFacadeAssembly)' != 'true'" /> @@ -318,39 +315,6 @@ <ItemGroup Condition="'$(TargetsWindows)' != 'true' and '$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="Internal\Cryptography\Pal\AnyOS\PkcsPal.AnyOS.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <Reference Include="mscorlib" /> - <Reference Include="System.Security" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netcoreapp3.0')) or '$(TargetFramework)' == 'netstandard2.1'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Numerics" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.Security.Cryptography.Csp" /> - <Reference Include="System.Security.Cryptography.Encoding" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Text.Encoding.Extensions" /> - </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetFramework)' != 'netstandard2.1'"> - <Reference Include="System.Buffers" /> - </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> - <Reference Include="System.Formats.Asn1" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Security.Cryptography.Cng" /> - </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs" Link="Common\System\Memory\PointerMemoryManager.cs" /> @@ -667,4 +631,47 @@ <ItemGroup> <None Include="@(AsnXml)" /> </ItemGroup> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> + <Reference Include="System.Security" /> + </ItemGroup> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Formats.Asn1\src\System.Formats.Asn1.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" /> + <!-- Ref assembly for netstandard2.0 isn't live built anymore. --> + <PackageDownload Include="$(MSBuildProjectName)" Version="[$(SystemSecurityCryptographyPkcsVersion)]" /> + <ResolvedMatchingContract Include="$(NuGetPackageRoot)$(MSBuildProjectName.ToLowerInvariant())\$(SystemSecurityCryptographyPkcsVersion)\ref\$(TargetFramework)\$(MSBuildProjectName).dll" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.1')) or + $(TargetFramework.StartsWith('netcoreapp3.0')) or + $(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp3.0'))"> + <Reference Include="System.Buffers" /> + <Reference Include="System.Collections" /> + <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Collections.NonGeneric" /> + <Reference Include="System.Diagnostics.Debug" /> + <Reference Include="System.Diagnostics.Tools" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Memory" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Runtime.InteropServices" /> + <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> + <Reference Include="System.Runtime.Numerics" /> + <Reference Include="System.Security.Cryptography.Algorithms" /> + <Reference Include="System.Security.Cryptography.Csp" /> + <Reference Include="System.Security.Cryptography.Encoding" /> + <Reference Include="System.Security.Cryptography.Primitives" /> + <Reference Include="System.Security.Cryptography.X509Certificates" /> + <Reference Include="System.Text.Encoding.Extensions" /> + <Reference Include="System.Threading" /> + </ItemGroup> </Project> 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<CryptographicException>(() => cms.Decode(ReadOnlySpan<byte>.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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net48-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs" @@ -66,4 +66,11 @@ <ItemGroup Condition="'$(TargetsWindows)' == 'true' and $(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))"> <Compile Include="EnvelopedCms\DecryptTests.KeyPersistence.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj" /> + <ProjectReference Include="..\src\System.Security.Cryptography.Pkcs.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))"> + <Reference Include="System.Security" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Security.Cryptography.Primitives</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -12,7 +11,6 @@ <Compile Include="System.Security.Cryptography.ProtectedData.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> <Reference Include="System.Security" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -34,14 +33,9 @@ Link="Common\System\HResults.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> <Reference Include="System.Security" /> </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Memory" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.Cryptography.Primitives" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="ProtectedDataTests.cs" /> <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs" Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Security.Cryptography.ProtectedData.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net461'))"> + <Reference Include="System.Security" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> </Project>
\ 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 @@ <Reference Include="System.Threading" /> </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> - <Reference Include="System.Security.Cryptography.Cng" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj" /> <Reference Include="System.Security.Cryptography.Csp" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj" /> <Reference Include="System.Diagnostics.StackTrace" /> - <Reference Include="System.Security.Cryptography.OpenSsl" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> <Reference Include="System.Console" Condition="'$(Configuration)' == 'Debug'" /> 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" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj" /> <PackageReference Include="System.Security.Cryptography.X509Certificates.TestData" Version="$(SystemSecurityCryptographyX509CertificatesTestDataVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -11,10 +10,6 @@ <ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml" /> <Reference Include="System.Security" /> </ItemGroup> <ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -91,32 +90,12 @@ <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.Net.Requests" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.Numerics" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Csp" /> - <Reference Include="System.Security.Cryptography.Encoding" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.Pkcs" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Security.Permissions" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Xml.ReaderWriter" /> - <Reference Include="System.Xml.XPath" /> - <Reference Include="System.Memory" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" /> </ItemGroup> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Security" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> @@ -65,4 +65,10 @@ <EmbeddedResource Include="EncryptedXmlSample1.xml" /> <EmbeddedResource Include="XmlLicenseSample.xml" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Security.Cryptography.Xml.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.Security" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;netcoreapp3.0;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;netcoreapp3.0</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -19,12 +18,8 @@ <Compile Include="System.Security.Permissions.netcoreapp.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Configuration" /> - <Reference Include="System.Data" /> <Reference Include="System.Data.OracleClient" /> - <Reference Include="System.Drawing" /> <Reference Include="System.Net" /> <Reference Include="System.Security" /> <Reference Include="System.ServiceProcess" /> @@ -33,20 +28,23 @@ <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp3.0'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Windows.Extensions\ref\System.Windows.Extensions.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> - <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> - <ProjectReference Include="..\..\System.Data.Common\ref\System.Data.Common.csproj" /> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Csp\ref\System.Security.Cryptography.Csp.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> - <ProjectReference Include="..\..\System.Text.RegularExpressions\ref\System.Text.RegularExpressions.csproj" /> - <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Data.Common\ref\System.Data.Common.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Csp\ref\System.Security.Cryptography.Csp.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Primitives\ref\System.Security.Cryptography.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.RegularExpressions\ref\System.Text.RegularExpressions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Threading\ref\System.Threading.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="netstandard" /> @@ -62,7 +60,4 @@ <Reference Include="System.Text.RegularExpressions" /> <Reference Include="System.Threading" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp3.0'"> - <ProjectReference Include="..\..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <!-- We conditionally apply net5.0+ obsoletions --> <PropertyGroup Condition="!($(TargetFramework.StartsWith('netcoreapp')) or $(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('net4')))"> @@ -187,24 +186,16 @@ <Compile Include="System\Xaml\Permissions\XamlLoadPermission.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> - <Compile Include="..\..\System.Private.CoreLib\src\System\Security\IStackWalk.cs" + <Compile Include="$(LibrariesProjectRoot)System.Private.CoreLib\src\System\Security\IStackWalk.cs" Link="System\Security\IStackWalk.cs" /> - <Compile Include="..\..\System.Private.CoreLib\src\System\Security\PermissionSet.cs" + <Compile Include="$(LibrariesProjectRoot)System.Private.CoreLib\src\System\Security\PermissionSet.cs" Link="System\Security\PermissionSet.cs" /> - <Compile Include="..\..\System.Private.CoreLib\src\System\Security\Permissions\PermissionState.cs" + <Compile Include="$(LibrariesProjectRoot)System.Private.CoreLib\src\System\Security\Permissions\PermissionState.cs" Link="System\Security\Permissions\PermissionState.cs" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.Security.AccessControl" /> - </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.Configuration" /> - <Reference Include="System.Core" /> - <Reference Include="System.Data" /> <Reference Include="System.Data.OracleClient" /> - <Reference Include="System.Drawing" /> <Reference Include="System.Net" /> <Reference Include="System.Security" /> <Reference Include="System.ServiceProcess" /> @@ -213,7 +204,11 @@ <Reference Include="System.Xaml" /> <Reference Include="WindowsBase" /> </ItemGroup> + <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp3.0'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Windows.Extensions\src\System.Windows.Extensions.csproj" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> <Reference Include="System.ComponentModel.Primitives" /> @@ -229,6 +224,5 @@ <Reference Include="System.Text.RegularExpressions" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Windows.Extensions" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT</TargetFrameworks> <!-- SYSLIB0003 is the obsoletion of CAS, but we still have unit tests for it --> <NoWarn>$(NoWarn);SYSLIB0003</NoWarn> </PropertyGroup> @@ -23,4 +23,7 @@ <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> <Compile Include="XamlLoadPermissionTests.cs"/> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> - <IsNETCoreAppRef>false</IsNETCoreAppRef> <IsWindowsSpecific>true</IsWindowsSpecific> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -12,14 +11,10 @@ <ItemGroup> <Compile Include="System.Security.Principal.Windows.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Security.Claims\ref\System.Security.Claims.csproj" /> - <ProjectReference Include="..\..\System.Security.Principal\ref\System.Security.Principal.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Claims\ref\System.Security.Claims.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal\ref\System.Security.Principal.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="System.Runtime" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(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</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;netstandard2.0;netcoreapp2.0-Windows_NT;netcoreapp2.0-Unix;netcoreapp2.1-Windows_NT;netcoreapp2.1-Unix;net461-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -135,10 +134,8 @@ <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CheckTokenMembership.cs" Link="Common\Interop\Interop.CheckTokenMembership.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp2'))"> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Debug" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="NTAccount.cs" /> @@ -15,4 +15,7 @@ <Compile Include="$(CommonTestPath)System\Threading\ThreadTestHelpers.cs" Link="Common\System\Threading\ThreadTestHelpers.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Security.Principal.Windows.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Security.Principal</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.Security.SecureString</RootNamespace> - <AssemblyName>System.Security.SecureString</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);net461;netcoreapp2.1;netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461;netcoreapp2.1;netstandard2.0</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -14,13 +13,16 @@ <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp2.1'"> <Compile Include="System.ServiceModel.Syndication.netcoreapp.cs" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> + <Reference Include="System.ServiceModel" /> + </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Collections\ref\System.Collections.csproj" /> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" /> - <ProjectReference Include="..\..\System.Runtime.Serialization.Xml\ref\System.Runtime.Serialization.Xml.csproj" /> - <ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> - <ProjectReference Include="..\..\System.Xml.XmlSerializer\ref\System.Xml.XmlSerializer.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\ref\System.Collections.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Xml\ref\System.Runtime.Serialization.Xml.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Xml.XmlSerializer\ref\System.Xml.XmlSerializer.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'"> <Reference Include="System.Collections" /> @@ -30,11 +32,4 @@ <Reference Include="System.Xml.ReaderWriter" /> <Reference Include="System.Xml.XmlSerializer" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Runtime.Serialization" /> - <Reference Include="System.ServiceModel" /> - <Reference Include="System.Xml" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461-Windows_NT</TargetFrameworks> + <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> @@ -53,7 +53,16 @@ <Compile Include="System\ServiceModel\XmlBuffer.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> <Reference Include="System.ServiceModel" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <Reference Include="System.Collections" /> + <Reference Include="System.Linq" /> + <Reference Include="System.Runtime" /> + <Reference Include="System.Runtime.Serialization.Primitives" /> + <Reference Include="System.Runtime.Serialization.Xml" /> + <Reference Include="System.Threading" /> + <Reference Include="System.Xml.ReaderWriter" /> + <Reference Include="System.Xml.XmlSerializer" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="BasicScenarioTests.cs" /> @@ -58,4 +58,10 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.ServiceModel.Syndication.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> + <Reference Include="System.ServiceModel" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;$(NetFrameworkCurrent);net461</TargetFrameworks> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -11,8 +11,6 @@ <Compile Include="System.ServiceProcess.ServiceController.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Reference Include="System.ServiceProcess" /> </ItemGroup> <ItemGroup> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netstandard2.0-Windows_NT;net461-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <NoWarn>$(NoWarn);CA2249</NoWarn> <Nullable>enable</Nullable> </PropertyGroup> @@ -74,14 +73,8 @@ <Compile Include="System\ServiceProcess\SessionChangeReason.cs" /> <Compile Include="System\ServiceProcess\TimeoutException.cs" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.Diagnostics.EventLog" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.ServiceProcess" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or ($(TargetFramework.StartsWith('netstandard')) and '$(TargetsWindows)' == 'true')"> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) and + '$(TargetsWindows)' == 'true'"> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Buffers" /> <Reference Include="System.Collections" /> @@ -98,4 +91,14 @@ <Reference Include="System.Threading.Thread" /> <Reference Include="System.Threading.ThreadPool" /> </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> + <Reference Include="System.ServiceProcess" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or $(TargetFramework.StartsWith('netstandard2.0'))"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + </ItemGroup> </Project> 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <OutputType>Exe</OutputType> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <Nullable>annotations</Nullable> </PropertyGroup> <ItemGroup> @@ -37,4 +37,7 @@ <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\src\System.ServiceProcess.ServiceController.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="ServiceBaseTests.cs" /> @@ -10,6 +10,9 @@ <Compile Include="ServiceProcessDescriptionAttributeTests.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include=".\System.ServiceProcess.ServiceController.TestService\System.ServiceProcess.ServiceController.TestService.csproj" /> + <ProjectReference Include="System.ServiceProcess.ServiceController.TestService\System.ServiceProcess.ServiceController.TestService.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.ServiceProcess" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <Nullable>enable</Nullable> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="System.Text.Encoding.CodePages.cs" /> <Compile Include="System.Text.Encoding.CodePages.netcoreapp.cs" Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="../../System.Runtime/ref/System.Runtime.csproj" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime/ref/System.Runtime.csproj" /> </ItemGroup> </Project>
\ 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netstandard2.0-Windows_NT;net461-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT;netstandard2.0;netcoreapp2.0-Windows_NT;netstandard2.0-Windows_NT;net461-Windows_NT</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> </PropertyGroup> + <!-- Generator for code mapping table, target to invoke is GenerateEncodingSource --> + <PropertyGroup> + <!-- This Task can be re-run with /t:GenerateEncodingSource + An IANA Mapping file contains rows of two elements: a valid IANA encoding identifier, and the equivalent code page. + There may be many IANA ids (aliases) mapped to a single code page. --> + <IANAMappingPath>Data\CodePageNameMappings.csv</IANAMappingPath> + <!-- The preferred name file contains rows of three elements: a code page, the 'canonical' IANA identifier, + and an "English" or descriptive name. There is one row per code page. --> + <PreferredIANANamesPath>Data\PreferredCodePageNames.csv</PreferredIANANamesPath> + <OutputDataTablePath>System\Text\EncodingTable.Data.cs</OutputDataTablePath> + </PropertyGroup> <ItemGroup> <Compile Include="Microsoft\Win32\SafeHandles\SafeAllocHHandle.cs" /> <Compile Include="System\Text\BaseCodePageEncoding.cs" /> @@ -55,10 +65,14 @@ <EmbeddedResource Include="Data\codepages.nlp"> <LogicalName>codepages.nlp</LogicalName> </EmbeddedResource> - </ItemGroup> - <ItemGroup> <None Include="Data\CodePageNameMappings.csv" /> <None Include="Data\PreferredCodePageNames.csv" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> + </ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)')) or + $(TargetFramework.StartsWith('netcoreapp2.0'))"> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Tools" /> @@ -67,22 +81,5 @@ <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Threading" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - <Reference Include="System" /> - </ItemGroup> - <!-- Generator for code mapping table, target to invoke is GenerateEncodingSource --> - <PropertyGroup> - <!-- This Task can be re-run with /t:GenerateEncodingSource - An IANA Mapping file contains rows of two elements: a valid IANA encoding identifier, and the equivalent code page. - There may be many IANA ids (aliases) mapped to a single code page. --> - <IANAMappingPath>Data\CodePageNameMappings.csv</IANAMappingPath> - <!-- The preferred name file contains rows of three elements: a code page, the 'canonical' IANA identifier, - and an "English" or descriptive name. There is one row per code page. --> - <PreferredIANANamesPath>Data\PreferredCodePageNames.csv</PreferredIANANamesPath> - <OutputDataTablePath>System\Text\EncodingTable.Data.cs</OutputDataTablePath> - </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="EncoderFallbackBufferHelper.cs" /> <Compile Include="EncodingCodePages.cs" /> <Compile Include="EncodingCodePages.netcoreapp.cs" Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="..\src\System.Text.Encoding.CodePages.csproj" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Text.Encoding.Extensions</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Text.Encoding</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- Only CLS-compliant members can be abstract --> @@ -12,16 +11,12 @@ <Compile Include="System.Text.Encodings.Web.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Memory\ref\System.Memory.csproj" /> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Memory\ref\System.Memory.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or $(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Memory" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="netstandard" /> - <Reference Include="System" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -42,19 +41,18 @@ <Compile Include="$(CoreLibSharedDir)System\Text\UnicodeUtility.cs" Link="System\Text\UnicodeUtility.cs" /> <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or + '$(TargetFramework)' == 'netcoreapp3.0'"> + <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Memory" /> <Reference Include="System.Resources.ResourceManager" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp3.0'"> - <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.Intrinsics" /> <Reference Include="System.Threading" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <UnicodeUcdVersion>13.0</UnicodeUcdVersion> </PropertyGroup> <ItemGroup> @@ -53,4 +53,7 @@ <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="..\src\System.Text.Encodings.Web.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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<byte> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> <Compile Include="System.Text.Json.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp3.0'"> - <ProjectReference Include="..\..\System.Memory\ref\System.Memory.csproj" /> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Memory\ref\System.Memory.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)' and '$(TargetFramework)' != 'netcoreapp3.0'"> - <Reference Include="mscorlib" /> - <Reference Include="netstandard" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="System.Memory" /> - <Reference Include="System.Threading.Tasks.Extensions" /> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> + <Reference Include="System.Runtime" /> + <Reference Include="netstandard" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + '$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> </ItemGroup> <!-- Since S.T.E.W continues to be built live within this repo (as both an in-box library and a standalone netstandard2.0 assembly), we should use ProjectReference instead of Reference to make sure that its ref assembly gets built first before S.T.Json, regardless of the TFM. --> <ItemGroup> - <ProjectReference Include="..\..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netcoreapp3.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> <!-- Workaround for overriding the XML comments related warnings that are being supressed repo wide (within arcade): --> <!-- https://github.com/dotnet/arcade/blob/ea6addfdc65e5df1b2c036f11614a5f922e36267/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props#L90 --> <!-- For this project, we want warnings if there are public APIs/types without properly formatted XML comments (particularly CS1591). --> @@ -16,6 +15,8 @@ <!-- BUILDING_INBOX_LIBRARY is only false when building the netstandard compatible NuGet package. --> <DefineConstants Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp3.0'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants> <NoWarn Condition="'$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('net4'))">$(NoWarn);nullable</NoWarn> + <!-- Use the contract reference path for ApiCompat. --> + <ContractTargetFramework Condition="'$(TargetFramework)' == 'netcoreapp3.0'">netstandard2.0</ContractTargetFramework> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> @@ -214,46 +215,47 @@ <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.String.cs" /> <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.UnsignedNumber.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('net4'))"> - <Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" /> - <!-- Common or Common-branched source files --> - <Compile Include="$(CommonPath)System\Buffers\ArrayBufferWriter.cs" Link="Common\System\Buffers\ArrayBufferWriter.cs" /> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.ValueTuple" /> - <Reference Include="System.Numerics.Vectors" /> - <Reference Include="Microsoft.Bcl.AsyncInterfaces" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'netcoreapp3.0'"> - <Compile Include="$(CommonPath)System\Collections\Generic\ReferenceEqualityComparer.cs" Link="Common\System\Collections\Generic\ReferenceEqualityComparer.cs" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp3.0'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Reflection.Primitives" /> - <Reference Include="System.Reflection.Emit.ILGeneration" /> - <Reference Include="System.Reflection.Emit.Lightweight" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Text.Encoding.Extensions" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicDependencyAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" /> + <Compile Include="$(CommonPath)System\Collections\Generic\ReferenceEqualityComparer.cs" Link="Common\System\Collections\Generic\ReferenceEqualityComparer.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('net4'))"> + <Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" /> + <!-- Common or Common-branched source files --> + <Compile Include="$(CommonPath)System\Buffers\ArrayBufferWriter.cs" + Link="Common\System\Buffers\ArrayBufferWriter.cs" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or + '$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="System.Buffers" /> + <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> + <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Linq" /> <Reference Include="System.Memory" /> <Reference Include="System.Numerics.Vectors" /> + <Reference Include="System.Reflection.Emit.ILGeneration" /> + <Reference Include="System.Reflection.Emit.Lightweight" /> + <Reference Include="System.Reflection.Primitives" /> + <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.CompilerServices.Unsafe" /> + <Reference Include="System.Runtime.Extensions" /> + <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Text.Encodings.Web" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Tasks" /> <Reference Include="System.Threading.Tasks.Extensions" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" /> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" /> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj" /> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" Condition="'$(TargetFramework)' == 'net461'" /> + </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -146,10 +146,15 @@ <ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'"> <Compile Include="Serialization\IsExternalInit.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> <Compile Include="$(CommonPath)System\Buffers\ArrayBufferWriter.cs" Link="CommonTest\System\Buffers\ArrayBufferWriter.cs" /> </ItemGroup> <ItemGroup> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.IO.Pipelines\src\System.IO.Pipelines.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> + <ProjectReference Include="..\src\System.Text.Json.csproj" /> </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Text.RegularExpressions</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <IncludeRemoteExecutor>true</IncludeRemoteExecutor> <!-- xUnit2008 is about regexes and isn't appropriate in the test project for regexes --> <NoWarn>$(NoWarn);xUnit2008</NoWarn> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="AttRegexTests.cs" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -11,10 +10,6 @@ <ItemGroup> <Compile Include="System.Threading.AccessControl.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - </ItemGroup> <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0-Windows_NT;net461-Windows_NT;netstandard2.0</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>enable</Nullable> </PropertyGroup> @@ -44,16 +43,14 @@ <Compile Include="System\Threading\ThreadingAclExtensions.cs" /> </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> <Compile Include="System\Threading\EventWaitHandleAcl.net46.cs" /> <Compile Include="System\Threading\MutexAcl.net46.cs" /> <Compile Include="System\Threading\SemaphoreAcl.net46.cs" /> <Compile Include="System\Threading\ThreadingAclExtensions.net46.cs" /> </ItemGroup> - <ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Memory" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\src\System.Security.AccessControl.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Constants.cs" @@ -14,4 +14,7 @@ <Compile Include="SemaphoreAclTests.cs" /> <Compile Include="ThreadingAclExtensionsTests.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Threading.AccessControl.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.0;netstandard1.3;netstandard2.0;netstandard2.1;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.Channels.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' AND '$(TargetFramework)' != 'netstandard2.0'"> + <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and + '$(TargetFramework)' != 'netstandard2.0' and + '$(TargetFramework)' != 'net461'"> <Compile Include="System.Threading.Channels.netstandard21.cs" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))"> - <Reference Include="System.Threading.Tasks.Extensions" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="System.Runtime" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="../../System.Runtime/ref/System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime/ref/System.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading.Tasks" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) or + '$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> + <!-- Include these transitive dependencies to overrule NuGet's ProjectReference over PackageReferene behavior. --> + <PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" Condition="'$(TargetFramework)' == 'netstandard1.3'" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;net461</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> <Nullable>enable</Nullable> </PropertyGroup> @@ -31,8 +30,8 @@ <Compile Include="$(CommonPath)System\Collections\Concurrent\SingleProducerConsumerQueue.cs" Link="Common\System\Collections\Concurrent\SingleProducerConsumerQueue.cs" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.AppContext" Condition="'$(TargetFramework)' == 'netstandard1.3'" /> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or + '$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Diagnostics.Debug" /> @@ -40,12 +39,12 @@ <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Threading" /> - <Reference Include="System.Threading.ThreadPool" Condition="!$(TargetFramework.StartsWith('netstandard')) AND !$(TargetFramework.StartsWith('net4'))" /> + <Reference Include="System.Threading.ThreadPool" /> <Reference Include="System.Threading.Tasks" /> <Reference Include="System.Threading.Tasks.Extensions" /> </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="BoundedChannelTests.cs" /> @@ -18,4 +18,7 @@ <Compile Include="ChannelClosedExceptionTests.netcoreapp.cs" /> <Compile Include="ChannelTestBase.netcoreapp.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="..\src\System.Threading.Channels.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> <IsWindowsSpecific>true</IsWindowsSpecific> </PropertyGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard1.0;netstandard1.1</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.0;netstandard1.1;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> <Compile Include="System.Threading.Tasks.Dataflow.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' Or '$(TargetFramework)' == 'netstandard1.1'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading.Tasks" /> - </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>netstandard2.0;netstandard1.0;netstandard1.1;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>netstandard2.0;netstandard1.0;netstandard1.1;net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -61,27 +60,9 @@ <ItemGroup> <Content Include="XmlDocs\System.Threading.Tasks.Dataflow.xml" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.0'"> - <Reference Include="System.Diagnostics.Tracing" /> - <Reference Include="System.Collections.Concurrent" /> - </ItemGroup> - <ItemGroup> - <Reference Include="System.Collections" /> - <Reference Include="System.Diagnostics.Contracts" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.Dynamic.Runtime" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.Serialization.Primitives" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Tasks" /> - </ItemGroup> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="System.Core" /> - <Reference Include="System" /> + <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'"> + <PackageReference Include="System.Diagnostics.Contracts" Version="$(SystemDiagnosticsContractsVersion)" /> + <PackageReference Include="System.Dynamic.Runtime" Version="$(SystemDynamicRuntimeVersion)" /> + <PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(SystemRuntimeSerializationPrimitivesVersion)" /> </ItemGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> </PropertyGroup> <ItemGroup> <Compile Include="Dataflow\ActionBlockTests.cs" /> @@ -26,4 +26,7 @@ <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs" Link="Common\System\Diagnostics\DebuggerAttributes.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <ProjectReference Include="..\src\System.Threading.Tasks.Dataflow.csproj" /> + </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>System.Threading.Tasks.Parallel</RootNamespace> - <AssemblyName>System.Threading.Tasks.Parallel</AssemblyName> <DefineConstants>$(DefineConstants);FEATURE_TRACING</DefineConstants> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Threading.Tasks</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Threading.Thread</AssemblyName> - <OutputType>Library</OutputType> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Threading.ThreadPool</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Threading.Timer</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Threading</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <OutputType>Library</OutputType> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> 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 @@ <Compile Include="System\Transactions\TransactionState.cs" /> <Compile Include="System\Transactions\TransactionTable.cs" /> <Compile Include="System\Transactions\TransactionTraceIdentifier.cs" /> + <Compile Include="System\Transactions\TransactionsEtwProvider.cs" /> <Compile Include="System\Transactions\VolatileEnlistmentMultiplexing.cs" /> <Compile Include="System\Transactions\VolatileEnlistmentState.cs" /> <Compile Include="System\Transactions\Configuration\AppSettings.cs" /> @@ -50,7 +51,4 @@ <Reference Include="System.Threading.Thread" /> <Reference Include="System.Threading.ThreadPool" /> </ItemGroup> - <ItemGroup> - <Compile Include="System\Transactions\TransactionsEtwProvider.cs" /> - </ItemGroup> </Project> 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<TState>(int length, TState state, System.Buffers.SpanAction<byte, TState> action) { throw null; } #endif public static System.Utf8String CreateFromRelaxed(System.ReadOnlySpan<byte> buffer) { throw null; } public static System.Utf8String CreateFromRelaxed(System.ReadOnlySpan<char> buffer) { throw null; } -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_0 && !NETFRAMEWORK public static System.Utf8String CreateRelaxed<TState>(int length, TState state, System.Buffers.SpanAction<byte, TState> 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<byte> utf8Contents) { throw null; } -#if !NETSTANDARD2_0 +#if !NETSTANDARD2_0 && !NETFRAMEWORK public static System.Utf8String UnsafeCreateWithoutValidation<TState>(int length, TState state, System.Buffers.SpanAction<byte, TState> action) { throw null; } #endif public readonly partial struct ByteEnumerable : System.Collections.Generic.IEnumerable<byte> 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 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- disable warnings about obsolete APIs --> <NoWarn>$(NoWarn);0809;0618</NoWarn> - <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.0;$(NetCoreAppCurrent)</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.0;$(NetCoreAppCurrent);net461</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup Condition="'$(IsPrerelease)' != 'false'"> <Compile Include="System.Utf8String.Experimental.cs" /> <Compile Include="System.Utf8String.Experimental.Forwards.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPrerelease)' != 'false' AND '$(TargetFramework)' == 'netstandard2.0'"> + <ItemGroup Condition="'$(IsPrerelease)' != 'false' and ('$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461')"> <Compile Include="System.Utf8String.Experimental.Range.cs" /> <Compile Include="System.Utf8String.Experimental.Rune.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPrerelease)' != 'false' AND '$(TargetFramework)' == 'netstandard2.1'"> + <ItemGroup Condition="'$(IsPrerelease)' != 'false' and '$(TargetFramework)' == 'netstandard2.1'"> <Compile Include="System.Utf8String.Experimental.Rune.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPrerelease)' != 'false' AND '$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <ItemGroup Condition="'$(IsPrerelease)' != 'false' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Compile Include="System.Utf8String.Experimental.net5.0.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> - <Reference Include="System.Memory" /> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'"> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Net.Http\ref\System.Net.Http.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Net.Primitives\ref\System.Net.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="netstandard" /> @@ -30,10 +36,8 @@ <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.InteropServices" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.Net.Http\ref\System.Net.Http.csproj" /> - <ProjectReference Include="..\..\System.Net.Primitives\ref\System.Net.Primitives.csproj" /> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> + <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> + <Reference Include="System.Net.Http" /> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" Condition="'$(TargetFramework)' == 'net461'" /> </ItemGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;netcoreapp3.0;net461;$(NetFrameworkCurrent)</TargetFrameworks> - <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage> + <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;netcoreapp3.0;net461</TargetFrameworks> <Nullable>enable</Nullable> <DefineConstants>$(DefineContants);FEATURE_UTF8STRING</DefineConstants> </PropertyGroup> @@ -17,7 +16,7 @@ <Compile Include="System\IO\Utf8StringStream.cs" /> <Compile Include="System\Net\Http\Utf8StringContent.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPrerelease)' != 'false' AND ('$(TargetFramework)' == 'netstandard2.0' OR $(TargetFramework.StartsWith('net4')))"> + <ItemGroup Condition="'$(IsPrerelease)' != 'false' AND ('$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('net4')))"> <Compile Include="$(CoreLibSharedDir)\System\Index.cs" Link="System\Index.cs" /> <Compile Include="$(CoreLibSharedDir)\System\Numerics\BitOperations.cs" @@ -113,15 +112,27 @@ <ItemGroup Condition="'$(IsPrerelease)' != 'false' AND '$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Compile Include="System\Net\Http\Utf8StringContent.netcoreapp.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR $(TargetFramework.StartsWith('net4'))"> - <Reference Include="System.Buffers" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Numerics.Vectors" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> + <ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'"> + <!-- Duplicate types with System.Runtime.Intrinsics. Excluding the default reference. --> + <DefaultReferenceExclusion Include="System.Runtime.Intrinsics" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or + $(TargetFramework.StartsWith('net4'))"> + <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> + <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'"> - <Reference Include="System.Numerics.Vectors" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> + <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <!-- The predefined type 'Interlocked' is defined in multiple assemblies. --> + <DefaultReferenceExclusion Include="System.Threading" /> + <ProjectReference Include="$(CoreLibProject)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\src\System.Runtime.csproj" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Net.Primitives" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <Reference Include="netstandard" /> @@ -134,21 +145,10 @@ <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> <Reference Include="System.Security.Cryptography.Algorithms" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(CoreLibProject)" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Net.Primitives" /> - <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" /> - </ItemGroup> <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <Reference Include="mscorlib" /> - <Reference Include="netstandard" /> - <Reference Include="System" /> <Reference Include="System.Net.Http" /> - <Reference Include="System.Core" /> - <Reference Include="System.ValueTuple" /> + <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" Condition="'$(TargetFramework)' == 'net461'" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludePartialFacadeTests>true</IncludePartialFacadeTests> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks> <TestRuntime>true</TestRuntime> <IncludeRemoteExecutor>true</IncludeRemoteExecutor> - <!-- Must reference the Utf8String reference assembly, which is normally excluded from unit test projects. --> - <IncludeUtf8StringAsmRef>true</IncludeUtf8StringAsmRef> </PropertyGroup> <ItemGroup Condition="'$(IsPrerelease)' != 'false'"> <Compile Include="System\Char8Tests.cs" /> @@ -43,7 +41,13 @@ <Compile Include="System\Utf8ExtensionsTests.netcoreapp.cs" /> <Compile Include="System\Utf8StringTests.Ctor.netcoreapp.cs" /> </ItemGroup> - <ItemGroup Condition="'$(IsPrerelease)' != 'false' and '$(TargetFramework)' == '$(NetFrameworkCurrent)'"> + <ItemGroup Condition="'$(IsPrerelease)' != 'false' and '$(TargetFramework)' == 'net461'"> <Compile Include="System\MemoryTests.netfx.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\System.Utf8String.Experimental.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> + <Reference Include="System.Net.Http" /> + </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <!-- Must match version supported by frameworks which support 4.0.* inbox. Can be removed when API is added and this assembly is versioned to 4.1.* --> <AssemblyVersion>4.0.3.0</AssemblyVersion> - <TargetFrameworks>$(NetCoreAppCurrent);_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> <Compile Include="System.ValueTuple.TypeForwards.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <!-- rev'ed to 4.0.1.0 even though 4.0.0.0 never shipped so that we can drop pre-release down to beta --> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> - <TargetFrameworks>$(NetCoreAppCurrent);_$(NetFrameworkCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> <ItemGroup> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Open</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Compile Include="System.Windows.Extensions.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="..\..\System.ComponentModel.EventBasedAsync\ref\System.ComponentModel.EventBasedAsync.csproj" /> - <ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> - <ProjectReference Include="..\..\System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.EventBasedAsync\ref\System.ComponentModel.EventBasedAsync.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Runtime" /> <Reference Include="System.ComponentModel.EventBasedAsync" /> <Reference Include="System.ComponentModel.Primitives" /> + <Reference Include="System.ComponentModel.TypeConverter" /> + <Reference Include="System.Runtime" /> <Reference Include="System.Security.Cryptography.X509Certificates" /> </ItemGroup> </Project>
\ 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 @@ <PropertyGroup> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_System_Windows_Extensions</GeneratePlatformNotSupportedAssemblyMessage> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp3.0-Windows_NT;netcoreapp3.0;$(NetCoreAppCurrent)</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;netcoreapp3.0-Windows_NT;$(NetCoreAppCurrent);netcoreapp3.0</TargetFrameworks> <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage> </PropertyGroup> <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> @@ -55,6 +55,9 @@ <Compile Include="System\Media\SystemSounds.cs" /> <Compile Include="System\Xaml\Permissions\XamlAccessLevel.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetsWindows)' == 'true'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Common\src\System.Drawing.Common.csproj" /> + </ItemGroup> <ItemGroup> <Reference Include="System.Buffers" /> <Reference Include="System.Collections.NonGeneric" /> @@ -63,7 +66,6 @@ <Reference Include="System.ComponentModel.TypeConverter" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.Drawing.Common" /> <Reference Include="System.IO.FileSystem" /> <Reference Include="System.Memory" /> <Reference Include="System.Net.Requests" /> 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 @@ <PackageReference Include="System.ComponentModel.TypeConverter.TestData" Version="$(SystemComponentModelTypeConverterTestDataVersion)" /> <PackageReference Include="System.Drawing.Common.TestData" Version="$(SystemDrawingCommonTestDataVersion)" /> <PackageReference Include="System.Windows.Extensions.TestData" Version="$(SystemWindowsExtensionsTestDataVersion)" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Common\src\System.Drawing.Common.csproj" /> + <ProjectReference Include="..\src\System.Windows.Extensions.csproj" /> </ItemGroup> </Project> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Xml.ReaderWriter</AssemblyName> <RootNamespace>System.Xml</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> - </ItemGroup> - <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" /> <Reference Include="System.Runtime" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Xml.XDocument</AssemblyName> <RootNamespace>System.Xml</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" /> - <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> - </ItemGroup> - <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" /> <Reference Include="System.Runtime" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Compile Include="System\Xml\XPath\XDocumentExtensions.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> - <ProjectReference Include="..\..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" /> - </ItemGroup> - <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Extensions" /> </ItemGroup> 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Xml.XPath</AssemblyName> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> - </ItemGroup> - <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" /> <Reference Include="System.Runtime" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Xml.XmlDocument</AssemblyName> - <RootNamespace>System.Xml.XmlDocument</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> - </ItemGroup> - <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" /> <Reference Include="System.Runtime" /> </ItemGroup> </Project>
\ 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 @@ <Import Project="..\Directory.Build.props" /> <PropertyGroup> <StrongNameKeyId>Microsoft</StrongNameKeyId> - <IsNETCoreApp>true</IsNETCoreApp> </PropertyGroup> </Project>
\ 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AssemblyName>System.Xml.XmlSerializer</AssemblyName> - <RootNamespace>System.Xml.XmlSerializer</RootNamespace> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" /> - </ItemGroup> - <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" /> <Reference Include="System.Runtime" /> </ItemGroup> </Project>
\ 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 @@ <TargetFrameworksToExclude Include="net463" /> <TargetFrameworksToExclude Include="net47" /> <TargetFrameworksToExclude Include="netcoreapp2.2" /> - - <!-- CI machines doesn't have net472 targeting pack installed yet and we hit: https://github.com/dotnet/corefx/issues/29906 --> - <TargetFrameworksToExclude Include="net472" /> </ItemGroup> <PropertyGroup> 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 @@ <Project Sdk="Microsoft.Build.Traversal"> <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" /> - <PropertyGroup> - <TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties> - </PropertyGroup> - <PropertyGroup Condition="'$(ContinuousIntegrationBuild)' != 'true'"> <!-- Create an intermediate runsettings file to enable VSTest discovery. --> <EnableRunSettingsSupport>true</EnableRunSettingsSupport> <CreateIntermediateRunSettingsFile>true</CreateIntermediateRunSettingsFile> </PropertyGroup> - <!-- Explicitly build the runtime.depproj project first to correctly set up the testhost. --> + <!-- + Explicitly build the runtime.depproj project first to create the PlatformManifest for + the targeting and runtimepack before the test runners which consume that asset are built. + --> <ItemGroup> <RuntimeProject Include="$(MSBuildThisFileDirectory)restore\runtime\runtime.depproj" /> <ProjectReference Include="@(RuntimeProject)" Condition="'$(MSBuildRestoreSessionId)' != ''" /> @@ -20,8 +19,8 @@ <ProjectReference Include="$(CommonTestPath)AndroidTestRunner\AndroidTestRunner.csproj" Condition="'$(TargetOS)' == 'Android'" /> <ProjectReference Include="$(CommonTestPath)WasmTestRunner\WasmTestRunner.csproj" Condition="'$(TargetOS)' == 'Browser'" /> </ItemGroup> - - <Target Name="RestoreTestHost" + + <Target Name="RestoreRuntimeDepproj" BeforeTargets="Build"> <MSBuild Targets="Build" Projects="@(RuntimeProject)" @@ -29,104 +28,110 @@ </Target> <Target Name="CreateIntermediateRunSettingsFile" - Condition="'$(CreateIntermediateRunSettingsFile)' == 'true'" DependsOnTargets="GenerateRunSettingsFile" - BeforeTargets="Build" /> + BeforeTargets="Build" + Condition="'$(CreateIntermediateRunSettingsFile)' == 'true'" /> - <!-- Microsoft.XmlSerializer.Generator should not be marked as a platform item and be copy-local instead. --> - <Target Name="CollectSharedFrameworkRuntimeFiles" - Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'"> + <Target Name="GetSharedFrameworkRuntimeFiles"> <ItemGroup> - <_manualSharedFrameworkRuntimeFiles Include="System.Security.Cryptography.Native.OpenSsl.so" /> - <_manualSharedFrameworkRuntimeFiles Include="System.Security.Cryptography.Native.Apple.dylib" /> - <_manualSharedFrameworkRuntimeFiles Include="System.Security.Cryptography.Native.OpenSsl.dylib" /> - </ItemGroup> - <ItemGroup> - <SharedFrameworkRuntimeFiles Include="$(TestHostRuntimePath)*;@(_manualSharedFrameworkRuntimeFiles->'$(TestHostRuntimePath)%(Identity)')" - Exclude="$(TestHostRuntimePath)dotnet-Microsoft.XmlSerializer.Generator.*" - TargetPath="runtimes/" /> + <ManualRuntimePackNativeFile Include="System.Security.Cryptography.Native.OpenSsl.so" /> + <ManualRuntimePackNativeFile Include="System.Security.Cryptography.Native.Apple.dylib" /> + <ManualRuntimePackNativeFile Include="System.Security.Cryptography.Native.OpenSsl.dylib" /> + <SharedFrameworkRuntimeFile Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*; + $(MicrosoftNetCoreAppRuntimePackNativeDir)*; + @(ManualRuntimePackNativeFile->'$(MicrosoftNetCoreAppRuntimePackNativeDir)%(Identity)')" + TargetPath="runtimes/" /> </ItemGroup> </Target> + <!-- Generate the runtime pack's PlatformManifest --> <UsingTask TaskName="GenerateFileVersionProps" AssemblyFile="$(InstallerTasksAssemblyPath)"/> - <Target Name="GenerateFileVersionProps" - DependsOnTargets="CollectSharedFrameworkRuntimeFiles" - Condition="'$(PlatformManifestFile)' != '' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" - AfterTargets="RestoreTestHost"> - <GenerateFileVersionProps Files="@(SharedFrameworkRuntimeFiles)" - PackageId="$(SharedFrameworkName)" + <Target Name="GenerateFileVersionPropsRuntimePack" + DependsOnTargets="GetSharedFrameworkRuntimeFiles" + AfterTargets="RestoreRuntimeDepproj" + Inputs="@(SharedFrameworkRuntimeFile)" + Outputs="$(MicrosoftNetCoreAppRuntimePackDir)data\PlatformManifest.txt" + Condition="'$(BuildingNETCoreAppVertical)' == 'true'"> + <GenerateFileVersionProps Files="@(SharedFrameworkRuntimeFile)" + PackageId="$(SharedFrameworkName).Runtime.$(PackageRID)" PackageVersion="$(ProductVersion)" - PlatformManifestFile="$(PlatformManifestFile)" - PreferredPackages="$(SharedFrameworkName)" + PlatformManifestFile="$(MicrosoftNetCoreAppRuntimePackDir)data\PlatformManifest.txt" + PreferredPackages="$(SharedFrameworkName).Runtime.$(PackageRID)" PermitDllAndExeFilesLackingFileVersion="true" /> + </Target> - <Copy SourceFiles="$(PlatformManifestFile)" - DestinationFolder="$(MicrosoftNetCoreAppRefPackDataDir)" - UseHardlinksIfPossible="true" - SkipUnchangedFiles="true" /> + <!-- Generate the ref pack's PlatformManifest --> + <Target Name="GenerateFileVersionPropsRefPack" + DependsOnTargets="GetSharedFrameworkRuntimeFiles" + AfterTargets="RestoreRuntimeDepproj" + Inputs="@(SharedFrameworkRuntimeFile)" + Outputs="$(MicrosoftNetCoreAppRefPackDataDir)PlatformManifest.txt" + Condition="'$(BuildingNETCoreAppVertical)' == 'true'"> + <GenerateFileVersionProps Files="@(SharedFrameworkRuntimeFile)" + PackageId="$(SharedFrameworkName).Ref" + PackageVersion="$(ProductVersion)" + PlatformManifestFile="$(MicrosoftNetCoreAppRefPackDataDir)PlatformManifest.txt" + PreferredPackages="$(SharedFrameworkName).Ref" + PermitDllAndExeFilesLackingFileVersion="true" /> </Target> - <!-- - Shared framework deps file generation. - Produces a test shared-framework deps file. - To use invoke target directly specifying NETCoreAppTestSharedFrameworkPath property. - --> + <!-- Generate the shared framework's deps.json --> <UsingTask TaskName="GenerateTestSharedFrameworkDepsFile" AssemblyFile="$(InstallerTasksAssemblyPath)"/> - <Target Name="GenerateTestSharedFrameworkDepsFile" - Condition="'$(BinplaceTestSharedFramework)' == 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" - AfterTargets="RestoreTestHost"> + <Target Name="GenerateTestSharedFrameworkAssets" + AfterTargets="RestoreRuntimeDepproj" + Inputs="$(NETCoreAppTestSharedFrameworkPath)*.*" + Outputs="$(NETCoreAppTestSharedFrameworkPath)$(SharedFrameworkName).deps.json" + Condition="'$(BinPlaceTestSharedFramework)' == 'true'"> + <!-- Shared framework deps file generation. Produces a test shared-framework deps file. --> <GenerateTestSharedFrameworkDepsFile SharedFrameworkDirectory="$(NETCoreAppTestSharedFrameworkPath)" RuntimeGraphFiles="$(RuntimeIdGraphDefinitionFile)" TargetRuntimeIdentifier="$(PackageRID)" /> </Target> - <UsingTask TaskName="CreateFrameworkListFile" AssemblyFile="$(DotNetBuildTasksSharedFrameworkTaskFile)"/> - <Target Name="GenerateFrameworkListFile" - Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" - AfterTargets="RestoreTestHost"> + <Target Name="GetRuntimePackFiles"> <ItemGroup> - <_refPackLibFile Include="$(MicrosoftNetCoreAppRefPackRefDir)*.*"> - <TargetPath>ref/$(NetCoreAppCurrent)</TargetPath> - </_refPackLibFile> - <_runtimePackLibFiles Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.*"> + <RuntimePackLibFile Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.*"> <TargetPath>runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)</TargetPath> - </_runtimePackLibFiles> - <_runtimePackNativeFiles Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)*.*"> + </RuntimePackLibFile> + <RuntimePackNativeFile Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)*.*"> <TargetPath>runtimes/$(PackageRID)/native</TargetPath> <IsNative>true</IsNative> - </_runtimePackNativeFiles> - <!-- Clear the IsNative flag on System.PrivateCoreLib given that it is present in native dir but it is actually managed --> - <_runtimePackNativeFiles Update="@(_runtimePackNativeFiles)" Condition="'%(FileName)%(Extension)' == 'System.Private.CoreLib.dll'" IsNative="" /> - - <FrameworkListRootAttributes Include="Name" Value="$(NetCoreAppCurrentBrandName)" /> - <FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value="$(NetCoreAppCurrentIdentifier)" /> - <FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="$(NetCoreAppCurrentVersion)" /> - <FrameworkListRootAttributes Include="FrameworkName" Value="$(SharedFrameworkName)" /> + </RuntimePackNativeFile> + <!-- Clear the IsNative flag on System.Private.CoreLib given that it is present in native dir but it is actually managed --> + <RuntimePackNativeFile IsNative="" + Condition="'%(FileName)%(Extension)' == 'System.Private.CoreLib.dll'" /> </ItemGroup> - <!-- We need to set this metadata in a separate ItemGroup than when the Items are initially populated in order to have access to the Extension metadata. --> <ItemGroup> - <_refPackLibFile> - <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile> - </_refPackLibFile> - <_runtimePackLibFiles> + <RuntimePackLibFile> <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile> - </_runtimePackLibFiles> - <_runtimePackNativeFiles> + </RuntimePackLibFile> + <RuntimePackNativeFile> <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile> - </_runtimePackNativeFiles> + </RuntimePackNativeFile> </ItemGroup> + </Target> - <CreateFrameworkListFile Files="@(_refPackLibFile)" - TargetFile="$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml" - TargetFilePrefixes="ref/;runtimes/" - RootAttributes="@(FrameworkListRootAttributes)" /> + <!-- Generate the runtime pack's RuntimeList.xml --> + <UsingTask TaskName="CreateFrameworkListFile" AssemblyFile="$(DotNetBuildTasksSharedFrameworkTaskFile)"/> + <Target Name="GenerateRuntimeListFile" + DependsOnTargets="GetRuntimePackFiles" + AfterTargets="RestoreRuntimeDepproj" + Inputs="@(RuntimePackLibFile);@(RuntimePackNativeFile)" + Outputs="$(MicrosoftNetCoreAppRuntimePackDir)data\RuntimeList.xml" + Condition="'$(BuildingNETCoreAppVertical)' == 'true'"> + <ItemGroup> + <FrameworkListRootAttribute Include="Name" Value="$(NetCoreAppCurrentBrandName)" /> + <FrameworkListRootAttribute Include="TargetFrameworkIdentifier" Value="$(NetCoreAppCurrentIdentifier)" /> + <FrameworkListRootAttribute Include="TargetFrameworkVersion" Value="$(NetCoreAppCurrentVersion)" /> + <FrameworkListRootAttribute Include="FrameworkName" Value="$(SharedFrameworkName)" /> + </ItemGroup> - <CreateFrameworkListFile Files="@(_runtimePackLibFiles);@(_runtimePackNativeFiles)" + <CreateFrameworkListFile Files="@(RuntimePackLibFile);@(RuntimePackNativeFile)" TargetFile="$(MicrosoftNetCoreAppRuntimePackDir)data\RuntimeList.xml" TargetFilePrefixes="ref/;runtimes/" - RootAttributes="@(FrameworkListRootAttributes)" /> + RootAttributes="@(FrameworkListRootAttribute)" /> </Target> <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" /> 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 @@ <Project Sdk="Microsoft.Build.Traversal"> + <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" /> <PropertyGroup> <TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties> </PropertyGroup> <ItemGroup> - <GeneratedShimProject Include="shims\generated\*.csproj" /> + <_allRef Include="$(MSBuildThisFileDirectory)*\ref\*.csproj" + Exclude="@(ProjectExclusions)" /> + <NonNetCoreAppProject Include="@(_allRef)" + Exclude="@(NetCoreAppLibrary->'%(Identity)\ref\%(Identity).csproj')" /> + <NetCoreAppProject Include="@(_allRef)" + Exclude="@(NonNetCoreAppProject)" /> + <GeneratedShimProject Include="shims\generated\*.csproj" + Condition="'$(BuildingNETCoreAppVertical)' == 'true'" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" /> + <ProjectReference Include="@(NetCoreAppProject)" /> + <!-- Restore only and build later. --> - <ProjectReference Include="@(GeneratedShimProject)" Condition="'$(MSBuildRestoreSessionId)' != ''" /> + <ProjectReference Include="@(NonNetCoreAppProject); + @(GeneratedShimProject)" + Condition="'$(MSBuildRestoreSessionId)' != ''" /> </ItemGroup> <Target Name="BuildGeneratedShims" - AfterTargets="Build"> + AfterTargets="Build" + Condition="'@(GeneratedShimProject)' != ''"> <MSBuild Targets="Build" Projects="@(GeneratedShimProject)" Properties="$(TraversalGlobalProperties)" /> </Target> + <Target Name="GetRefPackFiles"> + <ItemGroup> + <RefPackLibFile Include="$(MicrosoftNetCoreAppRefPackRefDir)*.*"> + <TargetPath>ref/$(NetCoreAppCurrent)</TargetPath> + <IsSymbolFile Condition="$([System.String]::Copy('%(Identity)').EndsWith('pdb'))">true</IsSymbolFile> + </RefPackLibFile> + </ItemGroup> + <!-- We need to set this metadata in a separate ItemGroup than when the Items are initially populated in order to + have access to the Extension metadata. --> + <ItemGroup> + <RefPackLibFile> + <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile> + </RefPackLibFile> + </ItemGroup> + </Target> + + <!-- Generate the ref pack's FrameworkList.xml --> + <UsingTask TaskName="CreateFrameworkListFile" AssemblyFile="$(DotNetBuildTasksSharedFrameworkTaskFile)"/> + <Target Name="GenerateFrameworkListFile" + DependsOnTargets="GetRefPackFiles" + AfterTargets="BuildGeneratedShims" + Inputs="@(RefPackLibFile)" + Outputs="$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml" + Condition="'$(BuildingNETCoreAppVertical)' == 'true'"> + <ItemGroup> + <FrameworkListRootAttribute Include="Name" Value="$(NetCoreAppCurrentBrandName)" /> + <FrameworkListRootAttribute Include="TargetFrameworkIdentifier" Value="$(NetCoreAppCurrentIdentifier)" /> + <FrameworkListRootAttribute Include="TargetFrameworkVersion" Value="$(NetCoreAppCurrentVersion)" /> + <FrameworkListRootAttribute Include="FrameworkName" Value="$(SharedFrameworkName)" /> + </ItemGroup> + + <CreateFrameworkListFile Files="@(RefPackLibFile)" + TargetFile="$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml" + TargetFilePrefixes="ref/;runtimes/" + RootAttributes="@(FrameworkListRootAttribute)" /> + </Target> + + <Target Name="BuildNonNetCoreAppProjects" + AfterTargets="GenerateFrameworkListFile"> + <MSBuild Targets="Build" + BuildInParallel="true" + Projects="@(NonNetCoreAppProject)" + Properties="$(TraversalGlobalProperties)" /> + </Target> + + <!-- Build generated shims with the full reference closure, including OOB assemblies. --> + <Target Name="RebuildGeneratedShims" + AfterTargets="BuildNonNetCoreAppProjects" + Condition="'@(GeneratedShimProject)' != ''"> + <MSBuild Targets="Build" + Projects="@(GeneratedShimProject)" + Properties="$(TraversalGlobalProperties);_Incremental=true" /> + </Target> + + <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" /> </Project> 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 @@ -<Project TreatAsLocalProperty="AdditionalBuildTargetFrameworks"> +<Project> <Import Project="..\Directory.Build.props" /> <PropertyGroup> @@ -11,7 +11,6 @@ <SkipDeriveTargetFrameworks>true</SkipDeriveTargetFrameworks> <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> - <AdditionalBuildTargetFrameworks Condition="'$(BuildAllProjects)' == 'true'">netstandard2.0</AdditionalBuildTargetFrameworks> </PropertyGroup> <!-- don't bring in props/targets from packages, we're not consuming them we're diff --git a/src/libraries/restore/Directory.Build.targets b/src/libraries/restore/Directory.Build.targets index 28eaed69674..785efcc4de2 100644 --- a/src/libraries/restore/Directory.Build.targets +++ b/src/libraries/restore/Directory.Build.targets @@ -4,6 +4,4 @@ <PropertyGroup> <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages> </PropertyGroup> - - <Import Project="$(MSBuildThisFileDirectory)\runtime\referenceFromRuntime.targets" Condition="'$(TargetFramework)' == 'netcoreapp3.0' and '$(TargetFrameworkSuffix)' == 'Windows_NT'"/> </Project> diff --git a/src/libraries/restore/binplacePackages/binplacePackages.depproj b/src/libraries/restore/binplacePackages/binplacePackages.depproj deleted file mode 100644 index 5b7928b270c..00000000000 --- a/src/libraries/restore/binplacePackages/binplacePackages.depproj +++ /dev/null @@ -1,53 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> - <BinPlaceRef>true</BinPlaceRef> - <BinPlaceRuntime>true</BinPlaceRuntime> - <NETStandardVersion Condition="$(TargetFramework.StartsWith('netstandard'))">$(TargetFramework.SubString(11))</NETStandardVersion> - <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> - <TargetsNetStandardLowerThan21 Condition="$(TargetFramework.StartsWith('netstandard')) and '$(NETStandardVersion)' < 2.1">true</TargetsNetStandardLowerThan21> - <TargetFrameworks>net461;net472;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netstandard2.0;netcoreapp2.0;netcoreapp3.0;$(NetCoreAppCurrent)</TargetFrameworks> - </PropertyGroup> - - <!-- Ref binplacing for all configurations --> - <ItemGroup> - <BinPlaceTargetFrameworks Include="$(TargetFramework)"> - <RefPath>$(RefPath)</RefPath> - </BinPlaceTargetFrameworks> - </ItemGroup> - - <!-- Runtime / test-runtime binplacing, when we aren't building better live version of these libs --> - <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <BinPlaceTargetFrameworks Include="$(TargetFramework)"> - <ItemName>BinPlaceLib</ItemName> - <RuntimePath>$(RuntimePath)</RuntimePath> - </BinPlaceTargetFrameworks> - <BinPlaceTargetFrameworks Include="$(TargetFramework)"> - <ItemName>BinPlaceLib</ItemName> - <RuntimePath>$(TestHostRuntimePath)</RuntimePath> - </BinPlaceTargetFrameworks> - </ItemGroup> - - <!-- This is to make sure that nothing unintended gets restored for netcoreapp. --> - <ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <!-- runtime dependency: System.Diagnostics.PerformanceCounters netcoreapp2.0,net461 --> - <PackageReference Include="System.Memory" Version="4.5.3" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or $(TargetFramework.StartsWith('net4')) or ($(TargetFramework.StartsWith('netstandard')) and '$(NETStandardVersion)' >= 1.1)" /> - <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" Condition="'$(TargetsNetStandardLowerThan21)' == 'true' or $(TargetFramework.StartsWith('net4'))" /> - <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('netstandard'))" /> - </ItemGroup> - - <ItemGroup> - <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" Condition="!$(TargetFramework.StartsWith('netstandard')) or '$(NETStandardVersion)' >= 2.0" /> - <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" Condition="!$(TargetFramework.StartsWith('netstandard')) or '$(NETStandardVersion)' >= 2.0" /> - - <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" Condition="!$(TargetFramework.StartsWith('netstandard')) or '$(NETStandardVersion)' <= 2.0" /> - <!-- Only include the assets from the direct packages we reference in the output --> - <PackageToInclude Include="@(PackageReference)" /> - </ItemGroup> - - <Target Name="AddHarvestedLibraries" BeforeTargets="CoreCompile" - Condition="!$(TargetFramework.StartsWith('netstandard'))"> - <ItemGroup> - <BinPlaceLib Include="@(ReferenceCopyLocalPaths)" /> - </ItemGroup> - </Target> -</Project> 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 @@ -<Project> - <Import Project="Directory.Build.props" /> - - <ItemGroup> - <ProjectReference Include="netcoreapp/external.netcoreapp.depproj" Condition="'$(DotNetBuildFromSource)' != 'true'" /> - <ProjectReference Include="netstandard/external.netstandard.depproj" /> - <ProjectReference Include="netfx/netfx.depproj" /> - <ProjectReference Include="binplacePackages/binplacePackages.depproj" /> - </ItemGroup> - - <Target Name="Restore"> - <MSBuild Projects="@(ProjectReference)" - Properties="BuildAllProjects=true;MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" - BuildInParallel="true" - Targets="Restore" /> - - <MSBuild Projects="@(ProjectReference)" - Properties="BuildAllProjects=true" - BuildInParallel="true" - Targets="Build" /> - </Target> - - <Import Project="Directory.Build.targets" /> - - <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. --> - <!-- Don't do anything during build. --> - <Target Name="Build" /> -</Project> 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 @@ -<Project Sdk="Microsoft.NET.Sdk"> - <!-- This project restores and publishes the targeting pack for specific versions of .NET Core. - With this, we are able to compile assemblies against shipped, stable versions of .NET Core. --> - <PropertyGroup> - <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> - <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences> - <BinPlaceRef>true</BinPlaceRef> - <TargetFrameworks>netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks> - </PropertyGroup> - - <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp2.'))"> - <PackageReference Update="Microsoft.NETCore.App" IsImplicitlyDefined="false" PrivateAssets="None" /> - </ItemGroup> - - <ItemGroup> - <!-- for all configurations this project provides refs for that configuration --> - <BinPlaceTargetFrameworks Include="$(TargetFramework)" RefPath="$(RefPath)" /> - <FileToExclude Include="System.ComponentModel.Composition" /> - </ItemGroup> -</Project> 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 @@ -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(LibrariesProjectRoot)shims\netfxreference.props" /> - <PropertyGroup> - <BinPlaceRef>true</BinPlaceRef> - <BinPlaceRuntime>true</BinPlaceRuntime> - <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> - <NETStandardSupportPackageId>NETStandard.Library.NETFramework</NETStandardSupportPackageId> - <NETStandardSupportPackageVersion>2.0.1-servicing-26011-01</NETStandardSupportPackageVersion> - <NETStandardSupportRoot>$(NuGetPackageRoot)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build</NETStandardSupportRoot> - <AddNetStandardSupportPackage Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net47'">true</AddNetStandardSupportPackage> - <TargetFrameworks>net45;net451;net46;net461;net462;net47;net471;net472</TargetFrameworks> - <!-- if we aren't building all configurations, ensure we populate NetFxRefPath for netcoreapp by building this project --> - <TargetFrameworks Condition="'$(BuildAllConfigurations)' != 'true'">$(TargetFrameworks);$(NetCoreAppCurrent)</TargetFrameworks> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <!-- For things not .NETFramework we need the net472 targeting pack to generate facades --> - <AssetTargetFallback>$(NetFrameworkCurrent)</AssetTargetFallback> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.7.2</TargetingPackNugetPackageId> - </PropertyGroup> - - <!-- Split $(TargetFramework) (e.g. net45) into short identifier and short version (e.g. 'net' and '45'). --> - <PropertyGroup Condition="'$(TargetFramework)' != '' and !$(TargetFramework.Contains(',')) and !$(TargetFramework.Contains('+'))"> - <_ShortFrameworkIdentifier>$(TargetFramework.TrimEnd('.0123456789'))</_ShortFrameworkIdentifier> - <_ShortFrameworkVersion>$(TargetFramework.Substring($(_ShortFrameworkIdentifier.Length)))</_ShortFrameworkVersion> - </PropertyGroup> - - <!-- Versions with dots are taken as is and just given leading 'v'. --> - <PropertyGroup Condition="'$(TargetFrameworkVersion)' == '' and '$(_ShortFrameworkVersion)' != '' and $(_ShortFrameworkVersion.Contains('.'))"> - <TargetFrameworkVersion>v$(_ShortFrameworkVersion)</TargetFrameworkVersion> - </PropertyGroup> - - <!-- Versions with no dots and up to 3 characters get leading 'v' and implicit dots between characters. --> - <PropertyGroup Condition="'$(TargetFrameworkVersion)' == '' and '$(_ShortFrameworkVersion)' != ''"> - <TargetFrameworkVersion Condition="$(_ShortFrameworkVersion.Length) == 1">v$(_ShortFrameworkVersion[0]).0</TargetFrameworkVersion> - <TargetFrameworkVersion Condition="$(_ShortFrameworkVersion.Length) == 2">v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1])</TargetFrameworkVersion> - <TargetFrameworkVersion Condition="$(_ShortFrameworkVersion.Length) == 3">v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1]).$(_ShortFrameworkVersion[2])</TargetFrameworkVersion> - </PropertyGroup> - - <!-- Map short name to long name. See earlier comment for example of how to work with identifiers that are not recognized here. --> - <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == ''"> - <TargetFrameworkIdentifier Condition="'$(_ShortFrameworkIdentifier)' == 'netstandard'">.NETStandard</TargetFrameworkIdentifier> - <TargetFrameworkIdentifier Condition="'$(_ShortFrameworkIdentifier)' == 'netcoreapp'">.NETCoreApp</TargetFrameworkIdentifier> - - <!-- The meaning of "net" as a short framework name depends on the version. If it's 4.x or less, it means .NETFramework. - If the version is 5.0 or higher, then "net" means .NET 5.0 and on, which is the evolution of .NET Core, and uses - the .NETCoreApp TargetFrameworkIdentifier. --> - <TargetFrameworkIdentifier Condition="'$(_ShortFrameworkIdentifier)' == 'net' And - $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '5.0'))">.NETFramework</TargetFrameworkIdentifier> - <TargetFrameworkIdentifier Condition="'$(_ShortFrameworkIdentifier)' == 'net' And - $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '5.0'))">.NETCoreApp</TargetFrameworkIdentifier> - </PropertyGroup> - - <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))"> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.$(TargetFrameworkVersion)</TargetingPackNugetPackageId> - </PropertyGroup> - - <ItemGroup> - <!-- For things not .NETFramework binplace to the NETFX ref path --> - <BinPlaceTargetFrameworks Condition="!$(TargetFramework.StartsWith('net4'))" Include="$(TargetFramework)"> - <RefPath>$(NetFxRefPath)</RefPath> - </BinPlaceTargetFrameworks> - - <!-- For things .NETFramework binplace to refpath --> - <BinPlaceTargetFrameworks Condition="$(TargetFramework.StartsWith('net4'))" Include="$(TargetFramework)"> - <RefPath>$(RefPath)</RefPath> - </BinPlaceTargetFrameworks> - </ItemGroup> - - <PropertyGroup> - <_TargetingPackVersion>1.0.1</_TargetingPackVersion> - <_TargetingPackVersion Condition="'$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.1' or '$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.2'">1.0.0</_TargetingPackVersion> - </PropertyGroup> - - <ItemGroup> - <PackageReference Include="$(TargetingPackNugetPackageId)" NoWarn="NU1701"> - <Version >$(_TargetingPackVersion)</Version> - </PackageReference> - <PackageReference Include="System.Memory" Condition="'$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46'"> - <Version>4.5.2</Version> - </PackageReference> - <PackageReference Include="System.Numerics.Vectors" Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == '$(NetFrameworkCurrent)'"> - <Version>4.5.0</Version> - </PackageReference> - <PackageReference Include="System.Buffers" Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == '$(NetFrameworkCurrent)'"> - <Version>4.5.0</Version> - </PackageReference> - <PackageReference Include="$(NETStandardSupportPackageId)" Condition="'$(AddNetStandardSupportPackage)' == 'true'"> - <Version>$(NETStandardSupportPackageVersion)</Version> - </PackageReference> - - <FileToExclude Include="System.EnterpriseServices" /> - <FileToExclude Include="System.EnterpriseServices.Thunk" /> - <FileToExclude Include="System.EnterpriseServices.Wrapper" /> - </ItemGroup> - - <Target Name="AddNETStandardShims" AfterTargets="FilterNugetPackages" - Condition="'$(AddNetStandardSupportPackage)' == 'true'"> - <ItemGroup> - <_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> - <Private>False</Private> - <NuGetPackageId>$(NETStandardSupportPackageId)</NuGetPackageId> - <NuGetPackageVersion>$(NETStandardSupportPackageVersion)</NuGetPackageVersion> - </_netStandardReference> - - <_referenceByFileName Include="@(Reference->'%(FileName)%(Extension)')"> - <OriginalIdentity>%(Identity)</OriginalIdentity> - </_referenceByFileName> - <_netStandardReferenceByFileName Include="@(_netStandardReference->'%(FileName)%(Extension)')" /> - - <_remainingReferenceByFileName Include="@(_referenceByFileName)" Exclude="@(_netStandardReferenceByFileName)" /> - <_remainingReference Include="@(_remainingReferenceByFileName->'%(OriginalIdentity)')" /> - - <Reference Remove="@(Reference)" /> - <Reference Include="@(_remainingReference);@(_netStandardReference)" /> - </ItemGroup> - </Target> -</Project> 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 @@ -<Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> - <NETStandardVersion Condition="$(TargetFramework.StartsWith('netstandard'))">$(TargetFramework.SubString(11))</NETStandardVersion> - <IsNETStandard1x Condition="$(NETStandardVersion.StartsWith('1.'))">true</IsNETStandard1x> - <IsNETStandard2x Condition="$(NETStandardVersion.StartsWith('2.'))">true</IsNETStandard2x> - <BinPlaceRef>true</BinPlaceRef> - <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> - <_NETStandardTFMFolder Condition="'$(TargetFramework)' == 'netstandard2.0'">netstandard2.0</_NETStandardTFMFolder> - <TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0</TargetFrameworks> - </PropertyGroup> - - <ItemGroup> - <PackageReference Include="NETStandard.Library"> - <Version>$(NETStandardLibraryVersion)</Version> - </PackageReference> - </ItemGroup> - - <ItemGroup Condition="'$(IsNETStandard1x)' == 'true'"> - <PackageReference Include="System.Diagnostics.Contracts"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Include="System.Diagnostics.Debug"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Include="System.Dynamic.Runtime"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Include="System.Runtime.Serialization.Primitives"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Condition="'$(NETStandardVersion)' >= 1.3" Include="System.Reflection.TypeExtensions"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Condition="'$(NETStandardVersion)' >= 1.2" Include="System.Data.SqlClient"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Condition="'$(NETStandardVersion)' >= 1.3" Include="System.Security.Cryptography.Cng"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Condition="'$(NETStandardVersion)' >= 1.1" Include="System.Reflection.Emit"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Include="System.Reflection.Emit.ILGeneration"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Include="System.Reflection.Emit.Lightweight"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Include="System.Runtime.WindowsRuntime"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Condition="'$(NETStandardVersion)' >= 1.1" Include="System.Runtime.WindowsRuntime.UI.Xaml"> - <Version>4.3.0</Version> - </PackageReference> - </ItemGroup> - <ItemGroup Condition="'$(IsNETStandard2x)' == 'true'"> - <PackageReference Condition="'$(NETStandardVersion)' == 2.0" Include="System.Buffers"> - <Version>4.5.0</Version> - </PackageReference> - <PackageReference Include="System.Security.Cryptography.Cng"> - <Version>4.5.0</Version> - </PackageReference> - <PackageReference Include="System.Security.Cryptography.OpenSsl"> - <Version>4.5.1</Version> - </PackageReference> - <PackageReference Include="System.Security.Cryptography.Pkcs"> - <Version>4.5.2</Version> - </PackageReference> - <PackageReference Include="System.Data.SqlClient"> - <Version>4.7.0</Version> - </PackageReference> - </ItemGroup> - - <ItemGroup> - <!-- for all configurations this project provides refs for that configuration --> - <BinPlaceTargetFrameworks Include="$(TargetFramework)"> - <RefPath>$(RefPath)</RefPath> - </BinPlaceTargetFrameworks> - <BinPlaceTargetFrameworks Include="$(TargetFramework)"> - <!-- copy shims to the testhost as well in order to be able to run the netfx tests --> - <RuntimePath>$(TestHostRootPath)</RuntimePath> - </BinPlaceTargetFrameworks> - </ItemGroup> - - <Target Name="AddNETStandard21Refs" AfterTargets="ResolveReferences"> - <PropertyGroup> - <_NETStandard21RefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\netstandard2.1\ref</_NETStandard21RefFolder> - </PropertyGroup> - - <ItemGroup> - <ExcludeNetStandard21Refs Include="System.ComponentModel.Composition" /> - <ExcludeNetStandard21Refs Include="System.Reflection.DispatchProxy" /> - <_NetStandard21Files - Include="$(_NETStandard21RefFolder)\*.dll" - Exclude="@(ExcludeNetStandard21Refs -> '$(_NETStandard21RefFolder)\%(Identity).dll')" /> - </ItemGroup> - - <Error Condition="'@(_NetStandard21Files)' == ''" Text="Could not find package assets for netstandard2.1" /> - - <Copy SourceFiles="@(_NetStandard21Files)" - DestinationFolder="$(NetStandard21RefPath)" - SkipUnchangedFiles="true" /> - </Target> - - <Target Name="AddNETStandard20Refs" AfterTargets="ResolveReferences" - Condition="'$(_NETStandardTFMFolder)' != ''"> - <PropertyGroup> - <_NETStandardRefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder> - </PropertyGroup> - - <ItemGroup> - <ExcludeNetStandardRefs Include="System.ComponentModel.Composition" /> - <NetStandardRefs - Include="$(_NETStandardRefFolder)\*.dll" - Exclude="@(ExcludeNetStandardRefs -> '$(_NETStandardRefFolder)\%(Identity).dll')" /> - </ItemGroup> - - <Error Condition="'@(NetStandardRefs)' == ''" Text="Could not find package assets for netstandard2.0" /> - - <ItemGroup> - <Reference Include="@(NetStandardRefs)"> - <Private>False</Private> - <NuGetPackageId>$(NETStandardLibraryPackage)</NuGetPackageId> - <NuGetPackageVersion>$(NETStandardLibraryVersion)</NuGetPackageVersion> - </Reference> - </ItemGroup> - </Target> -</Project> 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 @@ -<Project> - <!-- This is present in order to make ProjectReferences return the same set of content that would be BinPlaced. --> - <!-- Override build and GetTargetPath to return all items deployed --> - <Target Name="Build" - Condition=" '$(_InvalidConfigurationWarning)' != 'true' " - DependsOnTargets="$(BuildDependsOn)" - Returns="@(BinPlaceItem)" /> - - <!-- Depprojs need to run Compile in order to populate items that will be copied to output --> - <Target Name="GetTargetPath" - DependsOnTargets="Compile;GetBinPlaceItems" - Returns="@(BinPlaceItem)" /> -</Project>
\ 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 @@ <BinPlaceForTargetVertical>false</BinPlaceForTargetVertical> <BinPlaceNative>true</BinPlaceNative> <BinPlaceRuntime>false</BinPlaceRuntime> - <TargetFrameworks>netcoreapp3.0-Windows_NT;netcoreapp3.0-Unix;$(netcoreappCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> + <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks> </PropertyGroup> <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'"> @@ -22,10 +22,6 @@ <FileToExclude Include="apphost" /> </ItemGroup> - <ItemGroup> - <PackageReference Condition="'$(TargetFramework)' == 'netcoreapp3.0'" Include="Microsoft.Private.Corefx.NETCoreApp" Version="4.6.0-rc2.19462.14" /> - </ItemGroup> - <!-- Setup the testing shared framework host --> <Target Name="SetupTestingHost" Condition="'$(BinPlaceTestSharedFramework)' == 'true'" @@ -59,35 +55,31 @@ <Exec Command="chmod +x $(TestHostRootPath)%(DotnetExe.Filename)%(DotnetExe.Extension)" Condition="'$(TargetOS)' != 'Windows_NT' and '$(OS)' != 'Windows_NT'"/> </Target> - <Target Name="SetupRuntimePackNative" - AfterTargets="AfterResolveReferences"> - <ItemGroup> - <BinPlaceItem Include="@(RuntimeFiles)" /> - <BinPlaceItem Include="@(MonoCrossFiles)"> - <DestinationSubDirectory>cross/</DestinationSubDirectory> - </BinPlaceItem> - <BinPlaceItem Include="@(MonoIncludeFiles)"> - <DestinationSubDirectory>include/%(RecursiveDir)</DestinationSubDirectory> - </BinPlaceItem> - </ItemGroup> - </Target> - <Target Name="OverrideRuntimeCoreCLR" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" AfterTargets="AfterResolveReferences;FilterNugetPackages" Condition="'$(RuntimeFlavor)' != 'Mono'"> <ItemGroup> + <ReferenceCopyLocalPaths Include="@(RuntimeFiles)" /> <!-- CoreRun is not used for testing anymore, but we still use it for benchmarking and profiling --> <RuntimeFiles Include="$(CoreCLRArtifactsPath)/corerun*" /> <RuntimeFiles Include="$(CoreCLRArtifactsPath)/PDB/corerun*" /> - <ReferenceCopyLocalPaths Include="@(RuntimeFiles)" /> </ItemGroup> </Target> <Target Name="OverrideRuntimeMono" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" AfterTargets="AfterResolveReferences;FilterNugetPackages" - Condition="'$(RuntimeFlavor)' == 'Mono'" /> + Condition="'$(RuntimeFlavor)' == 'Mono'"> + <ItemGroup> + <ReferenceCopyLocalPaths Include="@(RuntimeFiles)" /> + <!-- Setup runtime pack native. --> + <ReferenceCopyLocalPaths Include="@(MonoCrossFiles)" + DestinationSubDirectory="cross" /> + <ReferenceCopyLocalPaths Include="@(MonoIncludeFiles)" + DestinationSubDirectory="include/%(RecursiveDir)" /> + </ItemGroup> + </Target> <Target Name="GetCoreCLRILFiles" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> <ItemGroup> @@ -109,10 +101,8 @@ <!-- Strip away placeholder tfms and TargetFrameworkSuffix. --> <Target Name="StripTargetFrameworkSuffixFromTargetFrameworks" - Condition="'$(TargetFrameworks)' != ''" BeforeTargets="_GetRestoreTargetFrameworksOutput;_GetRestoreTargetFrameworksAsItems"> <PropertyGroup> - <TargetFrameworks Condition="'$(TargetFrameworks)' != ''">$([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '_[^;]+;?', ''))</TargetFrameworks> <TargetFrameworks Condition="'$(TargetFrameworks)' != ''">$([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '-[^;]+', ''))</TargetFrameworks> </PropertyGroup> </Target> 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 @@ <!-- Helix auto-magically imports local *.props files. We're not going to import the Helix Sdk, so we need to import those files manually so we can reference the properties defined there. --> - <Import Project="$(MSBuildThisFileDirectory)/*.props" /> + <Import Project="Directory.Build.props" /> <Target Name="RunInParallelForEachScenario"> @@ -47,7 +47,7 @@ <Message Importance="High" Text="TestHostRootPath: $(TestHostRootPath)" /> <Message Importance="High" Text="TestArchiveRoot: $(TestArchiveRoot)" /> <Message Importance="High" Text="TestArchiveRuntimeRoot: $(TestArchiveRuntimeRoot)" /> - <Message Importance="High" Text="TestArchiveRuntimeFile: $(TestArchiveRuntimeFile)" /> + <Message Condition="'$(TestArchiveRuntimeFile)' != ''" Importance="High" Text="TestArchiveRuntimeFile: $(TestArchiveRuntimeFile)" /> <!-- Re-invoke MSBuild on this project to create the correlation payload --> <MSBuild Projects="$(MSBuildProjectFile)" Targets="PrepareCorrelationPayloadDirectory" Properties="Scenarios=$(_Scenarios)" /> @@ -80,7 +80,8 @@ <TargetsWindows Condition="'$(TargetOS)' == 'Windows_NT'">true</TargetsWindows> <!-- The Helix correlation payload file --> - <TestArchiveRuntimeFile Condition="'$(TestPackages)' != 'true'">$(TestArchiveRuntimeRoot)test-runtime-$(BuildSettings).zip</TestArchiveRuntimeFile> + <TestArchiveRuntimeFile Condition="'$(TestPackages)' != 'true' and + '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">$(TestArchiveRuntimeRoot)test-runtime-$(BuildSettings).zip</TestArchiveRuntimeFile> <TestArchiveRuntimeFile Condition="'$(TestPackages)' == 'true'">$(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip</TestArchiveRuntimeFile> </PropertyGroup> @@ -144,7 +145,9 @@ <Target Name="CompressRuntimeDirectory" Inputs="@(_RuntimeInputs);@(TestArchiveRuntimeDependency)" Outputs="$(TestArchiveRuntimeFile)" - Condition="'$(TestPackages)' != 'true' and '$(TargetsMobile)' != 'true'"> + Condition="'$(TestPackages)' != 'true' and + '$(TargetsMobile)' != 'true' and + '$(TestArchiveRuntimeFile)' != ''"> <!-- Compress the test files, testhost, and per-scenario scripts into a single ZIP file for sending to the Helix machines. --> 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. --> <HelixCommand Condition="'$(TargetsWindows)' == 'true'">call RunTests.cmd --runtime-path %HELIX_CORRELATION_PAYLOAD%</HelixCommand> + <HelixCommand Condition="'$(TargetsWindows)' == 'true' and '$(HelixCorrelationPayload)' != ''">$(HelixCommand) --runtime-path %HELIX_CORRELATION_PAYLOAD%</HelixCommand> <HelixCommand Condition="'$(TargetsWindows)' != 'true'">./RunTests.sh --runtime-path "$HELIX_CORRELATION_PAYLOAD"</HelixCommand> + <HelixCommand Condition="'$(TargetsWindows)' != 'true' and '$(HelixCorrelationPayload)' != ''">$(HelixCommand) --runtime-path "$HELIX_CORRELATION_PAYLOAD"</HelixCommand> </PropertyGroup> <ItemGroup> @@ -155,14 +157,15 @@ <Message Condition="'$(Scenario)' == ''" Importance="High" Text="Building Helix work items" /> <Message Condition="'$(Scenario)' != ''" Importance="High" Text="Building Helix work items for scenario $(Scenario)" /> <Message Importance="High" Text="Using TestRunNamePrefix: $(TestRunNamePrefix)" /> - <Message Importance="High" Text="Using HelixCorrelationPayload: $(HelixCorrelationPayload)" /> + <Message Condition="'$(HelixCorrelationPayload)' != ''" Importance="High" Text="Using HelixCorrelationPayload: $(HelixCorrelationPayload)" /> <Message Importance="High" Text="Using HelixCommand: $(HelixCommand)" /> <Message Importance="High" Text="Using HelixType: $(HelixType)" /> <Message Importance="High" Text="Using WorkItemArchiveWildCard: $(WorkItemArchiveWildCard)" /> <Message Importance="High" Text="Using Timeout: $(_timeoutSpan)" /> <ItemGroup> - <HelixCorrelationPayload Condition="'$(TargetOS)' != 'Browser'" Include="$(HelixCorrelationPayload)" /> + <HelixCorrelationPayload Include="$(HelixCorrelationPayload)" + Condition="'$(TargetOS)' != 'Browser' or '$(HelixCorrelationPayload)' != ''" /> <_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 @@ <TargetFramework>$(BuildTargetFramework)</TargetFramework> <!-- Set to true to build this project --> <BaselineApiCompat Condition="'$(BaselineApiCompat)' == ''">false</BaselineApiCompat> - <_RunApiCompat>true</_RunApiCompat> + <PreviousNetCoreApp>netcoreapp3.1</PreviousNetCoreApp> + <PreviousNetCoreAppPackageId>microsoft.netcore.app.ref</PreviousNetCoreAppPackageId> + <PreviousNetCoreAppPackageVersion>3.1.0</PreviousNetCoreAppPackageVersion> </PropertyGroup> <ItemGroup> @@ -14,6 +16,11 @@ <NetFxReference Include="System.DirectoryServices.Protocols" /> </ItemGroup> + <ItemGroup> + <PackageDownload Include="$(PreviousNetCoreAppPackageId)" Version="[$(PreviousNetCoreAppPackageVersion)]" /> + <PackageDownload Include="NETStandard.Library" Version="[$(NETStandardLibraryVersion)];[$(NetStandardLibrary20Version)]" /> + </ItemGroup> + <!-- Evaluate these properties inside a Target to gain access to TargetFrameworkIdentifier. --> <Target Name="SetApiCompatFiles"> <PropertyGroup> @@ -28,14 +35,13 @@ <!-- Run ApiCompat --> <Target Name="RunApiCompat" - Condition="'$(_RunApiCompat)' == 'true'" DependsOnTargets="SetApiCompatFiles" AfterTargets="Build" Inputs="$(ApiCompatResponseFile)" Outputs="$(ApiCompatBaselineFile);$(ApiCompatNSBaselineFile)"> <PropertyGroup> - <ApiCompatImplementationDirs>$(BuildTargetFrameworkRefPath.TrimEnd('\/'))</ApiCompatImplementationDirs> + <ApiCompatImplementationDirs>$(NetCoreAppCurrentRefPath.TrimEnd('\/'))</ApiCompatImplementationDirs> <ApiCompatArgs Condition="'$(ApiCompatExcludeAttributeList)' != ''">$(ApiCompatArgs) --exclude-attributes "$(ApiCompatExcludeAttributeList)"</ApiCompatArgs> <ApiCompatArgs>$(ApiCompatArgs) --impl-dirs "$(ApiCompatImplementationDirs)"</ApiCompatArgs> <BaselineApiCompatArgs Condition="Exists($(ApiCompatBaselineIgnoreFile))">--baseline "$(ApiCompatBaselineIgnoreFile)"</BaselineApiCompatArgs> @@ -53,7 +59,7 @@ <Output TaskParameter="ExitCode" PropertyName="ApiCompatExitCode" /> </Exec> - <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing $(NetFrameworkCurrent) to $(TargetFramework)" /> + <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing $(NETFrameworkReferenceAssemblyTFM) to $(TargetFramework)" /> <!-- @@ -71,15 +77,14 @@ <PropertyGroup> <UpdateNETStandardBaseline Condition="'$(UpdateNETStandardBaseline)' == ''">False</UpdateNETStandardBaseline> <UpdateNETStandardBaselineLocally Condition="'$(UpdateNETStandardBaselineLocally)' == ''">False</UpdateNETStandardBaselineLocally> - <_netStandard21OnlyRef>$(NetStandard21RefPath)netstandard.dll</_netStandard21OnlyRef> + <_netStandardLibraryRefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library', '$(NETStandardLibraryVersion)', 'build', 'netstandard2.1', 'ref'))</_netStandardLibraryRefPath> + <_netStandardLibrary20RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library', '$(NetStandardLibrary20Version)', 'build', 'netstandard2.0', 'ref'))</_netStandardLibrary20RefPath> + <_netStandard21OnlyRef>$(_netStandardLibraryRefPath)netstandard.dll</_netStandard21OnlyRef> <_netStandard21OnlyRef Condition="$(UpdateNETStandardBaselineLocally)">$(MSBuildThisFileDirectory)..\..\..\standard\artifacts\bin\ref\netstandard\Debug\netstandard.dll</_netStandard21OnlyRef> <_netStandard21BaselineModifer>--baseline</_netStandard21BaselineModifer> <_netStandard21BaselineModifer Condition="$(UpdateNETStandardBaseline) or $(UpdateNETStandardBaselineLocally)">></_netStandard21BaselineModifer> </PropertyGroup> - <PropertyGroup Condition="$(UpdateNETStandardBaseline)"> - </PropertyGroup> - <Exec Command="$(_ApiCompatCommand) "$(_netStandard21OnlyRef)" @"$(ApiCompatResponseFile)" $(_netStandard21BaselineModifer) "$(ApiCompatNSOnlyBaselineFile)"" CustomErrorRegularExpression="^[a-zA-Z]+ :" StandardOutputImportance="Low" @@ -89,8 +94,7 @@ <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing netstandard.dll to $(ApiCompatTarget)" /> - <!-- TODO: Once the repo targets netstandard2.1, have this instance of APICompat run against NetStandard21RefPath --> - <Exec Command="$(_ApiCompatCommand) "$(NetStandard20RefPath.TrimEnd('\/'))" --baseline "$(ApiCompatNSBaselineFile)" @"$(ApiCompatResponseFile)"" + <Exec Command="$(_ApiCompatCommand) "$(_netStandardLibrary20RefPath.TrimEnd('\/'))" --baseline "$(ApiCompatNSBaselineFile)" @"$(ApiCompatResponseFile)"" CustomErrorRegularExpression="^[a-zA-Z]+ :" StandardOutputImportance="Low" IgnoreExitCode="true"> @@ -100,8 +104,7 @@ <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing netstandard to $(ApiCompatTarget)" /> <PropertyGroup> - <PreviousNetCoreApp>netcoreapp3.1</PreviousNetCoreApp> - <PreviousNetCoreAppRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(PreviousNetCoreApp)'))</PreviousNetCoreAppRefPath> + <PreviousNetCoreAppRefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', '$(PreviousNetCoreAppPackageId)', '$(PreviousNetCoreAppPackageVersion)', 'ref', '$(PreviousNetCoreApp)'))</PreviousNetCoreAppRefPath> <_previousNetCoreAppBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.PreviousNetCoreApp.txt</_previousNetCoreAppBaselineFile> <_previousNetCoreAppBaselineParam>--baseline "$(_previousNetCoreAppBaselineFile)"</_previousNetCoreAppBaselineParam> <_previousNetCoreAppBaselineParam Condition="'$(UpdatePreviousNetCoreAppBaseline)' == 'true'">> "$(_previousNetCoreAppBaselineFile)"</_previousNetCoreAppBaselineParam> 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 @@ <Import Project="netfxreference.props" /> <PropertyGroup> - <IsNETCoreApp>true</IsNETCoreApp> + <IsNETCoreAppSrc>true</IsNETCoreAppSrc> + <IsNETCoreAppRef>true</IsNETCoreAppRef> <NuGetTargetMoniker Condition="'$(NuGetTargetMoniker)' == ''">$(TargetFramework)</NuGetTargetMoniker> </PropertyGroup> @@ -16,8 +17,10 @@ to reference the latest packages. netstandard.dll doesn't need to do this since it has no dangling dependencies --> <GenFacadesForceZeroVersionSeeds Condition="'$(MSBuildProjectName)' != 'netstandard'">true</GenFacadesForceZeroVersionSeeds> - <IncludeDefaultReferences>false</IncludeDefaultReferences> <HasMatchingContract>true</HasMatchingContract> + <NETFrameworkReferenceAssemblyTFM>net48</NETFrameworkReferenceAssemblyTFM> + <NetFxRefPath>$(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNetFrameworkReferenceAssembliesVersion)\build\.NETFramework\v4.8\</NetFxRefPath> + <NETStandard21RefPath>$(NuGetPackageRoot)netstandard.library\$(NETStandardLibraryVersion)\build\netstandard2.1\ref\</NETStandard21RefPath> </PropertyGroup> <ItemGroup Condition="'$(MSBuildProjectName)' == 'System.Runtime' or '$(MSBuildProjectName)' == 'mscorlib' or '$(MSBuildProjectName)' == 'netstandard'"> 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 @@ </PropertyGroup> <Import Condition="Exists('$(MSBuildProjectName).props')" Project="$(MSBuildProjectName).props" /> - <Import Project="..\Directory.Build.props" /> + <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> + </PropertyGroup> + + <!-- Download the .NET Framework RefPack to build against the contract. --> + <ItemGroup> + <PackageDownload Include="NETStandard.Library" + Condition="'$(MSBuildProjectName)' == 'netstandard'" + Version="[$(NETStandardLibraryVersion)]" /> + <PackageDownload Include="Microsoft.NETFramework.ReferenceAssemblies.$(NETFrameworkReferenceAssemblyTFM)" + Condition="'$(MSBuildProjectName)' != 'netstandard'" + Version="[$(MicrosoftNetFrameworkReferenceAssembliesVersion)]" /> + <!-- System.Data.SqlClient is not live built anymore, reference it manually. --> + <PackageReference Include="System.Data.SqlClient" + Version="$(SystemDataSqlClientVersion)" /> + </ItemGroup> + <ItemGroup> <!-- reference everything but self --> <!-- Type duplicated in Microsoft.Extensions.DependencyModel. Exclude it for now: https://github.com/dotnet/runtime/issues/34420 --> <ReferencePath - Include="$(RefPath)*.dll" - Exclude="$(RefPath)$(MSBuildProjectName).dll;$(RefPath)netstandard.dll;$(RefPath)Microsoft.Extensions.DependencyModel.dll" /> + Include="$(NetCoreAppCurrentRefPath)*.dll" + Exclude="$(NetCoreAppCurrentRefPath)$(MSBuildProjectName).dll; + $(NetCoreAppCurrentRefPath)netstandard.dll; + $(NetCoreAppCurrentRefPath)Microsoft.Extensions.DependencyModel.dll" /> <!-- required by compiler to resolve core types --> - <ProjectReference Condition="'$(MSBuildProjectName)' != 'netstandard'" - Include="netstandard.csproj" /> + <ProjectReference Include="netstandard.csproj" + Condition="'$(MSBuildProjectName)' != 'netstandard'" + SkipUseReferenceAssembly="true" /> </ItemGroup> - - <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> - </PropertyGroup> </Project> 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 @@ </PropertyGroup> <ItemGroup> - <ReferencePath Include="$(RuntimePath)System.*.dll;$(RuntimePath)Microsoft.Win32.*.dll;$(RuntimePath)netstandard.dll" - Exclude="$(RuntimePath)$(MSBuildProjectName).dll" /> + <ReferencePath Include="$(NetCoreAppCurrentRuntimePath)System.*.dll; + $(NetCoreAppCurrentRuntimePath)Microsoft.Win32.*.dll; + $(NetCoreAppCurrentRuntimePath)netstandard.dll" + Exclude="$(NetCoreAppCurrentRuntimePath)$(MSBuildProjectName).dll" /> <ProjectReference Include="$(CoreLibProject)" /> </ItemGroup> </Project> 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 @@ <Compile Include="System.Data.forwards.cs" /> </ItemGroup> <ItemGroup> - <!-- System.Data.SqlClient is not live built anymore, make sure to use reference assembly for it --> - <ReferencePath Remove="$(RuntimePath)\System.Data.SqlClient.dll" /> - <ReferencePath Include="$(ArtifactsBinDir)ref\$(NetCoreAppCurrent)\System.Data.SqlClient.dll" /> + <!-- System.Data.SqlClient is not live built anymore, reference it manually. --> + <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" /> </ItemGroup> </Project> 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 @@ <PropertyGroup> <TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties> - <NativeBinPlaceDependsOnTargets Condition="'$(TargetOS)' == 'Browser'">BuildWasmRuntimes</NativeBinPlaceDependsOnTargets> </PropertyGroup> <ItemGroup> - <NativeBinPlaceProject Include="Native\native-binplace.proj" /> + <_allSrc Include="$(MSBuildThisFileDirectory)*\src\*.csproj" + Exclude="@(ProjectExclusions)" /> + <NonNetCoreAppProject Include="@(_allSrc)" + Exclude="@(NetCoreAppLibrary->'%(Identity)\src\%(Identity).csproj')" /> + <NetCoreAppProject Include="$(CoreLibProject); + @(_allSrc); + $(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\src\Microsoft.VisualBasic.Core.vbproj; + $(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" + Exclude="@(NonNetCoreAppProject)" /> <ManualShimProject Include="shims\manual\*.csproj" /> <ApiCompatProject Include="shims\ApiCompat.proj" - Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" /> - </ItemGroup> - - <!-- Restore only and build before/after. --> - <ItemGroup Condition="'$(MSBuildRestoreSessionId)' != ''"> - <ProjectReference Include="@(NativeBinPlaceProject)" /> - <ProjectReference Include="@(ManualShimProject)" /> - <ProjectReference Include="@(ApiCompatProject)" /> + Condition="'$(DotNetBuildFromSource)' != 'true' and + '$(BuildingNETCoreAppVertical)' == 'true' and + '$(RunApiCompat)' != 'false'" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.csproj" Exclude="@(ProjectExclusions)" /> - <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.ilproj" Exclude="@(ProjectExclusions)" /> - <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.vbproj" Exclude="@(ProjectExclusions)" /> - </ItemGroup> + <ProjectReference Include="@(NetCoreAppProject)" /> - <Import Condition="'$(TargetOS)' == 'Browser'" Project="$(MonoProjectRoot)wasm\wasm.targets" /> + <!-- Restore only and build before/after. --> + <ProjectReference Include="@(NonNetCoreAppProject); + @(ManualShimProject); + @(ApiCompatProject)" + Condition="'$(MSBuildRestoreSessionId)' != ''" /> + </ItemGroup> - <Target Name="NativeBinPlace" - AfterTargets="Build" - DependsOnTargets="$(NativeBinPlaceDependsOnTargets)"> + <Target Name="BuildNonNetCoreAppProjects" + AfterTargets="Build"> <MSBuild Targets="Build" - Projects="@(NativeBinPlaceProject)" + BuildInParallel="true" + Projects="@(NonNetCoreAppProject)" Properties="$(TraversalGlobalProperties)" /> </Target> + <Import Condition="'$(TargetOS)' == 'Browser'" Project="$(MonoProjectRoot)wasm\wasm.targets" /> + <Target Name="BuildManualShims" - AfterTargets="Build"> + AfterTargets="BuildNonNetCoreAppProjects" + Condition="'@(ManualShimProject)' != ''"> <MSBuild Targets="Build" Projects="@(ManualShimProject)" Properties="$(TraversalGlobalProperties)" /> 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 @@ <Project> - <UsingTask TaskName="PInvokeTableGenerator" - AssemblyFile="$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish', 'WasmAppBuilder.dll'))"/> - - <PropertyGroup> - <WasmPInvokeTablePath>$(ArtifactsObjDir)wasm/pinvoke-table.h</WasmPInvokeTablePath> - </PropertyGroup> - - <ItemGroup> - <PackageReference Include="$(MicrosoftNETCoreRuntimeICUTransportPackage)" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" /> - - <WasmPInvokeModules Include="libSystem.Native"/> - <WasmPInvokeModules Include="libSystem.IO.Compression.Native"/> - <WasmPInvokeModules Include="libSystem.Globalization.Native"/> - <WasmPInvokeAssemblies Include="$(MonoArtifactsPath)\System.Private.CoreLib.dll"/> - <WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Runtime\$(NetCoreAppCurrent)-$(Configuration)\System.Runtime.dll"/> - <WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Console\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.Console.dll"/> - <WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.IO.FileSystem\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.IO.FileSystem.dll"/> - <WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.IO.MemoryMappedFiles\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.IO.MemoryMappedFiles.dll"/> - <WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Net.Sockets\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.Net.Sockets.dll"/> - <WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Net.Primitives\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.Net.Primitives.dll"/> - <WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.Security.Cryptography.Algorithms\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.Security.Cryptography.Algorithms.dll"/> - <WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.IO.Compression\$(NetCoreAppCurrent)-Browser-$(Configuration)\System.IO.Compression.dll"/> - <!--<WasmPInvokeAssemblies Include="$(ArtifactsBinDir)\System.IO.Compression.Brotli\$(NetCoreAppCurrent)-Unix-$(Configuration)\System.IO.Compression.Brotli.dll"/>--> - </ItemGroup> - <Target Name="CheckEnv"> <Error Condition="'$(TargetArchitecture)' != 'wasm'" Text="Expected TargetArchitecture==wasm, got '$(TargetArchitecture)'"/> <Error Condition="'$(TargetOS)' != 'Browser'" Text="Expected TargetOS==Browser, got '$(TargetOS)'"/> <Error Condition="'$(EMSDK_PATH)' == ''" Text="The EMSDK_PATH environment variable should be set pointing to the emscripten SDK root dir."/> </Target> + <ItemGroup> + <PackageReference Include="$(MicrosoftNETCoreRuntimeICUTransportPackage)" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" /> + </ItemGroup> + + <UsingTask TaskName="PInvokeTableGenerator" AssemblyFile="$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish', 'WasmAppBuilder.dll'))"/> <Target Name="BuildPInvokeTable" DependsOnTargets="CheckEnv"> + <PropertyGroup> + <WasmPInvokeTablePath>$(ArtifactsObjDir)wasm\pinvoke-table.h</WasmPInvokeTablePath> + </PropertyGroup> + + <ItemGroup> + <WasmPInvokeModule Include="libSystem.Native" /> + <WasmPInvokeModule Include="libSystem.IO.Compression.Native" /> + <WasmPInvokeModule Include="libSystem.Globalization.Native" /> + <!-- Include CoreLib via the CollectedBuildOutput as it isn't binplaced into the runtime pack at this time. --> + <WasmPInvokeAssembly Include="@(CollectedBuildOutput)" + Condition="'%(CollectedBuildOutput.MSBuildSourceProjectFile)' == '$(CoreLibProject)'" /> + <WasmPInvokeAssembly Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" /> + </ItemGroup> + <MakeDir Directories="$(ArtifactsObjDir)wasm"/> - <PInvokeTableGenerator - Modules="@(WasmPInvokeModules)" - Assemblies="@(WasmPInvokeAssemblies)" - OutputPath="$(WasmPInvokeTablePath)" - /> + <PInvokeTableGenerator Modules="@(WasmPInvokeModule)" + Assemblies="@(WasmPInvokeAssembly)" + OutputPath="$(WasmPInvokeTablePath)" /> </Target> <Target Name="BuildWasmRuntimes" + AfterTargets="Build" DependsOnTargets="BuildPInvokeTable"> - <Exec Command="make -C $(MonoProjectRoot)wasm all SHELL=/bin/bash BINDIR=$(ArtifactsBinDir) MONO_BIN_DIR=$(MonoArtifactsPath) OBJDIR=$(ArtifactsObjDir) BUILDS_BIN_DIR=$(NativeBinDir) NATIVE_DIR=$(ArtifactsObjDir)/native/$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) CONFIG=$(Configuration) PINVOKE_TABLE=$(WasmPInvokeTablePath) ICU_LIBDIR=$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/browser-wasm/native/lib" IgnoreStandardErrorWarningFormat="true"/> + <Exec Command="make -C $(MonoProjectRoot)wasm all SHELL=/bin/bash BINDIR=$(ArtifactsBinDir) MONO_BIN_DIR=$(MonoArtifactsPath) OBJDIR=$(ArtifactsObjDir) BUILDS_BIN_DIR=$(NativeBinDir) NATIVE_DIR=$(ArtifactsObjDir)/native/$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) CONFIG=$(Configuration) PINVOKE_TABLE=$(WasmPInvokeTablePath) ICU_LIBDIR=$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/browser-wasm/native/lib" + IgnoreStandardErrorWarningFormat="true" /> + + <Copy SourceFiles="$(NativeBinDir)dotnet.js; + $(NativeBinDir)dotnet.wasm; + $(NativeBinDir)dotnet.timezones.blat; + $(NativeBinDir)icudt.dat" + DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)" + SkipUnchangedFiles="true" /> </Target> </Project> 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 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFrameworks>netstandard2.0</TargetFrameworks> - <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net46</TargetFrameworks> + <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <IsShipping>false</IsShipping> </PropertyGroup> |