<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
<SystemCollectionsVersion>4.3.0</SystemCollectionsVersion>
<SystemCollectionsConcurrentVersion>4.3.0</SystemCollectionsConcurrentVersion>
- <SystemComponentModelAnnotationsVersion>4.7.0</SystemComponentModelAnnotationsVersion>
+ <SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
<SystemDataSqlClientVersion>4.8.1</SystemDataSqlClientVersion>
<SystemDiagnosticsContractsVersion>4.3.0</SystemDiagnosticsContractsVersion>
<SystemDiagnosticsDebugVersion>4.3.0</SystemDiagnosticsDebugVersion>
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
<PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
- <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.Annotations\src\System.ComponentModel.Annotations.csproj" />
- </ItemGroup>
-
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
- <PackageDescription>Provides attributes that are used to define metadata for objects used as data sources.
-
-Commonly Used Types:
-System.ComponentModel.DataAnnotations.ValidationResult
-System.ComponentModel.DataAnnotations.IValidatableObject
-System.ComponentModel.DataAnnotations.ValidationAttribute
-System.ComponentModel.DataAnnotations.RequiredAttribute
-System.ComponentModel.DataAnnotations.StringLengthAttribute
-System.ComponentModel.DataAnnotations.DisplayAttribute
-System.ComponentModel.DataAnnotations.RegularExpressionAttribute
-System.ComponentModel.DataAnnotations.DataTypeAttribute
-System.ComponentModel.DataAnnotations.RangeAttribute
-System.ComponentModel.DataAnnotations.KeyAttribute</PackageDescription>
</PropertyGroup>
</Project>
\ No newline at end of file
+++ /dev/null
-<Project DefaultTargets="Build">
- <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
- <ItemGroup>
- <ProjectReference Include="..\ref\System.ComponentModel.Annotations.csproj">
- <SupportedFramework>netcoreapp3.0;$(AllXamarinFrameworks)</SupportedFramework>
- </ProjectReference>
- <ProjectReference Include="..\src\System.ComponentModel.Annotations.csproj" />
- <HarvestIncludePaths Include="ref/netcore50;lib/netcore50" />
- <HarvestIncludePaths Include="ref/netstandard1.1" />
- <HarvestIncludePaths Include="ref/netstandard1.3" />
- <HarvestIncludePaths Include="ref/netstandard1.4;lib/netstandard1.4" />
- <HarvestIncludePaths Include="ref/netstandard2.0;lib/netstandard2.0" />
- <HarvestIncludePaths Include="ref/net461;lib/net461" />
- <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
- <InboxOnTargetFramework Include="net45">
- <FrameworkReference>System.ComponentModel.DataAnnotations</FrameworkReference>
- </InboxOnTargetFramework>
- <InboxOnTargetFramework Include="win8" />
- <InboxOnTargetFramework Include="portable-net45+win8" />
- <ValidatePackageSuppression Include="PermitMissingImplementation">
- <!-- Supported inbox by all ns1.1-1.3 frameworks -->
- <Value>.NETStandard,Version=v1.1;.NETStandard,Version=v1.2;.NETStandard,Version=v1.3</Value>
- </ValidatePackageSuppression>
- <ValidatePackageSuppression Include="TreatAsOutOfBox">
- <Value>.NETCoreApp;UAP</Value>
- </ValidatePackageSuppression>
- </ItemGroup>
- <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netstandard2.1</TargetFrameworks>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.ComponentModel.Annotations.cs" />
- <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" />
- <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" />
- <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" />
</ItemGroup>
-</Project>
\ No newline at end of file
+ <ItemGroup>
+ <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel\ref\System.ComponentModel.csproj" />
+ <ProjectReference Include="$(LibrariesProjectRoot)System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" />
+ <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\ref\System.Runtime.csproj" />
+ </ItemGroup>
+</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.1</TargetFrameworks>
- <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
+ <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
<!--
Since many resource strings in this library are shown to an end-user,
<Compile Include="$(CommonPath)System\NotImplemented.cs"
Link="Common\System\NotImplemented.cs" />
</ItemGroup>
- <ItemGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETCoreApp'">
- <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMembersAttribute.cs" />
- <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" />
- <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\RequiresUnreferencedCodeAttribute.cs" />
- <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" />
- </ItemGroup>
- <ItemGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">
+ <ItemGroup>
<Reference Include="System.Collections" />
<Reference Include="System.Collections.Concurrent" />
<Reference Include="System.ComponentModel" />
"4.6.0",
"5.0.0"
],
- "BaselineVersion": "6.0.0",
+ "BaselineVersion": "5.0.0",
"InboxOn": {
"netcoreapp2.0": "4.2.0.0",
"netcoreapp2.1": "4.2.1.0",
"4.2.0.0": "4.4.0",
"4.2.1.0": "4.5.0",
"4.3.0.0": "4.6.0",
- "5.0.0.0": "5.0.0",
- "6.0.0.0": "6.0.0"
+ "5.0.0.0": "5.0.0"
}
},
"System.ComponentModel.Composition": {