- 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)"
<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.
<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>
<!-- 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>
- 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
## 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]`
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.
## 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
## 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.
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`)
--- /dev/null
+<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
<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>
<NETCoreAppFramework>$(NetCoreAppCurrent)</NETCoreAppFramework>
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
-
- <NetFrameworkCurrent>net472</NetFrameworkCurrent>
<MinimiumSupportedWindowsPlatform>WINDOWS7.0</MinimiumSupportedWindowsPlatform>
</PropertyGroup>
<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>
<!-- 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." />
</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>
<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>
<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>
<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>
<!-- 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>
<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>
<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>
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."
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."
<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>
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'))
archType: ''
osSubgroup: ''
crossrootfsDir: ''
- framework: ''
+ framework: 'net5.0'
isOfficialAllConfigurations: false
isSourceBuild: false
liveRuntimeBuildConfig: ''
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) }}
osSubgroup: ''
archType: ''
crossrootfsDir: ''
- framework: ''
+ framework: 'net5.0'
isOfficialBuild: false
isOfficialAllConfigurations: false
runtimeVariant: ''
- ${{ 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
# 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
- ${{ 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
# 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
- 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
jobParameters:
isOfficialBuild: ${{ variables['isOfficialBuild'] }}
isFullMatrix: ${{ variables['isFullMatrix'] }}
- framework: net472
+ framework: net48
runTests: true
testScope: outerloop
\ No newline at end of file
osGroup: ''
osSubgroup: ''
archType: ''
- framework: ''
+ framework: 'net5.0'
isOfficialBuild: false
liveRuntimeBuildConfig: ''
runtimeFlavor: 'coreclr'
- ${{ 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)) }}:
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
jobParameters:
isFullMatrix: ${{ variables.isFullMatrix }}
- framework: net472
+ framework: net48
runTests: true
testScope: innerloop
condition: >-
<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>
+++ /dev/null
-<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>
<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>
<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>
<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
<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>
--- /dev/null
+<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
<!-- 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>
: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
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
- <developmentMode developerInstallation="true" />
<UseRandomizedStringHashAlgorithm enabled="1" />
</runtime>
</configuration>
\ No newline at end of file
<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
.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>
<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
</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>
<RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
<SelfContained>true</SelfContained>
- <EnableTargetingPackDownload>false</EnableTargetingPackDownload>
- <PlatformManifestFile />
</PropertyGroup>
<!-- Provide runtime options to Mono (interpreter, aot, debugging, etc) -->
<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>
<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>
<!-- 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. -->
<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>
"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",
<_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>
#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)
{
{
Asserter.TestRan = true;
}
-#elif NET472
+#elif NETFRAMEWORK
[ConditionalFact]
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
public void ThisTestMustRunOnCLR()
{
Asserter.TestRan = true;
}
-#elif NET472
+#elif NETFRAMEWORK
[ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
[MemberData(nameof(GetInts))]
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" />
<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>
<SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
</PropertyGroup>
<Import Project="..\..\Directory.Build.props" />
+ <Import Project="NetCoreAppLibrary.props" />
<PropertyGroup Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">
<IsAspNetCoreApp>true</IsAspNetCoreApp>
<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>
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 -->
<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>
<!--
<!-- 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>
<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.
-->
<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>
<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>
<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 -->
<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>
<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>
<Project InitialTargets="UpdateProjectReferencesWithAttributes">
- <PropertyGroup>
- <RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)'))</RefPath>
- </PropertyGroup>
<Import Project="..\..\Directory.Build.targets" />
<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>
<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)" />
<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'" />
<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" />
'$(Configuration)' != '$(CoreCLRConfiguration)'">Configuration=$(CoreCLRConfiguration)</SetConfiguration>
<SetConfiguration Condition="'$(RuntimeFlavor)' == 'Mono' and
'$(Configuration)' != '$(MonoConfiguration)'">Configuration=$(MonoConfiguration)</SetConfiguration>
+ <Private>false</Private>
</ProjectReference>
</ItemGroup>
</Target>
<!-- 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>
<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')">
<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 -->
</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.-->
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<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>
<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'"
<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
<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>
<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>
<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>
</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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Microsoft.Extensions.Caching.Abstractions.cs" />
<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>
-<!-- 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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
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>
<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>
<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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
</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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
</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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
</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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Moq" Version="$(MoqVersion)" />
+ <ProjectReference Include="..\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
</ItemGroup>
</Project>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
</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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
</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>
<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>
<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>
<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>
<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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
</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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<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>
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>
<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>
<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>
</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" />
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>
<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>
</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"/>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
</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>
// 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;
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
using Xunit;
-using AbstractionsSR = DIAbstractions::System.SR;
-
namespace Microsoft.Extensions.DependencyInjection
{
public class ServiceCollectionServiceExtensionsTest
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]
<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>
<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>
</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>
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]
<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>
--- /dev/null
+// 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
+ {
+ }
+}
--- /dev/null
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFrameworks>netstandard2.0</TargetFrameworks>
+ <EnableDefaultItems>true</EnableDefaultItems>
+ </PropertyGroup>
+
+</Project>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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" />
</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>
<PropertyGroup>
<RootNamespace>Microsoft.Extensions.FileProviders.Physical</RootNamespace>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Moq" Version="$(MoqVersion)" />
- <ReferenceFromRuntime Include="Microsoft.Extensions.FileProviders.Physical" />
+ <ProjectReference Include="..\src\Microsoft.Extensions.FileProviders.Physical.csproj" SkipUseReferenceAssembly="true" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Microsoft.Extensions.FileSystemGlobbing.cs" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
- <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
+ <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<OutputType>Exe</OutputType>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<OutputType>Exe</OutputType>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<OutputType>Exe</OutputType>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<OutputType>Exe</OutputType>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<OutputType>Exe</OutputType>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<OutputType>Exe</OutputType>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
<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>
<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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
<ProjectReference Include="..\TestApp\Microsoft.Extensions.Hosting.TestApp.csproj" />
</ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+ <Reference Include="System.Net.Http" />
+ </ItemGroup>
+
</Project>
<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
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
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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
<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>
<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>
<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"
</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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Microsoft.Extensions.Logging.Abstractions.cs" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
- <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
+ <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
Link="Common\src\Extensions\Logging\NullScope.cs" />
</ItemGroup>
- <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
- <Reference Include="mscorlib" />
- <Reference Include="System.Core" />
- </ItemGroup>
-
</Project>
<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>
<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>
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>
<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>
<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" />
</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>
<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
<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>
<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" />
</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>
<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>
<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" />
</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>
<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>
<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>
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>
<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>
<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>
<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>
<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>
<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>
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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
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>
// 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;
{
public class TraceSourceScopeTest
{
-#if NET472
+#if NETFRAMEWORK
[Fact]
public static void DiagnosticsScope_PushesAndPops_LogicalOperationStack()
{
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
</PropertyGroup>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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" />
<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>
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>false</IsNETCoreApp>
</PropertyGroup>
</Project>
<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>
<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\" />
<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
<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" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyAttributes.cs" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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" />
<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. -->
<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
<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
<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
<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. -->
<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" />
<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>
<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" />
<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>
<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"
<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
<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. -->
<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
<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>
<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" />
<Reference Include="System.Threading" />
<Reference Include="System.Threading.Thread" />
</ItemGroup>
- <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp2.0'))">
- <Reference Include="System.ComponentModel.TypeConverter" />
- </ItemGroup>
</Project>
<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"
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\src\Microsoft.Win32.SystemEvents.csproj" />
+ </ItemGroup>
</Project>
</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
-<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>
<_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
<_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>
<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" />
<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>
--- /dev/null
+<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.AppContext</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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>
<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>
<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
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<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>
</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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
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>
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>
<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>
<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
<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. -->
<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" />
<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>
<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" />
</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" />
<Compile Include="ImmutableSortedSetBuilderTest.nonnetstandard.cs" />
<Compile Include="ImmutableSortedDictionaryTest.nonnetstandard.cs" />
</ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+ <ProjectReference Include="..\src\System.Collections.Immutable.csproj" />
+ </ItemGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <RootNamespace>System.Collections.Specialized</RootNamespace>
- <AssemblyName>System.Collections.Specialized</AssemblyName>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Collections</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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" />
<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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.ComponentModel.Composition.Registration</AssemblyName>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
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>
<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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0;_net461</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<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>
<Reference Include="System.Threading.Thread" />
<Reference Include="System.Text.Encoding.Extensions" />
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
<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
<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"
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <RootNamespace>System.ComponentModel.EventBasedAsync</RootNamespace>
- <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <RootNamespace>System.ComponentModel.Primitives</RootNamespace>
- <AssemblyName>System.ComponentModel.Primitives</AssemblyName>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <RootNamespace>System.ComponentModel</RootNamespace>
- <AssemblyName>System.ComponentModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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" />
<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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="SharingBoundaryAttributeTests.cs" />
<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
<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" />
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
<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" />
<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
<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" />
<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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="System\Composition\Hosting\Core\CompositionDependencyTests.cs" />
<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
<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" />
<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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="System\Composition\Hosting\Core\CompositionContractTests.cs" />
<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
<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" />
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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="ContainerConfigurationTests.cs" />
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
<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" />
<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
<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" />
<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
<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
<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>
<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
<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>
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>
<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"
<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>
[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));
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Data.Common</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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>
<!-- 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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Data.DataSetExtensions</AssemblyName>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
</PropertyGroup>
<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>
<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
<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. -->
<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" />
<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" />
<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>
// 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;
<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" />
<ItemGroup Condition="'$(TargetsWindows)' != 'true'">
<Compile Include="ConnectionStrings.Unix.cs" />
</ItemGroup>
+ <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))">
+ <ProjectReference Include="..\src\System.Data.Odbc.csproj" />
+ </ItemGroup>
</Project>
<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. -->
<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'))">
<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. -->
<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>
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Diagnostics.Contracts</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Diagnostics.Debug</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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" />
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
</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
<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>
<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)'">
</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" />
</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
<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" />
<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
<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>
</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
<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>
<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" />
<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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="EventInstanceTests.cs" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetExt>.dll</TargetExt>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<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. -->
<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
<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>
<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" />
<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
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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" />
<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" />
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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Diagnostics.StackTrace</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<Nullable>enable</Nullable>
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Diagnostics.Tools</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Diagnostics.Tracing</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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>
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" />
<Reference Include="System.Threading.Thread" />
<Reference Include="System.Xml.ReaderWriter" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
- <Reference Include="System.ComponentModel.TypeConverter" />
- </ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="ComputerPrincipalTest.cs" />
<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
<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. -->
</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" />
<Reference Include="System.Threading.Tasks.Extensions" />
<Reference Include="System.Xml.ReaderWriter" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
- <Reference Include="System.ComponentModel.Primitives" />
- </ItemGroup>
</Project>
<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" />
<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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0;_$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.DirectoryServices.cs" />
<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. -->
<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" />
<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" />
<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>
<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" />
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<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>
<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">
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Asn1TagTests.cs" />
<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>
<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>
<Compile Include="CborRoundtripTests.cs" />
<Compile Include="CoseKeyHelpers.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\src\System.Formats.Cbor.csproj" />
+ </ItemGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Globalization.Calendars</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Globalization</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>ECMA</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>ECMA</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.IO.Compression.ZipFile</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>ECMA</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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
<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. -->
<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" />
<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. -->
<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>
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.IO.FileSystem.Primitives</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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>
<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
<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. -->
<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" />
<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
<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
<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>
<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>
<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>
<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" />
<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" />
<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
<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
<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>
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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'">
<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>
<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>
<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
<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>
<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>
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.IO.UnmanagedMemoryStream</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.IO</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
- <DefaultReferenceExclusions Include="System.Linq.Expressions" />
- <ReferenceFromRuntime Include="System.Linq.Expressions" />
- </ItemGroup>
- <ItemGroup>
<AssembliesBeingTested Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit.extensibility.execution" Version="$(XUnitVersion)" />
+ <ProjectReference Include="..\src\System.Linq.Expressions.csproj" SkipUseReferenceAssembly="true" />
</ItemGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Linq.Parallel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Linq.Queryable</AssemblyName>
- <RootNamespace>System.Linq.Queryable</RootNamespace>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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" />
<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. -->
<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" />
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <IncludePartialFacadeTests>true</IncludePartialFacadeTests>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.Text.Json\ref\System.Text.Json.csproj" />
</ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+ <Reference Include="System.Net.Http" />
+ </ItemGroup>
</Project>
<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" />
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="HttpClientJsonExtensionsTests.cs" />
<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>
<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>
<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>
<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
<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>
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>
<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>
<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
<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"
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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" />
<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>
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
</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"
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<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" />
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
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" />
<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>
<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
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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" />
<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" />
</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"
</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"
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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" />
<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" />
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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
</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"
</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" />
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<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 -->
<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" />
<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>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" />
+ <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
</ItemGroup>
</Project>
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
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" />
<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" />
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Net.WebHeaderCollection</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
</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"
<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
<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>
</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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketCreateTest.cs"
Link="Common\System\Net\HttpKnownHeaderNames.cs" />
<Compile Include="WebSocketProtocolTests.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\src\System.Net.WebSockets.WebSocketProtocol.csproj" />
+ </ItemGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Net.WebSockets</AssemblyName>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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
<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. -->
<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
<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" />
</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 -->
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.ObjectModel</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
- <IsNETCoreAppRef>false</IsNETCoreAppRef>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Private.Uri</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)</TargetFrameworks>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
- <IsNETCoreAppRef>false</IsNETCoreAppRef>
</PropertyGroup>
</Project>
\ No newline at end of file
<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"
<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" />
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
- <IsNETCoreAppRef>false</IsNETCoreAppRef>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Private.Xml</AssemblyName>
<RootNamespace>System.Xml</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);FEATURE_COMPILED_XSL</DefineConstants>
<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
<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
<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. -->
<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
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\src\System.Reflection.Context.csproj" />
+ </ItemGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Reflection.Emit.ILGeneration</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Reflection.Emit.Lightweight</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Reflection.Extensions</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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" />
<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>
<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" />
<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>
<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"
</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
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<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>
<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" />
<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>
<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>
<Compile Include="src\TestUtils\TestUtils.JittedRuntimes.cs" />
<Compile Include="src\TestUtils\TypeWrapper.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\src\System.Reflection.MetadataLoadContext.csproj" />
+ </ItemGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Reflection.Primitives</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Reflection.TypeExtensions</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<Nullable>enable</Nullable>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Reflection</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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" />
<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" />
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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461</TargetFrameworks>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
</PropertyGroup>
<ItemGroup>
</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 -->
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Resources.Reader</AssemblyName>
<RootNamespace>System.Resources</RootNamespace>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Resources.ResourceManager</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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" />
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.
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <AssemblyName>System.Resources.Writer</AssemblyName>
<RootNamespace>System.Resources</RootNamespace>
<Nullable>enable</Nullable>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<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" />
<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
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<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
<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
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Runtime.CompilerServices.VisualC</AssemblyName>
<Nullable>enable</Nullable>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Runtime.Handles</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Runtime.InteropServices.JavaScript</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Runtime.InteropServices</AssemblyName>
- <OutputType>Library</OutputType>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<Nullable>enable</Nullable>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
- <IsNETCoreApp>true</IsNETCoreApp>
<StrongNameKeyId>Open</StrongNameKeyId>
</PropertyGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Runtime.Loader</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>System.Numerics</RootNamespace>
- <AssemblyName>System.Runtime.Numerics</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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. -->
</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>
public partial class FormatterServicesTests
{
[Fact]
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/39704", TestRuntimes.Mono)]
public void GetUninitializedObject_COMObject_ThrowsNotSupportedException()
{
Type comObjectType = typeof(COMObject);
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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
<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
<Compile Include="SerializationTestTypes\SampleTypes.cs" />
<Compile Include="SerializationTestTypes\SelfRefAndCycles.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="$(LibrariesProjectRoot)System.CodeDom\src\System.CodeDom.csproj" />
+ </ItemGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Runtime</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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>
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
<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
<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. -->
<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
<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. -->
<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" />
<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>
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Security.Claims</AssemblyName>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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
<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. -->
<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" />
<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. -->
<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" />
<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>
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
- <IsNETCoreAppRef>false</IsNETCoreAppRef>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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>
<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>
<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" />
</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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <UnsupportedPlatforms>Windows_NT</UnsupportedPlatforms>
<TargetFrameworks>$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
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>
<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>
<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" />
<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'" />
<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" />
<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>
}
[Theory]
-#if !NET472
+#if !NETFRAMEWORK
[InlineData(true)]
#endif
[InlineData(false)]
if (useSpan)
{
-#if !NET472
+#if !NETFRAMEWORK
Assert.ThrowsAny<CryptographicException>(() => cms.Decode(ReadOnlySpan<byte>.Empty));
#else
throw new Xunit.Sdk.XunitException(
[Theory]
[InlineData(false)]
-#if !NET472
+#if !NETFRAMEWORK
[InlineData(true)]
#endif
public static void ContentInfoGetContentTypeUnknown(bool fromSpan)
if (fromSpan)
{
-#if NET472
+#if NETFRAMEWORK
throw new Xunit.Sdk.XunitException(
"This test should not evaluate for .NET Framework, the API is missing.");
#else
[Theory]
[InlineData(false)]
-#if !NET472
+#if !NETFRAMEWORK
[InlineData(true)]
#endif
public static void TestContent(bool fromSpan)
if (fromSpan)
{
-#if !NET472
+#if !NETFRAMEWORK
cms.Decode(encodedMessage.AsSpan());
#else
throw new Xunit.Sdk.XunitException(
public static class SignedCmsWholeDocumentTests
{
[Theory]
-#if !NET472
+#if !NETFRAMEWORK
[InlineData(true)]
#endif
[InlineData(false)]
SignedCms cms = new SignedCms();
if (fromSpan)
{
-#if !NET472
+#if !NETFRAMEWORK
cms.Decode(SignedDocuments.RsaPssDocument.AsSpan());
#else
throw new Xunit.Sdk.XunitException(
<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"
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Security.Cryptography.Primitives</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<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. -->
<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
<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. -->
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
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
</PropertyGroup>
</Project>
\ No newline at end of file
<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'" />
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>
<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>
<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>
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<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
<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>
<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" />
<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" />
<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
<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')))">
<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" />
<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" />
<Reference Include="System.Text.RegularExpressions" />
<Reference Include="System.Threading" />
<Reference Include="System.Threading.Thread" />
- <Reference Include="System.Windows.Extensions" />
</ItemGroup>
</Project>
<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>
<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
<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
<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. -->
<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" />
<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. -->
<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" />
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Security.Principal</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<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>
<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" />
<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
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461-Windows_NT</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="BasicScenarioTests.cs" />
<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
<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. -->
<Compile Include="System.ServiceProcess.ServiceController.cs" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
- <Reference Include="mscorlib" />
- <Reference Include="System" />
<Reference Include="System.ServiceProcess" />
</ItemGroup>
<ItemGroup>
<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>
<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" />
<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>
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputType>Exe</OutputType>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<Nullable>annotations</Nullable>
</PropertyGroup>
<ItemGroup>
<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
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<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" />
<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" />
<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>
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Text.Encoding.Extensions</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Text.Encoding</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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 -->
<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
<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>
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
<UnicodeUcdVersion>13.0</UnicodeUcdVersion>
</PropertyGroup>
<ItemGroup>
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
}
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; }
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; } }
<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
<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). -->
<!-- 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" />
<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>
<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. -->
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Text.RegularExpressions</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<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" />
<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. -->
<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" />
<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>
<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>
<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"
<Compile Include="SemaphoreAclTests.cs" />
<Compile Include="ThreadingAclExtensionsTests.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\src\System.Threading.AccessControl.csproj" />
+ </ItemGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<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>
<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" />
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="BoundedChannelTests.cs" />
<Compile Include="ChannelClosedExceptionTests.netcoreapp.cs" />
<Compile Include="ChannelTestBase.netcoreapp.cs" />
</ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+ <ProjectReference Include="..\src\System.Threading.Channels.csproj" />
+ </ItemGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
<IsWindowsSpecific>true</IsWindowsSpecific>
</PropertyGroup>
</Project>
\ No newline at end of file
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<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. -->
<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>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Compile Include="Dataflow\ActionBlockTests.cs" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Threading.Tasks</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Threading.Thread</AssemblyName>
- <OutputType>Library</OutputType>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Threading.ThreadPool</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Threading.Timer</AssemblyName>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <AssemblyName>System.Threading</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <OutputType>Library</OutputType>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<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" />
<Reference Include="System.Threading.Thread" />
<Reference Include="System.Threading.ThreadPool" />
</ItemGroup>
- <ItemGroup>
- <Compile Include="System\Transactions\TransactionsEtwProvider.cs" />
- </ItemGroup>
</Project>
// 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))]
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; }
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>
<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" />
<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
<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>
<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"
<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" />
<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>
<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" />
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<!-- 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>
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Open</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<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'">
<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" />
<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" />
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>
\ No newline at end of file
<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
"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"
}
},
<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>
<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)' != ''" />
<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)"
</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" />
<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>
-<Project TreatAsLocalProperty="AdditionalBuildTargetFrameworks">
+<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<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
<PropertyGroup>
<PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
</PropertyGroup>
-
- <Import Project="$(MSBuildThisFileDirectory)\runtime\referenceFromRuntime.targets" Condition="'$(TargetFramework)' == 'netcoreapp3.0' and '$(TargetFrameworkSuffix)' == 'Windows_NT'"/>
</Project>
+++ /dev/null
-<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>
+++ /dev/null
-<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>
+++ /dev/null
-<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>
+++ /dev/null
-<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>
+++ /dev/null
-<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>
+++ /dev/null
-<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
<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'">
<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'"
<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>
<!-- 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>
<!-- 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">
<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)" />
<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>
<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. -->
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>
<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)" />
<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>
<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>
<!-- 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>
<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)" />
<!--
<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"
<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">
<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>
<Import Project="netfxreference.props" />
<PropertyGroup>
- <IsNETCoreApp>true</IsNETCoreApp>
+ <IsNETCoreAppSrc>true</IsNETCoreAppSrc>
+ <IsNETCoreAppRef>true</IsNETCoreAppRef>
<NuGetTargetMoniker Condition="'$(NuGetTargetMoniker)' == ''">$(TargetFramework)</NuGetTargetMoniker>
</PropertyGroup>
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'">
</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>
</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>
<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>
<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)" />
<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>
<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>
projects / platform / upstream / dotnet / runtime.git / commitdiff