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

Commit

Permalink
Merge pull request #13380 from mellinoe/newdistrotests-release110
Browse files Browse the repository at this point in the history
[release/1.1.0] Update buildtools dependencies for CI jobs on three new distros
  • Loading branch information
stephentoub committed Nov 5, 2016
2 parents 226a3b5 + 66ce16a commit 11a75e6
Show file tree
Hide file tree
Showing 206 changed files with 414 additions and 399 deletions.
2 changes: 1 addition & 1 deletion BuildToolsVersion.txt
@@ -1 +1 @@
1.0.26-prerelease-00927-04
1.0.26-prerelease-01005-01
2 changes: 1 addition & 1 deletion dependencies.props
Expand Up @@ -76,7 +76,7 @@
</StaticDependency>

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

<!--
Expand Down
13 changes: 11 additions & 2 deletions netci.groovy
Expand Up @@ -15,23 +15,29 @@ def projectFolder = Utilities.getFolderName(project) + '/' + Utilities.getFolder
// Map of osName -> osGroup.
def osGroupMap = ['Ubuntu14.04':'Linux',
'Ubuntu16.04':'Linux',
'Ubuntu16.10':'Linux',
'Debian8.4':'Linux',
'Fedora23':'Linux',
'Fedora24':'Linux',
'OSX':'OSX',
'Windows_NT':'Windows_NT',
'CentOS7.1': 'Linux',
'OpenSUSE13.2': 'Linux',
'OpenSUSE42.1': 'Linux',
'RHEL7.2': 'Linux',
'LinuxARMEmulator': 'Linux']

// Map of osName -> nuget runtime
def targetNugetRuntimeMap = ['OSX' : 'osx.10.10-x64',
'Ubuntu14.04' : 'ubuntu.14.04-x64',
'Ubuntu16.04' : 'ubuntu.16.04-x64',
'Ubuntu16.10' : 'ubuntu.16.10-x64',
'Fedora23' : 'fedora.23-x64',
'Fedora24' : 'fedora.24-x64',
'Debian8.4' : 'debian.8-x64',
'CentOS7.1' : 'centos.7-x64',
'OpenSUSE13.2' : 'opensuse.13.2-x64',
'OpenSUSE42.1' : 'opensuse.42.1-x64',
'RHEL7.2': 'rhel.7-x64']

def osShortName = ['Windows 10': 'win10',
Expand All @@ -41,10 +47,13 @@ def osShortName = ['Windows 10': 'win10',
'OSX' : 'osx',
'Windows Nano 2016' : 'winnano16',
'Ubuntu16.04' : 'ubuntu16.04',
'Ubuntu16.10' : 'ubuntu16.10',
'CentOS7.1' : 'centos7.1',
'Debian8.4' : 'debian8.4',
'OpenSUSE13.2' : 'opensuse13.2',
'OpenSUSE42.1' : 'opensuse42.1',
'Fedora23' : 'fedora23',
'Fedora24' : 'fedora42',
'RHEL7.2' : 'rhel7.2']

// **************************
Expand Down Expand Up @@ -207,7 +216,7 @@ def osShortName = ['Windows 10': 'win10',
// Define outerloop testing for OSes that can build and run. Run locally on each machine.
// **************************
[true, false].each { isPR ->
['Windows 7', 'Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04', 'CentOS7.1', 'OpenSUSE13.2', 'RHEL7.2', 'Fedora23', 'Debian8.4', 'OSX'].each { osName ->
['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 ->
['Debug', 'Release'].each { configurationGroup ->

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

Expand Down
2 changes: 1 addition & 1 deletion src/Common/test-runtime/project.json
Expand Up @@ -15,7 +15,7 @@
"Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0040",
"Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0040",
"Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"xunit.console.netcore": "1.0.3-prerelease-00607-01"
},
"frameworks": {
Expand Down
2 changes: 2 additions & 0 deletions src/Common/tests/System/PlatformDetection.cs
Expand Up @@ -26,7 +26,9 @@ public static class PlatformDetection
public static bool IsDebian8 { get; } = IsDistroAndVersion("debian", "8");
public static bool IsUbuntu1510 { get; } = IsDistroAndVersion("ubuntu", "15.10");
public static bool IsUbuntu1604 { get; } = IsDistroAndVersion("ubuntu", "16.04");
public static bool IsUbuntu1610 { get; } = IsDistroAndVersion("ubuntu", "16.10");
public static bool IsFedora23 { get; } = IsDistroAndVersion("fedora", "23");
public static bool IsFedora24 { get; } = IsDistroAndVersion("fedora", "24");

private static bool IsDistroAndVersion(string distroId, string versionId)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Common/tests/project.json
Expand Up @@ -25,8 +25,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.CSharp/tests/project.json
Expand Up @@ -24,8 +24,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.VisualBasic/tests/project.json
Expand Up @@ -26,8 +26,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Win32.Primitives/tests/project.json
Expand Up @@ -10,8 +10,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Win32.Registry.AccessControl/tests/project.json
Expand Up @@ -16,8 +16,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Win32.Registry/tests/project.json
Expand Up @@ -14,8 +14,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.AppContext/tests/project.json
Expand Up @@ -10,8 +10,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Buffers/tests/project.json
Expand Up @@ -13,8 +13,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Collections.Concurrent/tests/project.json
Expand Up @@ -19,8 +19,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Collections.Immutable/tests/project.json
Expand Up @@ -13,8 +13,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
Expand Up @@ -18,8 +18,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/System.Collections.NonGeneric/tests/project.json
Expand Up @@ -18,8 +18,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/System.Collections.Specialized/tests/project.json
Expand Up @@ -17,8 +17,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Collections/tests/Performance/project.json
Expand Up @@ -16,8 +16,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/System.Collections/tests/project.json
Expand Up @@ -17,8 +17,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/System.ComponentModel.Annotations/tests/project.json
Expand Up @@ -14,8 +14,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.4": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.ComponentModel.EventBasedAsync/tests/project.json
Expand Up @@ -11,8 +11,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.ComponentModel.Primitives/tests/project.json
Expand Up @@ -10,8 +10,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
Expand Up @@ -15,8 +15,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/System.ComponentModel.TypeConverter/tests/project.json
Expand Up @@ -15,8 +15,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/System.ComponentModel/tests/project.json
Expand Up @@ -9,8 +9,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Composition.Convention/tests/project.json
Expand Up @@ -8,8 +8,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Composition/tests/project.json
Expand Up @@ -8,8 +8,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Console/tests/Performance/project.json
Expand Up @@ -19,8 +19,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/System.Console/tests/project.json
Expand Up @@ -19,8 +19,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01",
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/System.Data.Common/tests/project.json
Expand Up @@ -16,8 +16,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Data.SqlClient/tests/FunctionalTests/project.json
Expand Up @@ -14,8 +14,8 @@
"target": "project",
"exclude": "compile"
},
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00731-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
"Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-01005-01",
"Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-01005-01"
},
"frameworks": {
"netstandard1.3": {}
Expand Down

0 comments on commit 11a75e6

Please sign in to comment.