Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Make 1.1 API netcoreapp1.1-specific #11886

Merged
ericstj merged 2 commits into from
Sep 21, 2016
Merged

Make 1.1 API netcoreapp1.1-specific #11886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b799df
Make 1.1 API netcoreapp1.1-specific
ericstj Sep 19, 2016
4f192af
Build Linq.Expression tests against live Regex
ericstj Sep 20, 2016
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
6 changes: 3 additions & 3 deletions pkg/Microsoft.Private.PackageBaseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,7 @@
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.0.0",
"4.1.0.0": "4.1.0",
"4.1.1.0": "4.3.0",
"4.1.1.0": "4.3.0"
}
},
"System.Linq.Expressions": {
Expand Down Expand Up @@ -1659,7 +1659,7 @@
"4.0.10.0": "4.0.10",
"4.0.20.0": "4.0.20",
"4.1.0.0": "4.1.0",
"4.2.0.0": "4.3.0"
"4.1.1.0": "4.3.0"
}
},
"System.Runtime.InteropServices.RuntimeInformation": {
Expand Down Expand Up @@ -2047,7 +2047,7 @@
"4.0.0.0": "4.0.0",
"4.0.10.0": "4.0.10",
"4.1.0.0": "4.1.0",
"4.2.0.0": "4.3.0"
"4.1.1.0": "4.3.0"
}
},
"System.Threading": {
Expand Down
2 changes: 2 additions & 0 deletions src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@
<Project>{aef718e9-d4fc-418f-a7ae-ed6b2c7b3787}</Project>
<Name>System.Linq.Expressions</Name>
</ProjectReference>
<!-- temporarily compile against the live build of RegularExpressions to handle assembly-version change -->
<ProjectReference Include="..\..\System.Text.RegularExpressions\pkg\System.Text.RegularExpressions.pkgproj"/>
Copy link
Copy Markdown
Member

@weshaggard weshaggard Sep 20, 2016

Choose a reason for hiding this comment

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

Can you please be sure to have a issue tracking the update of this in the release branch?

Copy link
Copy Markdown
Member Author

@ericstj ericstj Sep 20, 2016

Choose a reason for hiding this comment

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

Sure.

Copy link
Copy Markdown
Member Author

@ericstj ericstj Sep 20, 2016

Choose a reason for hiding this comment

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

https://github.com/dotnet/corefx/issues/11916

</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
2 changes: 1 addition & 1 deletion src/System.Runtime.InteropServices/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.2.0.0</AssemblyVersion>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
</PropertyGroup>
</Project>

14 changes: 1 addition & 13 deletions src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,8 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\4.0.0\System.Runtime.InteropServices.depproj">
<SupportedFramework>net45;netcore45</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\4.0.10\System.Runtime.InteropServices.depproj">
<SupportedFramework>net451;netcore451;wpa81</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\4.0.20\System.Runtime.InteropServices.depproj">
<SupportedFramework>net46;netcore50</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\4.1\System.Runtime.InteropServices.depproj">
<SupportedFramework>net462</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\System.Runtime.InteropServices.csproj">
<SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>netcoreapp1.1</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\redist\System.Runtime.InteropServices.depproj">
<TargetGroup>net462</TargetGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NoWarn>618</NoWarn>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputType>Library</OutputType>
<NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
<NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
<ProjectGuid>{B17014F1-D902-417F-89B0-271204695831}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Runtime.InteropServices/ref/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"System.Runtime.Handles": "4.0.0"
},
"frameworks": {
"netstandard1.6": {
"netcoreapp1.1": {
"imports": [
"dotnet5.7"
]
Expand Down
2 changes: 1 addition & 1 deletion src/System.Text.RegularExpressions/dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.2.0.0</AssemblyVersion>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
</PropertyGroup>
</Project>

8 changes: 1 addition & 7 deletions src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,8 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<ProjectReference Include="..\ref\4.0.0\System.Text.RegularExpressions.depproj">
<SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\4.0.10\System.Text.RegularExpressions.depproj">
<SupportedFramework>net46;netcore50</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\ref\System.Text.RegularExpressions.csproj">
<SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
<SupportedFramework>netcoreapp1.1</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Text.RegularExpressions.builds" />
<InboxOnTargetFramework Include="MonoAndroid10" />
Expand Down
2 changes: 1 addition & 1 deletion src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
<NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.Text.RegularExpressions.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/System.Text.RegularExpressions/ref/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"System.Runtime": "4.0.0"
},
"frameworks": {
"netstandard1.6": {
"netcoreapp1.1": {
"imports": [
"dotnet5.7"
]
Expand Down
5 changes: 0 additions & 5 deletions src/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<Project Include="System.Text.RegularExpressions.csproj" />
<!-- Net46 facade is currently inbox for 4.0-->
<Project Include="System.Text.RegularExpressions.csproj">
<TargetGroup>net463</TargetGroup>
</Project>
<Project Include="redist\System.Text.RegularExpressions.depproj">
<TargetGroup>netcore50</TargetGroup>
</Project>
Expand Down
8 changes: 0 additions & 8 deletions src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@
<PropertyGroup>
<ProjectGuid>{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}</ProjectGuid>
<AssemblyName>System.Text.RegularExpressions</AssemblyName>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
<ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory>
<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)' == '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" />
Expand Down Expand Up @@ -43,10 +39,6 @@
<Link>Common\System\IO\StringBuilderCache.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net463'">
<TargetingPackReference Include="mscorlib" />
<TargetingPackReference Include="System" />
</ItemGroup>
<ItemGroup>
<None Include="project.json" />
</ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/System.Text.RegularExpressions/src/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
"imports": [
"dotnet5.7"
]
},
"net463": {
"dependencies": {
"Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
}
}
}
}
4 changes: 4 additions & 0 deletions src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<Project Include="System.Text.RegularExpressions.Tests.csproj"/>
<Project Include="System.Text.RegularExpressions.Tests.csproj">
<TestTFMs>netcoreapp1.1</TestTFMs>
<TargetGroup>netcoreapp1.1</TargetGroup>
</Project>
<Project Include="System.Text.RegularExpressions.Tests.csproj">
<TestTFMs>net463</TestTFMs>
<OSGroup>Windows_NT</OSGroup>
Expand Down
6 changes: 4 additions & 2 deletions src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>System.Text.RegularExpressions.Tests</AssemblyName>
<NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker>
<NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.6</NugetTargetMoniker>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -22,7 +22,6 @@
<Compile Include="GroupCollectionTests.cs" />
<Compile Include="MatchCollectionTests.cs" />
<Compile Include="PrecompiledRegexScenarioTest.cs" />
<Compile Include="RegexGroupNameTests.cs" />
<Compile Include="Regex.EscapeUnescape.Tests.cs" />
<Compile Include="Regex.GetGroupNames.Tests.cs" />
<Compile Include="Regex.Ctor.Tests.cs" />
Expand All @@ -34,6 +33,9 @@
<Compile Include="Regex.Match.Tests.cs" />
<Compile Include="Regex.Tests.Common.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp1.1'">
<Compile Include="RegexGroupNameTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\pkg\System.Text.RegularExpressions.pkgproj">
<Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project>
Expand Down
3 changes: 2 additions & 1 deletion src/System.Text.RegularExpressions/tests/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
},
"frameworks": {
"netstandard1.6": {}
"netstandard1.6": {},
"netcoreapp1.1": {}
},
"supports": {
"coreFx.Test.netcoreapp1.0": {},
Expand Down