From 553ac5981e74625434d6c5b1c64ee6ef6257ad20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Jan 2020 13:29:45 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/arcade build 20200130.4 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20080.4 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20080.4 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20080.4 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20080.4 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20080.4 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20080.4 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20080.4 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20080.4 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20080.4 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20080.4 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20080.4 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20080.4 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20080.4 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20080.4 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 23 ++++++++--------- eng/common/build.sh | 10 ++++++++ global.json | 8 +++--- 4 files changed, 52 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3809a21e5928fa..2d2f4e859179a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,61 +46,61 @@ - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 - + https://github.com/dotnet/arcade - 8466781af43871ee0d4a1655acc008a305a62c0e + 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c91fa410d05880..a42cc1a090bf05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,6 @@ 0 alpha 1 - $(MajorVersion).$(MinorVersion).0.0 @@ -37,7 +36,6 @@ --> 0 - - 5.0.0-beta.20079.8 - 5.0.0-beta.20079.8 - 5.0.0-beta.20079.8 - 5.0.0-beta.20079.8 - 5.0.0-beta.20079.8 - 5.0.0-beta.20079.8 - 2.5.1-beta.20079.8 - 5.0.0-beta.20079.8 - 5.0.0-beta.20079.8 - 5.0.0-beta.20079.8 + 5.0.0-beta.20080.4 + 5.0.0-beta.20080.4 + 5.0.0-beta.20080.4 + 5.0.0-beta.20080.4 + 5.0.0-beta.20080.4 + 5.0.0-beta.20080.4 + 2.5.1-beta.20080.4 + 5.0.0-beta.20080.4 + 5.0.0-beta.20080.4 + 5.0.0-beta.20080.4 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/eng/common/build.sh b/eng/common/build.sh index 36f9aa0462ee17..6e395455f23ad7 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -175,6 +175,16 @@ function Build { InitializeCustomToolset if [[ ! -z "$projects" ]]; then + # Split project paths by semi-colon, find full-paths using readlink, + # finally and splice back as a semi-colon separated list + IFS=';' read -r -a projs <<< "$projects" + len=${#projs[@]} + for ((i=0; i<$len; i++)); + do + projs[$i]=$(readlink -f "${projs[$i]}"); + done + projects=$(IFS=\; ; echo "${projs[*]}") + echo Updated projects: $projects properties="$properties /p:Projects=$projects" fi diff --git a/global.json b/global.json index a3e219e8d90405..0bf0daccd296da 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20079.8", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20079.8", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20079.8", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20079.8", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20080.4", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20080.4", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20080.4", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20080.4", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2", "Microsoft.Build.NoTargets": "1.0.53", From cc6b6a9a8d3fc4aafe11c76fb9641e9614b2d695 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Feb 2020 13:26:03 +0000 Subject: [PATCH 02/10] Update dependencies from https://github.com/dotnet/arcade build 20200131.7 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20081.7 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20081.7 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20081.7 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20081.7 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20081.7 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20081.7 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20081.7 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20081.7 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20081.7 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20081.7 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20081.7 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20081.7 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20081.7 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20081.7 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- global.json | 8 +++--- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d2f4e859179a1..c7dfe6eb88c3ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,61 +46,61 @@ - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 - + https://github.com/dotnet/arcade - 00402f1fdc2b59dbc4f0b1c143850cb72e69fc90 + bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index a42cc1a090bf05..69389d40422b25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,16 @@ - 5.0.0-beta.20080.4 - 5.0.0-beta.20080.4 - 5.0.0-beta.20080.4 - 5.0.0-beta.20080.4 - 5.0.0-beta.20080.4 - 5.0.0-beta.20080.4 - 2.5.1-beta.20080.4 - 5.0.0-beta.20080.4 - 5.0.0-beta.20080.4 - 5.0.0-beta.20080.4 + 5.0.0-beta.20081.7 + 5.0.0-beta.20081.7 + 5.0.0-beta.20081.7 + 5.0.0-beta.20081.7 + 5.0.0-beta.20081.7 + 5.0.0-beta.20081.7 + 2.5.1-beta.20081.7 + 5.0.0-beta.20081.7 + 5.0.0-beta.20081.7 + 5.0.0-beta.20081.7 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/global.json b/global.json index 0bf0daccd296da..239de9f5aba987 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20080.4", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20080.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20080.4", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20080.4", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20081.7", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20081.7", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20081.7", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20081.7", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2", "Microsoft.Build.NoTargets": "1.0.53", From 55be6a74e97f91ccfd3cbb746999e49fb4c39d23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Feb 2020 13:26:36 +0000 Subject: [PATCH 03/10] Update dependencies from https://github.com/microsoft/vstest build 20200131-02 - Microsoft.NET.Test.Sdk - 16.5.0-preview-20200131-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7dfe6eb88c3ea..cebcd4fb826645 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -122,9 +122,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d0bb63d2ec7060714e63ee4082fac48f2e57f3e2 - + https://github.com/microsoft/vstest - 064dcc108f90955b756a77d0bdaf638dcd8eed21 + 1529833f8d927cd8c03d4bd782dba556fa4e5ee8 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 69389d40422b25..f107c7ef0dfda6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -113,7 +113,7 @@ 4.4.0 - 16.5.0-preview-20200130-01 + 16.5.0-preview-20200131-02 2.4.1 2.0.5 12.0.3 From 95566487f1652a3f85939f00ce3d91f7fd9fca49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 2 Feb 2020 13:25:55 +0000 Subject: [PATCH 04/10] Update dependencies from https://github.com/dotnet/arcade build 20200201.2 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20101.2 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20101.2 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20101.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20101.2 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20101.2 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20101.2 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20101.2 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20101.2 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20101.2 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20101.2 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20101.2 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20101.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20101.2 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20101.2 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- eng/common/tools.ps1 | 3 --- global.json | 8 +++--- 4 files changed, 42 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cebcd4fb826645..bad21345327435 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,61 +46,61 @@ - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 - + https://github.com/dotnet/arcade - bdc8c2f698e8c15195872af1e316b4b8f0eae7e1 + 779323758d3e8aa7e4ee3dc2619d57e696078089 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f107c7ef0dfda6..2c312d895ebd84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,16 @@ - 5.0.0-beta.20081.7 - 5.0.0-beta.20081.7 - 5.0.0-beta.20081.7 - 5.0.0-beta.20081.7 - 5.0.0-beta.20081.7 - 5.0.0-beta.20081.7 - 2.5.1-beta.20081.7 - 5.0.0-beta.20081.7 - 5.0.0-beta.20081.7 - 5.0.0-beta.20081.7 + 5.0.0-beta.20101.2 + 5.0.0-beta.20101.2 + 5.0.0-beta.20101.2 + 5.0.0-beta.20101.2 + 5.0.0-beta.20101.2 + 5.0.0-beta.20101.2 + 2.5.1-beta.20101.2 + 5.0.0-beta.20101.2 + 5.0.0-beta.20101.2 + 5.0.0-beta.20101.2 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 23a3fd53d7a52a..d3a432878e2167 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -655,9 +655,6 @@ Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir Write-PipelineSetVariable -Name 'TMP' -Value $TempDir -$env:TEMP=$TempDir -$env:TMP=$TempDir - # Import custom tools configuration, if present in the repo. # Note: Import in global scope so that the script set top-level variables without qualification. if (!$disableConfigureToolsetImport) { diff --git a/global.json b/global.json index 239de9f5aba987..90931f725f605a 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20081.7", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20081.7", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20081.7", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20081.7", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20101.2", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20101.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20101.2", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20101.2", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2", "Microsoft.Build.NoTargets": "1.0.53", From 2134bc4b4fb85cd1fc592321bf1c849ded6eb575 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sun, 2 Feb 2020 22:32:13 +0100 Subject: [PATCH 05/10] Rename RuntimeStressTestModes --- src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs | 2 +- .../tests/BigInteger/BigIntegerToStringTests.cs | 2 +- .../tests/BinaryFormatterTests.cs | 2 +- .../System.Text.RegularExpressions/tests/Regex.Match.Tests.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs b/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs index 7860b6f42f2145..08522d38298f81 100644 --- a/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs +++ b/src/libraries/System.Linq.Expressions/tests/AssemblyInfo.cs @@ -4,4 +4,4 @@ using Xunit; -[assembly: SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/25269", RuntimeStressTestModes.CheckedRuntime)] +[assembly: SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/25269", RuntimeTestModes.CheckedRuntime)] diff --git a/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs b/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs index 3255438e6e2ff0..e3601a9efa6982 100644 --- a/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs +++ b/src/libraries/System.Runtime.Numerics/tests/BigInteger/BigIntegerToStringTests.cs @@ -188,7 +188,7 @@ public static void RunStandardFormatToStringTests() } [Fact] - [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/22414", TestPlatforms.Linux, RuntimeStressTestModes.CheckedRuntime)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/22414", TestPlatforms.Linux, RuntimeTestModes.CheckedRuntime)] public static void RunRegionSpecificStandardFormatToStringTests() { CultureInfo[] cultures = new CultureInfo[] { new CultureInfo("en-US"), new CultureInfo("en-GB"), new CultureInfo("fr-CA"), diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs index 52460eca4c7d2e..05fc0218a2c91f 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs @@ -23,7 +23,7 @@ public partial class BinaryFormatterTests : FileCleanupTestBase { // On 32-bit we can't test these high inputs as they cause OutOfMemoryExceptions. [ConditionalTheory(typeof(Environment), nameof(Environment.Is64BitProcess))] - [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/20246", RuntimeStressTestModes.CheckedRuntime)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/20246", RuntimeTestModes.CheckedRuntime)] [InlineData(2 * 6_584_983 - 2)] // previous limit [InlineData(2 * 7_199_369 - 2)] // last pre-computed prime number public void SerializeHugeObjectGraphs(int limit) diff --git a/src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs b/src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs index f1e3a18c4710f7..09518b18ec2032 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs +++ b/src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs @@ -919,7 +919,7 @@ public void Match_SpecialUnicodeCharacters_Invariant() [InlineData(RegexOptions.None)] [InlineData(RegexOptions.Compiled)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework does not have fix for https://github.com/dotnet/corefx/issues/26484")] - [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/18912", RuntimeStressTestModes.JitMinOpts)] + [SkipOnCoreClr("Long running tests: https://github.com/dotnet/coreclr/issues/18912", RuntimeTestModes.JitMinOpts)] public void Match_ExcessPrefix(RegexOptions options) { RemoteExecutor.Invoke(optionsString => From 8bacac17891dff2fa75bf4ad94d364e9dbe17b9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Feb 2020 13:20:51 +0000 Subject: [PATCH 06/10] Update dependencies from https://github.com/microsoft/vstest build 20200203-01 - Microsoft.NET.Test.Sdk - 16.5.0-preview-20200203-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bad21345327435..5d808b163c205b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -122,9 +122,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d0bb63d2ec7060714e63ee4082fac48f2e57f3e2 - + https://github.com/microsoft/vstest - 1529833f8d927cd8c03d4bd782dba556fa4e5ee8 + fd0fe3df347a081b56c4da89f85a3e1ff463a4e7 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 2c312d895ebd84..878f06287a1634 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -113,7 +113,7 @@ 4.4.0 - 16.5.0-preview-20200131-02 + 16.5.0-preview-20200203-01 2.4.1 2.0.5 12.0.3 From 11483832197a251e125f966648d8cf1fda88d011 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Feb 2020 13:27:14 +0000 Subject: [PATCH 07/10] Update dependencies from https://github.com/dotnet/arcade build 20200203.5 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20103.5 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20103.5 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20103.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20103.5 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20103.5 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20103.5 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20103.5 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20103.5 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20103.5 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20103.5 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20103.5 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20103.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20103.5 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20103.5 --- eng/Version.Details.xml | 56 ++++++++++---------- eng/Versions.props | 20 +++---- eng/common/performance/performance-setup.ps1 | 4 +- eng/common/performance/performance-setup.sh | 4 +- global.json | 8 +-- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d808b163c205b..126e6666916193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,61 +46,61 @@ - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 - + https://github.com/dotnet/arcade - 779323758d3e8aa7e4ee3dc2619d57e696078089 + 27c8467294a4e64ac6642b4c12ca63495ff126c8 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 878f06287a1634..65d4052c7e54e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,16 @@ - 5.0.0-beta.20101.2 - 5.0.0-beta.20101.2 - 5.0.0-beta.20101.2 - 5.0.0-beta.20101.2 - 5.0.0-beta.20101.2 - 5.0.0-beta.20101.2 - 2.5.1-beta.20101.2 - 5.0.0-beta.20101.2 - 5.0.0-beta.20101.2 - 5.0.0-beta.20101.2 + 5.0.0-beta.20103.5 + 5.0.0-beta.20103.5 + 5.0.0-beta.20103.5 + 5.0.0-beta.20103.5 + 5.0.0-beta.20103.5 + 5.0.0-beta.20103.5 + 2.5.1-beta.20103.5 + 5.0.0-beta.20103.5 + 5.0.0-beta.20103.5 + 5.0.0-beta.20103.5 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 3c2adf8c737ef4..a6916d25f00b08 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -2,7 +2,7 @@ Param( [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, [string] $CoreRootDirectory, [string] $BaselineCoreRootDirectory, - [string] $Architecture="x64", + [string] $Architecture=$env:archType, [string] $Framework="netcoreapp5.0", [string] $CompilationMode="Tiered", [string] $Repository=$env:BUILD_REPOSITORY_NAME, @@ -14,7 +14,7 @@ Param( [string] $Kind="micro", [switch] $Internal, [switch] $Compare, - [string] $Configurations="CompilationMode=$CompilationMode" + [string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind" ) $RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance") diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 604aebffcae610..ba8bfc13dd768f 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -3,7 +3,7 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= baseline_core_root_directory= -architecture=x64 +architecture=$archType framework=netcoreapp5.0 compilation_mode=tiered repository=$BUILD_REPOSITORY_NAME @@ -15,7 +15,7 @@ compare=false kind="micro" run_categories="Libraries Runtime" csproj="src\benchmarks\micro\MicroBenchmarks.csproj" -configurations= +configurations="CompliationMode=$compilation_mode RunKind=$kind" run_from_perf_repo=false use_core_run=true use_baseline_core_run=true diff --git a/global.json b/global.json index 90931f725f605a..9ac71c5f379ef3 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20101.2", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20101.2", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20101.2", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20101.2", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20103.5", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20103.5", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20103.5", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20103.5", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2", "Microsoft.Build.NoTargets": "1.0.53", From 5dd468f2e02cebea21fb1a2f30be2990dbc0b539 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Fri, 31 Jan 2020 17:06:29 -0800 Subject: [PATCH 08/10] Update SkipOnCoreClrAttributes to new parameters --- .../RegistrationBuilderAttributedOverrideUnitTests.cs | 2 +- .../tests/FunctionalTests/AssemblyInfo.cs | 2 +- .../System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs | 2 +- .../tests/HttpListenerAuthenticationTests.cs | 2 +- .../System.Net.HttpListener/tests/HttpListenerContextTests.cs | 2 +- .../tests/HttpListenerResponseTests.Cookies.cs | 2 +- .../tests/HttpListenerResponseTests.cs | 2 +- .../System.Net.Mail/tests/Functional/SmtpClientTest.cs | 4 ++-- src/libraries/System.Net.Requests/tests/LoggingTest.cs | 3 +-- .../tests/FunctionalTests/SslStreamSniTest.cs | 2 +- .../System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs | 2 +- 11 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs b/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs index 96cd33d298a418..f6635e0ec7710b 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs +++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/RegistrationBuilderAttributedOverrideUnitTests.cs @@ -11,7 +11,7 @@ namespace System.ComponentModel.Composition.Registration.Tests { - [SkipOnCoreClr("Test failures on stress tests")] + [SkipOnCoreClr("Test failures on stress tests", RuntimeTestModes.CheckedRuntime)] [SkipOnMono("Test failures on stress tests")] public class RegistrationBuilderAttributedOverrideUnitTests { diff --git a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs index 0d7eda9ff9c4b4..9a17fee4084e15 100644 --- a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,5 @@ using Xunit; -[assembly: SkipOnCoreClr("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux)] +[assembly: SkipOnCoreClr("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux, RuntimeTestModes.CheckedRuntime)] [assembly: SkipOnMono("Timeout in stress tests on Linux/arm32", TestPlatforms.Linux)] diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs index 2fbf85306bc7ca..f4dbfa82accfe0 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,5 @@ using Xunit; -[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] +[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [assembly: SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs index 421caa5bca7840..b252edfe06f0c6 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs @@ -13,7 +13,7 @@ namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerAuthenticationTests : IDisposable diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs index 994d28fd95d8cb..1f6ab1a5dfd09c 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs @@ -14,7 +14,7 @@ namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerContextTests : IDisposable diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs index 8f507e1adf6936..d68ac1dc80c3c6 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs @@ -9,7 +9,7 @@ namespace System.Net.Tests { - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerResponseCookiesTests : HttpListenerResponseTestBase diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs index 905d0c292c36b8..92a63be0c42896 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs @@ -57,7 +57,7 @@ protected async Task GetResponse(string httpVersion = "1.1 } } - [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations")] + [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeTestModes.CheckedRuntime)] [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerResponseTests : HttpListenerResponseTestBase diff --git a/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs b/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs index e10bba2eccf43a..160c0308be9241 100644 --- a/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs +++ b/src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs @@ -339,7 +339,7 @@ public void TestZeroTimeout() [InlineData("howdydoo")] [InlineData("")] [InlineData(null)] - [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] public async Task TestMailDeliveryAsync(string body) { @@ -358,7 +358,7 @@ public async Task TestMailDeliveryAsync(string body) [Fact] [PlatformSpecific(TestPlatforms.Windows)] // NTLM support required, see https://github.com/dotnet/corefx/issues/28961 - [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] public async Task TestCredentialsCopyInAsyncContext() { diff --git a/src/libraries/System.Net.Requests/tests/LoggingTest.cs b/src/libraries/System.Net.Requests/tests/LoggingTest.cs index d5ae6a58ceab07..995224eb0fdca4 100644 --- a/src/libraries/System.Net.Requests/tests/LoggingTest.cs +++ b/src/libraries/System.Net.Requests/tests/LoggingTest.cs @@ -11,8 +11,7 @@ public class LoggingTest { [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "NetEventSource is only part of .NET Core.")] - [SkipOnCoreClr("System.Net.Tests are flaky")] - [SkipOnMono("System.Net.Tests are flaky")] + [SkipOnCoreClr("System.Net.Tests are flaky", RuntimeTestModes.CheckedRuntime)] public void EventSource_ExistsWithCorrectId() { Type esType = typeof(WebRequest).Assembly.GetType("System.Net.NetEventSource", throwOnError: true, ignoreCase: false); diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs index 3a4f0687a63a08..910bf8575f10d6 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSniTest.cs @@ -137,7 +137,7 @@ public async Task SslStream_ServerCallbackNotSet_UsesLocalCertificateSelection(s } [Fact] - [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] + [SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] public async Task SslStream_NoSniFromClient_CallbackReturnsNull() { diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs index 2fbf85306bc7ca..f4dbfa82accfe0 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AssemblyInfo.cs @@ -4,5 +4,5 @@ using Xunit; -[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] +[assembly: SkipOnCoreClr("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131", RuntimeTestModes.CheckedRuntime)] [assembly: SkipOnMono("System.Net.Tests are flaky and/or long running: https://github.com/dotnet/runtime/issues/131")] From a78883bb3749f9b6a82811997e1a82010658c9fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Feb 2020 13:33:02 +0000 Subject: [PATCH 09/10] Update dependencies from https://github.com/dotnet/arcade build 20200204.2 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20104.2 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20104.2 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20104.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20104.2 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20104.2 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20104.2 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20104.2 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20104.2 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20104.2 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20104.2 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20104.2 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20104.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20104.2 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20104.2 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- eng/common/build.sh | 10 -------- global.json | 8 +++--- 4 files changed, 42 insertions(+), 52 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 126e6666916193..2907ede30c58d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,61 +46,61 @@ - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e - + https://github.com/dotnet/arcade - 27c8467294a4e64ac6642b4c12ca63495ff126c8 + 0b404cb7575c8addc5e10f3fac57e79c596db28e https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 65d4052c7e54e4..0973732cadf3a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,16 @@ - 5.0.0-beta.20103.5 - 5.0.0-beta.20103.5 - 5.0.0-beta.20103.5 - 5.0.0-beta.20103.5 - 5.0.0-beta.20103.5 - 5.0.0-beta.20103.5 - 2.5.1-beta.20103.5 - 5.0.0-beta.20103.5 - 5.0.0-beta.20103.5 - 5.0.0-beta.20103.5 + 5.0.0-beta.20104.2 + 5.0.0-beta.20104.2 + 5.0.0-beta.20104.2 + 5.0.0-beta.20104.2 + 5.0.0-beta.20104.2 + 5.0.0-beta.20104.2 + 2.5.1-beta.20104.2 + 5.0.0-beta.20104.2 + 5.0.0-beta.20104.2 + 5.0.0-beta.20104.2 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/eng/common/build.sh b/eng/common/build.sh index 6e395455f23ad7..36f9aa0462ee17 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -175,16 +175,6 @@ function Build { InitializeCustomToolset if [[ ! -z "$projects" ]]; then - # Split project paths by semi-colon, find full-paths using readlink, - # finally and splice back as a semi-colon separated list - IFS=';' read -r -a projs <<< "$projects" - len=${#projs[@]} - for ((i=0; i<$len; i++)); - do - projs[$i]=$(readlink -f "${projs[$i]}"); - done - projects=$(IFS=\; ; echo "${projs[*]}") - echo Updated projects: $projects properties="$properties /p:Projects=$projects" fi diff --git a/global.json b/global.json index 9ac71c5f379ef3..f9ee80fd97ba86 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20103.5", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20103.5", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20103.5", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20103.5", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20104.2", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20104.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20104.2", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20104.2", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2", "Microsoft.Build.NoTargets": "1.0.53", From a85b8aab2d4268021a4d62d5cbea5d171ad867a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Feb 2020 13:33:37 +0000 Subject: [PATCH 10/10] Update dependencies from https://github.com/microsoft/vstest build 20200205-01 - Microsoft.NET.Test.Sdk - 16.5.0 --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2907ede30c58d3..237dbf86e0c4e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -122,7 +122,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d0bb63d2ec7060714e63ee4082fac48f2e57f3e2 - + https://github.com/microsoft/vstest fd0fe3df347a081b56c4da89f85a3e1ff463a4e7 diff --git a/eng/Versions.props b/eng/Versions.props index 0973732cadf3a0..febaad0fb8ff22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -113,7 +113,7 @@ 4.4.0 - 16.5.0-preview-20200203-01 + 16.5.0 2.4.1 2.0.5 12.0.3