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

Commit 7d363ad

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/1.1.0' changes
2 parents 9b13556 + c1daee5 commit 7d363ad

File tree

3 files changed

+18
-43
lines changed

3 files changed

+18
-43
lines changed

‎dependencies.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
33
<PropertyGroup>
4-
<CoreFxCurrentRef>6ca25f39d0d804af7aa08aaf587d739056583175</CoreFxCurrentRef>
5-
<CoreClrCurrentRef>6ca25f39d0d804af7aa08aaf587d739056583175</CoreClrCurrentRef>
4+
<CoreFxCurrentRef>83f626674b94f65afdc7f16ec5f15f205f943b7c</CoreFxCurrentRef>
5+
<CoreClrCurrentRef>83f626674b94f65afdc7f16ec5f15f205f943b7c</CoreClrCurrentRef>
66
</PropertyGroup>
77

88
<!-- Auto-upgraded properties for each build info dependency. -->
99
<PropertyGroup>
10-
<CoreFxExpectedPrerelease>servicing-25616-01</CoreFxExpectedPrerelease>
10+
<CoreFxExpectedPrerelease>servicing-25705-01</CoreFxExpectedPrerelease>
1111
</PropertyGroup>
1212

1313
<!-- Full package version strings that are used in other parts of the build. -->
1414
<PropertyGroup>
15-
<CoreClrPackageVersion>1.1.3-servicing-25616-01</CoreClrPackageVersion>
15+
<CoreClrPackageVersion>1.1.3</CoreClrPackageVersion>
1616
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
1717

1818
<XUnitPerformanceApiVersion>1.0.0-beta-build0007</XUnitPerformanceApiVersion>

‎dir.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
<BinDir>$(__BinDir)\</BinDir>
5959
<BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
60-
60+
6161
<__IntermediatesDir Condition="'$(__IntermediatesDir)' == ''">$(RootBinDir)obj\$(BuildOS).$(BuildArch).$(BuildType)</__IntermediatesDir>
6262
<IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(__IntermediatesDir)\</IntermediateOutputRootPath>
6363

@@ -153,8 +153,8 @@
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.3</Version>
157-
156+
<Version Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(Version)' == ''">1.1.4</Version>
157+
158158
<!-- Set the boolean below to true to generate packages with stabilized versions -->
159159
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
160160
<StableVersion Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(Version)</StableVersion>

