зеркало из https://github.com/CryptoPro/runtime.git
Remove depprojs in favor of PackageReferences (#35606)
- Remove depprojs which currently binplace external references into the RefPath folders in favor of PackageReference and PackageDownload items.
- Build all configurations by default when building an individual project (either on the CLI or inside VS) same as with the official SDK. This enables .NETFramework Test Explorer support.
- Centrally define libraries that compose the shared framework instead of in each Directory.Build.props file to be able to build the targeting pack first and consume it in the OOB libraries.
- Use ProjectReferences to reference OOB projects. Compile against the reference assembly but use the implementation assembly app-local during runtime.
- Remove OOBs from the testhost and remove the testhost folder for .NETFramework as it isn't required anymore.
- Only binplace for $(NetCoreAppCurrent) to compose a) the targeting pack, b) the runtime pack, c) the testhost, d) a full closure for the shims.
- Use Targeting Packs for OOB projects (with their implicit assembly references) but still explicitly define granular references for .NETCoreApp configurations (DisableImplicitAssemblyReferences switch). Use the implicit targeting pack references in some Microsoft.Extensions.* cases.
- Remove placeholder configurations as they aren't needed anymore with explicit P2Ps vs Targeting Pack references.
- Remove implicit assembly references (ie for .NETFramework, mscorlib)
- Remove AssemblySearchPath hacks that were introduced with b7c4cb7 as the targeting pack is now used by default.
- Reduce unnecessary .NETFramework configurations that were added to run tests in favor of the already existing ref&src configurations.
- Stop hardcoding the paths for wasm assemblies and use the returned TargetPath of the ProjectReferences.
- Addressed formatting (ItemGroups, References at the bottom of the project file, ordering of references, use LibrariesProjectRoot instead of a relative path, unnecessary AssemblyName and RootNamespace properties which are identical to the project name, ordering of tfms)
- Revert "fix clean (#33758)"
This commit is contained in:
Viktor Hofer
GitHub
Родитель
e8c4169b4f
Коммит
809a06f451
|
|
@ -1,5 +1,9 @@
|
|||
<Project Sdk="Microsoft.Build.Traversal">
|
||||
|
||||
<PropertyGroup>
|
||||
<TraversalGlobalProperties>BuildTargetFramework=$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))</TraversalGlobalProperties>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Subsets are already imported by Directory.Build.props.
|
||||
Reference the projects for traversal build. Ordering matters here.
|
||||
|
|
@ -35,7 +39,7 @@
|
|||
|
||||
<Target Name="RestoreWithoutStaticGraph"
|
||||
BeforeTargets="Restore">
|
||||
<MSBuild Projects="@(LibrariesRestoreProject);@(DepprojProjectToBuild);@(PkgprojProjectToBuild);@(BundleProjectToBuild)"
|
||||
<MSBuild Projects="@(DepprojProjectToBuild);@(PkgprojProjectToBuild);@(BundleProjectToBuild)"
|
||||
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid());RestoreUseStaticGraphEvaluation=false"
|
||||
Targets="Restore" />
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<!-- Installer specific, required during restore. -->
|
||||
<InstallerTasksOutputPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'installer.tasks'))</InstallerTasksOutputPath>
|
||||
<InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'netstandard2.0', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
|
||||
<InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net46', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
|
||||
<InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net461', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
|
||||
|
||||
<DocsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))</DocsDir>
|
||||
<ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))</ManPagesDir>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@ once before you can iterate and work on a given library project.
|
|||
- Setup tools (currently done in restore in build.cmd/sh)
|
||||
- Restore external dependencies
|
||||
- CoreCLR - Copy to `bin\runtime\$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)`
|
||||
- Netstandard Library - Copy to `bin\ref\netstandard2.0`
|
||||
- NetFx targeting pack - Copy to `bin\ref\net472`
|
||||
- Build targeting pack
|
||||
- Build src\libraries\ref.proj which builds all references assembly projects. For reference assembly project information see [ref](#ref)
|
||||
- Build product
|
||||
|
|
@ -28,7 +26,7 @@ Below is a list of all the various options we pivot the project builds on:
|
|||
## Individual build properties
|
||||
The following are the properties associated with each build pivot
|
||||
|
||||
- `$(BuildTargetFramework) -> netstandard2.1 | net5.0 | net472`
|
||||
- `$(BuildTargetFramework) -> Any .NETCoreApp, .NETStandard or .NETFramework TFM, e.g. net5.0`
|
||||
- `$(TargetOS) -> Windows | Linux | OSX | FreeBSD | [defaults to running OS when empty]`
|
||||
- `$(Configuration) -> Release | [defaults to Debug when empty]`
|
||||
- `$(TargetArchitecture) - x86 | x64 | arm | arm64 | [defaults to x64 when empty]`
|
||||
|
|
@ -60,23 +58,10 @@ Pure netstandard configuration:
|
|||
All supported targets with unique windows/unix build for netcoreapp:
|
||||
```
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetFrameworkCurrent)-Windows_NT</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461-Windows_NT</TargetFrameworks>
|
||||
<PropertyGroup>
|
||||
```
|
||||
|
||||
### Placeholder Target Frameworks
|
||||
Placeholder Target Framework can be added to the `<TargetFrameworks>` property to indicate the build system that the specific project is inbox in that framework and that Build Setting needs to be ignored.
|
||||
|
||||
Placeholder target frameworks start with _ prefix.
|
||||
|
||||
Example:
|
||||
When we have a project that has a `netstandard2.0` target framework that means that this project is compatible with any build setting. So if we do a vertical build for `net472` this project will be built as part of the vertical because `net472` is compatible with `netstandard2.0`. This means that in the runtime and testhost binaries the netstandard2.0 implementation will be included, and we will test against those assets instead of testing against the framework inbox asset. In order to tell the build system to not include this project as part of the `net472` vertical we need to add a placeholder target framework:
|
||||
```
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;_net472</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
```
|
||||
|
||||
## Options for building
|
||||
|
||||
A full or individual project build is centered around BuildTargetFramework, TargetOS, Configuration and TargetArchitecture.
|
||||
|
|
@ -94,7 +79,7 @@ When building an individual project the `BuildTargetFramework` and `TargetOS` wi
|
|||
|
||||
## Supported full build settings
|
||||
- .NET Core latest on current OS (default) -> `$(NetCoreAppCurrent)-[RunningOS]`
|
||||
- .NET Framework latest -> `$(NetFrameworkCurrent)-Windows_NT`
|
||||
- .NET Framework latest -> `net48-Windows_NT`
|
||||
|
||||
# Library project guidelines
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ This document provides the steps necessary after modifying a CoreFx library in a
|
|||
|
||||
## Check for existence of a .pkgproj
|
||||
|
||||
Most CoreFx libraries are not packaged by default. Some libraries have their output packaged in `Microsoft.Private.CoreFx.NetCoreApp`, which is always built, while other libraries have their own specific packages, which are only built on-demand. Your first step is to determine whether or not your library has its own package. To do this, go into the root folder for the library you've made changes to. If there is a `pkg` folder there (which should have a `.pkgproj` file inside of it), your library does have its own package. If there is no `pkg` folder there, the library should be built as part of `Microsoft.Private.CoreFx.NetCoreApp` and shipped as part of `Microsoft.NetCore.App`. To confirm this, check for the `IsNETCoreApp` property being set to `true` in the library's `Directory.Build.props` (or dir.props). If it is, then there is nothing that needs to be done. If it's not, contact a member of the servicing team for guidance, as this situation goes against our convention.
|
||||
Most libraries are not packaged by default. Some libraries have their output packaged in `Microsoft.Private.CoreFx.NetCoreApp`, which is always built, while other libraries have their own specific packages, which are only built on-demand. Your first step is to determine whether or not your library has its own package. To do this, go into the root folder for the library you've made changes to. If there is a `pkg` folder there (which should have a `.pkgproj` file inside of it), your library does have its own package. If there is no `pkg` folder there, the library should be built as part of `Microsoft.Private.CoreFx.NetCoreApp` and shipped as part of `Microsoft.NetCore.App`. To confirm this, check if the library is listed in NetCoreAppLibrary.props. If it is, then there is nothing that needs to be done. If it's not, contact a member of the servicing team for guidance, as this situation goes against our convention.
|
||||
|
||||
For example, if you made changes to [System.Data.SqlClient](https://github.com/dotnet/runtime/tree/master/src/libraries/Microsoft.Win32.Registry), then you have a .pkgproj, and will have to follow the steps in this document. However, if you made changes to [System.Collections](https://github.com/dotnet/runtime/tree/master/src/libraries/System.Collections), then you don't have a .pkgproj, and you do not need to do any further work for servicing.
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ The libraries build has two logical components, the native build which produces
|
|||
|
||||
The build settings (BuildTargetFramework, TargetOS, Configuration, Architecture) are generally defaulted based on where you are building (i.e. which OS or which architecture) but we have a few shortcuts for the individual properties that can be passed to the build scripts:
|
||||
|
||||
- `-framework|-f` identifies the target framework for the build. Possible values include `net5.0` (currently the latest .NET version) or `net472`. (msbuild property `BuildTargetFramework`)
|
||||
- `-framework|-f` identifies the target framework for the build. Possible values include `net5.0` (currently the latest .NET version) or `net48` (the latest .NETFramework version). (msbuild property `BuildTargetFramework`)
|
||||
- `-os` identifies the OS for the build. It defaults to the OS you are running on but possible values include `Windows_NT`, `Unix`, `Linux`, or `OSX`. (msbuild property `TargetOS`)
|
||||
- `-configuration|-c Debug|Release` controls the optimization level the compilers use for the build. It defaults to `Debug`. (msbuild property `Configuration`)
|
||||
- `-arch` identifies the architecture for the build. It defaults to `x64` but possible values include `x64`, `x86`, `arm`, or `arm64`. (msbuild property `TargetArchitecture`)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
<Project>
|
||||
<!-- Set PackageId to a temporary value to avoid NuGet restore cycle error NU1108: https://github.com/NuGet/Home/issues/6754 -->
|
||||
<PropertyGroup>
|
||||
<_PackageIdTemp>$(PackageId)</_PackageIdTemp>
|
||||
<PackageId>$(PackageId)_temp</PackageId>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="_UpdatePackageId"
|
||||
BeforeTargets="$(PackDependsOn)" >
|
||||
<PropertyGroup>
|
||||
<PackageId>$(_PackageIdTemp)</PackageId>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -6,10 +6,6 @@
|
|||
<TargetFramework>$(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-'))))</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)'))</RefPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(MSBuildThisDirectory)targetframeworksuffix.props" Condition="'$(DesignTimeBuild)' == 'true'" />
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
<NETCoreAppFramework>$(NetCoreAppCurrent)</NETCoreAppFramework>
|
||||
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
|
||||
<NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
|
||||
|
||||
<NetFrameworkCurrent>net472</NetFrameworkCurrent>
|
||||
<MinimiumSupportedWindowsPlatform>WINDOWS7.0</MinimiumSupportedWindowsPlatform>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
<DefaultMonoSubsets Condition="'$(MonoEnableLLVM)' == 'true' and '$(MonoLLVMDir)' == ''">mono.llvm+</DefaultMonoSubsets>
|
||||
<DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib</DefaultMonoSubsets>
|
||||
|
||||
<DefaultLibrariesSubsets>libs.depprojs+libs.native+libs.ref+libs.src+libs.pretest+libs.packages</DefaultLibrariesSubsets>
|
||||
<DefaultLibrariesSubsets>libs.native+libs.ref+libs.src+libs.pretest+libs.packages</DefaultLibrariesSubsets>
|
||||
|
||||
<DefaultInstallerSubsets>corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles+installers+installer.tests</DefaultInstallerSubsets>
|
||||
<DefaultInstallerSubsets Condition="'$(RuntimeFlavor)' == 'Mono'">installer.pkgprojs</DefaultInstallerSubsets>
|
||||
|
|
@ -95,7 +95,6 @@
|
|||
|
||||
<!-- Libs -->
|
||||
<SubsetName Include="Libs" Description="The libraries native part, refs and source assemblies, test infra and packages, but NOT the tests (use Libs.Tests to request those explicitly)" />
|
||||
<SubsetName Include="Libs.Depprojs" Description="The libraries upfront restore projects." />
|
||||
<SubsetName Include="Libs.Native" Description="The native libraries used in the shared framework." />
|
||||
<SubsetName Include="Libs.Ref" Description="The managed reference libraries." />
|
||||
<SubsetName Include="Libs.Src" Description="The managed implementation libraries." />
|
||||
|
|
@ -177,12 +176,6 @@
|
|||
</ItemGroup>
|
||||
|
||||
<!-- Libraries sets -->
|
||||
<ItemGroup Condition="$(_subset.Contains('+libs.depprojs+'))">
|
||||
<LibrariesRestoreProject Include="$(LibrariesProjectRoot)restore\depproj.proj">
|
||||
<AdditionalProperties Condition="'$(LibrariesConfiguration)' != ''">Configuration=$(LibrariesConfiguration)</AdditionalProperties>
|
||||
</LibrariesRestoreProject>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(_subset.Contains('+libs.native+'))">
|
||||
<ProjectToBuild Include="$(LibrariesProjectRoot)Native\build-native.proj" Category="libs" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20364.3">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20372.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
|
||||
</Dependency>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
|
||||
<UsingToolIbcOptimization>true</UsingToolIbcOptimization>
|
||||
<UsingToolXliff>false</UsingToolXliff>
|
||||
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
|
||||
<!-- Blob storage container that has the "Latest" channel to publish to. -->
|
||||
<ContainerName>dotnet</ContainerName>
|
||||
<ChecksumContainerName>$(ContainerName)</ChecksumContainerName>
|
||||
|
|
@ -56,10 +57,10 @@
|
|||
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20364.3</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20364.3</MicrosoftDotNetGenAPIVersion>
|
||||
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20364.3</MicrosoftDotNetGenFacadesVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20364.3</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20367.6</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20364.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20364.3</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20364.3</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20367.6</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20364.3</MicrosoftDotNetVersionToolsTasksVersion>
|
||||
<!-- Installer dependencies -->
|
||||
<MicrosoftNETCoreAppVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreAppVersion>
|
||||
|
|
@ -69,7 +70,36 @@
|
|||
<!-- CoreClr dependencies -->
|
||||
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.8.20359.4</MicrosoftNETCoreILAsmVersion>
|
||||
<!-- Libraries dependencies -->
|
||||
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
|
||||
<SystemCollectionsVersion>4.3.0</SystemCollectionsVersion>
|
||||
<SystemCollectionsConcurrentVersion>4.3.0</SystemCollectionsConcurrentVersion>
|
||||
<SystemComponentModelAnnotationsVersion>4.7.0</SystemComponentModelAnnotationsVersion>
|
||||
<SystemDataSqlClientVersion>4.8.1</SystemDataSqlClientVersion>
|
||||
<SystemDiagnosticsContractsVersion>4.3.0</SystemDiagnosticsContractsVersion>
|
||||
<SystemDiagnosticsDebugVersion>4.3.0</SystemDiagnosticsDebugVersion>
|
||||
<SystemDiagnosticsTracingVersion>4.3.0</SystemDiagnosticsTracingVersion>
|
||||
<SystemDynamicRuntimeVersion>4.3.0</SystemDynamicRuntimeVersion>
|
||||
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
|
||||
<SystemMemoryVersion>4.5.4</SystemMemoryVersion>
|
||||
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
|
||||
<SystemNetPrimitivesVersion>4.3.1</SystemNetPrimitivesVersion>
|
||||
<SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
|
||||
<SystemResourcesResourceManagerVersion>4.3.0</SystemResourcesResourceManagerVersion>
|
||||
<SystemRuntimeVersion>4.3.1</SystemRuntimeVersion>
|
||||
<SystemRuntimeExtensionsVersion>4.3.1</SystemRuntimeExtensionsVersion>
|
||||
<SystemRuntimeInteropServicesVersion>4.3.0</SystemRuntimeInteropServicesVersion>
|
||||
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
|
||||
<SystemRuntimeSerializationPrimitivesVersion>4.3.0</SystemRuntimeSerializationPrimitivesVersion>
|
||||
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
|
||||
<SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion>
|
||||
<SystemSecurityCryptographyPkcsVersion>4.7.0</SystemSecurityCryptographyPkcsVersion>
|
||||
<SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion>
|
||||
<SystemTextJsonVersion>5.0.0-preview.4.20202.18</SystemTextJsonVersion>
|
||||
<SystemThreadingVersion>4.3.0</SystemThreadingVersion>
|
||||
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
|
||||
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
|
||||
<MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion>
|
||||
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
|
||||
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>
|
||||
<!-- Runtime-Assets dependencies -->
|
||||
<SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20364.1</SystemComponentModelTypeConverterTestDataVersion>
|
||||
|
|
@ -82,6 +112,7 @@
|
|||
<SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20364.1</SystemWindowsExtensionsTestDataVersion>
|
||||
<!-- Standard dependencies -->
|
||||
<NETStandardLibraryVersion>2.2.0-prerelease.19564.1</NETStandardLibraryVersion>
|
||||
<NetStandardLibrary20Version>2.0.3</NetStandardLibrary20Version>
|
||||
<!-- dotnet-optimization dependencies -->
|
||||
<optimizationwindows_ntx64IBCCoreFxVersion>99.99.99-master-20200228.3</optimizationwindows_ntx64IBCCoreFxVersion>
|
||||
<optimizationlinuxx64IBCCoreFxVersion>99.99.99-master-20200228.3</optimizationlinuxx64IBCCoreFxVersion>
|
||||
|
|
@ -101,8 +132,6 @@
|
|||
<RefOnlyMicrosoftBuildUtilitiesCoreVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildUtilitiesCoreVersion>
|
||||
<RefOnlyNugetProjectModelVersion>4.9.4</RefOnlyNugetProjectModelVersion>
|
||||
<RefOnlyNugetPackagingVersion>4.9.4</RefOnlyNugetPackagingVersion>
|
||||
<!-- System.Data.SqlClient -->
|
||||
<SystemDataSqlClientVersion>4.8.0</SystemDataSqlClientVersion>
|
||||
<!-- Testing -->
|
||||
<MicrosoftNETTestSdkVersion>16.8.0-preview-20200716-03</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20352.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ function Get-Help() {
|
|||
Write-Host "Libraries settings:"
|
||||
Write-Host " -allconfigurations Build packages for all build configurations."
|
||||
Write-Host " -coverage Collect code coverage when testing."
|
||||
Write-Host " -framework (-f) Build framework: net5.0 or net472."
|
||||
Write-Host " -framework (-f) Build framework: net5.0 or net48."
|
||||
Write-Host " [Default: net5.0]"
|
||||
Write-Host " -testnobuild Skip building tests when invoking -test."
|
||||
Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all."
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ usage()
|
|||
echo "Libraries settings:"
|
||||
echo " --allconfigurations Build packages for all build configurations."
|
||||
echo " --coverage Collect code coverage when testing."
|
||||
echo " --framework (-f) Build framework: net5.0 or net472."
|
||||
echo " --framework (-f) Build framework: net5.0 or net48."
|
||||
echo " [Default: net5.0]"
|
||||
echo " --testnobuild Skip building tests when invoking -test."
|
||||
echo " --testscope Test scope, allowed values: innerloop, outerloop, all."
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<PropertyGroup>
|
||||
<ILLinkTasksDir>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NET_ILLink_Tasks)', 'tools'))</ILLinkTasksDir>
|
||||
<ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' == 'core'">$(ILLinkTasksDir)netcoreapp3.0/ILLink.Tasks.dll</ILLinkTasksPath>
|
||||
<ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' != 'core'">$(ILLinkTasksDir)$(NetFrameworkCurrent)/ILLink.Tasks.dll</ILLinkTasksPath>
|
||||
<ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' != 'core'">$(ILLinkTasksDir)net472/ILLink.Tasks.dll</ILLinkTasksPath>
|
||||
<ILLinkTrimAssemblyPath>$(IntermediateOutputPath)$(TargetName)$(TargetExt)</ILLinkTrimAssemblyPath>
|
||||
<ILLinkTrimAssemblySymbols>$(IntermediateOutputPath)$(TargetName).pdb</ILLinkTrimAssemblySymbols>
|
||||
<ILLinkTrimInputPath>$(IntermediateOutputPath)PreTrim/</ILLinkTrimInputPath>
|
||||
|
|
|
|||
|
|
@ -91,10 +91,12 @@ jobs:
|
|||
displayName: Create Core_Root
|
||||
condition: and(succeeded(), ne(variables.runtimeFlavorName, 'Mono'))
|
||||
|
||||
- script: "build.cmd -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)\\bin\\mono\\$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\.dotnet-mono /E /I /Y;copy $(Build.SourcesDirectory)\\artifacts\\bin\\coreclr\\$(osGroup).$(archType).$(buildConfigUpper)\\corerun.exe $(Build.SourcesDirectory)\\.dotnet-mono\\shared\\Microsoft.NETCore.App\\5.0.0\\corerun.exe"
|
||||
# Copy the runtime directory into the testhost folder to include OOBs.
|
||||
|
||||
- script: "build.cmd -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)\\bin\\mono\\$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\runtime\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\shared\\Microsoft.NETCore.App\\5.0.0 /E /I /Y;xcopy $(Build.SourcesDirectory)\\artifacts\\bin\\testhost\\$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)\\* $(Build.SourcesDirectory)\\.dotnet-mono /E /I /Y;copy $(Build.SourcesDirectory)\\artifacts\\bin\\coreclr\\$(osGroup).$(archType).$(buildConfigUpper)\\corerun.exe $(Build.SourcesDirectory)\\.dotnet-mono\\shared\\Microsoft.NETCore.App\\5.0.0\\corerun.exe"
|
||||
displayName: "Create mono dotnet (Windows)"
|
||||
condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), eq(variables.osGroup, 'Windows_NT'))
|
||||
|
||||
- script: "mkdir $(Build.SourcesDirectory)/.dotnet-mono;./build.sh -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;cp $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/.dotnet-mono -r;cp $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)/corerun $(Build.SourcesDirectory)/.dotnet-mono/shared/Microsoft.NETCore.App/5.0.0/corerun"
|
||||
- script: "mkdir $(Build.SourcesDirectory)/.dotnet-mono;./build.sh -subset libs.pretest -configuration release -ci -arch $(archType) -testscope innerloop /p:RuntimeArtifactsPath=$(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper) /p:RuntimeFlavor=mono;cp $(Build.SourcesDirectory)/artifacts/bin/runtime/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/shared/Microsoft.NETCore.App/5.0.0 -rf;cp $(Build.SourcesDirectory)/artifacts/bin/testhost/$(_Framework)-$(osGroup)-$(buildConfigUpper)-$(archType)/* $(Build.SourcesDirectory)/.dotnet-mono -r;cp $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)/corerun $(Build.SourcesDirectory)/.dotnet-mono/shared/Microsoft.NETCore.App/5.0.0/corerun"
|
||||
displayName: "Create mono dotnet (Linux)"
|
||||
condition: and(and(succeeded(), eq(variables.runtimeFlavorName, 'Mono')), ne(variables.osGroup, 'Windows_NT'))
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ parameters:
|
|||
archType: ''
|
||||
osSubgroup: ''
|
||||
crossrootfsDir: ''
|
||||
framework: ''
|
||||
framework: 'net5.0'
|
||||
isOfficialAllConfigurations: false
|
||||
isSourceBuild: false
|
||||
liveRuntimeBuildConfig: ''
|
||||
|
|
@ -25,10 +25,10 @@ parameters:
|
|||
jobs:
|
||||
- template: /eng/common/templates/job/job.yml
|
||||
parameters:
|
||||
${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
|
||||
${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
|
||||
displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
|
||||
name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
|
||||
${{ if in(parameters.framework, 'allConfigurations', 'net472') }}:
|
||||
${{ if in(parameters.framework, 'allConfigurations', 'net48') }}:
|
||||
displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
|
||||
name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ parameters:
|
|||
osSubgroup: ''
|
||||
archType: ''
|
||||
crossrootfsDir: ''
|
||||
framework: ''
|
||||
framework: 'net5.0'
|
||||
isOfficialBuild: false
|
||||
isOfficialAllConfigurations: false
|
||||
runtimeVariant: ''
|
||||
|
|
@ -65,7 +65,7 @@ jobs:
|
|||
- ${{ if eq(parameters.osGroup, 'Browser') }}:
|
||||
- EMSDK_PATH: /usr/local/emscripten
|
||||
|
||||
# Tests only run for 'allConfiguration' and 'net472' build-jobs
|
||||
# Tests only run for 'allConfiguration' and 'net48' build-jobs
|
||||
# If platform is in testBuildPlatforms we build tests as well.
|
||||
- ${{ if or(eq(parameters.runTests, true), containsValue(parameters.testBuildPlatforms, parameters.platform)) }}:
|
||||
- _subset: libs+libs.tests
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ jobs:
|
|||
# Windows_NT x64
|
||||
- ${{ if eq(parameters.platform, 'Windows_NT_x64') }}:
|
||||
# netcoreapp
|
||||
- ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}:
|
||||
- ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net48') }}:
|
||||
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
|
||||
- Windows.81.Amd64.Open
|
||||
- Windows.10.Amd64.ServerRS5.Open
|
||||
|
|
@ -101,8 +101,8 @@ jobs:
|
|||
- ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}:
|
||||
- (Windows.Nano.1809.Amd64.Open)windows.10.amd64.serverrs5.open@mcr.microsoft.com/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
|
||||
|
||||
# NET472
|
||||
- ${{ if eq(parameters.jobParameters.framework, 'net472') }}:
|
||||
# .NETFramework
|
||||
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
|
||||
- Windows.10.Amd64.Client19H1.Open
|
||||
|
||||
# AllConfigurations
|
||||
|
|
@ -112,7 +112,7 @@ jobs:
|
|||
# Windows_NT x86
|
||||
- ${{ if eq(parameters.platform, 'Windows_NT_x86') }}:
|
||||
# netcoreapp
|
||||
- ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}:
|
||||
- ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net48') }}:
|
||||
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
|
||||
- Windows.7.Amd64.Open
|
||||
- Windows.10.Amd64.ServerRS5.Open
|
||||
|
|
@ -124,8 +124,8 @@ jobs:
|
|||
- Windows.7.Amd64.Open
|
||||
- Windows.10.Amd64.Server19H1.Open
|
||||
|
||||
# NET472
|
||||
- ${{ if eq(parameters.jobParameters.framework, 'net472') }}:
|
||||
# .NETFramework
|
||||
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
|
||||
- Windows.10.Amd64.Client19H1.Open
|
||||
|
||||
# Windows_NT arm
|
||||
|
|
|
|||
|
|
@ -99,6 +99,6 @@ jobs:
|
|||
jobParameters:
|
||||
isOfficialBuild: ${{ variables['isOfficialBuild'] }}
|
||||
isFullMatrix: ${{ variables['isFullMatrix'] }}
|
||||
framework: net472
|
||||
framework: net48
|
||||
runTests: true
|
||||
testScope: outerloop
|
||||
|
|
@ -3,7 +3,7 @@ parameters:
|
|||
osGroup: ''
|
||||
osSubgroup: ''
|
||||
archType: ''
|
||||
framework: ''
|
||||
framework: 'net5.0'
|
||||
isOfficialBuild: false
|
||||
liveRuntimeBuildConfig: ''
|
||||
runtimeFlavor: 'coreclr'
|
||||
|
|
@ -55,7 +55,7 @@ jobs:
|
|||
- ${{ if ne(parameters.dependsOn[0], '') }}:
|
||||
- ${{ parameters.dependsOn }}
|
||||
- ${{ if eq(parameters.dependsOn[0], '') }}:
|
||||
- ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
|
||||
- ${{ if notIn(parameters.framework, 'allConfigurations', 'net48') }}:
|
||||
- ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
|
||||
# tests are built as part of product build
|
||||
- ${{ if or(ne(parameters.archType, parameters.dependsOnTestArchitecture), ne(parameters.buildConfig, parameters.dependsOnTestBuildConfiguration)) }}:
|
||||
|
|
|
|||
|
|
@ -576,7 +576,7 @@ jobs:
|
|||
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
|
||||
jobParameters:
|
||||
isFullMatrix: ${{ variables.isFullMatrix }}
|
||||
framework: net472
|
||||
framework: net48
|
||||
runTests: true
|
||||
testScope: innerloop
|
||||
condition: >-
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<Project>
|
||||
<PropertyGroup Condition="'$(BuildAllProjects)' == 'true' and
|
||||
!$(BuildTargetFramework.StartsWith('netstandard'))">
|
||||
<AdditionalBuildTargetFrameworks Condition="!$(BuildTargetFramework.StartsWith('net45'))">$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks>
|
||||
<AdditionalBuildTargetFrameworks Condition="!$(BuildTargetFramework.StartsWith('netcoreapp2.0')) and
|
||||
!$(BuildTargetFramework.StartsWith('net4'))">$(AdditionalBuildTargetFrameworks);netstandard2.1</AdditionalBuildTargetFrameworks>
|
||||
!$(BuildTargetFramework.StartsWith('netstandard')) and
|
||||
!$(BuildTargetFramework.StartsWith('net4'))">
|
||||
<AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks>
|
||||
<AdditionalBuildTargetFrameworks Condition="!$(BuildTargetFramework.StartsWith('netcoreapp2.0'))">$(AdditionalBuildTargetFrameworks);netstandard2.1</AdditionalBuildTargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,124 +0,0 @@
|
|||
<Project>
|
||||
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'">
|
||||
<PrepareProjectReferencesDependsOn>
|
||||
AddRuntimeProjectReference;
|
||||
$(PrepareProjectReferencesDependsOn);
|
||||
</PrepareProjectReferencesDependsOn>
|
||||
<ResolveReferencesDependsOn>
|
||||
AddRuntimeProjectReference;
|
||||
$(ResolveReferencesDependsOn);
|
||||
</ResolveReferencesDependsOn>
|
||||
<CleanDependsOn>
|
||||
AddRuntimeProjectReference;
|
||||
$(CleanDependsOn)
|
||||
</CleanDependsOn>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<RuntimeProjectFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'restore', 'runtime', 'runtime.depproj'))</RuntimeProjectFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="AddRuntimeProjectReference"
|
||||
Condition="'$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true' and '@(ReferenceFromRuntime)' != ''">
|
||||
<Error Text="ReferenceFromRuntime may not be used from reference assemblies."
|
||||
Condition="'$(IsReferenceAssembly)' == 'true' and '$(AllowReferenceFromRuntime)' != 'true'" />
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(RuntimeProjectFile)">
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
<OutputItemType>_referencePathFromRestoredRuntime</OutputItemType>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="GetFilesFromRuntime" Returns="@(RuntimeFiles)" DependsOnTargets="GetFilesFromCoreClr;GetFilesFromMono">
|
||||
<ItemGroup>
|
||||
<RuntimeFiles Include="@(RuntimeFiles)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
The check must use != Mono because we don't consistently set this value to CoreCLR
|
||||
https://github.com/dotnet/runtime/issues/32884
|
||||
-->
|
||||
<Target Name="GetFilesFromCoreCLR"
|
||||
Condition="'$(RuntimeFlavor)' != 'Mono'"
|
||||
Returns="@(RuntimeFiles)"
|
||||
DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" />
|
||||
|
||||
<Target Name="GetFilesFromMono"
|
||||
Condition="'$(RuntimeFlavor)' == 'Mono'"
|
||||
Returns="@(RuntimeFiles)"
|
||||
DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" />
|
||||
|
||||
<Target Name="FilterReferenceFromRuntime"
|
||||
AfterTargets="ResolveProjectReferences"
|
||||
Condition="'@(ReferenceFromRuntime)' != ''">
|
||||
|
||||
<Error Condition="'$(IsReferenceAssembly)' == 'true' and '$(AllowReferenceFromRuntime)' != 'true'" Text="ReferenceFromRuntime may not be used from reference assemblies." />
|
||||
|
||||
<MSBuild Projects="$(MSBuildProjectFile)" Targets="GetFilesFromRuntime" Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<Output TaskParameter="TargetOutputs" ItemName="RuntimeFiles" />
|
||||
</MSBuild>
|
||||
|
||||
<ItemGroup>
|
||||
<_referencePathFromRuntime Include="@(RuntimeFiles)" Private="false" />
|
||||
<_referencePathFromRuntime Include="@(_referencePathFromRestoredRuntime)" Private="false" />
|
||||
<!-- If this is a test project, also use the $(RuntimePath) to find a @(ReferenceFromRuntime) assembly. -->
|
||||
<_referencePathFromRuntime Include="@(ReferenceFromRuntime->'$(RuntimePath)%(Identity).dll')" Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'" />
|
||||
<!-- transform to filename in order to intersect -->
|
||||
<_referencePathFromRuntimeByFileName Include="@(_referencePathFromRuntime->'%(FileName)')" Condition="'%(_referencePathFromRuntime.Extension)' == '.dll'" >
|
||||
<ReferencePath>%(Identity)</ReferencePath>
|
||||
</_referencePathFromRuntimeByFileName>
|
||||
</ItemGroup>
|
||||
|
||||
<RemoveDuplicates Inputs="@(_referencePathFromRuntimeByFileName)">
|
||||
<Output TaskParameter="Filtered" ItemName="_referencePathFromRuntimeByFileNameFiltered" />
|
||||
</RemoveDuplicates>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
<!-- intersect with ReferenceFromRuntime -->
|
||||
<_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileNameFiltered)"
|
||||
Condition="'@(_referencePathFromRuntimeByFileNameFiltered)' == '@(ReferenceFromRuntime)' and '%(Identity)' != ''">
|
||||
<Aliases>@(ReferenceFromRuntime->'%(Aliases)')</Aliases>
|
||||
</_filteredReferencePathFromRuntimeByFileName>
|
||||
|
||||
<_remainingReferenceFromRuntime Include="@(ReferenceFromRuntime)" Exclude="@(_filteredReferencePathFromRuntimeByFileName)" />
|
||||
|
||||
<!-- Fallback and check for native images for the references as well -->
|
||||
<_remainingReferenceFromRuntimeWithNI Include="@(_remainingReferenceFromRuntime->'%(Identity).ni')">
|
||||
<OriginalReferenceFromRuntime>%(Identity)</OriginalReferenceFromRuntime>
|
||||
</_remainingReferenceFromRuntimeWithNI>
|
||||
|
||||
<_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileNameFiltered)"
|
||||
Condition="'@(_referencePathFromRuntimeByFileNameFiltered)' == '@(_remainingReferenceFromRuntimeWithNI)' and '%(Identity)' != ''">
|
||||
<Aliases>@(_remainingReferenceFromRuntimeWithNI->'%(Aliases)')</Aliases>
|
||||
</_filteredReferencePathFromRuntimeByFileName>
|
||||
|
||||
<_missingReferenceFromRuntime Include="@(_remainingReferenceFromRuntimeWithNI)" Exclude="@(_filteredReferencePathFromRuntimeByFileName)" />
|
||||
|
||||
<!-- transform back to path -->
|
||||
<!-- We are adding two items(with and without aliases) for references having Aliases. The major reason behind this to not use the Aliases for all the types in that reference. -->
|
||||
<!-- We can't use a Reference item for both since only the first one will be kept. -->
|
||||
<!-- Aliases provides no way to encode both an alias and a non-aliased reference : https://github.com/dotnet/roslyn/issues/42604 -->
|
||||
<!-- Use ReferencePath for the second reference so it will still be passed to the compiler. -->
|
||||
<Reference Include="@(_filteredReferencePathFromRuntimeByFileName->'%(ReferencePath)')" />
|
||||
<_aliasedReferencePathFromRuntime Include="@(_filteredReferencePathFromRuntimeByFileName->'%(ReferencePath)')" Condition="'%(_filteredReferencePathFromRuntimeByFileName.Aliases)' != ''" />
|
||||
<ReferencePath Include="@(_aliasedReferencePathFromRuntime)" Aliases=""/>
|
||||
</ItemGroup>
|
||||
|
||||
<Error Condition="'@(_missingReferenceFromRuntime)' != ''"
|
||||
Text="Could not resolve ReferenceFromRuntime item(s) '%(_missingReferenceFromRuntime.OriginalReferenceFromRuntime)' from '$(RuntimeProjectFile)'." />
|
||||
</Target>
|
||||
|
||||
<Target Name="RemoveAliasedReferenceFromRuntime"
|
||||
AfterTargets="CoreCompile"
|
||||
Condition="'@(_aliasedReferencePathFromRuntime)' != ''">
|
||||
<!-- SDK's GenerateBuildDependencyFile will break when they encounter two identical reference paths, fix by removing the aliased ones -->
|
||||
<ItemGroup>
|
||||
<ReferencePath Remove="@(_aliasedReferencePathFromRuntime)"/>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,67 +1,56 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<ContractDependencyPaths>$(RefPath)</ContractDependencyPaths>
|
||||
<FrameworkPathOverride>$(RefPath)</FrameworkPathOverride>
|
||||
<AssemblySearchPaths>$(AssemblySearchPaths);$(RefPath);{RawFileName}</AssemblySearchPaths>
|
||||
<!-- Disable RAR from transitively discovering dependencies for References -->
|
||||
<_FindDependencies>false</_FindDependencies>
|
||||
<!--
|
||||
We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder
|
||||
that exists to skip the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644).
|
||||
Need to set these after the common targets import.
|
||||
-->
|
||||
<_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
|
||||
<_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(IncludeDefaultReferences)' == ''">
|
||||
<IncludeDefaultReferences Condition="'$(MSBuildProjectExtension)' == '.csproj'">true</IncludeDefaultReferences>
|
||||
<IncludeDefaultReferences Condition="'$(MSBuildProjectExtension)' == '.vbproj'">true</IncludeDefaultReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="SetupDefaultReferences">
|
||||
<ItemGroup Condition="'$(IncludeDefaultReferences)' == 'true'">
|
||||
<!-- netstandard is a default reference whenever building for NETStandard or building an implementation assembly -->
|
||||
<DefaultReference Condition="('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(IsReferenceAssembly)' != 'true') and Exists('$(RefPath)netstandard.dll')" Include="netstandard" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
<Target Name="UpdateReferenceItems" DependsOnTargets="SetupDefaultReferences" BeforeTargets="AddReferencesDynamically">
|
||||
<!-- 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>
|
||||
|
||||
<!-- 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>
|
||||
|
||||
<!-- 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>
|
||||
|
||||
<!-- Filter out transitive P2Ps which should be excluded. -->
|
||||
<Target Name="FilterTransitiveProjectReferences"
|
||||
AfterTargets="IncludeTransitiveProjectReferences"
|
||||
Condition="'$(DisableTransitiveProjectReferences)' != 'true' and
|
||||
'@(DefaultReferenceExclusion)' != ''">
|
||||
<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>
|
||||
<_transitiveProjectReferenceWithExclusion Include="@(ProjectReference)">
|
||||
<Exclusion>%(DefaultReferenceExclusion.Identity)</Exclusion>
|
||||
</_transitiveProjectReferenceWithExclusion>
|
||||
<ProjectReference Remove="@(_transitiveProjectReferenceWithExclusion)"
|
||||
Condition="'%(_transitiveProjectReferenceWithExclusion.NuGetPackageId)' == '%(_transitiveProjectReferenceWithExclusion.Exclusion)'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="AddDefaultTestReferences" BeforeTargets="SetupDefaultReferences" Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">
|
||||
<!-- 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>
|
||||
<DefaultReferenceExclusions Include="@(ReferenceFromRuntime)"/>
|
||||
|
||||
<!-- Reference everything in the targeting pack directory -->
|
||||
<DefaultReferenceDirs Include="$(RefPath)" />
|
||||
<DefaultReferenceItems Include="%(DefaultReferenceDirs.Identity)/*.dll" />
|
||||
|
||||
<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" />
|
||||
<ProjectReferenceWithConfiguration PrivateAssets="all"
|
||||
Private="false"
|
||||
Condition="$(NetCoreAppLibrary.Contains('$([System.IO.Path]::GetFileNameWithoutExtension('%(MSBuildSourceProjectFile)'));'))" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="RemoveConflictResolutionAssetsForTests"
|
||||
AfterTargets="_HandlePackageFileConflicts"
|
||||
DependsOnTargets="AddDefaultTestReferences"
|
||||
Condition="'@(_defaultReferenceExclusionsFullPath)' != ''">
|
||||
<ItemGroup>
|
||||
<Reference Remove="@(_defaultReferenceExclusionsFullPath)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="AddReferencesDynamically" BeforeTargets="PrepareForBuild" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,18 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<ContractDependencyPaths Condition="'$(DisableImplicitFrameworkReferences)' == 'true' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">$(MicrosoftNetCoreAppRefPackRefDir)</ContractDependencyPaths>
|
||||
<!-- Use implementation referencepath if no contract tfm is set. -->
|
||||
<ContractDependencyPaths Condition="'$(ContractDependencyPaths)' == ''">$(ContractDependencyPaths);@(ReferencePath->'%(RelativeDir)'->Distinct())</ContractDependencyPaths>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(IsSourceProject)' == 'true'">
|
||||
<ContractProject Condition="'$(ContractProject)' == ''">$(LibrariesProjectRoot)$(MSBuildProjectName)/ref/$(MSBuildProjectName).csproj</ContractProject>
|
||||
<ContractProject Condition="'$(ContractProject)' == ''">$(LibrariesProjectRoot)$(MSBuildProjectName)\ref\$(MSBuildProjectName).csproj</ContractProject>
|
||||
<HasMatchingContract Condition="'$(HasMatchingContract)' == '' and Exists('$(ContractProject)')">true</HasMatchingContract>
|
||||
<ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == ''">$(RefPath)/$(MSBuildProjectName).dll</ContractAssemblyPath>
|
||||
<ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == '' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))">$(NetCoreAppCurrentRefPath)$(TargetFileName)</ContractAssemblyPath>
|
||||
<ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == ''">$([MSBuild]::NormalizePath('$(BaseOutputPath)', 'ref', '$(TargetFramework)-$(Configuration)', '$(TargetFileName)'))</ContractAssemblyPath>
|
||||
|
||||
<!-- Disable API compat if the project doesn't have reference assembly -->
|
||||
<RunApiCompat Condition="'$(HasMatchingContract)' != 'true'">false</RunApiCompat>
|
||||
|
|
@ -10,8 +20,43 @@
|
|||
|
||||
<ItemGroup Condition="'$(HasMatchingContract)' == 'true'">
|
||||
<ResolvedMatchingContract Condition="Exists('$(ContractAssemblyPath)')" Include="$(ContractAssemblyPath)" />
|
||||
<!-- If the contract doesn't exist in the default contract output path add a project reference to the contract project to resolve -->
|
||||
<ProjectReference Condition="'@(ResolvedMatchingContract)' == ''" Include="$(ContractProject)">
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
<OutputItemType>ResolvedMatchingContract</OutputItemType>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- intentionally empty since we no longer need a target -->
|
||||
<Target Name="ResolveMatchingContract" />
|
||||
|
||||
<!-- Allow P2Ps that target a source project to build against the corresponding ref project. -->
|
||||
<Target Name="AnnotateTargetPathWithTargetPlatformMonikerWithReferenceAssembly"
|
||||
Condition="'$(HasMatchingContract)' == 'true'"
|
||||
AfterTargets="GetTargetPathWithTargetPlatformMoniker">
|
||||
<ItemGroup>
|
||||
<TargetPathWithTargetPlatformMoniker ReferenceAssembly="@(ResolvedMatchingContract)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="HandleReferenceAssemblyAttributeForProjectReferences"
|
||||
AfterTargets="ResolveProjectReferences"
|
||||
BeforeTargets="FindReferenceAssembliesForReferences"
|
||||
Condition="'@(ProjectReference)' != '' and '@(_ResolvedProjectReferencePaths)' != ''">
|
||||
<!-- If we have a ProjectReference to CoreLib, we need to compile against implementation assemblies. -->
|
||||
<PropertyGroup Condition="@(_ResolvedProjectReferencePaths->AnyHaveMetadataValue('MSBuildSourceProjectFile', '$(CoreLibProject)'))">
|
||||
<CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
|
||||
</PropertyGroup>
|
||||
<!-- Clear the ReferenceAssembly attribute on resolved P2Ps that set SkipUseReferenceAssembly to true. -->
|
||||
<ItemGroup>
|
||||
<_resolvedP2PFiltered Include="@(ProjectReference)">
|
||||
<ProjectReferenceItemSpec>$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)'))</ProjectReferenceItemSpec>
|
||||
<SkipUseReferenceAssembly>%(ProjectReference.SkipUseReferenceAssembly)</SkipUseReferenceAssembly>
|
||||
</_resolvedP2PFiltered>
|
||||
<_ResolvedProjectReferencePaths Update="@(_resolvedProjectReferenceFiltred)"
|
||||
Condition="'%(_resolvedP2PFiltered.ProjectReferenceItemSpec)' == '%(_resolvedP2PFiltered.MSBuildSourceProjectFile)' and
|
||||
'%(_resolvedP2PFiltered.SkipUseReferenceAssembly)' == 'true'"
|
||||
ReferenceAssembly="" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<Project TreatAsLocalProperty="ExcludeRestorePackageImports">
|
||||
<PropertyGroup>
|
||||
<ToolSetCommonDirectory>$(RepoRoot)artifacts\toolset\Common\</ToolSetCommonDirectory>
|
||||
<RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation>
|
||||
<!-- Need to set ProjectAssetsFile to something so it doesn't get set to the Tools.proj assets file when we import the generated props -->
|
||||
<ProjectAssetsFile Condition="'$(ProjectAssetsFile)' == ''">unused</ProjectAssetsFile>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
<Project>
|
||||
<PropertyGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))">
|
||||
<_UseLocalTargetingRuntimePack>true</_UseLocalTargetingRuntimePack>
|
||||
<EnableTargetingPackDownload>false</EnableTargetingPackDownload>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- .NETCoreApp 2.x DisableImplicitAssemblyReferences support. -->
|
||||
<Choose>
|
||||
<When Condition="'$(DisableImplicitAssemblyReferences)' == 'true' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
$([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0'))">
|
||||
<PropertyGroup>
|
||||
<MicrosoftNetCoreAppRefPackRefDir>$(PkgMicrosoft_NETCore_App)\ref\$(_ShortFrameworkIdentifier)$(_ShortFrameworkVersion)\</MicrosoftNetCoreAppRefPackRefDir>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Update="Microsoft.NETCore.App"
|
||||
ExcludeAssets="all"
|
||||
GeneratePathProperty="true" />
|
||||
</ItemGroup>
|
||||
</When>
|
||||
</Choose>
|
||||
|
||||
<!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
|
||||
<ItemGroup>
|
||||
<Reference Update="@(Reference)">
|
||||
<Private Condition="'%(Reference.Extension)' != '.dll'">false</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- .NETCoreApp > 2.x DisableImplicitAssemblyReferences support. -->
|
||||
<Target Name="RemoveFrameworkReferences"
|
||||
BeforeTargets="_HandlePackageFileConflicts"
|
||||
AfterTargets="ResolveTargetingPackAssets"
|
||||
Condition="'$(DisableImplicitAssemblyReferences)' == 'true' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '3.0'))">
|
||||
<PropertyGroup>
|
||||
<MicrosoftNetCoreAppRefPackRefDir>%(ResolvedFrameworkReference.TargetingPackPath)\ref\$(_ShortFrameworkIdentifier)$(_ShortFrameworkVersion)\</MicrosoftNetCoreAppRefPackRefDir>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Remove="@(Reference)"
|
||||
Condition="'%(Reference.FrameworkReferenceName)' == '$(SharedFrameworkName)'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Add the resolved targeting pack to the assembly search path. -->
|
||||
<Target Name="UseTargetingPackForAssemblySearchPaths"
|
||||
BeforeTargets="ResolveAssemblyReferences;
|
||||
DesignTimeResolveAssemblyReferences"
|
||||
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
|
||||
<PropertyGroup>
|
||||
<AssemblySearchPaths>$(AssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</AssemblySearchPaths>
|
||||
<DesignTimeAssemblySearchPaths>$(DesignTimeAssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</DesignTimeAssemblySearchPaths>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Use local targeting pack for NetCoreAppCurrent. -->
|
||||
<Target Name="UpdateTargetingAndRuntimePack"
|
||||
Condition="'$(_UseLocalTargetingRuntimePack)' == 'true'"
|
||||
AfterTargets="ResolveFrameworkReferences">
|
||||
<ItemGroup>
|
||||
<ResolvedTargetingPack Path="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
|
||||
NuGetPackageVersion="$(ProductVersion)"
|
||||
PackageDirectory="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
|
||||
Condition="'%(ResolvedTargetingPack.RuntimeFrameworkName)' == '$(SharedFrameworkName)' and
|
||||
Exists('$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml')" />
|
||||
<ResolvedRuntimePack PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)"
|
||||
Condition="'%(ResolvedRuntimePack.FrameworkName)' == '$(SharedFrameworkName)'" />
|
||||
<ResolvedFrameworkReference TargetingPackPath="$(MicrosoftNetCoreAppRefPackDir.TrimEnd('/\'))"
|
||||
TargetingPackVersion="$(ProductVersion)"
|
||||
Condition="'%(Identity)' == '$(SharedFrameworkName)'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Update the local targeting pack's version as it's written into the runtimeconfig.json file to select the shared framework. -->
|
||||
<Target Name="UpdateRuntimeFrameworkVersion"
|
||||
Condition="'$(_UseLocalTargetingRuntimePack)' == 'true'"
|
||||
AfterTargets="ResolveTargetingPackAssets">
|
||||
<ItemGroup>
|
||||
<RuntimeFramework Version="$(ProductVersion)"
|
||||
Condition="'%(RuntimeFramework.FrameworkName)' == '$(SharedFrameworkName)'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Filter out conflicting implicit assembly references. -->
|
||||
<Target Name="FilterImplicitAssemblyReferences"
|
||||
Condition="'$(DisableImplicitAssemblyReferences)' != 'true'"
|
||||
DependsOnTargets="ResolveProjectReferences"
|
||||
AfterTargets="ResolveTargetingPackAssets">
|
||||
<ItemGroup>
|
||||
<_targetingPackReferenceExclusion Include="$(TargetName)" />
|
||||
<_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->'%(Filename)')" />
|
||||
<_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_targetingPackReferenceWithExclusion Include="@(Reference)">
|
||||
<Exclusion>%(_targetingPackReferenceExclusion.Identity)</Exclusion>
|
||||
</_targetingPackReferenceWithExclusion>
|
||||
<Reference Remove="@(_targetingPackReferenceWithExclusion)"
|
||||
Condition="'%(_targetingPackReferenceWithExclusion.ExternallyResolved)' == 'true' and '%(_targetingPackReferenceWithExclusion.Filename)' == '%(_targetingPackReferenceWithExclusion.Exclusion)'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -18,10 +18,6 @@
|
|||
<!-- Filter out failing (wrong framwork, platform, runtime or activeissue) tests -->
|
||||
<TestCaseFilter>$$TESTCASEFILTER$$</TestCaseFilter>
|
||||
<DotNetHostPath>$$DOTNETHOSTPATH$$</DotNetHostPath>
|
||||
<EnvironmentVariables>
|
||||
<!-- Use our self-built framework on .NET Framework -->
|
||||
<DEVPATH>$$DEVPATH$$</DEVPATH>
|
||||
</EnvironmentVariables>
|
||||
</RunConfiguration>
|
||||
<LoggerRunSettings>
|
||||
<Loggers>
|
||||
|
|
|
|||
|
|
@ -41,12 +41,6 @@ set EXECUTION_DIR=%~dp0
|
|||
|
||||
:argparser_end
|
||||
|
||||
if not defined RUNTIME_PATH (
|
||||
echo error: -r^|--runtime-path argument is required.
|
||||
call :usage
|
||||
exit /b -1
|
||||
)
|
||||
|
||||
:: Don't use a globally installed SDK.
|
||||
set DOTNET_MULTILEVEL_LOOKUP=0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<developmentMode developerInstallation="true" />
|
||||
<UseRandomizedStringHashAlgorithm enabled="1" />
|
||||
</runtime>
|
||||
</configuration>
|
||||
|
|
@ -1,8 +1,12 @@
|
|||
<Project>
|
||||
<Target Name="Test" DependsOnTargets="GetProjectWithBestTargetFrameworks">
|
||||
<MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
|
||||
Targets="Test"
|
||||
BuildInParallel="$(BuildInParallel)">
|
||||
Targets="Test">
|
||||
</MSBuild>
|
||||
</Target>
|
||||
<Target Name="VSTest" DependsOnTargets="GetProjectWithBestTargetFrameworks">
|
||||
<MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
|
||||
Targets="VSTest">
|
||||
</MSBuild>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -36,7 +36,6 @@
|
|||
.Replace('$$DISABLEPARALLELIZATION$$', '$([MSBuild]::ValueOrDefault('$(TestDisableParallelization)', 'false'))')
|
||||
.Replace('$$DISABLEAPPDOMAIN$$', '$([MSBuild]::ValueOrDefault('$(TestDisableAppDomain)', 'false'))')
|
||||
.Replace('$$TESTCASEFILTER$$', '$(_testFilter)')
|
||||
.Replace('$$DEVPATH$$', '$(TestHostRootPath)')
|
||||
.Replace('$$DOTNETHOSTPATH$$', '$(TestHostRootPath)$([System.IO.Path]::GetFileName('$(DotNetTool)'))'))</RunSettingsFileContent>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,45 +1,31 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<!-- Copies the app.config file to the OutDir. -->
|
||||
<TestRuntimeConfigurationFile Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">$(MSBuildThisFileDirectory)netfx.exe.config</TestRuntimeConfigurationFile>
|
||||
|
||||
<!-- By default copy the test runtime config file for executable test projects (+ test support projects). -->
|
||||
<GenerateRuntimeConfigurationFiles Condition="'$(IsTestProject)' == 'true' or '$(OutputType.ToLower())' == 'exe'">true</GenerateRuntimeConfigurationFiles>
|
||||
<IsTestProjectOrExecutable Condition="'$(IsTestProject)' == 'true' or
|
||||
'$(OutputType.ToLower())' == 'exe'">true</IsTestProjectOrExecutable>
|
||||
<GenerateRuntimeConfigurationFiles Condition="'$(GenerateRuntimeConfigurationFiles)' == '' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
'$(IsTestProjectOrExecutable)' == 'true'">true</GenerateRuntimeConfigurationFiles>
|
||||
<GenerateAppConfigurationFile Condition="'$(IsTestProjectOrExecutable)' == 'true' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETFramework'">true</GenerateAppConfigurationFile>
|
||||
<AppConfig Condition="'$(GenerateAppConfigurationFile)' == 'true'">$(MSBuildThisFileDirectory)netfx.exe.config</AppConfig>
|
||||
<!-- TODO: Change in RemoteExecutor -->
|
||||
<RemoteClientAppConfigFile Condition="'$(GenerateAppConfigurationFile)' == 'true'">$(TargetPath).config</RemoteClientAppConfigFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'">
|
||||
<None Include="$(TestRuntimeConfigurationFile)"
|
||||
Condition="Exists('$(TestRuntimeConfigurationFile)')"
|
||||
Link="$(TargetName).exe.config"
|
||||
CopyToOutputDirectory="PreserveNewest"
|
||||
Visible="false" />
|
||||
<ItemGroup Condition="'$(IsTestProjectOrExecutable)' == 'true'">
|
||||
<!--
|
||||
Include deps.json and runtimeconfig.json in ContentWithTargetPath so they will
|
||||
be copied to the output folder of projects that reference this one.
|
||||
Tracking issue: https://github.com/dotnet/sdk/issues/1675
|
||||
-->
|
||||
<ContentWithTargetPath Include="$(ProjectDepsFilePath)"
|
||||
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(GenerateDependencyFile)' == 'true'"
|
||||
Condition="'$(GenerateDependencyFile)' == 'true'"
|
||||
CopyToOutputDirectory="PreserveNewest"
|
||||
TargetPath="$(ProjectDepsFileName)" />
|
||||
<ContentWithTargetPath Include="$(ProjectRuntimeConfigFilePath)"
|
||||
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"
|
||||
Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'"
|
||||
CopyToOutputDirectory="PreserveNewest"
|
||||
TargetPath="$(ProjectRuntimeConfigFileName)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
We disabled implicit framework references but still want to be treated as framework dependent:
|
||||
1. To have runtimeTargets in the deps file.
|
||||
2. To populate the framework node in the runtimeconfig's runtimeOptions
|
||||
To do this we manually set the RuntimeFramework.
|
||||
At that point restore and conflict resolution already happened therefore setting the item here has no side effects.
|
||||
-->
|
||||
<Target Name="_SetRuntimeFrameworksForTestAssemblies"
|
||||
Condition="'$(SelfContained)' != 'true' and '$(MSBuildProjectExtension)' != '.depproj'"
|
||||
BeforeTargets="GenerateBuildDependencyFile">
|
||||
<ItemGroup>
|
||||
<RuntimeFramework Include="Microsoft.NETCore.App" Version="$(ProductVersion)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -183,21 +183,8 @@
|
|||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="AddFrameworkReference">
|
||||
<ItemGroup>
|
||||
<FrameworkReference Include="$(SharedFrameworkName)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="UpdateRuntimePack"
|
||||
DependsOnTargets="AddFrameworkReference;ResolveFrameworkReferences">
|
||||
<ItemGroup>
|
||||
<ResolvedRuntimePack Update="@(ResolvedRuntimePack)" PackageDirectory="$(MicrosoftNetCoreAppRuntimePackDir)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishTestAsSelfContained"
|
||||
Condition="'$(IsCrossTargetingBuild)' != 'true'"
|
||||
AfterTargets="Build"
|
||||
DependsOnTargets="UpdateRuntimePack;Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
|
||||
DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
|
||||
<RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
|
||||
<SelfContained>true</SelfContained>
|
||||
<EnableTargetingPackDownload>false</EnableTargetingPackDownload>
|
||||
<PlatformManifestFile />
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Provide runtime options to Mono (interpreter, aot, debugging, etc) -->
|
||||
|
|
|
|||
|
|
@ -19,11 +19,6 @@
|
|||
<RunScriptHost Condition="'$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Set env variable to use the local netfx assemblies instead of the ones in the GAC. -->
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
<RunScriptCommands Include="set DEVPATH=%RUNTIME_PATH%" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ArchiveTestsAfterTargets>PrepareForRun</ArchiveTestsAfterTargets>
|
||||
|
||||
|
|
@ -96,7 +91,10 @@
|
|||
|
||||
<Target Name="RunTests">
|
||||
<PropertyGroup>
|
||||
<RunTestsCommand>"$(RunScriptOutputPath)" --runtime-path "$(TestHostRootPath.TrimEnd('\/'))"</RunTestsCommand>
|
||||
<RunTestsCommand>"$(RunScriptOutputPath)"</RunTestsCommand>
|
||||
<!-- Use runtime path only for the live built shared framework (NetCoreAppCurrent). -->
|
||||
<RunTestsCommand Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))">$(RunTestsCommand) --runtime-path "$(TestHostRootPath.TrimEnd('\/'))"</RunTestsCommand>
|
||||
<RunTestsCommand Condition="'$(TestRspFile)' != '' and '$(RuntimeFlavor)' != 'Mono'">$(RunTestsCommand) --rsp-file "$(TestRspFile)"</RunTestsCommand>
|
||||
<RunTestsCommand Condition="'$(TargetsMobile)' == 'true'">"$(RunScriptOutputPath)" $(AssemblyName) $(TargetArchitecture)</RunTestsCommand>
|
||||
<RunTestsCommand Condition="'$(TargetOS)' == 'Browser'">"$(RunScriptOutputPath)" $(JSEngine) $(AssemblyName).dll $(_withoutCategories.Replace(';', ' -notrait category='))</RunTestsCommand>
|
||||
|
|
|
|||
|
|
@ -43,19 +43,17 @@
|
|||
|
||||
<!-- Overwrite the runner config file with the app local one. -->
|
||||
<Target Name="OverwriteDesktopTestRunnerConfigs"
|
||||
Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true' and '$(TargetFrameworkIdentifier)' == '.NETFramework'"
|
||||
Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and
|
||||
'$(GenerateAppConfigurationFile)' == 'true' and
|
||||
'@(AppConfigWithTargetPath)' != ''"
|
||||
AfterTargets="CopyFilesToOutputDirectory">
|
||||
|
||||
<ItemGroup>
|
||||
<_testRunnerConfigSourceFile Include="$(TargetDir)$(TargetName).exe.config" />
|
||||
<_testRunnerConfigDestFile Include="$(TargetDir)xunit.console.exe.config" />
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(_testRunnerConfigSourceFile)"
|
||||
Condition="'@(_testRunnerConfigSourceFile)' != ''"
|
||||
<Copy SourceFiles="@(AppConfigWithTargetPath)"
|
||||
DestinationFiles="@(_testRunnerConfigDestFile)"
|
||||
SkipUnchangedFiles="true" />
|
||||
|
||||
</Target>
|
||||
|
||||
<!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. -->
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
<Project>
|
||||
<ItemGroup>
|
||||
<!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
|
||||
<PackageReference Include="NETStandard.Library"
|
||||
Version="$(NetStandardLibrary20Version)"
|
||||
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Run target (F5) support. -->
|
||||
<PropertyGroup>
|
||||
<RunWorkingDirectory>$(OutDir)</RunWorkingDirectory>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"python3": "3.7.1"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20364.3",
|
||||
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20372.2",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3",
|
||||
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3",
|
||||
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<_RexcepFilePath Condition=" '$(_RexcepFilePath)' == '' ">$(MSBuildThisFileDirectory)..\vm\rexcep.h</_RexcepFilePath>
|
||||
<_ILLinkDescriptorsIntermediatePath>$(IntermediateOutputPath)ILLink.Descriptors.Combined.xml</_ILLinkDescriptorsIntermediatePath>
|
||||
<_ILLinkTasksToolsDir>$(PkgMicrosoft_NET_ILLink_Tasks)/tools</_ILLinkTasksToolsDir>
|
||||
<_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/$(NetFrameworkCurrent)/</_ILLinkTasksDir>
|
||||
<_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/net472/</_ILLinkTasksDir>
|
||||
<_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp3.0/</_ILLinkTasksDir>
|
||||
<_ILLinkTasksPath>$(_ILLinkTasksDir)ILLink.Tasks.dll</_ILLinkTasksPath>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ namespace System
|
|||
#endif
|
||||
public static unsafe string ToString(ReadOnlySpan<byte> bytes, Casing casing = Casing.Upper)
|
||||
{
|
||||
#if NET45 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472 || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
#if NETFRAMEWORK || NETSTANDARD1_0 || NETSTANDARD1_3 || NETSTANDARD2_0
|
||||
Span<char> result = stackalloc char[0];
|
||||
if (bytes.Length > 16)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Testing
|
|||
{
|
||||
Asserter.TestRan = true;
|
||||
}
|
||||
#elif NET472
|
||||
#elif NETFRAMEWORK
|
||||
[ConditionalFact]
|
||||
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
|
||||
public void ThisTestMustRunOnCLR()
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Testing
|
|||
{
|
||||
Asserter.TestRan = true;
|
||||
}
|
||||
#elif NET472
|
||||
#elif NETFRAMEWORK
|
||||
[ConditionalTheory]
|
||||
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
|
||||
[MemberData(nameof(GetInts))]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
This assembly is referenced from rid agnostic configurations therefore we can't make it RID specific
|
||||
and instead use runtime checks.
|
||||
-->
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="System\AdminHelpers.cs" />
|
||||
|
|
@ -63,4 +63,13 @@
|
|||
<PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" />
|
||||
<PackageReference Include="xunit.assert" Version="$(XUnitVersion)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<!-- Upgrade the NetStandard.Library transitive xunit dependency to avoid 1.x NS dependencies. -->
|
||||
<PackageReference Include="NETStandard.Library" Version="$(NetStandardLibrary20Version)" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" PrivateAssets="all" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" PrivateAssets="all" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
|
||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
<SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\..\Directory.Build.props" />
|
||||
<Import Project="NetCoreAppLibrary.props" />
|
||||
|
||||
<PropertyGroup Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">
|
||||
<IsAspNetCoreApp>true</IsAspNetCoreApp>
|
||||
|
|
@ -10,14 +11,11 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<BeforeTargetFrameworkInferenceTargets>$(RepositoryEngineeringDir)BeforeTargetFrameworkInference.targets</BeforeTargetFrameworkInferenceTargets>
|
||||
<ToolSetCommonDirectory>$(RepoRoot)artifacts\toolset\Common\</ToolSetCommonDirectory>
|
||||
<IsSourceProject>$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))</IsSourceProject>
|
||||
<IsReferenceAssembly Condition="'$(IsReferenceAssembly)' == '' and ($(MSBuildProjectFullPath.Contains('\ref\')) or $(MSBuildProjectFullPath.Contains('/ref/')))">true</IsReferenceAssembly>
|
||||
<LanguageTargets Condition="'$(MSBuildProjectExtension)' == '.depproj'">$(RepositoryEngineeringDir)depProj.common.targets</LanguageTargets>
|
||||
<RuntimeGraph>$(LibrariesProjectRoot)OSGroups.json</RuntimeGraph>
|
||||
<BuildTargetFramework>$(NetCoreAppCurrent)</BuildTargetFramework>
|
||||
<ShouldUnsetParentConfigurationAndPlatform>false</ShouldUnsetParentConfigurationAndPlatform>
|
||||
<AdditionalBuildTargetFrameworks Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(AdditionalBuildTargetFrameworks);$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-NetBSD;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris</AdditionalBuildTargetFrameworks>
|
||||
<!-- Remove once is fixed: https://github.com/dotnet/roslyn/issues/42344 -->
|
||||
<GeneratePlatformNotSupportedAssemblyHeaderFile>$(RepositoryEngineeringDir)LicenseHeader.txt</GeneratePlatformNotSupportedAssemblyHeaderFile>
|
||||
</PropertyGroup>
|
||||
|
|
@ -40,10 +38,13 @@
|
|||
the build system to use browser/ios/android as the RuntimeOS for produced package RIDs. -->
|
||||
<RuntimeOS Condition="'$(TargetsMobile)' == 'true'">$(TargetOS.ToLowerInvariant())</RuntimeOS>
|
||||
|
||||
<!-- Initialize BuildSettings from the individual properties if it wasn't already explicitly set -->
|
||||
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
|
||||
<BuildTargetFramework Condition="'$(BuildAllProjects)' != 'true' and '$(TargetFramework)' != ''">$(TargetFramework)</BuildTargetFramework>
|
||||
<BuildSettings Condition="'$(BuildSettings)' == ''">$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)</BuildSettings>
|
||||
<!-- Initialize BuildSettings from the individual properties. -->
|
||||
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
|
||||
<BuildTargetFramework Condition="'$(BuildTargetFramework)' == '' and '$(TargetFramework)' != ''">$(TargetFramework)</BuildTargetFramework>
|
||||
<!-- Build all .NET Framework configurations when net48 is passed in. This is for convenience. -->
|
||||
<AdditionalBuildTargetFrameworks Condition="'$(BuildTargetFramework)' == 'net48'">net45;net451;net452;net46;net461;net462;net47;net471;net472</AdditionalBuildTargetFrameworks>
|
||||
<AdditionalBuildTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true' and '$(BuildAllProjects)' == 'true'">$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks>
|
||||
<BuildSettings>$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)</BuildSettings>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Define test projects and companions -->
|
||||
|
|
@ -142,11 +143,10 @@
|
|||
<PackageRID Condition="'$(PackageRID)' == ''">$(RuntimeOS)-$(TargetArchitecture)</PackageRID>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- set properties for each vertical -->
|
||||
<PropertyGroup>
|
||||
<BuildingNETCoreAppVertical Condition="'$(BuildingNETCoreAppVertical)' == '' and ('$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETCoreAppVertical>
|
||||
<BuildingNETFxVertical Condition="'$(BuildingNETFxVertical)' == '' and ('$(BuildTargetFramework)' == '$(NetFrameworkCurrent)' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETFxVertical>
|
||||
<BinPlaceNETCoreAppPackage Condition="'$(BuildingNETCoreAppVertical)' == 'true'">true</BinPlaceNETCoreAppPackage>
|
||||
<BuildingNETCoreAppVertical Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
|
||||
'$(BuildAllConfigurations)' == 'true'">true</BuildingNETCoreAppVertical>
|
||||
<BinPlaceTestSharedFramework Condition="'$(BuildingNETCoreAppVertical)' == 'true'">true</BinPlaceTestSharedFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
|
|
@ -216,13 +216,7 @@
|
|||
|
||||
<!-- Disable some standard properties for building our projects -->
|
||||
<PropertyGroup>
|
||||
<NoStdLib>true</NoStdLib>
|
||||
<NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib>
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
<CopyNuGetImplementations>false</CopyNuGetImplementations>
|
||||
<DisableImplicitConfigurationDefines>true</DisableImplicitConfigurationDefines>
|
||||
<!-- Don't reference implicit framework packages, all projects in this repo must be explicit -->
|
||||
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
|
||||
<!-- We can't generate an apphost without restoring the targeting pack. -->
|
||||
<UseAppHost>false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
|
@ -238,14 +232,7 @@
|
|||
<EnableAnalyzers Condition="'$(EnableAnalyzers)' == '' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' != '.ilproj'">true</EnableAnalyzers>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Set up some common paths -->
|
||||
<PropertyGroup>
|
||||
<CommonPathRoot>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common'))</CommonPathRoot>
|
||||
<CommonPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'src'))</CommonPath>
|
||||
<CommonTestPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests'))</CommonTestPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Set up the default output and intermediate paths -->
|
||||
<!-- Set up common paths -->
|
||||
<PropertyGroup>
|
||||
<!--
|
||||
Microsoft.NET.TargetFrameworkInference.targets appends the TargetFramework.
|
||||
|
|
@ -253,11 +240,8 @@
|
|||
-->
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
|
||||
<RuntimePath Condition="'$(RuntimePath)' == ''">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(BuildSettings)'))</RuntimePath>
|
||||
<BuildTargetFrameworkRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(BuildTargetFramework)'))</BuildTargetFrameworkRefPath>
|
||||
<NetStandard20RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.0'))</NetStandard20RefPath>
|
||||
<NetStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.1'))</NetStandard21RefPath>
|
||||
<NetFxRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetFrameworkCurrent)'))</NetFxRefPath>
|
||||
<NetCoreAppCurrentRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetCoreAppCurrent)'))</NetCoreAppCurrentRefPath>
|
||||
<NetCoreAppCurrentRuntimePath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)'))</NetCoreAppCurrentRuntimePath>
|
||||
|
||||
<!-- System.Private.CoreLib -->
|
||||
<CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'src', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
|
||||
|
|
@ -280,6 +264,7 @@
|
|||
<ASPNETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\aspnetcoreapp\lib</ASPNETCoreAppPackageRuntimePath>
|
||||
|
||||
<TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildSettings)'))</TestHostRootPath>
|
||||
<NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', '$(SharedFrameworkName)', '$(ProductVersion)'))</NETCoreAppTestSharedFrameworkPath>
|
||||
|
||||
<MicrosoftNetCoreAppRefPackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref'))</MicrosoftNetCoreAppRefPackDir>
|
||||
<MicrosoftNetCoreAppRefPackRefDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRefPackRefDir>
|
||||
|
|
@ -292,7 +277,9 @@
|
|||
|
||||
<VersionFileForPackages Condition="'$(VersionFileForPackages)' == ''">$(ArtifactsObjDir)version.txt</VersionFileForPackages>
|
||||
|
||||
<AdditionalBuildTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true' and '$(BuildAllProjects)' == 'true'">$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks>
|
||||
<CommonPathRoot>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common'))</CommonPathRoot>
|
||||
<CommonPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'src'))</CommonPath>
|
||||
<CommonTestPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests'))</CommonTestPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Import it at the end of the props file to override the OutputPath for reference assemblies and use common directory props -->
|
||||
|
|
@ -308,23 +295,6 @@
|
|||
<EnableDefaultItems>false</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(BuildAllConfigurations)' != 'true'">
|
||||
<!-- We add extra binplacing for the test shared framework until we can get hardlinking with the runtime directory working on all platforms -->
|
||||
<BinPlaceTestSharedFramework Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">true</BinPlaceTestSharedFramework>
|
||||
<BinPlaceNETFXRuntime Condition="'$(BuildTargetFramework)' == '$(NetFrameworkCurrent)'">true</BinPlaceNETFXRuntime>
|
||||
|
||||
<NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(ProductVersion)'))</NETCoreAppTestSharedFrameworkPath>
|
||||
|
||||
<TestHostRuntimePath Condition="'$(BinPlaceTestSharedFramework)' == 'true'">$(NETCoreAppTestSharedFrameworkPath)</TestHostRuntimePath>
|
||||
<TestHostRuntimePath Condition="'$(BinPlaceNETFXRuntime)' == 'true'">$(TestHostRootPath)</TestHostRuntimePath>
|
||||
|
||||
<PlatformManifestFile Condition="'$(BinPlaceTestSharedFramework)' == 'true'">$(TestHostRuntimePath)PlatformManifest.txt</PlatformManifestFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(PlatformManifestFile)' != '' and ('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true')">
|
||||
<PackageConflictPlatformManifests Include="$(PlatformManifestFile)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
|
||||
<ProjectReference Include="$(CommonTestPath)TestUtilities\TestUtilities.csproj" />
|
||||
</ItemGroup>
|
||||
|
|
@ -354,22 +324,6 @@
|
|||
<CoverageIncludeDirectory Include="shared\Microsoft.NETCore.App\$(ProductVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemDefinitionGroup Condition="'$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'">
|
||||
<!-- Project references for non-test assemblies should never be copied to the output. -->
|
||||
<ProjectReference>
|
||||
<Private>false</Private>
|
||||
</ProjectReference>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<!--
|
||||
The Utf8String package is experimental. We don't want tests to inadvertently take a dependency on this
|
||||
feature unless they explicitly opt in to it. (Source projects explicitly reference their dependencies,
|
||||
so they can't inadvertently take a dependency on it.)
|
||||
-->
|
||||
<ItemGroup Condition="('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true') and '$(IncludeUtf8StringAsmRef)' != 'true'">
|
||||
<DefaultReferenceExclusions Include="System.Utf8String.Experimental" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<CLSCompliant Condition="'$(CLSCompliant)' == '' and ('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true')">false</CLSCompliant>
|
||||
<CLSCompliant Condition="'$(CLSCompliant)' == ''">true</CLSCompliant>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
<Project InitialTargets="UpdateProjectReferencesWithAttributes">
|
||||
<PropertyGroup>
|
||||
<RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)'))</RefPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\..\Directory.Build.targets" />
|
||||
|
||||
|
|
@ -17,6 +14,22 @@
|
|||
<WarningsAsErrors Condition="'$(WarningsAsErrors)' == 'NU1605'" />
|
||||
<!-- Set the documentation output file globally. -->
|
||||
<DocumentationFile Condition="'$(IsSourceProject)' == 'true' and '$(DocumentationFile)' == '' and '$(MSBuildProjectExtension)' != '.vbproj'">$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
|
||||
<IsNETCoreAppSrc Condition="'$(IsNETCoreAppSrc)' == '' and
|
||||
'$(IsSourceProject)' == 'true' and
|
||||
$(NetCoreAppLibrary.Contains('$(AssemblyName);'))">true</IsNETCoreAppSrc>
|
||||
<IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == '' and
|
||||
'$(IsReferenceAssembly)' == 'true' and
|
||||
$(NetCoreAppLibrary.Contains('$(AssemblyName);')) and
|
||||
!$(NetCoreAppLibraryNoReference.Contains('$(AssemblyName);'))">true</IsNETCoreAppRef>
|
||||
<!-- By default, disable implicit framework references for NetCoreAppCurrent libraries. -->
|
||||
<DisableImplicitFrameworkReferences Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)')) and
|
||||
('$(IsNETCoreAppRef)' == 'true' or '$(IsNETCoreAppSrc)' == 'true')">true</DisableImplicitFrameworkReferences>
|
||||
<!-- Disable implicit assembly references for .NETCoreApp refs and sources. -->
|
||||
<DisableImplicitAssemblyReferences Condition="'$(DisableImplicitAssemblyReferences)' == '' and
|
||||
'$(DisableImplicitFrameworkReferences)' != 'true' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
('$(IsReferenceAssembly)' == 'true' or '$(IsSourceProject)' == 'true')">true</DisableImplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -41,21 +54,18 @@
|
|||
|
||||
<Import Project="$(RepositoryEngineeringDir)versioning.targets" />
|
||||
|
||||
<!-- Corefx-specific binplacing properties -->
|
||||
<!-- Libraries-specific binplacing properties -->
|
||||
<PropertyGroup>
|
||||
<IsRuntimeAssembly Condition="'$(IsRuntimeAssembly)'=='' and '$(IsReferenceAssembly)' != 'true' and '$(BinPlaceRef)' != 'true' and '$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'">true</IsRuntimeAssembly>
|
||||
<!-- Try to determine if this is a simple library without a ref project.
|
||||
https://github.com/dotnet/corefx/issues/14291 is tracking cleaning this up -->
|
||||
<IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and '$(IsRuntimeAssembly)' == 'true' and Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)') and !Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)/ref') and !$(MSBuildProjectName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly>
|
||||
<IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == ''">$(IsNETCoreApp)</IsNETCoreAppRef>
|
||||
<IsNetFxNETStandardRef Condition="'$(IsNetFxNETStandardRef)' == ''">$(IsNetFxNETStandard)</IsNetFxNETStandardRef>
|
||||
|
||||
<BinPlaceRef Condition="'$(BinPlaceRef)' == '' and ('$(IsReferenceAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef>
|
||||
<BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' and ('$(IsRuntimeAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime>
|
||||
<BinPlaceForTargetVertical Condition="'$(BinPlaceForTargetVertical)' == ''">true</BinPlaceForTargetVertical>
|
||||
<AllTargetFrameworks>net45;net451;net46;net461;net462;net47;net471;net472;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;$(netcoreappCurrent);</AllTargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">
|
||||
<!-- Microsoft.Extensions are not yet using the doc-file package -->
|
||||
<BinPlaceItem Include="$(DocumentationFile)" />
|
||||
|
|
@ -63,74 +73,52 @@
|
|||
|
||||
<ItemGroup Condition="'@(BinPlaceTargetFrameworks)' == ''">
|
||||
<!-- binplace to directories for the target vertical -->
|
||||
<BinPlaceTargetFrameworks Include="$(BuildTargetFramework)-$(TargetOS)" Condition="'$(BinPlaceForTargetVertical)' == 'true'">
|
||||
<NativePath>$(RuntimePath)</NativePath>
|
||||
<RefPath>$(BuildTargetFrameworkRefPath)</RefPath>
|
||||
<RuntimePath>$(RuntimePath)</RuntimePath>
|
||||
<BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)"
|
||||
Condition="'$(BinPlaceForTargetVertical)' == 'true'">
|
||||
<NativePath>$(NetCoreAppCurrentRuntimePath)</NativePath>
|
||||
<RefPath>$(NetCoreAppCurrentRefPath)</RefPath>
|
||||
<RuntimePath>$(NetCoreAppCurrentRuntimePath)</RuntimePath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
|
||||
<!-- binplace to directories for packages -->
|
||||
<BinPlaceTargetFrameworks Condition="'$(IsNETCoreApp)' == 'true' and '$(BuildingNETCoreAppVertical)' == 'true'" Include="$(NetCoreAppCurrent)-$(TargetOS)">
|
||||
<PackageFileNativePath>$(NETCoreAppPackageRuntimePath)</PackageFileNativePath>
|
||||
<BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)"
|
||||
Condition="'$(BuildingNETCoreAppVertical)' == 'true'">
|
||||
<PackageFileNativePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppPackageRuntimePath)</PackageFileNativePath>
|
||||
<PackageFileRefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(NETCoreAppPackageRefPath)</PackageFileRefPath>
|
||||
<PackageFileRuntimePath>$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath>
|
||||
<NativePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture)</NativePath>
|
||||
<RefPath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true' and '$(IsNETCoreAppRef)' == 'true'">$(RefRootPath)microsoft.netcore.app\$(Configuration)</RefPath>
|
||||
<RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture)</RuntimePath>
|
||||
<PackageFileRuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath>
|
||||
<NativePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture)</NativePath>
|
||||
<RefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(RefRootPath)microsoft.netcore.app\$(Configuration)</RefPath>
|
||||
<RuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture)</RuntimePath>
|
||||
<!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly -->
|
||||
<SetProperties Condition="'$(BinPlaceRuntime)' == 'true' and '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties>
|
||||
<SetProperties Condition="'$(IsNETCoreAppSrc)' == 'true' and
|
||||
'$(BinPlaceRuntime)' == 'true' and
|
||||
'$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties>
|
||||
</BinPlaceTargetFrameworks>
|
||||
<BinPlaceTargetFrameworks Condition="'$(IsAspNetCoreApp)' == 'true'" Include="$(NetCoreAppCurrent)">
|
||||
<BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)"
|
||||
Condition="'$(IsAspNetCoreApp)' == 'true'">
|
||||
<RuntimePath>$(ASPNETCoreAppPackageRuntimePath)</RuntimePath>
|
||||
<RefPath>$(ASPNETCoreAppPackageRefPath)</RefPath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
|
||||
<!-- Setup the shared framework directory for testing -->
|
||||
<BinPlaceTargetFrameworks Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="$(NetCoreAppCurrent)-$(TargetOS)">
|
||||
<NativePath>$(NETCoreAppTestSharedFrameworkPath)</NativePath>
|
||||
<RuntimePath>$(NETCoreAppTestSharedFrameworkPath)</RuntimePath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
<BinPlaceTargetFrameworks Condition="'$(BinPlaceNETFXRuntime)' == 'true'" Include="$(NetFrameworkCurrent)-Windows_NT">
|
||||
<NativePath>$(TestHostRootPath)</NativePath>
|
||||
<RuntimePath>$(TestHostRootPath)</RuntimePath>
|
||||
<BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)"
|
||||
Condition="'$(BinPlaceTestSharedFramework)' == 'true'">
|
||||
<NativePath >$(NETCoreAppTestSharedFrameworkPath)</NativePath>
|
||||
<RuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(NETCoreAppTestSharedFrameworkPath)</RuntimePath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
|
||||
<!-- Microsoft.NetCore.App.Ref targeting pack -->
|
||||
<BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)">
|
||||
<RefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(MicrosoftNetCoreAppRefPackRefDir)</RefPath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
|
||||
<!-- Microsoft.NetCore.App.Runtime targeting pack -->
|
||||
<!-- Microsoft.NetCore.App.Ref and Microsoft.NetCore.App.Runtime targeting packs -->
|
||||
<BinPlaceTargetFrameworks Include="$(NetCoreAppCurrent)-$(TargetOS)">
|
||||
<NativePath>$(MicrosoftNetCoreAppRuntimePackNativeDir)</NativePath>
|
||||
<RuntimePath>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</RuntimePath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
|
||||
<!-- binplace targeting packs which may be different from Build TargetFramework -->
|
||||
<BinPlaceTargetFrameworks Include="netstandard2.0">
|
||||
<RefPath>$(NetStandard20RefPath)</RefPath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
<BinPlaceTargetFrameworks Include="netstandard2.1">
|
||||
<RefPath>$(NetStandard21RefPath)</RefPath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
<!-- some libraries that produce packages will remain targeting netcoreapp2.0 -->
|
||||
<BinPlaceTargetFrameworks Condition="'$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp2.0">
|
||||
<RefPath>$(RefRootPath)netcoreapp2.0/</RefPath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
<AllTargetFrameworkList Include="$(AllTargetFrameworks)"/>
|
||||
<!-- for BuildAllConfigurations make sure all refpaths are created. -->
|
||||
<BinPlaceTargetFrameworks Condition="'$(BuildAllConfigurations)' == 'true'" Include="@(AllTargetFrameworkList)">
|
||||
<RefPath>$(RefRootPath)%(Identity)/</RefPath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
<!-- for BuildAllConfigurations make sure runtimepaths are created for all vertical target frameworks. -->
|
||||
<BinPlaceTargetFrameworks Condition="'$(BuildAllConfigurations)' == 'true' and ('$(BinPlaceForTargetVertical)' == 'true' or ('$(TargetFramework)' != '$(NetCoreAppCurrent)' and '$(TargetFrameworkSuffix)' == ''))" Include="$(NetCoreAppCurrent)-$(TargetOS)">
|
||||
<NativePath>$(ArtifactsBinDir)runtime/%(Identity)-$(Configuration)-$(TargetArchitecture)</NativePath>
|
||||
<RuntimePath>$(ArtifactsBinDir)runtime/%(Identity)-$(Configuration)-$(TargetArchitecture)</RuntimePath>
|
||||
<RefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(MicrosoftNetCoreAppRefPackRefDir)</RefPath>
|
||||
<RuntimePath Condition="'$(IsNETCoreAppSrc)' == 'true'">$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</RuntimePath>
|
||||
</BinPlaceTargetFrameworks>
|
||||
|
||||
<BinPlaceTargetFrameworks Include="@(AdditionalBinPlaceTargetFrameworks)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(RepositoryEngineeringDir)codeOptimization.targets" />
|
||||
<Import Project="$(RepositoryEngineeringDir)targetingpacks.targets" />
|
||||
<Import Project="$(RepositoryEngineeringDir)references.targets" />
|
||||
<Import Project="$(RepositoryEngineeringDir)resolveContract.targets" />
|
||||
<Import Project="$(RepositoryEngineeringDir)testing\tests.targets" Condition="'$(EnableTestSupport)' == 'true'" />
|
||||
|
|
@ -141,9 +129,9 @@
|
|||
|
||||
<Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.targets" />
|
||||
<Import Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" Condition="'$(DisableProjectRestore)' == 'true'" />
|
||||
<Import Project="$(RepositoryEngineeringDir)referenceFromRuntime.targets" />
|
||||
<Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(IsSourceProject)' == 'true'" />
|
||||
<Import Project="$(RepositoryEngineeringDir)notSupported.SourceBuild.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" />
|
||||
<Import Project="$(RepositoryEngineeringDir)AvoidRestoreCycleOnSelfReference.targets" Condition="'$(AvoidRestoreCycleOnSelfReference)' == 'true'" />
|
||||
|
||||
<ItemGroup Condition="'$(IsSourceProject)' == 'true' or '$(IsReferenceAssembly)' == 'true' or '$(IsPartialFacadeAssembly)' == 'true'">
|
||||
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
|
||||
|
|
@ -193,6 +181,7 @@
|
|||
'$(Configuration)' != '$(CoreCLRConfiguration)'">Configuration=$(CoreCLRConfiguration)</SetConfiguration>
|
||||
<SetConfiguration Condition="'$(RuntimeFlavor)' == 'Mono' and
|
||||
'$(Configuration)' != '$(MonoConfiguration)'">Configuration=$(MonoConfiguration)</SetConfiguration>
|
||||
<Private>false</Private>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
|
@ -200,7 +189,9 @@
|
|||
<!-- Used for packaging -->
|
||||
<Target Name="IsNotNetCoreAppProject" Returns="@(IsNotNetCoreAppProjectResult)">
|
||||
<ItemGroup>
|
||||
<IsNotNetCoreAppProjectResult Condition="'$(IsNetCoreApp)' != 'true'" Include="$(MSBuildProjectName)" Version="$(PackageVersion)" />
|
||||
<IsNotNetCoreAppProjectResult Include="$(MSBuildProjectName)"
|
||||
Version="$(PackageVersion)"
|
||||
Condition="!$(NetCoreAppLibrary.Contains('$(MSBuildProjectName);'))" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
|
@ -222,6 +213,19 @@
|
|||
<Target Name="GetDocumentationFile"
|
||||
Returns="$(DocumentationFile)"/>
|
||||
|
||||
<!--
|
||||
Do not clean binplace assets in the ref targeting pack to avoid incremental build failures
|
||||
when the SDK tries to resolve the assets from the FrameworkList.
|
||||
-->
|
||||
<Target Name="RemoveTargetingPackIncrementalClean"
|
||||
Condition="'@(AdditionalCleanDirectories)' != ''"
|
||||
BeforeTargets="IncrementalCleanAdditionalDirectories;
|
||||
CleanAdditionalDirectories">
|
||||
<ItemGroup>
|
||||
<AdditionalCleanDirectories Remove="@(AdditionalCleanDirectories)" Condition="'%(Identity)' == '$(MicrosoftNetCoreAppRefPackRefDir)'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Adds Nullable annotation attributes to netstandard <= 2.0 builds -->
|
||||
<Choose>
|
||||
<When Condition="'$(Nullable)' != '' and ($(TargetFramework.StartsWith('netstandard1')) or '$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('netcoreapp2')) or '$(TargetFrameworkIdentifier)' == '.NETFramework')">
|
||||
|
|
@ -233,7 +237,6 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<ExcludeFromPackage Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' and '$(ExcludeCurrentNetCoreAppFromPackage)' == 'true'">true</ExcludeFromPackage>
|
||||
<ExcludeFromPackage Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)' and '$(ExcludeCurrentFullFrameworkFromPackage)' == 'true'">true</ExcludeFromPackage>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Adds System.Runtime.Versioning*Platform* annotation attributes to < .NET 5 builds -->
|
||||
|
|
@ -253,7 +256,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<SkipLocalsInit Condition="'$(SkipLocalsInit)' == '' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' == '.csproj' and '$(IsNETCoreApp)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'">true</SkipLocalsInit>
|
||||
<SkipLocalsInit Condition="'$(SkipLocalsInit)' == '' and '$(MSBuildProjectExtension)' == '.csproj' and '$(IsNETCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'">true</SkipLocalsInit>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--Instructs compiler not to emit .locals init, using SkipLocalsInitAttribute.-->
|
||||
|
|
|
|||
|
|
@ -2,6 +2,5 @@
|
|||
<Import Project="..\Directory.Build.props" />
|
||||
<PropertyGroup>
|
||||
<StrongNameKeyId>Microsoft</StrongNameKeyId>
|
||||
<IsNETCoreApp>true</IsNETCoreApp>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<AssemblyName>Microsoft.CSharp</AssemblyName>
|
||||
<RootNamespace>Microsoft.CSharp</RootNamespace>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)</TargetFrameworks>
|
||||
<Nullable>enable</Nullable>
|
||||
<NoWarn>$(NoWarn);nullable</NoWarn>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net48</TargetFrameworks>
|
||||
<!--
|
||||
We wish to test operations that would result in
|
||||
"Operator '-' cannot be applied to operands of type 'ushort' and 'EnumArithmeticTests.UInt16Enum'"
|
||||
|
|
@ -37,4 +37,7 @@
|
|||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<Compile Include="AccessTests.netcoreapp.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -2,8 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<AssemblyName>Microsoft.Diagnostics.Tracing.EventSource</AssemblyName>
|
||||
<DefineConstants>$(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;TARGET_WINDOWS</DefineConstants>
|
||||
<TargetFrameworks>$(NetFrameworkCurrent)-Windows_NT;net461-Windows_NT</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>net461-Windows_NT</TargetFrameworks>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
@ -70,8 +69,4 @@
|
|||
<Compile Include="..\..\System.Private.CoreLib\src\System\Diagnostics\Tracing\TraceLogging\TraceLoggingTypeInfo.cs" />
|
||||
<Compile Include="..\..\System.Private.CoreLib\src\System\Diagnostics\Tracing\TraceLogging\TypeAnalysis.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);USE_MDT_EVENTSOURCE</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<TargetFrameworks>$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>net461-Windows_NT</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SDTTestDir>..\..\System.Diagnostics.Tracing\tests</SDTTestDir>
|
||||
|
|
@ -36,5 +36,6 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(TraceEventVersion)" />
|
||||
<ProjectReference Include="..\src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Caching.Abstractions.cs" />
|
||||
|
|
|
|||
|
|
@ -1,16 +1,12 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Primitives" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
<!-- This file is automatically generated. -->
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Caching.Memory.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Caching.Abstractions\ref\Microsoft.Extensions.Caching.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Caching.Abstractions\ref\Microsoft.Extensions.Caching.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,22 +1,16 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Caching.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.Options" />
|
||||
<Reference Include="Microsoft.Extensions.Primitives" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System.Core" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Caching.Abstractions\src\Microsoft.Extensions.Caching.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -10,7 +10,11 @@
|
|||
Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs" />
|
||||
<Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs"
|
||||
Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs" />
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Caching.Memory" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Caching.Memory.csproj" SkipUseReferenceAssembly="true" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.Abstractions.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,23 +1,16 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="*.cs" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Primitives" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.ValueTuple" />
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
|
||||
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.Binder.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,13 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -13,7 +13,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Binder" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" SkipUseReferenceAssembly="true" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Binder.csproj" SkipUseReferenceAssembly="true" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.CommandLine.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework);net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
<!-- Use targeting pack references instead of granular ones in the project file. -->
|
||||
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -15,7 +15,9 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.CommandLine" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.CommandLine.csproj" SkipUseReferenceAssembly="true" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,19 +1,13 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System.Core" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -15,7 +15,9 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj" SkipUseReferenceAssembly="true" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.FileExtensions.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,16 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
|
||||
<Reference Include="Microsoft.Extensions.Primitives" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Moq" Version="$(MoqVersion)" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.Ini.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,15 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
|
||||
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -15,7 +15,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Ini" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Ini.csproj" SkipUseReferenceAssembly="true" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.Json.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\System.Text.Json\ref\System.Text.Json.csproj" />
|
||||
<Reference Include="System.Threading.Tasks.Extensions" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\ref\System.Text.Json.csproj" />
|
||||
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,31 +1,24 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
<!-- Use targeting pack references instead of granular ones in the project file. -->
|
||||
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
|
||||
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
|
||||
<Reference Include="System.Memory" />
|
||||
<Reference Include="System.Text.Json" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<Reference Include="System.Collections" />
|
||||
<Reference Include="System.Linq" />
|
||||
<Reference Include="System.Runtime" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or
|
||||
$(TargetFramework.StartsWith('net4'))">
|
||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -15,8 +15,9 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Json" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Json.csproj" SkipUseReferenceAssembly="true" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.UserSecrets.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,17 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
<!-- Use targeting pack references instead of granular ones in the project file. -->
|
||||
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Json" />
|
||||
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<Reference Include="System.IO.FileSystem" />
|
||||
<Reference Include="System.Runtime" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -23,11 +19,4 @@
|
|||
<Content Include="build\netstandard2.0\$(MSBuildProjectName).targets" PackagePath="%(Identity)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Json" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.UserSecrets" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.UserSecrets.csproj" SkipUseReferenceAssembly="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.Xml.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,31 +1,21 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
<!-- Use targeting pack references instead of granular ones in the project file. -->
|
||||
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<Reference Include="System.Collections" />
|
||||
<Reference Include="System.Linq" />
|
||||
<Reference Include="System.Runtime" />
|
||||
<Reference Include="System.Xml.ReaderWriter" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
|
||||
<Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
|
||||
<Reference Include="System.Security.Cryptography.Xml" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Xml\src\System.Security.Cryptography.Xml.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Security" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -22,13 +22,18 @@
|
|||
Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\RuntimeFrameworks.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkCurrent)'">
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
|
||||
<Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TestPlatformHelper.cs"
|
||||
Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TestPlatformHelper.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.Xml" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.Xml.csproj" SkipUseReferenceAssembly="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
|
||||
<Reference Include="System.Security" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.Configuration.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,19 +1,13 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
|
||||
<Reference Include="Microsoft.Extensions.Primitives" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System.Core" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -11,6 +11,15 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.CommandLine\src\Microsoft.Extensions.Configuration.CommandLine.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.EnvironmentVariables\src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Ini\src\Microsoft.Extensions.Configuration.Ini.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.UserSecrets\src\Microsoft.Extensions.Configuration.UserSecrets.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Xml\src\Microsoft.Extensions.Configuration.Xml.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -11,7 +11,9 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Moq" Version="$(MoqVersion)" />
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.Configuration" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.Configuration.csproj" SkipUseReferenceAssembly="true" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<DefineConstants>$(DefineConstants);ActivatorUtilities_In_DependencyInjection</DefineConstants>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
<Nullable>enable</Nullable>
|
||||
|
|
@ -19,10 +18,4 @@
|
|||
Link="Common\src\Extensions\ActivatorUtilities\ObjectFactory.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.DependencyInjection.cs" />
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
|
||||
<Reference Include="System.Threading.Tasks.Extensions" />
|
||||
<Reference Include="Microsoft.Bcl.AsyncInterfaces" />
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
|
||||
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
|
||||
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
|
||||
<!-- Debug IL generation -->
|
||||
<ILEmitBackendSaveAssemblies>False</ILEmitBackendSaveAssemblies>
|
||||
</PropertyGroup>
|
||||
|
|
@ -14,36 +13,6 @@
|
|||
<DefineConstants Condition="$(TargetFramework.StartsWith('net4')) and '$(ILEmitBackendSaveAssemblies)' == 'True'">$(DefineConstants);SAVE_ASSEMBLIES</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0'">
|
||||
<Reference Include="Microsoft.Bcl.AsyncInterfaces" />
|
||||
<Reference Include="System.Threading.Tasks.Extensions" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System.Linq.Expressions" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<Reference Include="System.Collections" />
|
||||
<Reference Include="System.Collections.Concurrent" />
|
||||
<Reference Include="System.ComponentModel" />
|
||||
<Reference Include="System.Diagnostics.Tracing" />
|
||||
<Reference Include="System.Linq" />
|
||||
<Reference Include="System.Linq.Expressions" />
|
||||
<Reference Include="System.Reflection.Emit.ILGeneration" />
|
||||
<Reference Include="System.Reflection.Emit.Lightweight" />
|
||||
<Reference Include="System.Reflection.Primitives" />
|
||||
<Reference Include="System.Runtime" />
|
||||
<Reference Include="System.Threading" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="**\*.cs" />
|
||||
<Compile Remove="ServiceLookup\ILEmit\**\*.cs" />
|
||||
|
|
@ -56,4 +25,28 @@
|
|||
Link="Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<Reference Include="System.Collections" />
|
||||
<Reference Include="System.Collections.Concurrent" />
|
||||
<Reference Include="System.ComponentModel" />
|
||||
<Reference Include="System.Diagnostics.Tracing" />
|
||||
<Reference Include="System.Linq" />
|
||||
<Reference Include="System.Linq.Expressions" />
|
||||
<Reference Include="System.Reflection.Emit.ILGeneration" />
|
||||
<Reference Include="System.Reflection.Emit.Lightweight" />
|
||||
<Reference Include="System.Reflection.Primitives" />
|
||||
<Reference Include="System.Runtime" />
|
||||
<Reference Include="System.Threading" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or
|
||||
$(TargetFramework.StartsWith('net4'))">
|
||||
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
|
||||
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
<NoWarn>$(NoWarn);CS8002</NoWarn>
|
||||
<SignAssembly Condition="$(TargetFramework.StartsWith('net4'))">false</SignAssembly>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
|
||||
<PropertyGroup>
|
||||
<SignAssembly Condition="'$(TargetFramework)' == 'net461'">false</SignAssembly>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -16,8 +20,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection" />
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection.Abstractions" Aliases="DIAbstractions" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj" SkipUseReferenceAssembly="true" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" SkipUseReferenceAssembly="true" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
|
||||
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1"/>
|
||||
<PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="2.1.0"/>
|
||||
|
|
@ -29,4 +33,15 @@
|
|||
<PackageReference Include="Unity.Microsoft.DependencyInjection" Version="2.1.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Include these transitive dependencies to overrule NuGet's ProjectReference over PackageReferene behavior: https://github.com/NuGet/Home/issues/9354. -->
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
|
||||
<PackageReference Include="Microsoft.Win32.Primitives" Version="$(MicrosoftWin32PrimitivesVersion)" />
|
||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
|
||||
<PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
|
||||
<PackageReference Include="System.Runtime.Extensions" Version="$(SystemRuntimeExtensionsVersion)" />
|
||||
<PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesVersion)" />
|
||||
<PackageReference Include="System.Collections" Version="$(SystemCollectionsVersion)" />
|
||||
<PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -13,13 +13,10 @@
|
|||
<Compile Include="..\DI.Specification.Tests\**\*.cs" />
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
extern alias DIAbstractions;
|
||||
|
||||
using System;
|
||||
using Microsoft.AspNetCore.Testing;
|
||||
|
|
@ -8,8 +7,6 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
|
|||
using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
|
||||
using Xunit;
|
||||
|
||||
using AbstractionsSR = DIAbstractions::System.SR;
|
||||
|
||||
namespace Microsoft.Extensions.DependencyInjection
|
||||
{
|
||||
public class ServiceCollectionServiceExtensionsTest
|
||||
|
|
@ -350,7 +347,7 @@ namespace Microsoft.Extensions.DependencyInjection
|
|||
ExceptionAssert.ThrowsArgument(
|
||||
() => collection.TryAddEnumerable(descriptor),
|
||||
"descriptor",
|
||||
AbstractionsSR.Format(AbstractionsSR.TryAddIndistinguishableTypeToEnumerable, implementationType, serviceType));
|
||||
string.Format(@"Implementation type cannot be '{0}' because it is indistinguishable from other services registered for '{1}'.", implementationType, serviceType));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.DependencyModel.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net461;$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
@ -19,16 +18,15 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Runtime" />
|
||||
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="'$(TargetFramework)' == 'net461'" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="System.Buffers" />
|
||||
<Reference Include="System.Memory" />
|
||||
<Reference Include="System.Text.Json" />
|
||||
<Reference Include="System.Text.Encodings.Web" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj" />
|
||||
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
|
||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests
|
|||
var loader = new DependencyContextLoader();
|
||||
var context = loader.Load(typeof(DependencyContextLoaderTests).Assembly);
|
||||
|
||||
context.RuntimeLibraries.Should().Contain(l => l.Name == "Microsoft.Extensions.DependencyModel");
|
||||
context.RuntimeLibraries.Should().Contain(l => l.Name == "nonentrypointassembly");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
|
||||
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
<DefaultItemExcludes>$(DefaultItemExcludes);nonentrypointassembly\*</DefaultItemExcludes>
|
||||
<!-- Needed for .NET Framework. -->
|
||||
<GenerateDependencyFile>true</GenerateDependencyFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ReferenceFromRuntime Include="Microsoft.Extensions.DependencyModel" />
|
||||
|
||||
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
|
||||
<PackageReference Include="FluentAssertions" Version="4.19.4" />
|
||||
<PackageReference Include="Moq" Version="$(MoqVersion)" />
|
||||
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
|
||||
<PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-003121" />
|
||||
<PackageReference Include="Moq" Version="$(MoqVersion)" />
|
||||
<!-- Upgrade the transitive dependency's version to avoid PackageTargetFallback on .NETCoreApp. -->
|
||||
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
|
||||
<ProjectReference Include="..\src\Microsoft.Extensions.DependencyModel.csproj" SkipUseReferenceAssembly="true" />
|
||||
<ProjectReference Include="nonentrypointassembly\nonentrypointassembly.csproj" />
|
||||
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace nonentrypointassembly
|
||||
{
|
||||
public class NonEntryPointClass
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<EnableDefaultItems>true</EnableDefaultItems>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Microsoft.Extensions.FileProviders.Abstractions.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче