Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add NetCoreAppCurrent configuration to libs (Phase 1) #54544

Merged
merged 25 commits into from
Jun 29, 2021
Merged

Add NetCoreAppCurrent configuration to libs (Phase 1) #54544

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0b0ed72
Use property to indicate NetCoreApp min version
ViktorHofer Jun 22, 2021
8b4a471
Add NetCoreAppCurrent to S.Numerics.Tensors
ViktorHofer Jun 22, 2021
e91462f
Add NetCoreAppCurrent to S.T.AccessControl
ViktorHofer Jun 22, 2021
73e70c6
Add NetCoreAppCurrent to System.Memory.Data
ViktorHofer Jun 22, 2021
ef78b74
Add NetCoreAppCurrent to S.Composition.* projects
ViktorHofer Jun 22, 2021
39f809c
Add NetCoreAppCurrent to System.IO.Packaging
ViktorHofer Jun 22, 2021
61dd121
Add NetCoreAppCurrent config to System.IO.Ports
ViktorHofer Jun 22, 2021
39d1319
Add NetCoreAppCurrent to System.Data.OleDb
ViktorHofer Jun 22, 2021
03a9157
Add NetCoreAppCurrent to M.W32.Registry.AccessControl
ViktorHofer Jun 23, 2021
bb57f13
Add NetCoreAppCurrent to S.Reflection.Context
ViktorHofer Jun 23, 2021
69a5de2
Add NetCoreAppCurrent to S.C.Composition.Registration
ViktorHofer Jun 23, 2021
bf78da8
Add NetCoreAppCurrent to S.Resources.Extensions
ViktorHofer Jun 23, 2021
b6ca563
Add NetCoreAppCurrent to S.N.H.WinHttpHandler
ViktorHofer Jun 23, 2021
efbaa66
Mark CodeBase with RequireAssemblyFiles
ViktorHofer Jun 24, 2021
c01683e
Apply serialPort feedback
ViktorHofer Jun 24, 2021
88b6536
Apply SerialStream feedback
ViktorHofer Jun 24, 2021
9e11a15
Avoid ifdefs
ViktorHofer Jun 24, 2021
19ba381
Fix trailing whitespace lol
ViktorHofer Jun 24, 2021
ac39e76
Fix NoWarn
ViktorHofer Jun 24, 2021
2a31394
Remove further ifdefs
ViktorHofer Jun 25, 2021
93fe112
Add pragma warning back
ViktorHofer Jun 25, 2021
46f9562
Suppress CA1845
ViktorHofer Jun 25, 2021
20834c0
Fix unnecessary empty line changes
ViktorHofer Jun 28, 2021
89f8589
Revert SerialStream changes
ViktorHofer Jun 29, 2021
5123778
Disable SerialStream warning for memory overloads
ViktorHofer Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
<NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
<NetCoreAppMinimum>netcoreapp3.1</NetCoreAppMinimum>
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
Expand Down
2 changes: 1 addition & 1 deletion ...ries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</ItemGroup>

<ItemGroup>
<NETStandardCompatError Include="netcoreapp2.0" Supported="netcoreapp3.1" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
Copy link
Member

@ericstj ericstj Jun 24, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to default NETStandardCompatError/@Supported to $(NetCoreAppMinimum) so that we don't need to duplicate that in all the projects?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not know why I am here. But I love you.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even though we mostly care about .NETCoreApp, as .NETStandard has multiple compatible frameworks, I wouldn't want to default it to .NETCoreApp. As an example, for NET7 the min .NETFramework version will be net462 and we will make use of this infrastructure for .NETFramework as well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Defaulting could happen in Targets after the project sets the Include value. You could handle both cases based on TFI of the include. It's just a suggestion, but could avoid boilerplate if we think the boilerplate isn't adding value to the project. I guess from that perspective we could automatically calculate these entirely since we see what the project is targeting.

Copy link
Member Author

@ViktorHofer ViktorHofer Jun 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess from that perspective we could automatically calculate these entirely since we see what the project is targeting.

