summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>2018-11-16 14:53:21 +0000
committerGitHub <noreply@github.com>2018-11-16 14:53:21 +0000
commit2fe48b4e38ec2b2174561cee3928b44197208eb1 (patch)
treea5162f541f9ab33c5dda9dc265cab426957ce312
parent78aa753ded9031c21a4b2804aeeb36ba43cbafa6 (diff)
downloadcoreclr-2fe48b4e38ec2b2174561cee3928b44197208eb1.tar.gz
coreclr-2fe48b4e38ec2b2174561cee3928b44197208eb1.tar.bz2
coreclr-2fe48b4e38ec2b2174561cee3928b44197208eb1.zip
Update dependencies from https://github.com/dotnet/arcade build 365 (#21052)
This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.18565.9 - Microsoft.DotNet.Helix.Sdk - 1.0.0-beta.18565.9
-rw-r--r--eng/Version.Details.xml8
-rw-r--r--eng/common/PublishBuildAssets.cmd2
-rw-r--r--eng/common/build.ps13
-rw-r--r--eng/common/templates/steps/helix-publish.yml3
-rw-r--r--global.json4
5 files changed, 11 insertions, 9 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d83794b147..698ddb3530 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,13 +2,13 @@
<Dependencies>
<ProductDependencies></ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18564.20">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18565.9">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>069237d9a7e83bed62c9f664228125b95ddf91f6</Sha>
+ <Sha>0448fb93bd78ed7a90ce3eabc7a0a3190e74ac48</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18564.20">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="1.0.0-beta.18565.9">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>069237d9a7e83bed62c9f664228125b95ddf91f6</Sha>
+ <Sha>0448fb93bd78ed7a90ce3eabc7a0a3190e74ac48</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
diff --git a/eng/common/PublishBuildAssets.cmd b/eng/common/PublishBuildAssets.cmd
index 4f9d54d028..399ca0bd32 100644
--- a/eng/common/PublishBuildAssets.cmd
+++ b/eng/common/PublishBuildAssets.cmd
@@ -1,3 +1,3 @@
@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -publishBuildAssets %*"
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -msbuildEngine dotnet -restore -execute /p:PublishBuildAssets=true /p:SdkTaskProjects=PublishBuildAssets.proj %*"
exit /b %ErrorLevel%
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index ca45b3db71..76f108fd5d 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -6,6 +6,7 @@ Param(
[string] $msbuildEngine = $null,
[bool] $warnaserror = $true,
[bool] $nodereuse = $true,
+ [switch] $execute,
[switch] $restore,
[switch] $deployDeps,
[switch] $build,
@@ -88,7 +89,7 @@ try {
/p:PerformanceTest=$performanceTest `
/p:Sign=$sign `
/p:Publish=$publish `
- /p:PublishBuildAssets=$publishBuildAssets `
+ /p:Execute=$execute `
/p:ContinuousIntegrationBuild=$ci `
@properties
diff --git a/eng/common/templates/steps/helix-publish.yml b/eng/common/templates/steps/helix-publish.yml
index 6bbebd30cb..f261d0ad0e 100644
--- a/eng/common/templates/steps/helix-publish.yml
+++ b/eng/common/templates/steps/helix-publish.yml
@@ -26,7 +26,7 @@ steps:
command: custom
projects: eng/common/helixpublish.proj
custom: msbuild
- arguments: '/t:test /p:Language=msbuild /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\SendToHelix.binlog'
+ arguments: '/t:test /p:Language=msbuild /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog'
displayName: Send job to Helix
env:
HelixSource: ${{ parameters.HelixSource }}
@@ -41,6 +41,7 @@ steps:
CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
XUnitProjects: ${{ parameters.XUnitProjects }}
XUnitTargetFramework: ${{ parameters.XUnitTargetFramework }}
+ XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }}
IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
diff --git a/global.json b/global.json
index 9e3e1caf28..7e6df0e71c 100644
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
"python": "2.7.15"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18564.20",
- "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18564.20"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18565.9",
+ "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18565.9"
}
}