‎netci.groovy‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@ def static getOSGroup(def os) {
1616
'RHEL7.2': 'Linux',
1717
'Ubuntu16.04': 'Linux',
1818
'Debian8.4':'Linux',
19-
'Fedora23':'Linux',
2019
'OSX':'OSX',
2120
'Windows_NT':'Windows_NT',
22-
'FreeBSD':'FreeBSD',
2321
'CentOS7.1': 'Linux',
24-
'OpenSUSE13.2': 'Linux',
25-
'OpenSUSE42.1': 'Linux',
2622
'LinuxARMEmulator': 'Linux']
2723
def osGroup = osGroupMap.get(os, null)
2824
assert osGroup != null : "Could not find os group for ${os}"
@@ -35,8 +31,8 @@ class Constants {
3531
// The Windows_NT_BuildOnly OS is a way to speed up the Non-NT builds temporarily by avoiding
3632
// test execution in the build flow runs. It generates the exact same build
3733
// as Windows_NT but without the tests.
38-
def static osList = ['Ubuntu', 'Debian8.4', 'OSX', 'Windows_NT', 'Windows_NT_BuildOnly', 'FreeBSD', 'CentOS7.1', 'OpenSUSE13.2', 'OpenSUSE42.1', 'RHEL7.2', 'LinuxARMEmulator', 'Ubuntu16.04', 'Fedora23']
39-
def static crossList = ['Ubuntu', 'OSX', 'CentOS7.1', 'RHEL7.2', 'Debian8.4', 'OpenSUSE13.2']
34+
def static osList = ['Ubuntu', 'Debian8.4', 'OSX', 'Windows_NT', 'Windows_NT_BuildOnly', 'CentOS7.1', 'RHEL7.2', 'LinuxARMEmulator', 'Ubuntu16.04']
35+
def static crossList = ['Ubuntu', 'OSX', 'CentOS7.1', 'RHEL7.2', 'Debian8.4']
4036
// This is a set of JIT stress modes combined with the set of variables that
4137
// need to be set to actually enable that stress mode. The key of the map is the stress mode and
4238
// the values are the environment variables
@@ -281,7 +277,7 @@ def static getJobName(def configuration, def architecture, def os, def scenario,
281277

282278
// **************************
283279
// Define the basic inner loop builds for PR and commit. This is basically just the set
284-
// of coreclr builds over linux/osx/freebsd/windows and debug/release/checked. In addition, the windows
280+
// of coreclr builds over linux/osx/windows and debug/release/checked. In addition, the windows
285281
// builds will do a couple extra steps.
286282
// **************************
287283

@@ -294,7 +290,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
294290
return
295291
}
296292

297-
def bidailyCrossList = ['RHEL7.2', 'Debian8.4', 'OpenSUSE13.2']
293+
def bidailyCrossList = ['RHEL7.2', 'Debian8.4']
298294
// Non pull request builds.
299295
if (!isPR) {
300296
// Check scenario.
@@ -554,8 +550,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
554550
}
555551

556552
switch (os) {
557-
// OpenSUSE, Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
558-
case 'OpenSUSE13.2':
553+
// Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
559554
case 'Debian8.4':
560555
case 'RHEL7.2':
561556
if (scenario == 'default') {
@@ -567,9 +562,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
567562
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Pri 1 Build & Test", "(?i).*test\\W+${os}\\W+${scenario}.*")
568563
}
569564
break
570-
case 'Fedora23':
571565
case 'Ubuntu16.04':
572-
case 'OpenSUSE42.1':
573566
assert !isFlowJob
574567
assert scenario == 'default'
575568
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Build", "(?i).*test\\W+${os}\\W+.*")
@@ -1055,12 +1048,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
10551048
break
10561049
}
10571050
break
1058-
case 'FreeBSD':
1059-
assert scenario == 'default'
1060-
if (configuration == 'Checked') {
1061-
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Build")
1062-
}
1063-
break
10641051
default:
10651052
println("Unknown os: ${os}");
10661053
assert false
@@ -1852,7 +1839,6 @@ combinedScenarios.each { scenario ->
18521839
// Run the rest of the build
18531840
// Build the mscorlib for the other OS's
18541841
buildCommands += "build.cmd ${lowerConfiguration} ${arch} linuxmscorlib"
1855-
buildCommands += "build.cmd ${lowerConfiguration} ${arch} freebsdmscorlib"
18561842
buildCommands += "build.cmd ${lowerConfiguration} ${arch} osxmscorlib"
18571843

18581844
// Zip up the tests directory so that we don't use so much space/time copying
@@ -1915,12 +1901,8 @@ combinedScenarios.each { scenario ->
19151901
case 'Ubuntu16.04':
19161902
case 'Debian8.4':
19171903
case 'OSX':
1918-
case 'FreeBSD':
19191904
case 'CentOS7.1':
19201905
case 'RHEL7.2':
1921-
case 'OpenSUSE13.2':
1922-
case 'OpenSUSE42.1':
1923-
case 'Fedora23':
19241906
switch (architecture) {
19251907
case 'x64':
19261908
case 'x86ryujit':
@@ -1938,16 +1920,9 @@ combinedScenarios.each { scenario ->
19381920
if (!enableCorefxTesting) {
19391921
// We run pal tests on all OS but generate mscorlib (and thus, nuget packages)
19401922
// only on supported OS platforms.
1941-
if ((os == 'FreeBSD') || (os == 'OpenSUSE13.2'))
1942-
{
1943-
buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${arch}"
1944-
}
1945-
else
1946-
{
1947-
def bootstrapRid = Utilities.getBoostrapPublishRid(os)
1948-
def bootstrapRidEnv = bootstrapRid != null ? "__PUBLISH_RID=${bootstrapRid} " : ''
1949-
buildCommands += "${bootstrapRidEnv}./build.sh verbose ${lowerConfiguration} ${arch}"
1950-
}
1923+
def bootstrapRid = Utilities.getBoostrapPublishRid(os)
1924+
def bootstrapRidEnv = bootstrapRid != null ? "__PUBLISH_RID=${bootstrapRid} " : ''
1925+
buildCommands += "${bootstrapRidEnv}./build.sh verbose ${lowerConfiguration} ${arch}"
19511926
buildCommands += "src/pal/tests/palsuite/runpaltests.sh \${WORKSPACE}/bin/obj/${osGroup}.${arch}.${configuration} \${WORKSPACE}/bin/paltestout"
19521927

19531928
// Set time out
@@ -2114,7 +2089,7 @@ combinedScenarios.each { scenario ->
21142089
return
21152090
}
21162091
//Skip stress modes for these scenarios
2117-
if (os == 'RHEL7.2' || os == 'Debian8.4' || os == 'OpenSUSE13.2') {
2092+
if (os == 'RHEL7.2' || os == 'Debian8.4') {
21182093
return
21192094
}
21202095
}
@@ -2136,8 +2111,8 @@ combinedScenarios.each { scenario ->
21362111
return
21372112
}
21382113
}
2139-
// For RedHat, Debian, and OpenSUSE, we only do Release pri1 builds.
2140-
else if (os == 'RHEL7.2' || os == 'Debian8.4' || os == 'OpenSUSE13.2') {
2114+
// For RedHat and Debian, we only do Release pri1 builds.
2115+
else if (os == 'RHEL7.2' || os == 'Debian8.4') {
21412116
if (scenario != 'pri1') {
21422117
return
21432118
}

0 commit comments

Comments
 (0)