diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-26 11:02:53 -0700 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-27 13:07:51 -0700 |
| commit | 323f09d890015ea7fccece60d1681dd8d3e5f1f2 (patch) | |
| tree | 1b1cb6cdc9e31402b87812c8a9c72289eee7092b /config.json | |
| parent | ad1ad9e87965f23b5821216affb906aff63fe5da (diff) | |
| download | coreclr-323f09d890015ea7fccece60d1681dd8d3e5f1f2.tar.gz coreclr-323f09d890015ea7fccece60d1681dd8d3e5f1f2.tar.bz2 coreclr-323f09d890015ea7fccece60d1681dd8d3e5f1f2.zip | |
Merge various restore tasks into one Sync target
There were various restore targets happening independently
when they should all be combined so the sync step can be
independent from the build step. This change merges them
together under the Sync target.
In particular this moves RestoreOptData and RestoreNETCorePlatforms
to be part of the sync step instead of being individually ran.
Pass BuildType to sync commands so optdata gets restored correctly
Diffstat (limited to 'config.json')
| -rw-r--r-- | config.json | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/config.json b/config.json index 915c31807c..49a5575451 100644 --- a/config.json +++ b/config.json @@ -84,8 +84,8 @@ "values": [ "Windows_NT", "Linux", "Unix", "OSX", "Android" ], "defaultValue": "${OSName}" }, - "RestoreNETCorePlatforms": { - "description": "MsBuild target that restores the NETCore packages.", + "Sync": { + "description": "MsBuild target that restores the packages.", "valueType": "target", "values": [], "defaultValue": "" @@ -527,6 +527,13 @@ "settings": { "Build": "default" } + }, + "optdata": { + "description": "Restores optimization profile data for the repository.", + "settings": { + "Project": "./build.proj", + "RestoreOptData": "default" + } } }, "defaultValues": { @@ -578,21 +585,7 @@ "settings": { "Project": "./build.proj", "RestoreDuringBuild": true, - "RestoreNETCorePlatforms": "default" - } - }, - "optdata": { - "description": "Restores optimization profile data for the repository.", - "settings": { - "Project": "./build.proj", - "RestoreDuringBuild": true, - "RestoreOptData": "default" - } - }, - "priority": { - "description": "Sets CLRTestPriorityToBuild property.", - "settings": { - "CLRTestPriorityToBuild": "default" + "Sync": "default" } }, "ab": { @@ -655,6 +648,12 @@ "settings": { "BuildNumberMinor": "default" } + }, + "buildType": { + "description": "Sets buildtype.", + "settings": { + "__BuildType": "default" + } } }, "defaultValues": { |