diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2022-04-27 18:27:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 18:27:56 +0300 |
| commit | b54561a957729ed479914db30dcda5b6873c21c7 (patch) | |
| tree | 5ba6e8d0777519983fb32008f8b47a9e9460d0ce | |
| parent | 6af4abc5a0db0560e719539a869233d15d28dc09 (diff) | |
Fix VS complaining about missing projects in slns (continued) (#68543)
* Infra clean-up to simplify auto references
* Ref project file updates
* Src project file updates
* Test project file updates
98 files changed, 311 insertions, 1077 deletions
diff --git a/eng/generators.targets b/eng/generators.targets index 8143fdf8e25..78afaac2569 100644 --- a/eng/generators.targets +++ b/eng/generators.targets @@ -21,7 +21,7 @@ or ('@(ProjectReference)' != '' and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))) or ('$(NetCoreAppCurrentTargetFrameworkMoniker)' == '$(TargetFrameworkMoniker)' - and '$(DisableImplicitAssemblyReferences)' != 'true'))" /> + and '$(DisableImplicitFrameworkReferences)' != 'true'))" /> <EnabledGenerators Include="LibraryImportGenerator" Condition="'$(EnableLibraryImportGenerator)' == '' and '$(IsSourceProject)' == 'true' diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index b61f18b44c9..3033cb9c4d8 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -67,21 +67,13 @@ </Reference> </ItemGroup> - <Target Name="RemoveFrameworkReferences" - BeforeTargets="_HandlePackageFileConflicts" - AfterTargets="ResolveTargetingPackAssets" - Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <!-- Point MicrosoftNetCoreAppRefPackRefDir to the acquired targeting pack to use it later for AssemblySearchPaths resolution. --> - <PropertyGroup Condition="'$(TargetFrameworkVersion)' != 'v$(NetCoreAppCurrentVersion)'"> - <MicrosoftNetCoreAppRefPackRefDir>%(ResolvedFrameworkReference.TargetingPackPath)\ref\net$(TargetFrameworkVersion.TrimStart('v'))\</MicrosoftNetCoreAppRefPackRefDir> - </PropertyGroup> - </Target> - <!-- Add the resolved targeting pack to the assembly search path. --> <Target Name="UseTargetingPackForAssemblySearchPaths" BeforeTargets="ResolveAssemblyReferences; DesignTimeResolveAssemblyReferences" - Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + '$(TargetFrameworkVersion)' == 'v$(NetCoreAppCurrentVersion)' and + '$(DisableImplicitFrameworkReferences)' == 'true'"> <PropertyGroup> <AssemblySearchPaths>$(AssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</AssemblySearchPaths> <DesignTimeAssemblySearchPaths>$(DesignTimeAssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</DesignTimeAssemblySearchPaths> @@ -131,7 +123,7 @@ <!-- Filter out conflicting implicit assembly references. --> <Target Name="FilterImplicitAssemblyReferences" - Condition="'$(DisableImplicitAssemblyReferences)' != 'true'" + Condition="'$(DisableImplicitFrameworkReferences)' != 'true'" DependsOnTargets="ResolveProjectReferences" AfterTargets="ResolveTargetingPackAssets"> <ItemGroup> diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj index f6f6fd45442..afc52b29a0c 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -3,8 +3,6 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <IsPackable>true</IsPackable> <PackageDescription>File system globbing to find files matching a specified pattern.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj index 09b10bd7c07..482e0b70e47 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -5,8 +5,6 @@ <EnableBinPlacing>false</EnableBinPlacing> <!-- This project should not build against the live built .NETCoreApp targeting pack as it contributes to the build itself. --> <UseLocalTargetingRuntimePack>false</UseLocalTargetingRuntimePack> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <AssemblyName>Microsoft.NETCore.Platforms.BuildTasks</AssemblyName> <IncludeBuildOutput>false</IncludeBuildOutput> <IncludeSymbols>false</IncludeSymbols> diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj index c97e12cc37a..bdc92da2027 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj @@ -8,16 +8,6 @@ <Compile Include="Microsoft.Win32.Registry.AccessControl.Forwards.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.AccessControl" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" /> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj index 07ceefb365b..7f6d66bdba8 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj @@ -1,5 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <IsPackable>true</IsPackable> <PackageDescription>Provides support for managing access and audit control lists for Microsoft.Win32.RegistryKey. @@ -8,7 +9,6 @@ Commonly Used Types: System.Security.AccessControl.RegistryAccessRule System.Security.AccessControl.RegistryAuditRule System.Security.AccessControl.RegistrySecurity</PackageDescription> - <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> @@ -22,12 +22,6 @@ System.Security.AccessControl.RegistrySecurity</PackageDescription> <Compile Include="Microsoft\Win32\RegistryAclExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.AccessControl" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" /> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj index 33a412241e3..31eb5372ea6 100644 --- a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj @@ -8,16 +8,4 @@ <Compile Include="System.CodeDom.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.CodeDom.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.CodeDom/src/System.CodeDom.csproj b/src/libraries/System.CodeDom/src/System.CodeDom.csproj index f3bdc0bb47b..030e04f61c5 100644 --- a/src/libraries/System.CodeDom/src/System.CodeDom.csproj +++ b/src/libraries/System.CodeDom/src/System.CodeDom.csproj @@ -1,8 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);CODEDOM</DefineConstants> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>annotations</Nullable> <IsTrimmable>false</IsTrimmable> <IsPackable>true</IsPackable> @@ -14,10 +14,12 @@ System.CodeDom.Compiler.CodeDomProvider Microsoft.CSharp.CSharpCodeProvider Microsoft.VisualBasic.VBCodeProvider</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly> </PropertyGroup> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="Microsoft\CSharp\CSharpCodeGenerator.cs" /> <Compile Include="Microsoft\CSharp\CSharpCodeGenerator.PlatformNotSupported.cs" /> @@ -139,18 +141,4 @@ Microsoft.VisualBasic.VBCodeProvider</PackageDescription> <Compile Include="$(CommonPath)System\CSharpHelpers.cs" /> <Compile Include="StringExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Process" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Threading" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj index 165d168ef10..d0547290823 100644 --- a/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/ref/System.Collections.Immutable.csproj @@ -2,20 +2,18 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Collections.Immutable.cs" /> <Compile Include="System.Collections.Immutable.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\ref\System.Collections.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 994e07fdd16..76202d0ea8f 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -22,6 +22,7 @@ System.Collections.Immutable.ImmutableSortedSet<T> System.Collections.Immutable.ImmutableStack System.Collections.Immutable.ImmutableStack<T></PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="Properties\InternalsVisibleTo.cs" /> <Compile Include="System\Collections\Generic\IHashKeyCollection.cs" /> @@ -104,16 +105,19 @@ System.Collections.Immutable.ImmutableStack<T></PackageDescription> Link="Common\System\Runtime\Versioning\NonVersionableAttribute.cs" /> <None Include="Interfaces.cd" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> <Reference Include="System.Linq" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Threading" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> </ItemGroup> diff --git a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj index ec44055fe54..09d70bb9247 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj @@ -12,9 +12,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Composition\ref\System.ComponentModel.Composition.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Context\ref\System.Reflection.Context.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj index aa0d3f5e318..24344af3cf4 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj @@ -43,12 +43,4 @@ System.ComponentModel.Composition.Registration.ExportBuilder</PackageDescription <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Context\src\System.Reflection.Context.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj index 5cf24c94095..969ee361a12 100644 --- a/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/ref/System.ComponentModel.Composition.csproj @@ -2,15 +2,9 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.ComponentModel.Composition.cs" /> <Compile Include="System.ComponentModel.Composition.Forwards.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Linq.Expressions\ref\System.Linq.Expressions.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj index 60eb2bf4f29..f6dd177f01d 100644 --- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj +++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj @@ -24,10 +24,12 @@ System.ComponentModel.Composition.Primitives.ExportDefinition System.ComponentModel.Composition.Primitives.ImportDefinition System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetFramework)' == 'netstandard2.0'">SR.PlatformNotSupported_ComponentModel_Composition</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Include="TypeForwards.cs" /> <Compile Include="Microsoft\Internal\AttributeServices.cs" /> @@ -200,33 +202,4 @@ System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices</Packa <Compile Include="$(CommonPath)System\Composition\Diagnostics\TraceWriter.cs" Link="Common\System\Composition\Diagnostics\TraceWriter.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.Diagnostics.Contracts" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.StackTrace" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.Linq.Queryable" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Reflection.Emit" /> - <Reference Include="System.Reflection.Emit.ILGeneration" /> - <Reference Include="System.Reflection.Primitives" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Text.Encoding.Extensions" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj index 86c81384c0f..3209fddaf7a 100644 --- a/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj +++ b/src/libraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj @@ -2,8 +2,8 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> - <IsPackable>true</IsPackable> <StrongNameKeyId>Microsoft</StrongNameKeyId> + <IsPackable>true</IsPackable> <PackageDescription>Provides common attributes used by System.Composition types. Commonly Used Types: @@ -27,8 +27,4 @@ System.Composition.Convention.AttributedModelProvider</PackageDescription> <Compile Include="System\Composition\SharedAttribute.cs" /> <Compile Include="System\Composition\SharingBoundaryAttribute.cs" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj index f37ecbea394..351feefa42c 100644 --- a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj +++ b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj @@ -3,8 +3,8 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> <IsTrimmable>false</IsTrimmable> - <IsPackable>true</IsPackable> <StrongNameKeyId>Microsoft</StrongNameKeyId> + <IsPackable>true</IsPackable> <PackageDescription>Provides types that support using Managed Extensibility Framework with a convention-based configuration model. Commonly Used Types: @@ -37,12 +37,4 @@ System.Composition.Convention.ParameterImportConventionBuilder</PackageDescripti <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj index 785911e47da..6122fbd3133 100644 --- a/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj +++ b/src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj @@ -3,8 +3,8 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> <IsTrimmable>false</IsTrimmable> - <IsPackable>true</IsPackable> <StrongNameKeyId>Microsoft</StrongNameKeyId> + <IsPackable>true</IsPackable> <PackageDescription>Provides Managed Extensibility Framework types that are useful to developers of extensible applications, or hosts. Commonly Used Types: @@ -44,15 +44,6 @@ System.Composition.Hosting.CompositionHost</PackageDescription> <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Runtime\src\System.Composition.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.ComponentModel.Composition" /> </ItemGroup> diff --git a/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj b/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj index 6bd1824f3ca..a8505133b50 100644 --- a/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj +++ b/src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj @@ -3,8 +3,8 @@ <RootNamespace>System.Composition</RootNamespace> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> - <IsPackable>true</IsPackable> <StrongNameKeyId>Microsoft</StrongNameKeyId> + <IsPackable>true</IsPackable> <PackageDescription>Contains runtime components of the Managed Extensibility Framework. Commonly Used Types: @@ -20,10 +20,4 @@ System.Composition.CompositionContext</PackageDescription> <Compile Include="System\Composition\Hosting\Core\CompositionContract.cs" /> <Compile Include="System\Composition\Runtime\Util\Formatters.cs" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj index 6bc2e6b5c02..104a09832de 100644 --- a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj +++ b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj @@ -4,8 +4,8 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> <IsTrimmable>false</IsTrimmable> - <IsPackable>true</IsPackable> <StrongNameKeyId>Microsoft</StrongNameKeyId> + <IsPackable>true</IsPackable> <PackageDescription>Provides some extension methods for the Managed Extensibility Framework. Commonly Used Types: @@ -46,11 +46,4 @@ System.Composition.Hosting.ContainerConfiguration</PackageDescription> <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Hosting\src\System.Composition.Hosting.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Runtime\src\System.Composition.Runtime.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj index a0312284d45..58e634cc963 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/ref/System.Configuration.ConfigurationManager.csproj @@ -4,28 +4,17 @@ <Nullable>disable</Nullable> <NoWarn>$(NoWarn);CS0618</NoWarn> </PropertyGroup> - <ItemGroup > + + <ItemGroup> <Compile Include="System.Configuration.ConfigurationManager.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="$(CommonPath)System\Obsoletions.cs" Link="Common\System\Obsoletions.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.Configuration.ConfigurationManager.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Configuration" /> </ItemGroup> diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj index 627ba0d86f0..48fab46deb3 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj @@ -270,38 +270,6 @@ System.Configuration.ConfigurationManager</PackageDescription> <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Process" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.Runtime.Serialization.Formatters" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Text.RegularExpressions" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Net.WebClient" /> - <Reference Include="System.Xml.ReaderWriter" /> - <Reference Include="System.Xml.XmlSerializer" /> - </ItemGroup> - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> - </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj" /> </ItemGroup> diff --git a/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj b/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj index bf167c01dfd..496204bc494 100644 --- a/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj +++ b/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj @@ -6,7 +6,4 @@ <ItemGroup> <Compile Include="ManualTests.cs" /> </ItemGroup> - <ItemGroup> - <Reference Include="System.Diagnostics.Process" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj index e1f683e8507..8ff48d8625a 100644 --- a/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/ref/System.Data.Odbc.csproj @@ -2,17 +2,9 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Data.Odbc.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.Data.Odbc.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Data.Common\ref\System.Data.Common.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Data.Common" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj index 03aa8af16c3..8fad480d961 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-FreeBSD;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>$(NoWarn);CA2249;CA1838;CA1846</NoWarn> <!-- Suppress CA1845: Use span-based 'string.Concat' and 'AsSpan' instead of 'Substring' to avoid ifdefs. --> <NoWarn>$(NoWarn);CA1845</NoWarn> @@ -17,6 +17,7 @@ System.Data.Odbc.OdbcParameter System.Data.Odbc.OdbcParameterCollection System.Data.Odbc.OdbcTransaction</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> @@ -25,9 +26,7 @@ System.Data.Odbc.OdbcTransaction</PackageDescription> <NoWarn Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">$(NoWarn);SA1121</NoWarn> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetPlatformIdentifier)' == ''">SR.Odbc_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" > - <Compile Include="System\Data\Odbc\ODBC32.Common.cs"/> - </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' != ''"> <Compile Include="$(CommonPath)System\Data\Common\AdapterUtil.cs" Link="Common\System\Data\Common\AdapterUtil.cs" /> @@ -126,62 +125,43 @@ System.Data.Odbc.OdbcTransaction</PackageDescription> <Compile Include="$(CommonPath)Interop\Interop.Odbc.cs" Link="Common\Interop\Interop.Odbc.cs" /> </ItemGroup> + + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" > + <Compile Include="System\Data\Odbc\ODBC32.Common.cs"/> + </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs" - Link="Common\DisableRuntimeMarshalling.cs" /> + Link="Common\DisableRuntimeMarshalling.cs" /> <Compile Include="$(CommonPath)System\Runtime\InteropServices\HandleRefMarshaller.cs" - Link="Common\System\Runtime\InteropServices\HandleRefMarshaller.cs" /> + Link="Common\System\Runtime\InteropServices\HandleRefMarshaller.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'Linux' or '$(TargetPlatformIdentifier)' == 'FreeBSD' or '$(TargetPlatformIdentifier)' == 'illumos' or '$(TargetPlatformIdentifier)' == 'Solaris'"> <Compile Include="$(CommonPath)Interop\Linux\Interop.Libraries.cs" Link="Common\Interop\Linux\Interop.Libraries.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'OSX' or '$(TargetPlatformIdentifier)' == 'iOS' or '$(TargetPlatformIdentifier)' == 'tvOS'"> <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs" Link="Common\Interop\OSX\Interop.Libraries.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" Link="Common\Interop\Windows\Interop.Libraries.cs" /> </ItemGroup> + <ItemGroup> - <EmbeddedResource Include="Resources\System.Data.Odbc.OdbcMetaData.xml"> - <LogicalName>System.Data.Odbc.OdbcMetaData.xml</LogicalName> - </EmbeddedResource> + <EmbeddedResource Include="Resources\System.Data.Odbc.OdbcMetaData.xml" + LogicalName="System.Data.Odbc.OdbcMetaData.xml" /> </ItemGroup> + <ItemGroup> <None Include="DatabaseSetupInstructions.md" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Data.Common" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.FileVersionInfo" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.Globalization" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.Security.Claims" /> - <Reference Include="System.Security.Principal" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Text.RegularExpressions" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Tasks" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading.ThreadPool" /> - <Reference Include="System.Threading.Timer" /> - <Reference Include="System.Transactions.Local" /> - <Reference Include="System.Xml.ReaderWriter" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj index b2a6044ed6e..c9fc4a77215 100644 --- a/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj @@ -10,27 +10,8 @@ <Compile Include="System.Data.OleDb.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Data.Common\ref\System.Data.Common.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Data.Common" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Transactions.Local" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" /> - <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 --> - <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" /> - <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" PrivateAssets="all" /> - <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" /> - <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" PrivateAssets="all" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index bfbecd63c58..ef2c702bc4c 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -1,6 +1,5 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- Supress CA2249: Consider using String.Contains instead of String.IndexOf to avoid ifdefs. --> @@ -143,28 +142,5 @@ System.Data.OleDb.OleDbTransaction</PackageDescription> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.PerformanceCounter\src\System.Diagnostics.PerformanceCounter.csproj" /> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Data.Common" /> - <Reference Include="System.Diagnostics.FileVersionInfo" /> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.Diagnostics.Tracing" /> - <Reference Include="System.Memory" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading.ThreadPool" /> - <Reference Include="System.Transactions.Local" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Text.RegularExpressions" /> - <Reference Include="System.Xml.ReaderWriter" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj index 237724fc5e9..339529877cf 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj @@ -4,25 +4,19 @@ <CLSCompliant>false</CLSCompliant> </PropertyGroup> - <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> - <PropertyGroup> - <DefineConstants Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">$(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS</DefineConstants> - </PropertyGroup> - <ItemGroup> <Compile Include="System.Diagnostics.DiagnosticSource.Typeforwards.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"/> <Compile Include="System.Diagnostics.DiagnosticSource.cs" /> <Compile Include="System.Diagnostics.DiagnosticSourceActivity.cs" /> - <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> - <Compile Include="$(CoreLibSharedDir)System\Runtime\CompilerServices\IsExternalInit.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> + <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" /> + <Compile Include="$(CoreLibSharedDir)System\Runtime\CompilerServices\IsExternalInit.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index 5b3fda9d99d..fabda09091a 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -1,9 +1,9 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLSCompliant>false</CLSCompliant> <NoWarn>$(NoWarn);SA1205;CA1845</NoWarn> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <EnableTrimAnalyzer Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">false</EnableTrimAnalyzer> <IsPackable>true</IsPackable> <PackageDescription>Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools) @@ -12,28 +12,17 @@ Commonly Used Types: System.Diagnostics.DiagnosticListener System.Diagnostics.DiagnosticSource</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <DefineConstants Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">$(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS;ENABLE_HTTP_HANDLER</DefineConstants> <DefineConstants Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">$(DefineConstants);W3C_DEFAULT_ID_FORMAT;MEMORYMARSHAL_SUPPORT;OS_ISBROWSER_SUPPORT</DefineConstants> <IncludePlatformAttributes>true</IncludePlatformAttributes> </PropertyGroup> + <ItemGroup> - <Compile Include="System\Diagnostics\DiagnosticSource.cs" /> - <Compile Include="System\Diagnostics\DiagnosticListener.cs" /> - <Compile Include="System\Diagnostics\DiagnosticSourceEventSource.cs" /> - <None Include="DiagnosticSourceUsersGuide.md" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> - <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicDependencyAttribute.cs" /> - <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" /> - <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" /> - <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" /> - <Compile Include="$(CoreLibSharedDir)System\Runtime\CompilerServices\IsExternalInit.cs" /> - </ItemGroup> - <ItemGroup> - <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> <Compile Include="System\Diagnostics\Activity.cs" /> + <Compile Include="System\Diagnostics\Activity.Current.net46.cs" /> <Compile Include="System\Diagnostics\ActivityStatusCode.cs" /> <Compile Include="System\Diagnostics\ActivityTagsCollection.cs" /> <Compile Include="System\Diagnostics\ActivityContext.cs" /> @@ -44,7 +33,10 @@ System.Diagnostics.DiagnosticSource</PackageDescription> <Compile Include="System\Diagnostics\ActivityLink.cs" /> <Compile Include="System\Diagnostics\ActivityListener.cs" /> <Compile Include="System\Diagnostics\ActivitySource.cs" /> + <Compile Include="System\Diagnostics\DiagnosticSource.cs" /> <Compile Include="System\Diagnostics\DiagnosticSourceActivity.cs" /> + <Compile Include="System\Diagnostics\DiagnosticListener.cs" /> + <Compile Include="System\Diagnostics\DiagnosticSourceEventSource.cs" /> <Compile Include="System\Diagnostics\DiagLinkedList.cs" /> <Compile Include="System\Diagnostics\DistributedContextPropagator.cs" /> <Compile Include="System\Diagnostics\LegacyPropagator.cs" /> @@ -59,8 +51,6 @@ System.Diagnostics.DiagnosticSource</PackageDescription> <Compile Include="System\Diagnostics\Metrics\Histogram.cs" /> <Compile Include="System\Diagnostics\Metrics\Instrument.cs" /> <Compile Include="System\Diagnostics\Metrics\Instrument.common.cs" /> - <Compile Include="System\Diagnostics\Metrics\Instrument.netcore.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> - <Compile Include="System\Diagnostics\Metrics\Instrument.netfx.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> <Compile Include="System\Diagnostics\Metrics\InstrumentState.cs" /> <Compile Include="System\Diagnostics\Metrics\LastValueAggregator.cs" /> <Compile Include="System\Diagnostics\Metrics\Measurement.cs" /> @@ -68,50 +58,61 @@ System.Diagnostics.DiagnosticSource</PackageDescription> <Compile Include="System\Diagnostics\Metrics\MeterListener.cs" /> <Compile Include="System\Diagnostics\Metrics\MetricsEventSource.cs" /> <Compile Include="System\Diagnostics\Metrics\ObjectSequence.cs" /> - <Compile Include="System\Diagnostics\Metrics\ObjectSequence.netcore.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> - <Compile Include="System\Diagnostics\Metrics\ObjectSequence.netfx.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> <Compile Include="System\Diagnostics\Metrics\ObservableCounter.cs" /> <Compile Include="System\Diagnostics\Metrics\ObservableGauge.cs" /> <Compile Include="System\Diagnostics\Metrics\ObservableInstrument.cs" /> <Compile Include="System\Diagnostics\Metrics\ObservableUpDownCounter.cs" /> <Compile Include="System\Diagnostics\Metrics\RateAggregator.cs" /> <Compile Include="System\Diagnostics\Metrics\StringSequence.cs" /> - <Compile Include="System\Diagnostics\Metrics\StringSequence.netcore.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> - <Compile Include="System\Diagnostics\Metrics\StringSequence.netfx.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> <Compile Include="System\Diagnostics\Metrics\TagList.cs" /> <Compile Include="System\Diagnostics\Metrics\UpDownCounter.cs" /> + + <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> + + <None Include="DiagnosticSourceUsersGuide.md" /> <None Include="ActivityUserGuide.md" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Compile Include="System\Diagnostics\LocalAppContextSwitches.cs" /> - <Compile Include="System\Diagnostics\System.Diagnostics.DiagnosticSource.Typeforwards.netcoreapp.cs" /> - <Compile Include="$(CommonPath)System\LocalAppContextSwitches.Common.cs"> - <Link>Common\System\LocalAppContextSwitches.Common.cs</Link> - </Compile> - </ItemGroup> - <ItemGroup> - <Compile Include="System\Diagnostics\Activity.Current.net46.cs" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' or - '$(TargetFramework)' == 'netstandard2.0'"> - <Compile Include="System\Diagnostics\Activity.DateTime.corefx.cs" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Include="System\Diagnostics\Activity.GenerateRootId.netcoreapp.cs" /> <Compile Include="System\Diagnostics\ActivityContext.netcoreapp.cs" /> <Compile Include="System\Diagnostics\ActivityLink.netcoreapp.cs" /> + <Compile Include="System\Diagnostics\LocalAppContextSwitches.cs" /> + <Compile Include="System\Diagnostics\Metrics\Instrument.netcore.cs" /> + <Compile Include="System\Diagnostics\Metrics\ObjectSequence.netcore.cs" /> + <Compile Include="System\Diagnostics\Metrics\StringSequence.netcore.cs" /> + <Compile Include="System\Diagnostics\System.Diagnostics.DiagnosticSource.Typeforwards.netcoreapp.cs" /> + <Compile Include="$(CommonPath)System\LocalAppContextSwitches.Common.cs" + Link="Common\System\LocalAppContextSwitches.Common.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="System\Diagnostics\Activity.GenerateRootId.netfx.cs" /> <Compile Include="System\Diagnostics\ActivityContext.netfx.cs" /> <Compile Include="System\Diagnostics\ActivityLink.netfx.cs" /> + <Compile Include="System\Diagnostics\Metrics\Instrument.netfx.cs" /> + <Compile Include="System\Diagnostics\Metrics\ObjectSequence.netfx.cs" /> + <Compile Include="System\Diagnostics\Metrics\StringSequence.netfx.cs" /> + + <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicDependencyAttribute.cs" /> + <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" /> + <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" /> + <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" /> + <Compile Include="$(CoreLibSharedDir)System\Runtime\CompilerServices\IsExternalInit.cs" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' or + '$(TargetFramework)' == 'netstandard2.0'"> + <Compile Include="System\Diagnostics\Activity.DateTime.corefx.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Compile Include="System\Diagnostics\HttpHandlerDiagnosticListener.cs" /> <Compile Include="AssemblyInfo.netfx.cs" /> <Compile Include="System\Diagnostics\Activity.DateTime.netfx.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Diagnostics.Tracing" /> @@ -121,9 +122,11 @@ System.Diagnostics.DiagnosticSource</PackageDescription> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Thread" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))" > <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj index dcd56682dac..80ae1f91e0b 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj @@ -4,20 +4,10 @@ <Nullable>disable</Nullable> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Diagnostics.PerformanceCounter.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.Diagnostics.PerformanceCounter.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> <Compile Include="System.Diagnostics.PerformanceCounter.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index ff0ebc6c358..8a800527bb1 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>$(NoWarn);CA1847</NoWarn> <Nullable>annotations</Nullable> <IsPackable>true</IsPackable> @@ -10,6 +10,7 @@ Commonly Used Types: System.Diagnostics.PerformanceCounter</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> @@ -17,6 +18,7 @@ System.Diagnostics.PerformanceCounter</PackageDescription> <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetPlatformIdentifier)' != 'windows'">SR.PlatformNotSupported_PerfCounters</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="System\Diagnostics\DiagnosticsConfiguration.cs" /> <Compile Include="System\Diagnostics\CounterCreationData.cs" /> @@ -129,34 +131,13 @@ System.Diagnostics.PerformanceCounter</PackageDescription> <Compile Include="$(CommonPath)System\Diagnostics\NetFrameworkUtils.cs" Link="Common\System\Diagnostics\NetFrameworkUtils.cs" /> </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs" Link="Common\DisableRuntimeMarshalling.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Buffers" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Process" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.IO.MemoryMappedFiles" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.Claims" /> - <Reference Include="System.Security.Principal" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> </ItemGroup> </Project> diff --git a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj index c1f09b6a192..a3347391ee9 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj @@ -3,19 +3,11 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <Nullable>disable</Nullable> </PropertyGroup> + <ItemGroup> <Compile Include="System.DirectoryServices.AccountManagement.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Security.Principal.Windows" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> </ItemGroup> diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index b918883f719..8152e3c7f05 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -1,8 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> - <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <NoWarn>$(NoWarn);CA2249</NoWarn> <!-- Suppressions to avoid ifdefs: CA1845: Use span-based 'string.Concat' and 'AsSpan' instead of 'Substring' @@ -14,11 +14,13 @@ <AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage> <PackageDescription>Provides uniform access and manipulation of user, computer, and group security principals across the multiple principal stores: Active Directory Domain Services (AD DS), Active Directory Lightweight Directory Services (AD LDS), and Machine SAM (MSAM).</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' != 'windows'">SR.DirectoryServicesAccountManagement_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="System\DirectoryServices\AccountManagement\interopt.cs" /> <Compile Include="System\DirectoryServices\AccountManagement\PrincipalSearcher.cs" /> @@ -189,42 +191,18 @@ <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeTokenHandle.cs" Link="Common\Microsoft\Win32\SafeHandles\SafeTokenHandle.cs" /> </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs" Link="Common\DisableRuntimeMarshalling.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj" /> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.IO.FileSystem.AccessControl" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Net.Security" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Claims" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Security.Principal" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Text.RegularExpressions" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> </ItemGroup> diff --git a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj index ef5b7753642..ee6a6e95dab 100644 --- a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj @@ -2,21 +2,11 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.DirectoryServices.Protocols.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Security.Principal.Windows" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> </ItemGroup> diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj index 33bfe13efee..56862519355 100644 --- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj +++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj @@ -1,8 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> - <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-OSX;$(NetCoreAppMinimum)-Linux;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <IsPackable>true</IsPackable> <Nullable>annotations</Nullable> <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage> @@ -11,11 +11,13 @@ <!-- CS3016: Arrays as attribute arguments is not CLS-compliant --> <NoWarn>$(NoWarn);CS3016</NoWarn> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' == ''">SR.DirectoryServicesProtocols_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' != ''"> <Compile Include="System\DirectoryServices\Protocols\common\AuthTypes.cs" /> <Compile Include="System\DirectoryServices\Protocols\common\BerConverter.cs" /> @@ -54,6 +56,7 @@ <Link>Common\Interop\Windows\Interop.BOOL.cs</Link> </Compile> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="System\DirectoryServices\Protocols\common\BerConverter.Windows.cs" /> <Compile Include="System\DirectoryServices\Protocols\common\QuotaControl.Windows.cs" /> @@ -73,6 +76,7 @@ <Link>Common\Interop\Windows\Wldap32\Interop.Ber.cs</Link> </Compile> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'Linux' or '$(TargetPlatformIdentifier)' == 'OSX'"> <Compile Include="System\DirectoryServices\Protocols\common\BerConverter.Linux.cs" /> <Compile Include="System\DirectoryServices\Protocols\common\QuotaControl.Linux.cs" /> @@ -93,41 +97,19 @@ <Link>Common\Interop\Linux\OpenLdap\Interop.Ber.cs</Link> </Compile> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'Linux'"> <Compile Include="$(CommonPath)Interop\Linux\Interop.Libraries.cs"> <Link>Common\Interop\Linux\Interop.Libraries.cs</Link> </Compile> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'OSX'"> <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs"> <Link>Common\Interop\OSX\Interop.Libraries.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Tasks" /> - <Reference Include="System.Threading.Tasks.Extensions" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> </ItemGroup> diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj index a14b32c85fc..4cbf8ecc877 100644 --- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj @@ -3,34 +3,19 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute> </PropertyGroup> + <ItemGroup> <Compile Include="System.DirectoryServices.cs" /> <Compile Include="System.DirectoryServices.manual.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.IO.FileSystem.AccessControl" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" /> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> - <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 --> - <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" /> - <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" PrivateAssets="all" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index 8ff90bb777d..83a118e940d 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute> <!-- Suppressions to avoid ifdefs: CA1845: Use span-based 'string.Concat' and 'AsSpan' instead of 'Substring' @@ -22,11 +22,13 @@ System.DirectoryServices.ActiveDirectory.DirectoryServer System.DirectoryServices.ActiveDirectory.Domain System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' != 'windows'">SR.DirectoryServices_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="System\DirectoryServices\ActiveDirectorySecurity.cs" /> <Compile Include="System\DirectoryServices\AdsVLV.cs" /> @@ -239,40 +241,11 @@ System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription> <Compile Include="$(CommonPath)System\Obsoletions.cs" Link="System\Obsoletions.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.IO.FileSystem.AccessControl" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Net.NameResolution" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Net.Security" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Claims" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - </ItemGroup> - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" /> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> diff --git a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj index acfa3717d84..94edb5b2309 100644 --- a/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.csproj @@ -2,18 +2,16 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Formats.Asn1.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\ref\System.Collections.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Numerics\ref\System.Runtime.Numerics.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Numerics" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj index ee552479a07..ba71d9c0237 100644 --- a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj +++ b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);CP_NO_ZEROMEMORY</DefineConstants> <IsPackable>true</IsPackable> <PackageDescription>Provides classes that can read and write the ASN.1 BER, CER, and DER data formats. @@ -10,6 +10,7 @@ Commonly Used Types: System.Formats.Asn1.AsnReader System.Formats.Asn1.AsnWriter</PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs"> <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link> @@ -52,7 +53,8 @@ System.Formats.Asn1.AsnWriter</PackageDescription> <Compile Include="System\Formats\Asn1\TagClass.cs" /> <Compile Include="System\Formats\Asn1\UniversalTagNumber.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> <Reference Include="System.Memory" /> <Reference Include="System.Runtime" /> @@ -60,10 +62,12 @@ System.Formats.Asn1.AsnWriter</PackageDescription> <Reference Include="System.Runtime.Numerics" /> <Reference Include="System.Text.Encoding.Extensions" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" /> <Reference Include="System.Numerics" /> diff --git a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj index f2275e9c5a9..3ea7a7fffd4 100644 --- a/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/ref/System.Formats.Cbor.csproj @@ -8,16 +8,6 @@ <Compile Include="System.Formats.Cbor.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Numerics\ref\System.Runtime.Numerics.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Numerics" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj index 27a0711c3ea..c0fcf419444 100644 --- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj @@ -47,15 +47,6 @@ System.Formats.Cbor.CborWriter</PackageDescription> <Compile Include="System\Formats\Cbor\HalfHelpers.netstandard.cs" /> <Compile Include="System\Formats\Cbor\Writer\CborWriter.Simple.netstandard.cs" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Numerics" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Threading" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> diff --git a/src/libraries/System.Formats.Tar/ref/System.Formats.Tar.csproj b/src/libraries/System.Formats.Tar/ref/System.Formats.Tar.csproj index 6dc2adf4bd0..2f9463a3287 100644 --- a/src/libraries/System.Formats.Tar/ref/System.Formats.Tar.csproj +++ b/src/libraries/System.Formats.Tar/ref/System.Formats.Tar.csproj @@ -1,13 +1,15 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks> + <TargetFramework>$(NetCoreAppCurrent)</TargetFramework> <Nullable>enable</Nullable> </PropertyGroup> + <ItemGroup> <Compile Include="System.Formats.Tar.cs" /> </ItemGroup> + <ItemGroup> - <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\ref\System.Collections.csproj" /> </ItemGroup> </Project> diff --git a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj index 8452c405ab9..f4813c3c361 100644 --- a/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj +++ b/src/libraries/System.IO.Hashing/src/System.IO.Hashing.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPackable>true</IsPackable> <PackageDescription>Provides non-cryptographic hash algorithms, such as CRC-32. @@ -24,11 +24,6 @@ System.IO.Hashing.XxHash32</PackageDescription> Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj index de02c044682..051410f190c 100644 --- a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj @@ -13,15 +13,6 @@ <Compile Include="System.IO.Packaging.netframework.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\ref\System.Collections.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="WindowsBase" /> </ItemGroup> diff --git a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj index f6f7123ebd3..c5d5c39d226 100644 --- a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- Suppress `string.Contains(char)` offers better performance than `string.Contains(string)` to avoid ifdefs.--> <NoWarn>$(NoWarn);CA1847</NoWarn> <IsPackable>true</IsPackable> @@ -44,15 +44,6 @@ <Compile Include="System\IO\Packaging\PackUriHelper.PackUriScheme.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.IO.Compression" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj index 48c1f1c24e2..d0c281262a7 100644 --- a/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj @@ -2,17 +2,11 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.IO.Pipelines.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Memory\ref\System.Memory.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj index 36cce225770..b56224122aa 100644 --- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj +++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj @@ -9,9 +9,10 @@ System.IO.Pipelines.Pipe System.IO.Pipelines.PipeWriter System.IO.Pipelines.PipeReader</PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" - Link="Common\System\Threading\Tasks\TaskToApm.cs" /> + Link="Common\System\Threading\Tasks\TaskToApm.cs" /> <Compile Include="Properties\InternalsVisibleTo.cs" /> <Compile Include="System\IO\Pipelines\BufferSegment.cs" /> <Compile Include="System\IO\Pipelines\CompletionData.cs" /> @@ -45,21 +46,17 @@ System.IO.Pipelines.PipeReader</PackageDescription> <Compile Include="$(CommonPath)System\IO\StreamHelpers.CopyValidation.cs" Link="Common\System\IO\StreamHelpers.CopyValidation.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Include="System\IO\Pipelines\ThreadPoolScheduler.netcoreapp.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="System\IO\Pipelines\StreamExtensions.netstandard.cs" /> <Compile Include="System\IO\Pipelines\ThreadPoolScheduler.netstandard.cs" /> <Compile Include="System\IO\Pipelines\CancellationTokenExtensions.netstandard.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.ThreadPool" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> diff --git a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj index 511eb67eee6..9d27dbab177 100644 --- a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj @@ -7,13 +7,4 @@ <Compile Include="System.IO.Ports.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.IO.Ports.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj index d0d4657146e..c341d6c3ba6 100644 --- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj +++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj @@ -1,10 +1,10 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);SERIAL_PORTS</DefineConstants> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> <Nullable>annotations</Nullable> - <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)-Unix;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <IsPackable>true</IsPackable> <PackageDescription>Provides classes for controlling serial ports. @@ -142,25 +142,6 @@ System.IO.Ports.SerialPort</PackageDescription> Link="Common\System\Threading\Tasks\TaskToApm.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="Microsoft.Win32.Registry" Condition="'$(TargetPlatformIdentifier)' == 'windows'" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Concurrent" Condition="'$(TargetPlatformIdentifier)' == 'Unix'" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Net.Sockets" Condition="'$(TargetPlatformIdentifier)' == 'Unix'" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" Condition="'$(TargetPlatformIdentifier)' == 'Unix'" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Overlapped" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading.ThreadPool" /> - </ItemGroup> - <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <!-- Just reference the runtime packages but don't build them in order to avoid unintentional Build/Pack invocations. --> <ProjectReference Include="..\pkg\runtime.native.$(MSBuildProjectName).proj" BuildReference="false" /> diff --git a/src/libraries/System.Management/ref/System.Management.csproj b/src/libraries/System.Management/ref/System.Management.csproj index 43aca345070..10bb412513d 100644 --- a/src/libraries/System.Management/ref/System.Management.csproj +++ b/src/libraries/System.Management/ref/System.Management.csproj @@ -3,22 +3,13 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <Nullable>disable</Nullable> </PropertyGroup> + <ItemGroup> <Compile Include="System.Management.cs" /> <Compile Include="System.Management.manual.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.CodeDom\ref\System.CodeDom.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj index 3395d2313ca..5b66be0b573 100644 --- a/src/libraries/System.Management/src/System.Management.csproj +++ b/src/libraries/System.Management/src/System.Management.csproj @@ -1,5 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NoWarn>$(NoWarn);0618</NoWarn> <!-- Suppressins to avoid ifdefs: @@ -7,7 +8,6 @@ <NoWarn>$(NoWarn);CA1845;IDE0059;CA1822</NoWarn> <Nullable>annotations</Nullable> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> - <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> <IsPackable>true</IsPackable> <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage> <AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage> @@ -18,11 +18,13 @@ System.Management.ManagementClass System.Management.ManagementObject System.Management.SelectQuery</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' != 'windows'">SR.PlatformNotSupported_SystemManagement</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" Link="Common\Interop\Windows\Interop.Libraries.cs" /> @@ -64,26 +66,8 @@ System.Management.SelectQuery</PackageDescription> <Compile Include="System\Management\WMIGenerator.cs" /> <Compile Include="System\Management\InteropClasses\WMIInterop.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.CodeDom\src\System.CodeDom.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Memory" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading.ThreadPool" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj b/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj index 37b689313e1..799867dc15d 100644 --- a/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj +++ b/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj @@ -15,10 +15,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\ref\System.Text.Json.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj index 0f666b37935..5f04cf915b8 100644 --- a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj +++ b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj @@ -23,11 +23,6 @@ System.BinaryData</PackageDescription> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj index 761bf770715..04f559c34a8 100644 --- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj @@ -28,12 +28,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Net.Primitives"/> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Net.Http" /> </ItemGroup> diff --git a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj index 4ea716d2aeb..31145acf20a 100644 --- a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj @@ -9,6 +9,7 @@ System.Net.Http.Json.HttpClientJsonExtensions System.Net.Http.Json.HttpContentJsonExtensions System.Net.Http.Json.JsonContent</PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="System\Net\Http\Json\JsonHelpers.cs" /> <Compile Include="System\Net\Http\Json\HttpClientJsonExtensions.Get.cs" /> @@ -19,11 +20,13 @@ System.Net.Http.Json.JsonContent</PackageDescription> <Compile Include="System\Net\Http\Json\JsonContent.cs" /> <Compile Include="System\Net\Http\Json\JsonContentOfT.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Include="System\Net\Http\Json\HttpContentJsonExtensions.netcoreapp.cs" /> <Compile Include="System\Net\Http\Json\JsonContent.netcoreapp.cs" /> <Compile Include="System\Net\Http\Json\JsonContentOfT.netcoreapp.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="System\ArraySegmentExtensions.netstandard.cs" /> <Compile Include="System\Net\Http\Json\HttpClientJsonExtensions.netstandard.cs" /> @@ -35,6 +38,7 @@ System.Net.Http.Json.JsonContent</PackageDescription> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" /> </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\StringSyntaxAttribute.cs" /> </ItemGroup> @@ -43,7 +47,7 @@ System.Net.Http.Json.JsonContent</PackageDescription> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\src\System.Text.Json.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Net.Http" /> <Reference Include="System.Net.Primitives" /> <Reference Include="System.Runtime" /> diff --git a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj index 75146f2ad42..9460de668e7 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj @@ -7,18 +7,6 @@ <Compile Include="System.Net.Http.WinHttpHandler.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Net.Http\ref\System.Net.Http.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Net.Http" /> </ItemGroup> diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj index 6dcae59eb5d..71ca94e7e2c 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPackable>true</IsPackable> <PackageDescription>Provides a message handler for HttpClient based on the WinHTTP interface of Windows. While similar to HttpClientHandler, it provides developers more granular control over the application's HTTP communication than the HttpClientHandler. @@ -112,26 +112,6 @@ System.Net.Http.WinHttpHandler</PackageDescription> Link="Common\DisableRuntimeMarshalling.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Diagnostics.Tracing" /> - <Reference Include="System.IO.Compression" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.Cryptography.Encoding" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Threading" /> - </ItemGroup> - - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj index eb140e46abb..07f3f466799 100644 --- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj +++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj @@ -11,7 +11,6 @@ <DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'windows'">$(DefineConstants);TARGET_WINDOWS</DefineConstants> </PropertyGroup> <ItemGroup> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" /> <Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="System.Collections" /> <Reference Include="System.Collections.NonGeneric" /> @@ -35,6 +34,7 @@ <Reference Include="System.Security.Cryptography.Algorithms" /> <Reference Include="System.Security.Cryptography.X509Certificates" /> <Reference Include="System.Security.Principal" /> + <Reference Include="System.Security.Principal.Windows" /> <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.Overlapped" /> diff --git a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj index 73ccbd74198..54dca69b3c2 100644 --- a/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.csproj @@ -10,12 +10,4 @@ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj index d034b8a4a65..0f240f76673 100644 --- a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPackable>true</IsPackable> <!-- We don't ship a stable package, enable whenever this package is no longer experimental. --> <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation> @@ -24,13 +24,6 @@ System.Numerics.Tensors.SparseTensor<T></PackageDescription> <Compile Include="System\Numerics\Tensors\Tensor.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj index caff80f38d2..d7ea3499b3c 100644 --- a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj +++ b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj @@ -10,12 +10,4 @@ <ItemGroup> <Compile Include="System.Reflection.Context.cs" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj index 2fd89568e35..0f87d7ce83d 100644 --- a/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj +++ b/src/libraries/System.Reflection.Context/src/System.Reflection.Context.csproj @@ -77,9 +77,4 @@ System.Reflection.Context.CustomReflectionContext</PackageDescription> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresAssemblyFilesAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj index a24dcfa761d..91aad7bbfca 100644 --- a/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.csproj @@ -1,20 +1,20 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLSCompliant>false</CLSCompliant> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Reflection.Metadata.cs" /> <Compile Include="System.Reflection.Metadata.Manual.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\ref\System.Collections.Immutable.csproj" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index c353bd76fa4..477b58f262f 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -1,9 +1,9 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefaultLanguage>en-US</DefaultLanguage> <CLSCompliant>false</CLSCompliant> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <IsPackable>true</IsPackable> <PackageDescription>This package provides a low-level .NET (ECMA-335) metadata reader and writer. It's geared for performance and is the ideal choice for building higher-level libraries that intend to provide their own object model, such as compilers. @@ -14,11 +14,13 @@ System.Reflection.Metadata.Ecma335.MetadataBuilder System.Reflection.PortableExecutable.PEBuilder System.Reflection.PortableExecutable.ManagedPEBuilder</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <!-- Constrained Execution Regions only apply to netstandard2.0 and net4* --> <DefineConstants Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETCoreApp'">$(DefineConstants);FEATURE_CER</DefineConstants> </PropertyGroup> + <ItemGroup> <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" Link="Common\Interop\Windows\Interop.Libraries.cs" @@ -92,6 +94,7 @@ System.Reflection.PortableExecutable.ManagedPEBuilder</PackageDescription> <Compile Include="System\Reflection\PortableExecutable\SectionLocation.cs" /> <Compile Include="System\Reflection\Internal\Utilities\BlobUtilities.cs" /> </ItemGroup> + <ItemGroup> <Compile Include="Properties\InternalsVisibleTo.cs" /> <Compile Include="System\Reflection\Internal\MemoryBlocks\AbstractMemoryBlock.cs" /> @@ -252,26 +255,18 @@ System.Reflection.PortableExecutable.ManagedPEBuilder</PackageDescription> <Compile Include="System\Reflection\Throw.cs" /> <Compile Include="System\Reflection\System.Reflection.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v$(NetCoreAppCurrentVersion)'"> <Reference Include="System.Collections" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.IO" /> <Reference Include="System.IO.Compression" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Reflection" /> - <Reference Include="System.Reflection.Extensions" /> - <Reference Include="System.Reflection.Primitives" /> - <Reference Include="System.Resources.ResourceManager" /> + <Reference Include="System.IO.MemoryMappedFiles" /> <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Text.Encoding" /> <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Threading" /> - <Reference Include="System.IO.MemoryMappedFiles" /> - <Reference Include="System.Buffers" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj index 6f8d262f934..ecad0ae48a0 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/ref/System.Reflection.MetadataLoadContext.csproj @@ -2,13 +2,8 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Reflection.MetadataLoadContext.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index 5e1e2a5e98a..94066308f29 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -1,9 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <RootNamespace>System.Reflection</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <!-- Only the netcoreapp version supports the new reflection apis (IsSZArray, etc.) --> - <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <IsPackable>true</IsPackable> <PackageDescription>Provides read-only reflection on assemblies in an isolated context with support for assemblies that have different architectures and runtimes. @@ -11,6 +10,7 @@ Commonly Used Types: System.Reflection.MetadataLoadContext System.Reflection.MetadataAssemblyResolver</PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="System\CoreRtBridge.cs" /> <Compile Include="System\Reflection\DefaultBinder.cs" /> @@ -146,23 +146,18 @@ System.Reflection.MetadataAssemblyResolver</PackageDescription> <Compile Include="System\Reflection\TypeLoading\Types\RoWrappedType.cs" /> <Compile Include="$(CommonPath)System\Obsoletions.cs" Link="Common\System\Obsoletions.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" /> </ItemGroup> + <ItemGroup> <!-- Application tfms (.NETCoreApp, .NETFramework) need to use the same or higher version of .NETStandard's dependencies. --> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Threading" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj index ff3774ba42a..ec7a3167fc3 100644 --- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj @@ -6,13 +6,4 @@ <ItemGroup> <Compile Include="System.Resources.Extensions.cs" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Resources.Writer\ref\System.Resources.Writer.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Resources.Writer" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj index 6bd689ae3d0..1ec696d4ebc 100644 --- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);RESOURCES_EXTENSIONS</DefineConstants> <IsPackable>true</IsPackable> <SuggestedBindingRedirectsPackageFile>$(BaseIntermediateOutputPath)SuggestedBindingRedirects.targets</SuggestedBindingRedirectsPackageFile> @@ -43,23 +43,10 @@ System.Resources.Extensions.PreserializedResourceWriter</PackageDescription> Link="System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Resources.Writer" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Serialization.Formatters" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> - <PropertyGroup> - </PropertyGroup> - <Target Name="GeneratePackageTargetsFile" Inputs="$(MSBuildAllProjects)" Outputs="$(SuggestedBindingRedirectsPackageFile)"> diff --git a/src/libraries/System.Runtime.Caching/ref/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/ref/System.Runtime.Caching.csproj index cbd4480c66a..0202f92a0f7 100644 --- a/src/libraries/System.Runtime.Caching/ref/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/ref/System.Runtime.Caching.csproj @@ -2,17 +2,8 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Runtime.Caching.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel\ref\System.ComponentModel.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Specialized\ref\System.Collections.Specialized.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index a9da990b9c9..869129ba71f 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -1,9 +1,9 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> - <IsPackable>true</IsPackable> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>Annotations</Nullable> + <IsPackable>true</IsPackable> <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage> <AddXamarinPlaceholderFilesToPackage>true</AddXamarinPlaceholderFilesToPackage> <AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage> @@ -21,6 +21,7 @@ System.Runtime.Caching.HostFileChangeMonitor System.Runtime.Caching.MemoryCache System.Runtime.Caching.ObjectCache</PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="System\Runtime\Caching\Counters.cs" /> <Compile Include="System\Runtime\Caching\CacheEntryChangeMonitor.cs" /> @@ -66,6 +67,7 @@ System.Runtime.Caching.ObjectCache</PackageDescription> <Compile Include="System\Runtime\Caching\Hosting\IMemoryCacheManager.cs" /> <Compile Include="System\Runtime\Caching\Resources\RH.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="System\Runtime\Caching\MemoryMonitor.Windows.cs" /> <Compile Include="System\Runtime\Caching\PhysicalMemoryMonitor.Windows.cs" /> @@ -74,35 +76,12 @@ System.Runtime.Caching.ObjectCache</PackageDescription> <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs" Link="Common\Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs" /> <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" Link="Common\Interop\Windows\Interop.Libraries.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' != 'windows'"> <Compile Include="System\Runtime\Caching\PhysicalMemoryMonitor.Unix.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Data.Common" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Tracing" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.IO.FileSystem.Watcher" /> - <Reference Include="System.Memory" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.Text.RegularExpressions" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading.Timer" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.Security.Cryptography.Cose/ref/System.Security.Cryptography.Cose.csproj b/src/libraries/System.Security.Cryptography.Cose/ref/System.Security.Cryptography.Cose.csproj index 7400bac594a..15a63930665 100644 --- a/src/libraries/System.Security.Cryptography.Cose/ref/System.Security.Cryptography.Cose.csproj +++ b/src/libraries/System.Security.Cryptography.Cose/ref/System.Security.Cryptography.Cose.csproj @@ -4,24 +4,18 @@ <EnablePreviewFeatures>True</EnablePreviewFeatures> <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute> </PropertyGroup> + <ItemGroup> <Compile Include="System.Security.Cryptography.Cose.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography\ref\System.Security.Cryptography.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> + <Compile Include="$(CoreLibSharedDir)System\Runtime\Versioning\RequiresPreviewFeaturesAttribute.cs" + Link="System\Runtime\Versioning\RequiresPreviewFeaturesAttribute.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> - <Compile Include="$(CoreLibSharedDir)System\Runtime\Versioning\RequiresPreviewFeaturesAttribute.cs" Link="System\Runtime\Versioning\RequiresPreviewFeaturesAttribute.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> diff --git a/src/libraries/System.Security.Cryptography.Cose/src/System.Security.Cryptography.Cose.csproj b/src/libraries/System.Security.Cryptography.Cose/src/System.Security.Cryptography.Cose.csproj index 7789bf56459..2c66e4920a1 100644 --- a/src/libraries/System.Security.Cryptography.Cose/src/System.Security.Cryptography.Cose.csproj +++ b/src/libraries/System.Security.Cryptography.Cose/src/System.Security.Cryptography.Cose.csproj @@ -2,13 +2,13 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <EnablePreviewFeatures>True</EnablePreviewFeatures> + <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute> <IsPackable>true</IsPackable> <!-- Disabling baseline validation since this is a brand new package. Once this package has shipped a stable version, the following line should be removed in order to re-enable validation. --> <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation> - <EnablePreviewFeatures>True</EnablePreviewFeatures> - <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute> <PackageDescription>Provides support for CBOR Object Signing and Encryption (COSE).</PackageDescription> </PropertyGroup> @@ -23,27 +23,13 @@ <Compile Include="System\Security\Cryptography\Cose\KnownCoseAlgorithms.cs" /> <Compile Include="System\Security\Cryptography\Cose\KnownHeaders.cs" /> </ItemGroup> - - <ItemGroup> - <ProjectReference Include="$(LibrariesProjectRoot)System.Formats.Cbor\src\System.Formats.Cbor.csproj" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="$(CoreLibSharedDir)System\Runtime\Versioning\RequiresPreviewFeaturesAttribute.cs" Link="System\Runtime\Versioning\RequiresPreviewFeaturesAttribute.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Numerics" /> - <Reference Include="System.Text.Encoding.Extensions" /> - </ItemGroup> - - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)System.Formats.Cbor\src\System.Formats.Cbor.csproj" /> </ItemGroup> <!-- For IncrementalHash --> diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index cfd5e41bea8..28e5201191b 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -2,27 +2,13 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Security.Cryptography.Pkcs.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.Security.Cryptography.Pkcs.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> <Compile Include="System.Security.Cryptography.Pkcs.netcoreapp.cs" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Algorithms\ref\System.Security.Cryptography.Algorithms.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Csp\ref\System.Security.Cryptography.Csp.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Encoding\ref\System.Security.Cryptography.Encoding.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography\ref\System.Security.Cryptography.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Csp" /> - <Reference Include="System.Security.Cryptography.Encoding" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Security" /> </ItemGroup> diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 4c3887fb226..1bbf74d2fe6 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -1,15 +1,16 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> <NoWarn>$(NoWarn);CA5384</NoWarn> - <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <IsPackable>true</IsPackable> <PackageDescription>Provides support for PKCS and CMS algorithms. Commonly Used Types: System.Security.Cryptography.Pkcs.EnvelopedCms</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly> @@ -637,39 +638,24 @@ System.Security.Cryptography.Pkcs.EnvelopedCms</PackageDescription> <Compile Include="System\Security\Cryptography\Pkcs\Rfc3161TimestampToken.cs" /> <Compile Include="System\Security\Cryptography\Pkcs\Rfc3161TimestampTokenInfo.cs" /> </ItemGroup> + <ItemGroup> <None Include="@(AsnXml)" /> </ItemGroup> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Formats.Asn1\src\System.Formats.Asn1.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation" /> - <Reference Include="System.Runtime.Numerics" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Cng" /> - <Reference Include="System.Security.Cryptography.Csp" /> - <Reference Include="System.Security.Cryptography.Encoding" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Security" /> </ItemGroup> diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj index cfc90f161a3..038d86a2db5 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj @@ -2,16 +2,12 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Security.Cryptography.ProtectedData.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.Security.Cryptography.ProtectedData.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Security" /> </ItemGroup> diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj index caeec8ccb59..34ed55a9689 100644 --- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj +++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPackable>true</IsPackable> <AddXamarinPlaceholderFilesToPackage>true</AddXamarinPlaceholderFilesToPackage> <PackageDescription>Provides access to Windows Data Protection Api. @@ -10,6 +10,7 @@ Commonly Used Types: System.Security.Cryptography.DataProtectionScope System.Security.Cryptography.ProtectedData</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> @@ -17,6 +18,7 @@ System.Security.Cryptography.ProtectedData</PackageDescription> <OmitResources Condition="'$(IsPartialFacadeAssembly)' == 'true'">true</OmitResources> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetPlatformIdentifier)' != 'windows'">SR.PlatformNotSupported_CryptographyProtectedData</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="System\Security\Cryptography\DataProtectionScope.cs" /> <Compile Include="System\Security\Cryptography\ProtectedData.cs" /> @@ -39,15 +41,12 @@ System.Security.Cryptography.ProtectedData</PackageDescription> <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoThrowHelper.Windows.cs" Link="Common\System\Security\Cryptography\CryptoThrowHelper.Windows.cs" /> </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0-windows'))"> <Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs" Link="Common\DisableRuntimeMarshalling.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Security" /> </ItemGroup> diff --git a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj index 0cbccb9ff70..9f5143a0efa 100644 --- a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj @@ -3,29 +3,16 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> </PropertyGroup> + <ItemGroup> <Compile Include="System.Security.Cryptography.Xml.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.Security.Cryptography.Xml.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == 'NETFramework'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography\ref\System.Security.Cryptography.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> - <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 --> - <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Security" /> </ItemGroup> diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj index bd04a5e439e..3e6c3eaf97e 100644 --- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj @@ -1,10 +1,10 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Nullable>disable</Nullable> - <IsPackable>true</IsPackable> <NoWarn>$(NoWarn);CA1850</NoWarn> <!-- CA1850 suppressed due to multitargeting --> + <IsPackable>true</IsPackable> <PackageDescription>Provides classes to support the creation and validation of XML digital signatures. The classes in this namespace implement the World Wide Web Consortium Recommendation, "XML-Signature Syntax and Processing", described at http://www.w3.org/TR/xmldsig-core/. Commonly Used Types: @@ -48,10 +48,12 @@ System.Security.Cryptography.Xml.XmlDsigXPathTransform System.Security.Cryptography.Xml.XmlDsigXsltTransform System.Security.Cryptography.Xml.XmlLicenseTransform</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly> </PropertyGroup> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="System\Security\Cryptography\Xml\AncestralNamespaceContextManager.cs" /> <Compile Include="System\Security\Cryptography\Xml\AttributeSortOrder.cs" /> @@ -132,33 +134,16 @@ System.Security.Cryptography.Xml.XmlLicenseTransform</PackageDescription> <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> </ItemGroup> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.Net.Requests" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Numerics" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Csp" /> - <Reference Include="System.Security.Cryptography.Encoding" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Text.Encoding.Extensions" /> - <Reference Include="System.Xml.ReaderWriter" /> - <Reference Include="System.Xml.XPath" /> - </ItemGroup> - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> <Reference Include="System.Security" /> </ItemGroup> diff --git a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj index 37699b91869..db6d8900582 100644 --- a/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/ref/System.ServiceModel.Syndication.csproj @@ -3,27 +3,13 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> </PropertyGroup> + <ItemGroup> <Compile Include="System.ServiceModel.Syndication.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'"/> <Compile Include="System.ServiceModel.Syndication.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"/> <Compile Include="System.ServiceModel.Syndication.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\ref\System.Collections.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Primitives\ref\System.Runtime.Serialization.Primitives.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Xml\ref\System.Runtime.Serialization.Xml.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Xml.XmlSerializer\ref\System.Xml.XmlSerializer.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Serialization.Primitives" /> - <Reference Include="System.Runtime.Serialization.Xml" /> - <Reference Include="System.Xml.ReaderWriter" /> - <Reference Include="System.Xml.XmlSerializer" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.ServiceModel" /> </ItemGroup> diff --git a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj index 9091509da94..2d717065a18 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj +++ b/src/libraries/System.ServiceModel.Syndication/src/System.ServiceModel.Syndication.csproj @@ -6,11 +6,13 @@ <IsPackable>true</IsPackable> <PackageDescription>Provides classes related to service model syndication.</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly> <OmitResources Condition="'$(IsPartialFacadeAssembly)' == 'true'">true</OmitResources> </PropertyGroup> + <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'"> <Compile Include="System\ServiceModel\Channels\UriGenerator.cs" /> <Compile Include="System\ServiceModel\Syndication\App10Constants.cs" /> @@ -55,16 +57,7 @@ <Compile Include="System\ServiceModel\Syndication\XmlUriData.cs" /> <Compile Include="System\ServiceModel\XmlBuffer.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Serialization.Primitives" /> - <Reference Include="System.Runtime.Serialization.Xml" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Xml.ReaderWriter" /> - <Reference Include="System.Xml.XmlSerializer" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.ServiceModel" /> </ItemGroup> diff --git a/src/libraries/System.Speech/ref/System.Speech.csproj b/src/libraries/System.Speech/ref/System.Speech.csproj index 5ba22b6db2f..b95196588a9 100644 --- a/src/libraries/System.Speech/ref/System.Speech.csproj +++ b/src/libraries/System.Speech/ref/System.Speech.csproj @@ -2,18 +2,8 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Speech.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.EventBasedAsync\ref\System.ComponentModel.EventBasedAsync.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.EventBasedAsync" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Speech/src/System.Speech.csproj b/src/libraries/System.Speech/src/System.Speech.csproj index 47824ef4845..22506f7bf96 100644 --- a/src/libraries/System.Speech/src/System.Speech.csproj +++ b/src/libraries/System.Speech/src/System.Speech.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- CS0649: uninitialized interop type fields --> <!-- SA1129: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3277 --> <!-- CA1846: Prefer 'AsSpan' over 'Substring' when span-based overloads are available --> @@ -17,6 +17,7 @@ Commonly Used Types System.Speech.Synthesis.SpeechSynthesizer System.Speech.Recognition.SpeechRecognizer</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> @@ -24,6 +25,7 @@ System.Speech.Recognition.SpeechRecognizer</PackageDescription> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' != 'windows'">SR.PlatformNotSupported_SystemSpeech</GeneratePlatformNotSupportedAssemblyMessage> <OmitResources Condition="'$(GeneratePlatformNotSupportedAssemblyMessage)' == ''">true</OmitResources> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="SR.cs" /> <Compile Include="SRID.cs" /> @@ -223,64 +225,32 @@ System.Speech.Recognition.SpeechRecognizer</PackageDescription> <Compile Include="$(CommonPath)Interop\Windows\WinMm\Interop.waveOutWrite.cs" Link="Common\Interop\Windows\WinMm\Interop.waveOutWrite.cs" /> </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0-windows'))"> <Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs" Link="Common\DisableRuntimeMarshalling.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> - <EmbeddedResource Include="Resources\Strings.resx"> - <Visible>true</Visible> - <ManifestResourceName>ExceptionStringTable</ManifestResourceName> - </EmbeddedResource> + <EmbeddedResource Include="Resources\Strings.resx" + Visible="true" + ManifestResourceName="ExceptionStringTable" /> </ItemGroup> + <ItemGroup> - <EmbeddedResource Include="upstable_chs.upsmap"> - <LogicalName>upstable_chs.upsmap</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="upstable_cht.upsmap"> - <LogicalName>upstable_cht.upsmap</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="upstable_deu.upsmap"> - <LogicalName>upstable_deu.upsmap</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="upstable_enu.upsmap"> - <LogicalName>upstable_enu.upsmap</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="upstable_esp.upsmap"> - <LogicalName>upstable_esp.upsmap</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="upstable_fra.upsmap"> - <LogicalName>upstable_fra.upsmap</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="upstable_jpn.upsmap"> - <LogicalName>upstable_jpn.upsmap</LogicalName> - </EmbeddedResource> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel.EventBasedAsync" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Net.Primitives" /> - <Reference Include="System.Net.Requests" /> - <Reference Include="System.Net.WebClient" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime.Serialization.Formatters" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Tasks" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading.ThreadPool" /> - <Reference Include="System.Xml.ReaderWriter" /> + <EmbeddedResource Include="upstable_chs.upsmap" + LogicalName="upstable_chs.upsmap" /> + <EmbeddedResource Include="upstable_cht.upsmap" + LogicalName="upstable_cht.upsmap" /> + <EmbeddedResource Include="upstable_deu.upsmap" + LogicalName="upstable_deu.upsmap" /> + <EmbeddedResource Include="upstable_enu.upsmap" + LogicalName="upstable_enu.upsmap" /> + <EmbeddedResource Include="upstable_esp.upsmap" + LogicalName="upstable_esp.upsmap" /> + <EmbeddedResource Include="upstable_fra.upsmap" + LogicalName="upstable_fra.upsmap" /> + <EmbeddedResource Include="upstable_jpn.upsmap" + LogicalName="upstable_jpn.upsmap" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj index 7b31e4d94c2..f49c80da704 100644 --- a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj @@ -2,14 +2,13 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Text.Encoding.CodePages.cs" /> <Compile Include="System.Text.Encoding.CodePages.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime/ref/System.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index a2262df50a0..2d7c738f939 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IncludePlatformAttributes>true</IncludePlatformAttributes> <IsPackable>true</IsPackable> <AddXamarinPlaceholderFilesToPackage>true</AddXamarinPlaceholderFilesToPackage> @@ -10,6 +10,7 @@ Commonly Used Types: System.Text.CodePagesEncodingProvider</PackageDescription> </PropertyGroup> + <!-- Generator for code mapping table, target to invoke is GenerateEncodingSource --> <PropertyGroup> <!-- This Task can be re-run with /t:GenerateEncodingSource @@ -21,6 +22,7 @@ System.Text.CodePagesEncodingProvider</PackageDescription> <PreferredIANANamesPath>Data\PreferredCodePageNames.csv</PreferredIANANamesPath> <OutputDataTablePath>System\Text\EncodingTable.Data.cs</OutputDataTablePath> </PropertyGroup> + <ItemGroup> <Compile Include="Microsoft\Win32\SafeHandles\SafeAllocHHandle.cs" /> <Compile Include="System\Text\BaseCodePageEncoding.cs" /> @@ -43,6 +45,7 @@ System.Text.CodePagesEncodingProvider</PackageDescription> <Compile Include="System\Text\ISCIIEncoding.cs" /> <Compile Include="System\Text\SBCSCodePageEncoding.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows' or '$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Compile Include="System\Text\CodePagesEncodingProvider.Windows.cs" /> <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs" @@ -56,13 +59,16 @@ System.Text.CodePagesEncodingProvider</PackageDescription> <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs" Link="Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework' and '$(TargetPlatformIdentifier)' != 'windows'"> <Compile Include="System\Text\CodePagesEncodingProvider.Default.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Include="System\Text\CodePagesEncodingProvider.netcoreapp.cs" /> <Compile Include="System\Text\BaseCodePageEncoding.netcoreapp.cs" /> </ItemGroup> + <ItemGroup> <EmbeddedResource Include="Data\codepages.nlp"> <LogicalName>codepages.nlp</LogicalName> @@ -70,20 +76,22 @@ System.Text.CodePagesEncodingProvider</PackageDescription> <None Include="Data\CodePageNameMappings.csv" /> <None Include="Data\PreferredCodePageNames.csv" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppCurrent)'))"> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Diagnostics.Tools" /> <Reference Include="System.Memory" /> <Reference Include="System.Resources.ResourceManager" /> <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> <Reference Include="System.Runtime.InteropServices" /> <Reference Include="System.Threading" /> </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj index 985b23fdcdf..f283aeefd92 100644 --- a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj @@ -5,16 +5,15 @@ <!-- Only CLS-compliant members can be abstract --> <NoWarn>$(NoWarn);CS3011</NoWarn> </PropertyGroup> + <ItemGroup> <Compile Include="System.Text.Encodings.Web.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index 19d6deec406..37e7d332f84 100644 --- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-Browser;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- CS3011: Only CLS-compliant members can be abstract --> <!-- CS3019: CLS attributes on internal types. Some shared source files are internal in this project. --> <NoWarn>$(NoWarn);CS3011;CS3019</NoWarn> @@ -13,11 +13,13 @@ System.Text.Encodings.Web.HtmlEncoder System.Text.Encodings.Web.UrlEncoder System.Text.Encodings.Web.JavaScriptEncoder</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> <DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'Browser'">$(DefineConstants);TARGET_BROWSER</DefineConstants> </PropertyGroup> + <ItemGroup> <Compile Include="System\IO\TextWriterExtensions.cs" /> <Compile Include="System\Text\Encodings\Web\AsciiByteMap.cs" /> @@ -41,30 +43,36 @@ System.Text.Encodings.Web.JavaScriptEncoder</PackageDescription> <Compile Include="System\Text\Unicode\UnicodeRanges.cs" /> <Compile Include="System\Text\Unicode\UnicodeRanges.generated.cs" /> </ItemGroup> + <ItemGroup> <Compile Include="$(CoreLibSharedDir)System\Text\UnicodeDebug.cs" Link="System\Text\UnicodeDebug.cs" /> <Compile Include="$(CoreLibSharedDir)System\Text\UnicodeUtility.cs" Link="System\Text\UnicodeUtility.cs" /> <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs" Link="Common\System\Text\ValueStringBuilder.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Include="System\Text\Encodings\Web\OptimizedInboxTextEncoder.Ssse3.cs" /> <Compile Include="System\Text\Encodings\Web\OptimizedInboxTextEncoder.AdvSimd64.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="Polyfills\System.Numerics.BitOperations.netstandard20.cs" /> <Compile Include="Polyfills\System.Text.Rune.netstandard20.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppCurrent)'))"> <Reference Include="System.Memory" /> <Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Intrinsics" /> <Reference Include="System.Threading" /> </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> diff --git a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj index 26d74266560..3e4e061785d 100644 --- a/src/libraries/System.Text.Json/ref/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/ref/System.Text.Json.csproj @@ -34,13 +34,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj index 3c04491e6e3..fbf4ad0135d 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <!-- Workaround for overriding the XML comments related warnings that are being supressed repo wide (within arcade): --> <!-- https://github.com/dotnet/arcade/blob/ea6addfdc65e5df1b2c036f11614a5f922e36267/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props#L90 --> <!-- For this project, we want warnings if there are public APIs/types without properly formatted XML comments (particularly CS1591). --> @@ -21,6 +21,7 @@ System.Text.Json.Nodes.JsonArray System.Text.Json.Nodes.JsonObject System.Text.Json.Nodes.JsonValue</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <!-- For the inbox library (that is shipping with the product), this should always be true. --> @@ -28,6 +29,7 @@ System.Text.Json.Nodes.JsonValue</PackageDescription> <DefineConstants Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants> <NoWarn Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETCoreApp'">$(NoWarn);nullable</NoWarn> </PropertyGroup> + <ItemGroup> <Compile Include="$(CommonPath)System\HexConverter.cs" Link="Common\System\HexConverter.cs" /> <Compile Include="$(CommonPath)System\Text\Json\PooledByteBufferWriter.cs" Link="Common\System\Text\Json\PooledByteBufferWriter.cs" /> @@ -316,6 +318,7 @@ System.Text.Json.Nodes.JsonValue</PackageDescription> <Compile Include="System\ReflectionExtensions.cs" /> <Compile Include="$(CommonPath)System\Obsoletions.cs" Link="Common\System\Obsoletions.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="$(CoreLibSharedDir)System\Collections\Generic\ReferenceEqualityComparer.cs" /> <Compile Include="$(CoreLibSharedDir)System\Runtime\CompilerServices\IsExternalInit.cs" /> @@ -326,23 +329,28 @@ System.Text.Json.Nodes.JsonValue</PackageDescription> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Include="System.Text.Json.Typeforwards.netcoreapp.cs" /> <Compile Include="System\Text\Json\Serialization\JsonSerializerOptionsUpdateHandler.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" /> <!-- Common or Common-branched source files --> <Compile Include="$(CommonPath)System\Buffers\ArrayBufferWriter.cs" Link="Common\System\Buffers\ArrayBufferWriter.cs" /> </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\StringSyntaxAttribute.cs" /> </ItemGroup> + <!-- Application tfms (.NETCoreApp, .NETFramework) need to use the same or higher version of .NETStandard's dependencies. --> <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Memory" /> @@ -355,9 +363,11 @@ System.Text.Json.Nodes.JsonValue</PackageDescription> <Reference Include="System.Text.Encoding.Extensions" /> <Reference Include="System.Threading" /> </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" /> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> @@ -366,6 +376,7 @@ System.Text.Json.Nodes.JsonValue</PackageDescription> <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj" /> </ItemGroup> + <ItemGroup> <AnalyzerReference Include="..\gen\System.Text.Json.SourceGeneration.Roslyn3.11.csproj" Condition="'$(DotNetBuildFromSource)' != 'true'" /> <AnalyzerReference Include="..\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj" /> diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj index 7ff239b8963..d3812ebfac5 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj @@ -223,11 +223,11 @@ <ItemGroup> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> <ProjectReference Include="$(LibrariesProjectRoot)System.IO.Pipelines\src\System.IO.Pipelines.csproj" /> - <Reference Include="Microsoft.CSharp" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\src\System.Collections.Immutable.csproj" /> <ProjectReference Include="..\..\src\System.Text.Json.csproj" /> + <Reference Include="Microsoft.CSharp" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /> diff --git a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj index 2fdcd42b683..8da1d59d602 100644 --- a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj @@ -9,19 +9,6 @@ <Compile Include="System.Threading.AccessControl.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == 'NETFramework'" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Threading\ref\System.Threading.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> diff --git a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index eb13c471fbb..54c8e0bad5f 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -15,12 +15,14 @@ System.Security.AccessControl.SemaphoreAccessRule System.Security.AccessControl.SemaphoreAuditRule System.Security.AccessControl.SemaphoreSecurity</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetPlatformIdentifier)' != 'windows'">SR.PlatformNotSupported_AccessControl</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs" Link="Common\Interop\Windows\Interop.Errors.cs" /> @@ -54,24 +56,19 @@ System.Security.AccessControl.SemaphoreSecurity</PackageDescription> <Compile Include="System\Threading\SemaphoreAcl.cs" /> <Compile Include="System\Threading\ThreadingAclExtensions.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Compile Include="System\Threading\EventWaitHandleAcl.net46.cs" /> <Compile Include="System\Threading\MutexAcl.net46.cs" /> <Compile Include="System\Threading\SemaphoreAcl.net46.cs" /> <Compile Include="System\Threading\ThreadingAclExtensions.net46.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Threading" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj index ad9fad03549..6ca3b24f60a 100644 --- a/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/ref/System.Threading.Channels.csproj @@ -2,16 +2,16 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Threading.Channels.cs" /> <Compile Include="System.Threading.Channels.netcoreapp.cs" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"/> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime/ref/System.Runtime.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj index 9432c344013..95daa7a0ce7 100644 --- a/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj +++ b/src/libraries/System.Threading.Channels/src/System.Threading.Channels.csproj @@ -8,6 +8,7 @@ Commonly Used Types: System.Threading.Channel System.Threading.Channel<T></PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="System\VoidResult.cs" /> <Compile Include="System\Threading\Channels\AsyncOperation.cs" /> @@ -41,13 +42,15 @@ System.Threading.Channel<T></PackageDescription> <Compile Include="$(CommonPath)System\Collections\Generic\Deque.cs" Link="Common\System\Collections\Generic\Deque.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Runtime" /> <Reference Include="System.Threading" /> <Reference Include="System.Threading.ThreadPool" /> </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Threading.RateLimiting/ref/System.Threading.RateLimiting.csproj b/src/libraries/System.Threading.RateLimiting/ref/System.Threading.RateLimiting.csproj index f7be9b4e171..b9de31009f8 100644 --- a/src/libraries/System.Threading.RateLimiting/ref/System.Threading.RateLimiting.csproj +++ b/src/libraries/System.Threading.RateLimiting/ref/System.Threading.RateLimiting.csproj @@ -2,19 +2,13 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Threading.RateLimiting.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> - </ItemGroup> - <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Threading.RateLimiting/src/System.Threading.RateLimiting.csproj b/src/libraries/System.Threading.RateLimiting/src/System.Threading.RateLimiting.csproj index f973f0eac74..90582d65ede 100644 --- a/src/libraries/System.Threading.RateLimiting/src/System.Threading.RateLimiting.csproj +++ b/src/libraries/System.Threading.RateLimiting/src/System.Threading.RateLimiting.csproj @@ -12,6 +12,7 @@ System.Threading.RateLimiting.ConcurrencyLimiter System.Threading.RateLimiting.TokenBucketRateLimiter System.Threading.RateLimiting.RateLimitLease</PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="System\Threading\RateLimiting\ConcurrencyLimiter.cs" /> <Compile Include="System\Threading\RateLimiting\ConcurrencyLimiterOptions.cs" /> @@ -26,14 +27,9 @@ System.Threading.RateLimiting.RateLimitLease</PackageDescription> <Compile Include="System\Threading\RateLimiting\TokenBucketRateLimiterOptions.cs" /> <Compile Include="$(CommonPath)System\Collections\Generic\Deque.cs" Link="Common\System\Collections\Generic\Deque.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Threading" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> - </ItemGroup> - <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj index 460f2a2b966..4d91362df32 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/ref/System.Threading.Tasks.Dataflow.csproj @@ -11,8 +11,4 @@ <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj index 92d6f74857c..9708e10ef1f 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj +++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj @@ -18,6 +18,7 @@ System.Threading.Tasks.Dataflow.TransformBlock<TInput, TOutput> System.Threading.Tasks.Dataflow.TransformManyBlock<TInput, TOutput> System.Threading.Tasks.Dataflow.WriteOnceBlock<T></PackageDescription> </PropertyGroup> + <ItemGroup> <Compile Include="Base\DataflowBlock.cs" /> <Compile Include="Base\DataflowBlockOptions.cs" /> @@ -59,11 +60,13 @@ System.Threading.Tasks.Dataflow.WriteOnceBlock<T></PackageDescription> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> </ItemGroup> + <ItemGroup> <None Include="XmlDocs\CommonXmlDocComments.xml" /> <Content Include="XmlDocs\System.Threading.Tasks.Dataflow.xml" Pack="false" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + + <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> <Reference Include="System.Collections" /> <Reference Include="System.Collections.Concurrent" /> <Reference Include="System.Diagnostics.Tracing" /> diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Directory.Build.targets b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Directory.Build.targets index eef5145d0bc..ecf8568ce66 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Directory.Build.targets +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Blazor.Directory.Build.targets @@ -62,7 +62,7 @@ <!-- Filter out conflicting implicit assembly references. --> <Target Name="FilterImplicitAssemblyReferences" - Condition="'$(DisableImplicitAssemblyReferences)' != 'true' and '$(WasmNativeWorkload)' == 'true'" + Condition="'$(WasmNativeWorkload)' == 'true'" DependsOnTargets="ResolveProjectReferences" AfterTargets="ResolveTargetingPackAssets"> <ItemGroup> diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Workloads.Directory.Build.targets b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Workloads.Directory.Build.targets index 76e505544f5..9e70c3722ed 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Workloads.Directory.Build.targets +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Workloads.Directory.Build.targets @@ -70,7 +70,6 @@ <!-- Filter out conflicting implicit assembly references. --> <Target Name="FilterImplicitAssemblyReferences" - Condition="'$(DisableImplicitAssemblyReferences)' != 'true'" DependsOnTargets="ResolveProjectReferences" AfterTargets="ResolveTargetingPackAssets"> <ItemGroup> |