提交 2391ff35 编写于 作者: L Lakshmi Priya Sekar

Move RegularExpressions contract to be supported from net463.


Commit migrated from https://github.com/dotnet/corefx/commit/3dd150b10be8098c62a343d958e72b22f6d81d69
上级 704ba929
......@@ -9,7 +9,7 @@
<SupportedFramework>net46;netcore50</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\System.Text.RegularExpressions.csproj">
<SupportedFramework>net462;netcoreapp1.0</SupportedFramework>
<SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Text.RegularExpressions.builds" />
<InboxOnTargetFramework Include="MonoAndroid10" />
......
......@@ -4,8 +4,8 @@
<PropertyGroup>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
<OutputType>Library</OutputType>
<PackageTargetFramework>netstandard1.5</PackageTargetFramework>
<NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
<PackageTargetFramework>netstandard1.6</PackageTargetFramework>
<NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.Text.RegularExpressions.cs" />
......
......@@ -3,9 +3,9 @@
"System.Runtime": "4.0.0"
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": [
"dotnet5.6"
"dotnet5.7"
]
}
}
......
......@@ -5,7 +5,7 @@
<Project Include="System.Text.RegularExpressions.csproj" />
<!-- Net46 facade is currently inbox for 4.0-->
<Project Include="System.Text.RegularExpressions.csproj">
<TargetGroup>net462</TargetGroup>
<TargetGroup>net463</TargetGroup>
</Project>
<Project Include="redist\System.Text.RegularExpressions.depproj">
<TargetGroup>netcore50</TargetGroup>
......
......@@ -5,17 +5,17 @@
<ProjectGuid>{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}</ProjectGuid>
<AssemblyName>System.Text.RegularExpressions</AssemblyName>
<AssemblyVersion>4.1.0.0</AssemblyVersion>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net462'">true</IsPartialFacadeAssembly>
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net462'">None</ResourcesSourceOutputDirectory>
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.5</PackageTargetFramework>
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.5</NuGetTargetMoniker>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory>
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.6</PackageTargetFramework>
<NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.6</NuGetTargetMoniker>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net462_Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net462_Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' != 'net462'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' != 'net463'">
<Compile Include="System\Text\RegularExpressions\Regex.cs" />
<Compile Include="System\Text\RegularExpressions\RegexBoyerMoore.cs" />
<Compile Include="System\Text\RegularExpressions\RegexCapture.cs" />
......@@ -45,7 +45,7 @@
<Link>Common\System\IO\StringBuilderCache.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net462'">
<ItemGroup Condition="'$(TargetGroup)' == 'net463'">
<TargetingPackReference Include="mscorlib" />
<TargetingPackReference Include="System" />
</ItemGroup>
......
{
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc4-24201-04",
"System.Collections": "4.0.10",
......@@ -14,10 +14,10 @@
"System.Threading.Tasks": "4.0.10"
},
"imports": [
"dotnet5.6"
"dotnet5.7"
]
},
"net462": {
"net463": {
"dependencies": {
"Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册