Thanks for the suggestion. Tbh that's what I would prefer. When I added this infrastructure in a previous PR I considered automation but didn't do it for different reasons. That said, I definitely wouldn't want to clean this up as part of this PR. For now I'm fine with having these items in the project file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, also fine with it for now. Just had this gut-reaction when I saw this being treated like boilerplate. If we do end up keeping it in the project file then we should add it to the docs: https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/libraries-packaging.md

</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...rosoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</ItemGroup>

<ItemGroup>
<NETStandardCompatError Include="netcoreapp2.0" Supported="netcoreapp3.1" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ Microsoft.Extensions.Primitives.StringSegment</PackageDescription>
</ItemGroup>

<ItemGroup>
<NETStandardCompatError Include="netcoreapp2.0" Supported="netcoreapp3.1" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions ...Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.csproj" />
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0;net46" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
11 changes: 10 additions & 1 deletion .../Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<Compile Include="Microsoft.Win32.Registry.AccessControl.cs" />
<Compile Include="Microsoft.Win32.Registry.AccessControl.Forwards.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
<!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project. -->
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
</ItemGroup>
</Project>
13 changes: 11 additions & 2 deletions .../Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<TargetFrameworks>netstandard2.0-windows;netstandard2.0;net461-windows</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows</TargetFrameworks>
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
<Nullable>enable</Nullable>
</PropertyGroup>

<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_RegistryAccessControl</GeneratePlatformNotSupportedAssemblyMessage>
<OmitResources Condition="$(TargetFramework.StartsWith('net4'))">true</OmitResources>
<OmitResources Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</OmitResources>
</PropertyGroup>

<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="Microsoft\Win32\RegistryAclExtensions.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Reference Include="Microsoft.Win32.Registry" />
<Reference Include="System.Runtime" />
<Reference Include="System.Security.AccessControl" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
Expand Down
3 changes: 0 additions & 3 deletions ...ft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,4 @@
<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))">
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\Microsoft.Win32.SystemEvents.csproj" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="netcoreapp3.1" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
1 change: 1 addition & 0 deletions ...Model.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<InboxOnTargetFramework Include="net461">
<AsFrameworkReference>true</AsFrameworkReference>
</InboxOnTargetFramework>
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
8 changes: 5 additions & 3 deletions ...tModel.Composition.Registration/ref/System.ComponentModel.Composition.Registration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.1</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<Compile Include="System.ComponentModel.Composition.Registration.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\System.ComponentModel.Composition\ref\System.ComponentModel.Composition.csproj" />
<ProjectReference Include="..\..\System.Reflection.Context\ref\System.Reflection.Context.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Composition\ref\System.ComponentModel.Composition.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Context\ref\System.Reflection.Context.csproj" />
</ItemGroup>
</Project>
12 changes: 11 additions & 1 deletion ...tModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.1</TargetFrameworks>
<SetIsTrimmable>false</SetIsTrimmable>
</PropertyGroup>

<ItemGroup>
<Compile Include="System\ComponentModel\Composition\Registration\ExportBuilder.cs" />
<Compile Include="System\ComponentModel\Composition\Registration\ImportBuilder.cs" />
Expand All @@ -24,8 +25,17 @@
<Compile Include="$(CommonPath)System\Composition\Diagnostics\TraceWriter.cs"
Link="Common\System\Composition\Diagnostics\TraceWriter.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Context\src\System.Reflection.Context.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Reference Include="System.Collections" />
<Reference Include="System.Linq" />
<Reference Include="System.Linq.Expressions" />
<Reference Include="System.Runtime" />
<Reference Include="System.Threading" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions ...omposition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<!-- Disable nullable attributes explicitly as some tests depend on them not being present. -->
<Nullable>disable</Nullable>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</InboxOnTargetFramework>
<InboxOnTargetFramework Include="uap10.0.16299" />
<InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="netcoreapp3.1" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
1 change: 1 addition & 0 deletions ...braries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</ProjectReference>
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore45;netcore451;netcore50;uap10.0;net45;net451;net46;wp8;wpa81" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
7 changes: 6 additions & 1 deletion ...ibraries/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<ItemGroup>
<Compile Include="System\Composition\Convention\AttributedModelProvider.cs" />
<Compile Include="System\Composition\ExportAttribute.cs" />
Expand All @@ -17,4 +18,8 @@
<Compile Include="System\Composition\SharedAttribute.cs" />
<Compile Include="System\Composition\SharingBoundaryAttribute.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</ProjectReference>
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore45;netcore451;netcore50;uap10.0;net45;net451;net46;wp8;wpa81" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
12 changes: 11 additions & 1 deletion src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
<SetIsTrimmable>false</SetIsTrimmable>
</PropertyGroup>

