diff options
90 files changed, 109 insertions, 543 deletions
diff --git a/eng/generators.targets b/eng/generators.targets index f830dbd52f2..8143fdf8e25 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)' == 'false'))" /> + and '$(DisableImplicitAssemblyReferences)' != 'true'))" /> <EnabledGenerators Include="LibraryImportGenerator" Condition="'$(EnableLibraryImportGenerator)' == '' and '$(IsSourceProject)' == 'true' diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 0505ecdb7dd..b61f18b44c9 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -16,7 +16,7 @@ <PropertyGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and - $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))"> + '$(TargetFrameworkVersion)' == 'v$(NetCoreAppCurrentVersion)'"> <UseLocalTargetingRuntimePack Condition="'$(UseLocalTargetingRuntimePack)' == ''">true</UseLocalTargetingRuntimePack> <!-- Tests don't yet use a live build of the apphost: https://github.com/dotnet/runtime/issues/58109. --> <UseLocalAppHostPack Condition="'$(UseLocalAppHostPack)' == ''">false</UseLocalAppHostPack> @@ -67,20 +67,14 @@ </Reference> </ItemGroup> - <!-- DisableImplicitAssemblyReferences support. --> <Target Name="RemoveFrameworkReferences" BeforeTargets="_HandlePackageFileConflicts" AfterTargets="ResolveTargetingPackAssets" - Condition="'$(DisableImplicitAssemblyReferences)' == 'true' and - '$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <!-- Point MicrosoftNetCoreAppRefPackRefDir to the acquired targeting pack to use it later for AssemblySearchPaths resolution. --> - <PropertyGroup Condition="'$(UseLocalTargetingRuntimePack)' != 'true'"> + <PropertyGroup Condition="'$(TargetFrameworkVersion)' != 'v$(NetCoreAppCurrentVersion)'"> <MicrosoftNetCoreAppRefPackRefDir>%(ResolvedFrameworkReference.TargetingPackPath)\ref\net$(TargetFrameworkVersion.TrimStart('v'))\</MicrosoftNetCoreAppRefPackRefDir> </PropertyGroup> - <ItemGroup> - <Reference Remove="@(Reference)" - Condition="'%(Reference.FrameworkReferenceName)' == '$(LocalFrameworkOverrideName)'" /> - </ItemGroup> </Target> <!-- Add the resolved targeting pack to the assembly search path. --> diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 5c5ed4674f1..bbb40d64e07 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -51,11 +51,6 @@ <DisableImplicitFrameworkReferences Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)')) and ('$(IsNETCoreAppRef)' == 'true' or '$(IsNETCoreAppSrc)' == 'true')">true</DisableImplicitFrameworkReferences> - <!-- Disable implicit assembly references for .NETCoreApp refs and sources. --> - <DisableImplicitAssemblyReferences Condition="'$(DisableImplicitAssemblyReferences)' == '' and - '$(DisableImplicitFrameworkReferences)' != 'true' and - '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and - ('$(IsReferenceAssemblyProject)' == 'true' or '$(IsSourceProject)' == 'true')">true</DisableImplicitAssemblyReferences> <!-- Enable trimming for any source project that's part of the shared framework. Don't attempt to trim PNSE assemblies which are generated from the reference source. --> <ILLinkTrimAssembly Condition="'$(ILLinkTrimAssembly)' == '' and diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj index 043ea63d0a1..fab37a8e775 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj @@ -8,11 +8,10 @@ <Compile Include="Microsoft.Extensions.Caching.Abstractions.net6.0.cs" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))" /> <Compile Include="Microsoft.Extensions.Caching.Abstractions.Typeforwards.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"/> <Compile Include="$(CoreLibSharedDir)System\Runtime\CompilerServices\IsExternalInit.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" - Link="Common\System\Runtime\CompilerServices\IsExternalInit.cs" /> - <ProjectReference Include="..\..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> + Link="Common\System\Runtime\CompilerServices\IsExternalInit.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj index 8544bfee0a1..bf6448ad896 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj @@ -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>Caching abstractions for in-memory cache and distributed cache. diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj index d76962feb96..0f2ebaeb25b 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.csproj @@ -13,8 +13,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj index f774c53f6b6..3443e064abc 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -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>In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj index 75a381fd9d9..9c2f22bb81f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -10,8 +10,4 @@ <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj index 5c8cc4e192c..3668c5c0f6e 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -4,8 +4,6 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <IsPackable>true</IsPackable> <EnableDefaultItems>true</EnableDefaultItems> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <PackageDescription>Abstractions of key-value pair based configuration. Commonly Used Types: diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj index 56cf41ca81d..1d3a95f6f69 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj @@ -16,8 +16,4 @@ <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj index cd2c16cc699..747e97a0188 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj @@ -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>Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj index a252faa3288..87ab05ee97d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -5,11 +5,10 @@ <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.CommandLine.cs" /> - <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj index 08d3f88d461..00ecad03ffa 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -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>Command line configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index 02248fe1fe3..0ba6f8b689d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -5,11 +5,10 @@ <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.EnvironmentVariables.cs" /> - <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index c31b5e56fa5..79544766c2f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -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>Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj index 17a2b20beb1..f5895ad097b 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -6,13 +6,12 @@ <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.FileExtensions.cs" /> + </ItemGroup> + + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj index b8c4cdac7c7..25693a45b1c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -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>Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj index 7d73ff49999..0fc3d68dadb 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj @@ -5,13 +5,12 @@ <ItemGroup> <Compile Include="Microsoft.Extensions.Configuration.Ini.cs" /> + </ItemGroup> + + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj index bfa28c90763..5c859dcf9aa 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj @@ -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>INI configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj index 195538be004..9f549c62a0a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj @@ -8,15 +8,13 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Text.Json\ref\System.Text.Json.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> + <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj index 136bb005de2..d0733925f9f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -4,8 +4,6 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableDefaultItems>true</EnableDefaultItems> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <IsPackable>true</IsPackable> <PackageDescription>JSON configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj index 32f367d46a1..459f9fb8fd6 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -11,8 +11,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index 14280d73027..f3585bc67c4 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -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>User secrets configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj index 68ad5b0137b..0461bad28ab 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj @@ -13,13 +13,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> </ItemGroup> - - <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.Runtime" /> - <Reference Include="System.Xml.ReaderWriter" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index b950b320e48..bfc0ab612f9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -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>XML configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj index 6a89d03bcd2..6cf4a8786b5 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/ref/Microsoft.Extensions.Configuration.csproj @@ -8,8 +8,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj index a436ecf7236..d61fbd55c06 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.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>Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index c80d81213f2..d2f35679e26 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -12,16 +12,6 @@ <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel\ref\System.ComponentModel.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj" /> diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj index a4ae01e358b..9afe1920271 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -8,8 +8,6 @@ Commonly Used Types: Microsoft.Extensions.DependencyInjection.IServiceCollection</PackageDescription> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <ItemGroup> diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj index 917e1236b1b..fe48d9b4bb0 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj @@ -4,12 +4,10 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> <EnableDefaultItems>true</EnableDefaultItems> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <CLSCompliant>false</CLSCompliant> - <IsPackable>true</IsPackable> <IsTrimmable>false</IsTrimmable> <NoWarn>$(NoWarn);CA1852</NoWarn> + <IsPackable>true</IsPackable> <PackageDescription>Suite of xUnit.net tests to check for container compatibility with Microsoft.Extensions.DependencyInjection.</PackageDescription> <!-- this assembly doesn't need to be binplaced --> <EnableBinPlacing>false</EnableBinPlacing> diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj index 71e3f9dcb84..7e9a119ec87 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.csproj @@ -2,17 +2,16 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="Microsoft.Extensions.DependencyInjection.cs" /> <Compile Include="Microsoft.Extensions.DependencyInjection.Forwards.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Runtime" /> - </ItemGroup> + <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj" /> diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj index 4487aac95ba..c812ebcb21f 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -8,8 +8,6 @@ <NoWarn>$(NoWarn);CP0001</NoWarn> <IsPackable>true</IsPackable> <PackageDescription>Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection.</PackageDescription> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> </PropertyGroup> <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj index 158aa84d9b7..965488c7a92 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/ref/Microsoft.Extensions.DependencyModel.csproj @@ -10,14 +10,4 @@ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresAssemblyFilesAttribute.cs" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - <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> </Project> diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj index 44d5892521f..ef308aebcfe 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj @@ -2,8 +2,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>Abstractions for reading `.deps` files. diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj index a753205851e..e2f76f09460 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -10,8 +10,4 @@ <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj index f25f93e3e74..ac9af12a6ad 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -21,10 +21,4 @@ Microsoft.Extensions.FileProviders.IFileProvider</PackageDescription> <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Runtime" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Linq.Expressions" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj index e2f746686d3..7286cc15e0e 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj @@ -12,8 +12,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj index 02c8c07bace..5c4e43724d0 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj @@ -4,8 +4,6 @@ <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace> <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>Composite file and directory providers for Microsoft.Extensions.FileProviders.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj index b87b4421e6e..4cf33049334 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj @@ -2,19 +2,14 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="Microsoft.Extensions.FileProviders.Physical.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.IO.FileSystem.Watcher\ref\System.IO.FileSystem.Watcher.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.IO.FileSystem.Watcher" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index c3ed3068485..e467f6d4cbc 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -1,8 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <RootNamespace>Microsoft.Extensions.FileProviders</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableDefaultItems>true</EnableDefaultItems> <IsPackable>true</IsPackable> @@ -24,21 +24,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections.Concurrent" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.IO.FileSystem.Watcher" /> - <Reference Include="System.Linq" /> - <Reference Include="System.Linq.Expressions" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> - </ItemGroup> - <!-- For IncrementalHash --> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" /> diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj index c2d428aae02..7272667a563 100644 --- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -2,15 +2,8 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="Microsoft.Extensions.FileSystemGlobbing.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Collections\ref\System.Collections.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj index 9658bb63e1a..f50bff22f54 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -19,11 +19,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Runtime" /> - </ItemGroup> <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))"> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj" /> diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj index 404b08cd5ad..470c28257d2 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -4,19 +4,20 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <RootNamespace>Microsoft.Extensions.Hosting</RootNamespace> <EnableDefaultItems>true</EnableDefaultItems> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <IsPackable>true</IsPackable> <PackageDescription>Hosting and startup abstractions for applications.</PackageDescription> </PropertyGroup> + <ItemGroup> + <Compile Include="$(CommonPath)System\ThrowHelper.cs" Link="Common\System\ThrowHelper.cs" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" /> </ItemGroup> <ItemGroup> - <Compile Include="$(CommonPath)System\ThrowHelper.cs" Link="Common\System\ThrowHelper.cs" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj b/src/libraries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj index 8217ee10af7..906616c03d9 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/ref/Microsoft.Extensions.Hosting.Systemd.csproj @@ -8,8 +8,4 @@ <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Hosting\ref\Microsoft.Extensions.Hosting.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj b/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj index 20626cc0bd3..2094d08fe48 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj @@ -3,11 +3,9 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> - <PackageDescription>.NET hosting infrastructure for Systemd Services.</PackageDescription> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPackable>true</IsPackable> + <PackageDescription>.NET hosting infrastructure for Systemd Services.</PackageDescription> <Nullable>annotations</Nullable> </PropertyGroup> @@ -28,8 +26,4 @@ <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Hosting\src\Microsoft.Extensions.Hosting.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime.InteropServices" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj index 27ee12d52f0..b731b13b9c2 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj @@ -9,11 +9,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Hosting\ref\Microsoft.Extensions.Hosting.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)System.ServiceProcess.ServiceController\ref\System.ServiceProcess.ServiceController.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Runtime" /> - </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.ServiceProcess" /> diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj index bf2f6efa76d..d3ff9fd26c5 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj @@ -3,12 +3,9 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;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>.NET hosting infrastructure for Windows Services.</PackageDescription> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <ItemGroup> diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj index ec75e63c9a0..b0fa1a91f71 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -25,8 +25,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index 517208e2f58..673e5aebad7 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -4,11 +4,13 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <PackageDescription>Hosting and startup infrastructures for applications.</PackageDescription> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <IsPackable>true</IsPackable> </PropertyGroup> + <ItemGroup> + <Compile Include="$(CommonPath)System\ThrowHelper.cs" Link="Common\System\ThrowHelper.cs" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Remove="HostBuilder.notnetcoreapp.cs" /> <Compile Remove="Internal\ConsoleLifetime.notnetcoreapp.cs" /> @@ -23,7 +25,6 @@ </ItemGroup> <ItemGroup> - <Compile Include="$(CommonPath)System\ThrowHelper.cs" Link="Common\System\ThrowHelper.cs" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj" /> diff --git a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj index 6a1e04cab8d..5186bf230cd 100644 --- a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj @@ -19,16 +19,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Net.Http\ref\System.Net.Http.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.Net.Http" /> </ItemGroup> diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index 0cd7386c9cf..dbc74f13e85 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.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>The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. The HttpClient factory provides extensibility to plug in DelegatingHandlers that address cross-cutting concerns such as service location, load balancing, and reliability. The default HttpClient factory provides built-in diagnostics and logging and manages the lifetimes of connections in a performant way. diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj index 20a76cc3d60..27398964bb3 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj @@ -2,13 +2,8 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="Microsoft.Extensions.Logging.Abstractions.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> diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 2af3de5298d..b2eddd1426a 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -4,8 +4,6 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <IsPackable>true</IsPackable> <PackageDescription>Logging abstractions for Microsoft.Extensions.Logging. diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj index eb13c60dd76..6d25b454f2c 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj @@ -19,8 +19,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index fbd31f68180..455ebab7df9 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -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>Configuration support for Microsoft.Extensions.Logging.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index 71aeb235fd3..5e97ae48d2e 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -24,8 +24,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index e159508e847..001f1949be6 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -5,10 +5,7 @@ <EnableDefaultItems>true</EnableDefaultItems> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);NO_SUPPRESS_GC_TRANSITION</DefineConstants> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <IncludePlatformAttributes>true</IncludePlatformAttributes> - <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator> <IsPackable>true</IsPackable> <PackageDescription>Console logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj index 5601d41b98b..41a0d65dcc6 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj @@ -11,8 +11,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index a9f80f26a00..4d3c4cdac96 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -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>Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine().</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj index 43106bb8246..95e4238f0d5 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj @@ -12,8 +12,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index 16160099566..2d320fe34fb 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -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>Windows Event Log logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj index af66298ad59..c5b99512479 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj @@ -11,14 +11,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.Tracing\ref\System.Diagnostics.Tracing.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Diagnostics.Tracing" /> - <Reference Include="System.Runtime" /> - </ItemGroup> - </Project> diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index 2cf8cfcfe8b..4ed143b3a6a 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -4,8 +4,6 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <IsPackable>true</IsPackable> <PackageDescription>EventSource/EventListener logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj index 4bce269aae8..686a65d9bc9 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj @@ -11,13 +11,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.TraceSource\ref\System.Diagnostics.TraceSource.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index 25ca0a1129a..6fd1b72b9b5 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -3,18 +3,18 @@ <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>TraceSource logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent().</PackageDescription> </PropertyGroup> <ItemGroup> + <Compile Include="$(CommonPath)System\ThrowHelper.cs" Link="Common\System\ThrowHelper.cs" /> + </ItemGroup> + + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" /> - <Compile Include="$(CommonPath)System\ThrowHelper.cs" - Link="Common\System\ThrowHelper.cs" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj index 714855f4cfd..5ad076b2963 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj @@ -12,8 +12,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index 39d5c96b87e..83b547c44de 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -3,8 +3,6 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;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>Logging infrastructure default implementation for Microsoft.Extensions.Logging.</PackageDescription> </PropertyGroup> diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 229f0daff8f..46f069b2238 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -2,6 +2,7 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="Microsoft.Extensions.Options.ConfigurationExtensions.cs" /> </ItemGroup> @@ -19,8 +20,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index ab5fafcff69..4c823cdd704 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -3,12 +3,15 @@ <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>Provides additional configuration specific functionality related to Options.</PackageDescription> </PropertyGroup> + <ItemGroup> + <Compile Include="$(CommonPath)System\ThrowHelper.cs" Link="Common\System\ThrowHelper.cs" /> + </ItemGroup> + + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" /> @@ -22,8 +25,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> - <Compile Include="$(CommonPath)System\ThrowHelper.cs" - Link="Common\System\ThrowHelper.cs" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj index cf0ef402136..e0fb6f787bd 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -2,6 +2,7 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="Microsoft.Extensions.Options.DataAnnotations.cs" /> </ItemGroup> @@ -16,8 +17,4 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj index 2f0f392071a..4f4ce39d370 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -3,16 +3,12 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;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>Provides additional DataAnnotations specific functionality related to Options.</PackageDescription> </PropertyGroup> <ItemGroup> <Compile Include="$(CommonPath)System\ThrowHelper.cs" Link="Common\System\ThrowHelper.cs" /> - <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> @@ -22,6 +18,11 @@ <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> + <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" /> </ItemGroup> diff --git a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj index 2d114209d23..d496bf6c232 100644 --- a/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/ref/Microsoft.Extensions.Options.csproj @@ -17,10 +17,6 @@ <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Runtime" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" /> </ItemGroup> diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj index 3dbb9317806..bd4453bcd72 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -3,13 +3,14 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.1;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>Provides a strongly typed way of specifying and accessing settings using dependency injection.</PackageDescription> </PropertyGroup> - <!-- These types weren't available before net5.0 and need to be compiled into the assembly. --> + <ItemGroup> + <Compile Include="$(CommonPath)System\ThrowHelper.cs" Link="Common\System\ThrowHelper.cs" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" /> @@ -19,8 +20,6 @@ <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" /> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj" /> - <Compile Include="$(CommonPath)System\ThrowHelper.cs" - Link="Common\System\ThrowHelper.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> diff --git a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj index d8b462239f5..e1e40fa9736 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/ref/Microsoft.Extensions.Primitives.csproj @@ -7,16 +7,7 @@ <Compile Include="Microsoft.Extensions.Primitives.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'"> - <!-- PrivateAssets=all is a workaround to issue: https://github.com/NuGet/Home/issues/10368. --> - <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" /> + <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> </ItemGroup> </Project> diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index 8d684784c02..9ebe9571f78 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -3,8 +3,6 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <EnableDefaultItems>true</EnableDefaultItems> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <!-- Use targeting pack references instead of granular ones in the project file. --> - <DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences> <IsPackable>true</IsPackable> <PackageDescription>Primitives shared by framework extensions. Commonly used types include: diff --git a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj index df73521bc6d..fbf2f960be3 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/ref/Microsoft.Win32.SystemEvents.csproj @@ -2,15 +2,9 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="Microsoft.Win32.SystemEvents.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="Microsoft.Win32.SystemEvents.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/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj index aab069f287f..d7e7dc61211 100644 --- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj +++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj @@ -1,12 +1,12 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPackable>true</IsPackable> <PackageDescription>Provides access to Windows system event notifications. Commonly Used Types: Microsoft.Win32.SystemEvents</PackageDescription> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <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. --> @@ -127,20 +127,4 @@ Microsoft.Win32.SystemEvents</PackageDescription> Link="System\Runtime\InteropServices\SuppressGCTransitionAttribute.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="System.Collections" /> - <Reference Include="System.ComponentModel.EventBasedAsync" /> - <Reference Include="System.ComponentModel.Primitives" /> - <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.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs index b28c58a6226..a2922ac0970 100644 --- a/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs +++ b/src/libraries/System.CodeDom/src/Microsoft/VisualBasic/VBCodeGenerator.cs @@ -892,7 +892,11 @@ namespace Microsoft.VisualBasic } else { +#if NETCOREAPP + Output.Write(typeName.AsSpan(0, index + 1)); +#else Output.Write(typeName.Substring(0, index + 1)); +#endif } // The tricky thing is we need to declare the size - 1 @@ -913,7 +917,11 @@ namespace Microsoft.VisualBasic } else { +#if NETCOREAPP + Output.Write(typeName.AsSpan(index + 1)); +#else Output.Write(typeName.Substring(index + 1)); +#endif } Output.Write(" {}"); diff --git a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj index 76d3addabc4..a37095fa9cb 100644 --- a/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj @@ -3,24 +3,16 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <Nullable>disable</Nullable> </PropertyGroup> + <ItemGroup> <Compile Include="System.Diagnostics.EventLog.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.Diagnostics.EventLog.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.TraceSource\ref\System.Diagnostics.TraceSource.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.TraceSource" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Security.Principal.Windows" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" /> </ItemGroup> diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj index a97fd6227e0..cd2353be082 100644 --- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj +++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.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> <!-- Suppressions to avoid ifdefs: CA1845: Use span-based 'string.Concat' and 'AsSpan' instead of 'Substring' @@ -111,43 +111,18 @@ System.Diagnostics.EventLog</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'"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" /> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="Microsoft.Win32.Registry" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.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.Diagnostics.TraceSource" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Security.Principal.Windows" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Tasks" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading.ThreadPool" /> - <Reference Include="System.Threading.Overlapped" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" /> </ItemGroup> diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj index 18cd05f67c6..4fb483d5078 100644 --- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj @@ -3,6 +3,7 @@ <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute> </PropertyGroup> + <ItemGroup> <Compile Include="System.Drawing.Common.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.Drawing.Common.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> @@ -10,32 +11,8 @@ <Compile Include="System.Drawing.Common.netstandard.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'" /> <Compile Include="System.Drawing.Common.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel\ref\System.ComponentModel.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Primitives\ref\System.Drawing.Primitives.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Numerics.Vectors\ref\System.Numerics.Vectors.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.ObjectModel\ref\System.ObjectModel.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\ref\System.Runtime.InteropServices.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Drawing.Primitives" /> - <Reference Include="System.Numerics.Vectors" /> - <Reference Include="System.ObjectModel" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - </ItemGroup> </Project> diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index 7ed5630242d..df9c7ef864a 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -328,31 +328,5 @@ Since .NET 7, non-Windows platforms are not supported, even with the runtime con <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj" /> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="System.Buffers" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.Collections.Specialized" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.StackTrace" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.Drawing.Primitives" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Numerics.Vectors" /> - <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.Memory" /> - <Reference Include="System.ComponentModel" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Threading" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Text.Encoding.Extensions" /> </ItemGroup> </Project> diff --git a/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj index 2c382f5dd02..65b3d2b5777 100644 --- a/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj +++ b/src/libraries/System.Net.Quic/ref/System.Net.Quic.csproj @@ -1,6 +1,9 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>$(NetCoreAppCurrent)</TargetFramework> + <!-- Even though this library's contract isn't exposed in the shared framework, it is built as part of the shared framework build + (because the System.Net.Quic\src references this project) and hence need to define its dependencies. --> + <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> </PropertyGroup> <ItemGroup> <Compile Include="System.Net.Quic.cs" /> diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj index af02789cace..03e6b82d0ce 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -15,32 +15,8 @@ <ProjectReference Include="$(LibrariesProjectRoot)System.Windows.Extensions\ref\System.Windows.Extensions.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.Data.Common\ref\System.Data.Common.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Csp\ref\System.Security.Cryptography.Csp.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Text.RegularExpressions\ref\System.Text.RegularExpressions.csproj" /> - </ItemGroup> - - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Data.Common" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Csp" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Text.RegularExpressions" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"> <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'"> diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index e799d094a9d..899ae7ed932 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -1,11 +1,12 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> + <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly> <Nullable>disable</Nullable> <IsPackable>true</IsPackable> <PackageDescription>Provides types supporting Code Access Security (CAS).</PackageDescription> </PropertyGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'"> <Compile Include="System\ApplicationIdentity.cs" /> <Compile Include="System\Configuration\ConfigurationPermission.cs" /> @@ -179,9 +180,11 @@ <Compile Include="$(CommonPath)System\Obsoletions.cs" Link="Common\System\Obsoletions.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <Compile Include="System\Xaml\Permissions\XamlLoadPermission.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <Compile Include="$(LibrariesProjectRoot)System.Private.CoreLib\src\System\Security\IStackWalk.cs" Link="System\Security\IStackWalk.cs" /> @@ -190,31 +193,15 @@ <Compile Include="$(LibrariesProjectRoot)System.Private.CoreLib\src\System\Security\Permissions\PermissionState.cs" Link="System\Security\Permissions\PermissionState.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" /> </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <ProjectReference Include="$(LibrariesProjectRoot)System.Windows.Extensions\src\System.Windows.Extensions.csproj" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.Data.Common" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Security.AccessControl" /> - <Reference Include="System.Security.Cryptography.Algorithms" /> - <Reference Include="System.Security.Cryptography.Csp" /> - <Reference Include="System.Security.Cryptography.Primitives" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Security.Principal" /> - <Reference Include="System.Text.RegularExpressions" /> - <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)' == '.NETFramework'"> <Reference Include="System.Configuration" /> <Reference Include="System.Data.OracleClient" /> diff --git a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/DateTimeHelper.cs b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/DateTimeHelper.cs index b1129ef2799..ee0bb46bdfb 100644 --- a/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/DateTimeHelper.cs +++ b/src/libraries/System.ServiceModel.Syndication/src/System/ServiceModel/Syndication/DateTimeHelper.cs @@ -58,7 +58,11 @@ namespace System.ServiceModel.Syndication ++i; } +#if NETCOREAPP + dateTimeString = string.Concat(dateTimeString.AsSpan(0, 19), dateTimeString.AsSpan(i)); +#else dateTimeString = dateTimeString.Substring(0, 19) + dateTimeString.Substring(i); +#endif } return DateTimeOffset.TryParseExact(dateTimeString, Rfc3339DateTimeFormat, CultureInfo.InvariantCulture.DateTimeFormat, DateTimeStyles.None, out dto); diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj index 8409ad8f1a9..adc92d241d0 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -2,22 +2,17 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.ServiceProcess.ServiceController.cs" Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" /> <Compile Include="System.ServiceProcess.ServiceController.netframework.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" /> <Compile Include="System.ServiceProcess.ServiceController.netcoreapp.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.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.Runtime" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.ComponentModel.Primitives" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.ServiceProcess" /> </ItemGroup> diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index e7941df5f48..518c800ae01 100644 --- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.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);CA2249</NoWarn> <IsPackable>true</IsPackable> <PackageDescription>Provides the System.ServiceProcess.ServiceContainer class, which allows you to connect to a running or stopped service, manipulate it, or get information about it. @@ -11,6 +11,7 @@ System.ServiceProcess.ServiceController System.ServiceProcess.ServiceControllerStatus System.ServiceProcess.ServiceType</PackageDescription> </PropertyGroup> + <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. --> <PropertyGroup> <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier> @@ -20,6 +21,7 @@ System.ServiceProcess.ServiceType</PackageDescription> <!-- we cannot add API on .NETStandard since it would be absent on .NETFramework, suppress warnings that require API changes --> <NoWarn Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETStandard'">$(NoWarn);CA1066</NoWarn> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs" Link="Common\System\Text\ValueStringBuilder.cs" /> @@ -81,26 +83,11 @@ System.ServiceProcess.ServiceType</PackageDescription> <Compile Include="System\ServiceProcess\SessionChangeReason.cs" /> <Compile Include="System\ServiceProcess\TimeoutException.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <Reference Include="Microsoft.Win32.Primitives" /> - <Reference Include="System.Buffers" /> - <Reference Include="System.Collections" /> - <Reference Include="System.Console" /> - <Reference Include="System.ComponentModel.Primitives" /> - <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" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading.ThreadPool" /> - </ItemGroup> + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> <Reference Include="System.ServiceProcess" /> </ItemGroup> diff --git a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj index 324bdf24af2..742a4410729 100644 --- a/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/ref/System.Windows.Extensions.csproj @@ -2,25 +2,13 @@ <PropertyGroup> <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum)</TargetFrameworks> </PropertyGroup> + <ItemGroup> <Compile Include="System.Windows.Extensions.cs" /> <Compile Include="System.Windows.Extensions.Forwards.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Common\ref\System.Drawing.Common.csproj" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.EventBasedAsync\ref\System.ComponentModel.EventBasedAsync.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" /> - <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.X509Certificates\ref\System.Security.Cryptography.X509Certificates.csproj" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetFramework)' != '$(NetCoreAppCurrent)'"> - <Reference Include="System.ComponentModel.EventBasedAsync" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj index 5562d66c9c3..ee9cb23d69e 100644 --- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj +++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum)</TargetFrameworks> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsPackable>true</IsPackable> <PackageDescription>Provides miscellaneous Windows-specific types @@ -9,11 +9,13 @@ Commonly Used Types: System.Security.Cryptography.X509Certificates.X509Certificate2UI System.Security.Cryptography.X509Certificates.X509SelectionFlag</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_System_Windows_Extensions</GeneratePlatformNotSupportedAssemblyMessage> </PropertyGroup> + <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'"> <Compile Include="TypeForwards.cs" /> <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CERT_CONTEXT.cs" @@ -81,34 +83,13 @@ System.Security.Cryptography.X509Certificates.X509SelectionFlag</PackageDescript <Compile Include="System\Media\SystemSounds.cs" /> <Compile Include="System\Xaml\Permissions\XamlAccessLevel.cs" /> </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0')) and '$(TargetPlatformIdentifier)' != ''"> <Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs" Link="Common\DisableRuntimeMarshalling.cs" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Common\src\System.Drawing.Common.csproj" /> - <Reference Include="System.Buffers" /> - <Reference Include="System.Collections.NonGeneric" /> - <Reference Include="System.ComponentModel.EventBasedAsync" /> - <Reference Include="System.ComponentModel.Primitives" /> - <Reference Include="System.ComponentModel.TypeConverter" /> - <Reference Include="System.Diagnostics.Debug" /> - <Reference Include="System.Diagnostics.Tools" /> - <Reference Include="System.IO.FileSystem" /> - <Reference Include="System.Memory" /> - <Reference Include="System.Net.Requests" /> - <Reference Include="System.Resources.ResourceManager" /> - <Reference Include="System.Runtime.CompilerServices.Unsafe" /> - <Reference Include="System.Runtime.Extensions" /> - <Reference Include="System.Runtime.InteropServices" /> - <Reference Include="System.Runtime" /> - <Reference Include="System.Security.Cryptography.X509Certificates" /> - <Reference Include="System.Text.RegularExpressions" /> - <Reference Include="System.Threading.Tasks" /> - <Reference Include="System.Threading.Thread" /> - <Reference Include="System.Threading" /> - </ItemGroup> - <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"> - <Reference Include="System.Security.Cryptography" /> </ItemGroup> </Project> |