Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -30,27 +30,19 @@
<PropertyGroup>
<TraversalBuildDependsOn>
BuildCoreFxTools;
GenerateConfigurationProperties;
CreateOrUpdateCurrentVersionFile;
$(TraversalBuildDependsOn);
</TraversalBuildDependsOn>
</PropertyGroup>
<Target Name="BuildCoreFxTools">
<ItemGroup>
<BuildToolsProject Include="src\Tools\CoreFx.Tools\CoreFx.Tools.csproj" />
<BuildToolsProject Include="src\Tools\CoreFx.Tools\CoreFx.Tools.csproj">
<TargetGroup>net46</TargetGroup>
</BuildToolsProject>
<BuildToolsProject Include="src\Tools\GenerateProps\GenerateProps.proj" />
</ItemGroup>
<MSBuild Projects="@(BuildToolsProject)"
ContinueOnError="ErrorAndContinue"
Condition="'%(Identity)' != ''"
Properties="Configuration=%(BuildToolsProject.TargetGroup);TargetGroup=%(BuildToolsProject.TargetGroup)" />
<!-- Generate the configurations for this repo -->
<UsingTask TaskName="GenerateConfigurationProps" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
<Target Name="GenerateConfigurationProperties">
<GenerateConfigurationProps Properties="@(Property)" PropertyValues="@(PropertyValue)" PropsFolder="$(BuildConfigurationFolder)" />
</Target>
<Target Name="Sync" DependsOnTargets="BuildCoreFxTools">
<Target Name="Sync" DependsOnTargets="GenerateConfigurationProperties">
<ItemGroup>
<ExternalProject Include="external\dir.proj" />
</ItemGroup>
@@ -59,10 +51,11 @@
ContinueOnError="ErrorAndContinue" />
</Target>
<UsingTask TaskName="UpdateVSConfigurations" AssemblyFile="$(CoreFxToolsTaskDir)CoreFx.Tools.dll"/>
<Target Name="UpdateVSConfigurations" DependsOnTargets="BuildCoreFxTools">
<UsingTask TaskName="UpdateVSConfigurations" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
<Target Name="UpdateVSConfigurations">
<Message Importance="High" Text="Updating configurations for projects ..." />
<ItemGroup>
<_projectsToExcludeFromUpdate Include="$(MSBuildThisFileDirectory)src/**/RestoreSDKProject.csproj" />
<_projectsToUpdate Include="$(MSBuildThisFileDirectory)src/**/*.*csproj" Exclude="@(_projectsToExcludeFromUpdate)" />
<_projectsToUpdate Include="$(MSBuildThisFileDirectory)src/**/*.*ilproj" Exclude="@(_projectsToExcludeFromUpdate)" />
<_solutionsToUpdateFiles Include="$(MSBuildThisFileDirectory)src/*/dir.props" />