Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 6753cf2

Browse files
committed
Merge in 'release/1.1.0' changes
2 parents 69599d8 + 6239bcf commit 6753cf2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<ProjectUrl>https://dot.net</ProjectUrl>
154154

155155
<!-- Central place to set the versions of all nuget packages produced in the repo -->
156-
<Version Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(Version)' == ''">1.1.6</Version>
156+
<Version Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(Version)' == ''">1.1.7</Version>
157157

158158
<!-- Set the boolean below to true to generate packages with stabilized versions -->
159159
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>

perf.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ def static getOSGroup(def os) {
237237

238238
// Create the Linux/OSX/CentOS coreclr test leg for debug and release and each scenario
239239
[true, false].each { isPR ->
240-
['Ubuntu14.04'].each { os ->
240+
['Ubuntu16.04'].each { os ->
241241
def newJob = job(Utilities.getFullJobName(project, "perf_${os}", isPR)) {
242242

243-
label('linux_clr_perf')
243+
label('ubuntu_1604_clr_perf')
244244
wrappers {
245245
credentialsBinding {
246246
string('BV_UPLOAD_SAS_TOKEN', 'CoreCLR Perf BenchView Sas')
@@ -326,10 +326,10 @@ def static getOSGroup(def os) {
326326

327327
// Create the Linux/OSX/CentOS coreclr test leg for debug and release and each scenario
328328
[true, false].each { isPR ->
329-
['Ubuntu14.04'].each { os ->
329+
['Ubuntu16.04'].each { os ->
330330
def newJob = job(Utilities.getFullJobName(project, "perf_throughput_${os}", isPR)) {
331331

332-
label('linux_clr_perf')
332+
label('ubuntu_1604_clr_perf')
333333
wrappers {
334334
credentialsBinding {
335335
string('BV_UPLOAD_SAS_TOKEN', 'CoreCLR Perf BenchView Sas')

0 commit comments

Comments
 (0)