diff options
author | chcosta <chcosta@microsoft.com> | 2016-12-10 22:29:31 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-10 22:29:31 +0300 |
commit | a07f6aac5309b30154d0fe00debe7f9979600ea1 (patch) | |
tree | 7aba7503381ae1b89febd7bf3d265e37004fa0db /src/System.Text.RegularExpressions | |
parent | d409227f1b7dae84ee697a7dd1e85001bc39baf0 (diff) |
vertical build port to Dev/eng [Do not merge] (#14171)
* Vertical build changes
* Build a vertical in dev/eng
* remove repro.bat from check-in
* Remove defaulttargetgroup from configurations.props files
* Remove configurations.props from test libraries
* Additional configuration files, updating traversal.
* Add default configurations for ref projects
* Remove default targetgroups, disable code analysis (currently breaking the
vertical build).
* Build vertical using Eric's changes to configurations
* Minor fixes to build from a clean enlitment
* Set targets properties in dir.props
* Make vertical build the default
* Include building src\tools in init-tools.cmd
* Add linux init-tools
* Fix msbuild.sh command
* Add build tools message to Linux
* Revert init-tools, investigate building corefx tools tomorrow
* Update configurations, remove empty targetgroup from all projects, modify
most conditionals to be positive conditions instead of negative
* Remove unneccessary generateprojectconfigurations project
* Build CoreFx.tools in init-tools
* Can't build corefx.tools in init-tools because packages aren't restored
* Hack build to build refs first
* Slightly less hacky reference project build, but still kind of hacky...
* Align properties for ref builds to prevent binclash and overbuilding
* Update BeforeTarget for rename
* Rework traversal to work with ref and corefx tools projects
* Add target for builds projects
* Fully qualify paths to projects
* Fully quality path name for corefx.tools
* testing removing osgroup from groovy on Windows
* Remove OSGroup from config.json
* revert change to groovy
* return os property
* Try changing osgroup to hostos
* hack around osgroup setting
* Fix passing groups
* Add system.collections which was missing from system.console
* Add some missing references for Unix build
* Add references for unix
* Unix support changes
* Fix typo in system.net.http
* Fix typo in system.threading.overlapped
* no ref project available for system.reflection.metadata
* Unix changes
* Exclude system.memory
* diagnostics.fileversioninfo was missing reference to Path
* Unix changes
* Fix reference name
* Add reference for unix
* Move source file to windows only
* Disable building system.threading.overlapped
Diffstat (limited to 'src/System.Text.RegularExpressions')
-rw-r--r-- | src/System.Text.RegularExpressions/src/Configurations.props | 9 | ||||
-rw-r--r-- | src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/System.Text.RegularExpressions/src/Configurations.props b/src/System.Text.RegularExpressions/src/Configurations.props new file mode 100644 index 0000000000..35e52f3e25 --- /dev/null +++ b/src/System.Text.RegularExpressions/src/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + net463-Windows_NT; + netstandard1.7; + </BuildConfigurations> + </PropertyGroup> +</Project> diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index 49b175f3f6..f2e5546ab3 100644 --- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -6,7 +6,6 @@ <AssemblyName>System.Text.RegularExpressions</AssemblyName> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory> - <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'netstandard1.7_Debug|AnyCPU' " /> @@ -18,7 +17,7 @@ <TargetGroup>netstandard1.7</TargetGroup> </ContractProject> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net463'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.7'"> <Compile Include="System\Text\RegularExpressions\HashtableExtensions.cs" /> <Compile Include="System\Text\RegularExpressions\Regex.cs" /> <Compile Include="System\Text\RegularExpressions\RegexBoyerMoore.cs" /> |