diff options
author | Ludovic Henry <ludovic@xamarin.com> | 2017-04-01 00:13:29 +0300 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2017-04-01 00:13:29 +0300 |
commit | d1760d0201c9dd26ecaa5b381dcd15845c93126d (patch) | |
tree | cde0d33b2e32d6c907566fba4a8aa3181bde22da | |
parent | 42711ca514f6d9d833926ad3c152404414f17749 (diff) |
Add "mono" configuration (#17573)
* Update mono config to only build mono and not be compatible with others
Exclude mono for including in packaging configurations
* Fix ApiCompat to allow for disabling it per configuration
-rw-r--r-- | Tools-Override/ApiCompat.targets | 7 | ||||
-rw-r--r-- | buildvertical.targets | 1 | ||||
-rw-r--r-- | config.json | 2 | ||||
-rw-r--r-- | external/runtime/Configurations.props | 1 | ||||
-rw-r--r-- | src/Tools/GenerateProps/targetgroups.props | 3 |
5 files changed, 10 insertions, 4 deletions
diff --git a/Tools-Override/ApiCompat.targets b/Tools-Override/ApiCompat.targets index 3cf634f471..eef26c9097 100644 --- a/Tools-Override/ApiCompat.targets +++ b/Tools-Override/ApiCompat.targets @@ -3,16 +3,17 @@ <UsingTask TaskName="LocatePreviousContract" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> <PropertyGroup> + <RunApiCompat Condition="'$(RunApiCompat)'==''">false</RunApiCompat> + </PropertyGroup> + + <PropertyGroup Condition="'$(RunApiCompat)' == 'true'"> <ApiCompatBaseline Condition="!Exists('$(ApiCompatBaseline)')">$(MSBuildProjectDirectory)\ApiCompatBaseline.$(TargetGroup).txt</ApiCompatBaseline> <ApiCompatBaseline Condition="!Exists('$(ApiCompatBaseline)')">$(MSBuildProjectDirectory)\ApiCompatBaseline.txt</ApiCompatBaseline> - </PropertyGroup> - <PropertyGroup> <RunApiCompatForSrc Condition="$(MSBuildProjectDirectory.EndsWith('src'))">true</RunApiCompatForSrc> <!-- TODO: Disable the version over version ref compat checks for now because we don't have a great way to get the previous version --> <RunApiCompatForRef Condition="$(MSBuildProjectDirectory.EndsWith('ref'))">false</RunApiCompatForRef> - <RunApiCompat Condition="'$(RunApiCompat)'==''">false</RunApiCompat> <ResolveMatchingContract Condition="'$(RunApiCompatForSrc)'=='true'">true</ResolveMatchingContract> <TargetsTriggeredByCompilation Condition="'$(RunApiCompatForSrc)'=='true'">$(TargetsTriggeredByCompilation);ValidateApiCompatForSrc</TargetsTriggeredByCompilation> diff --git a/buildvertical.targets b/buildvertical.targets index e08f4dd526..e8f08c4580 100644 --- a/buildvertical.targets +++ b/buildvertical.targets @@ -113,6 +113,7 @@ <ItemGroup Condition="'$(PackageConfigurations)' == ''"> <_buildConfigurations Include="$(BuildConfigurations)" /> <_excludeBuildConfigurations Include="@(_buildConfigurations)" Condition="'$(IsReferenceAssembly)' == 'true' AND ('%(Identity)' == 'netfx' OR $([System.String]::new('%(Identity)').StartsWith('net4'))) AND '$(IncludeDesktopRefInPackage)' != 'true'"/> + <_excludeBuildConfigurations Include="mono" /> <_packageConfigurations Include="@(_buildConfigurations)" Exclude="@(_excludeBuildConfigurations)" /> </ItemGroup> diff --git a/config.json b/config.json index a4f9b447b7..57f63aa43e 100644 --- a/config.json +++ b/config.json @@ -3,7 +3,7 @@ "TargetGroup": { "description": "Sets the target framework for the BuildConfiguration you want to build.", "valueType": "property", - "values": ["netcoreapp", "netstandard", "netfx", "uap"], + "values": ["netcoreapp", "netstandard", "netfx", "uap", "mono"], "defaultValue": "netcoreapp" }, "OSGroup": { diff --git a/external/runtime/Configurations.props b/external/runtime/Configurations.props index 6ea99618b9..7d40e785db 100644 --- a/external/runtime/Configurations.props +++ b/external/runtime/Configurations.props @@ -6,6 +6,7 @@ netcoreapp-Unix; uap; uapaot; + mono; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Tools/GenerateProps/targetgroups.props b/src/Tools/GenerateProps/targetgroups.props index 0ca9e0fbcb..c2de69d1c9 100644 --- a/src/Tools/GenerateProps/targetgroups.props +++ b/src/Tools/GenerateProps/targetgroups.props @@ -184,5 +184,8 @@ <!-- this targetgroup is not considered compatible with any other targetgroup so it should only build when specified directly or BuildAllConfigurations is set to True. --> </TargetGroups> + <TargetGroups Include="mono"> + <NuGetTargetMoniker>.NETFramework,Version=v4.6.3</NuGetTargetMoniker> + </TargetGroups> </ItemGroup> </Project> |