<ItemGroup>
<Compile Include="System\Composition\Convention\ConventionBuilder.cs" />
<Compile Include="System\Composition\Convention\ExportConventionBuilder.cs" />
Expand All @@ -21,7 +22,16 @@
<Compile Include="$(CommonPath)System\Composition\Diagnostics\TraceWriter.cs"
Link="Common\System\Composition\Diagnostics\TraceWriter.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(LibrariesProjectRoot)System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
ericstj marked this conversation as resolved.
Show resolved Hide resolved
<Reference Include="System.Collections" />
<Reference Include="System.Linq" />
<Reference Include="System.Linq.Expressions" />
<Reference Include="System.Runtime" />
<Reference Include="System.Threading" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</ProjectReference>
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore45;netcore451;netcore50;uap10.0;net45;net451;net46;wp8;wpa81" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
16 changes: 14 additions & 2 deletions src/libraries/System.Composition.Hosting/src/System.Composition.Hosting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
<SetIsTrimmable>false</SetIsTrimmable>
</PropertyGroup>

<ItemGroup>
<Compile Include="System\Composition\Hosting\CompositionHost.cs" />
<Compile Include="System\Composition\Hosting\Core\CompositeActivator.cs" />
Expand Down Expand Up @@ -31,10 +32,21 @@
<Compile Include="System\Composition\Hosting\Util\MethodInfoExtensions.cs" />
<Compile Include="System\Composition\Hosting\Util\SmallSparseInitonlyArray.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Runtime\src\System.Composition.Runtime.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Reference Include="System.Collections" />
<Reference Include="System.Linq" />
<Reference Include="System.Linq.Expressions" />
<Reference Include="System.ObjectModel" />
<Reference Include="System.Runtime" />
<Reference Include="System.Threading" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<Reference Include="System.ComponentModel.Composition" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</ProjectReference>
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore45;netcore451;netcore50;uap10.0;net45;net451;net46;wp8;wpa81" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
9 changes: 8 additions & 1 deletion src/libraries/System.Composition.Runtime/src/System.Composition.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>System.Composition</RootNamespace>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<Compile Include="System\Composition\CompositionContext.cs" />
<Compile Include="System\Composition\ExportFactoryOfT.cs" />
Expand All @@ -12,4 +13,10 @@
<Compile Include="System\Composition\Hosting\Core\CompositionContract.cs" />
<Compile Include="System\Composition\Runtime\Util\Formatters.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Reference Include="System.Collections" />
<Reference Include="System.Linq" />
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</ProjectReference>
<!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
<ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore45;netcore451;netcore50;uap10.0;net45;net451;net46;wp8;wpa81" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
11 changes: 10 additions & 1 deletion src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>System.Composition</RootNamespace>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
<SetIsTrimmable>false</SetIsTrimmable>
</PropertyGroup>

<ItemGroup>
<Compile Include="System\Composition\CompositionContextExtensions.cs" />
<Compile Include="System\Composition\Convention\AttributedModelProviderExtensions.cs" />
Expand All @@ -29,9 +30,17 @@
<Compile Include="$(CoreLibSharedDir)System\Numerics\Hashing\HashHelpers.cs"
Link="Common\System\Numerics\Hashing\HashHelpers.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(LibrariesProjectRoot)System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Hosting\src\System.Composition.Hosting.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Composition.Runtime\src\System.Composition.Runtime.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<Reference Include="System.Collections" />
<Reference Include="System.Linq" />
<Reference Include="System.Linq.Expressions" />
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Data.Odbc.csproj" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="netcoreapp3.1" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
1 change: 1 addition & 0 deletions src/libraries/System.Data.OleDb/pkg/System.Data.OleDb.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Data.OleDb.csproj" />
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
</Project>
Loading