summaryrefslogtreecommitdiff
path: root/buildpipeline
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2018-08-02 13:30:23 -0700
committerGitHub <noreply@github.com>2018-08-02 13:30:23 -0700
commit1b87d827bee297c8883c9156cd9fa857aa58e4a5 (patch)
tree7851e127242f7e8e52f94688ac63acfe747a0ba5 /buildpipeline
parentfecf57a0bfc8267e7ca50e9a532a83fa29ebec87 (diff)
parent6fc40cc8bf448ca3ad951cbec589646184f75776 (diff)
downloadcoreclr-1b87d827bee297c8883c9156cd9fa857aa58e4a5.tar.gz
coreclr-1b87d827bee297c8883c9156cd9fa857aa58e4a5.tar.bz2
coreclr-1b87d827bee297c8883c9156cd9fa857aa58e4a5.zip
Merge pull request #19115 from dotnet/dev/unix_test_workflow
Enable Windows ARM64 builds using release product tools
Diffstat (limited to 'buildpipeline')
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows.json6
-rw-r--r--buildpipeline/pipelines.json3
2 files changed, 2 insertions, 7 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
index 1c9e727d0e..10115873a7 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
@@ -122,7 +122,7 @@
},
"inputs": {
"filename": "build.cmd",
- "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) $(ToolsetArgs) -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -- /p:SignType=$(PB_SignType) /flp:\"v=diag\"",
+ "arguments": "$(Architecture) $(PB_BuildType) skiptests skipbuildpackages $(PB_EnforcePGO) -OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority) -skiprestore -- /p:SignType=$(PB_SignType) /flp:\"v=diag\"",
"workingFolder": "",
"failOnStandardError": "false"
}
@@ -370,10 +370,6 @@
"value": "x64",
"allowOverride": true
},
- "ToolsetArgs": {
- "value": "",
- "allowOverride": true
- },
"Priority": {
"value": "0"
},
diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json
index fddc4d5a28..8e9bb27f54 100644
--- a/buildpipeline/pipelines.json
+++ b/buildpipeline/pipelines.json
@@ -86,8 +86,7 @@
{
"Name": "DotNet-CoreClr-Trusted-Windows",
"Parameters": {
- "Architecture": "arm64",
- "ToolsetArgs": "toolset_dir C:\\tools\\clr"
+ "Architecture": "arm64"
},
"ReportingParameters": {
"OperatingSystem": "Windows",