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

Commit 11a75e6

Browse files
stephentoubstephentoub
authored
Merge pull request #13380 from mellinoe/newdistrotests-release110
[release/1.1.0] Update buildtools dependencies for CI jobs on three new distros
2 parents 226a3b5 + 66ce16a commit 11a75e6

File tree

206 files changed

+414
-399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+414
-399
lines changed

‎BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.26-prerelease-00927-04
1+
1.0.26-prerelease-01005-01

‎dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</StaticDependency>
7777

7878
<StaticDependency Include="Microsoft.xunit.netcore.extensions;Microsoft.DotNet.BuildTools.TestSuite">
79-
<Version>1.0.0-prerelease-00731-01</Version>
79+
<Version>1.0.0-prerelease-01005-01</Version>
8080
</StaticDependency>
8181

8282
<!--

‎netci.groovy

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,29 @@ def projectFolder = Utilities.getFolderName(project) + '/' + Utilities.getFolder
1515
// Map of osName -> osGroup.
1616
def osGroupMap = ['Ubuntu14.04':'Linux',
1717
'Ubuntu16.04':'Linux',
18+
'Ubuntu16.10':'Linux',
1819
'Debian8.4':'Linux',
1920
'Fedora23':'Linux',
21+
'Fedora24':'Linux',
2022
'OSX':'OSX',
2123
'Windows_NT':'Windows_NT',
2224
'CentOS7.1': 'Linux',
2325
'OpenSUSE13.2': 'Linux',
26+
'OpenSUSE42.1': 'Linux',
2427
'RHEL7.2': 'Linux',
2528
'LinuxARMEmulator': 'Linux']
2629

2730
// Map of osName -> nuget runtime
2831
def targetNugetRuntimeMap = ['OSX' : 'osx.10.10-x64',
2932
'Ubuntu14.04' : 'ubuntu.14.04-x64',
3033
'Ubuntu16.04' : 'ubuntu.16.04-x64',
34+
'Ubuntu16.10' : 'ubuntu.16.10-x64',
3135
'Fedora23' : 'fedora.23-x64',
36+
'Fedora24' : 'fedora.24-x64',
3237
'Debian8.4' : 'debian.8-x64',
3338
'CentOS7.1' : 'centos.7-x64',
3439
'OpenSUSE13.2' : 'opensuse.13.2-x64',
40+
'OpenSUSE42.1' : 'opensuse.42.1-x64',
3541
'RHEL7.2': 'rhel.7-x64']
3642

3743
def osShortName = ['Windows 10': 'win10',
@@ -41,10 +47,13 @@ def osShortName = ['Windows 10': 'win10',
4147
'OSX' : 'osx',
4248
'Windows Nano 2016' : 'winnano16',
4349
'Ubuntu16.04' : 'ubuntu16.04',
50+
'Ubuntu16.10' : 'ubuntu16.10',
4451
'CentOS7.1' : 'centos7.1',
4552
'Debian8.4' : 'debian8.4',
4653
'OpenSUSE13.2' : 'opensuse13.2',
54+
'OpenSUSE42.1' : 'opensuse42.1',
4755
'Fedora23' : 'fedora23',
56+
'Fedora24' : 'fedora42',
4857
'RHEL7.2' : 'rhel7.2']
4958

5059
// **************************
@@ -207,7 +216,7 @@ def osShortName = ['Windows 10': 'win10',
207216
// Define outerloop testing for OSes that can build and run. Run locally on each machine.
208217
// **************************
209218
[true, false].each { isPR ->
210-
['Windows 7', 'Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04', 'CentOS7.1', 'OpenSUSE13.2', 'RHEL7.2', 'Fedora23', 'Debian8.4', 'OSX'].each { osName ->
219+
['Windows 7', 'Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04', 'Ubuntu16.10', 'CentOS7.1', 'OpenSUSE13.2', 'OpenSUSE42.1', 'RHEL7.2', 'Fedora23', 'Fedora24', 'Debian8.4', 'OSX'].each { osName ->
211220
['Debug', 'Release'].each { configurationGroup ->
212221

213222
def newJobName = "outerloop_${osShortName[osName]}_${configurationGroup.toLowerCase()}"
@@ -342,7 +351,7 @@ def osShortName = ['Windows 10': 'win10',
342351
// **************************
343352
[true, false].each { isPR ->
344353
['Debug', 'Release'].each { configurationGroup ->
345-
['Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04', 'Debian8.4', 'CentOS7.1', 'OpenSUSE13.2', 'Fedora23', 'RHEL7.2', 'OSX'].each { osName ->
354+
['Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04', `Ubuntu16.10', 'Debian8.4', 'CentOS7.1', 'OpenSUSE13.2', 'OpenSUSE42.1, 'Fedora23', 'Fedora24', 'RHEL7.2', 'OSX'].each { osName ->
346355
def osGroup = osGroupMap[osName]
347356
def newJobName = "${osName.toLowerCase()}_${configurationGroup.toLowerCase()}"
348357

‎src/Common/test-runtime/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0040",
1616
"Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0040",
1717
"Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
18-
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
18+
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
1919
"xunit.console.netcore": "1.0.3-prerelease-00607-01"
2020
},
2121
"frameworks": {

‎src/Common/tests/System/PlatformDetection.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ public static class PlatformDetection
2626
public static bool IsDebian8 { get; } = IsDistroAndVersion("debian", "8");
2727
public static bool IsUbuntu1510 { get; } = IsDistroAndVersion("ubuntu", "15.10");
2828
public static bool IsUbuntu1604 { get; } = IsDistroAndVersion("ubuntu", "16.04");
29+
public static bool IsUbuntu1610 { get; } = IsDistroAndVersion("ubuntu", "16.10");
2930
public static bool IsFedora23 { get; } = IsDistroAndVersion("fedora", "23");
31+
public static bool IsFedora24 { get; } = IsDistroAndVersion("fedora", "24");
3032

3133
private static bool IsDistroAndVersion(string distroId, string versionId)
3234
{

‎src/Common/tests/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"target": "project",
2626
"exclude": "compile"
2727
},
28-
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
29-
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
28+
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
29+
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
3030
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
3131
},
3232
"frameworks": {

‎src/Microsoft.CSharp/tests/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"target": "project",
2525
"exclude": "compile"
2626
},
27-
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
28-
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
27+
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
28+
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
2929
},
3030
"frameworks": {
3131
"netstandard1.3": {}

‎src/Microsoft.VisualBasic/tests/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"target": "project",
2727
"exclude": "compile"
2828
},
29-
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
30-
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
29+
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
30+
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
3131
},
3232
"frameworks": {
3333
"netstandard1.3": {}

‎src/Microsoft.Win32.Primitives/tests/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"target": "project",
1111
"exclude": "compile"
1212
},
13-
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
14-
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
13+
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
14+
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
1515
},
1616
"frameworks": {
1717
"netstandard1.3": {}

‎src/Microsoft.Win32.Registry.AccessControl/tests/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"target": "project",
1717
"exclude": "compile"
1818
},
19-
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
20-
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
19+
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
20+
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
2121
},
2222
"frameworks": {
2323
"netstandard1.3": {}

0 commit comments

Comments
 (0)