From 4a1a6afaf804962fe57cbdd049311b8cb0c961a9 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 27 Jun 2018 16:42:26 -0700 Subject: [PATCH 1/3] Update BuildTools, CoreClr, CoreFx, PgoData to preview1-02928-01, preview1-26627-04, preview1-26627-04, master-20180627-0051, respectively --- BuildToolsVersion.txt | 2 +- ILAsmVersion.txt | 2 +- dependencies.props | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 27839f0817fb..bd0d34dd3aca 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.2.0-preview1-02920-01 +2.2.0-preview1-02928-01 diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt index 1e72fc8f6414..2eb2abc1ffc1 100644 --- a/ILAsmVersion.txt +++ b/ILAsmVersion.txt @@ -1 +1 @@ -2.2.0-preview1-26621-01 +3.0.0-preview1-26627-04 diff --git a/dependencies.props b/dependencies.props index ed8514b8eb70..895246339655 100644 --- a/dependencies.props +++ b/dependencies.props @@ -23,18 +23,18 @@ - 232e7f9230fcc7c6c8ea8c955e113f897403a0e7 - 232e7f9230fcc7c6c8ea8c955e113f897403a0e7 - 3b09a6a5fd370dfb8b7af43ca0a93114efdaa0a1 - 1f57485574742714a2401175bce892597bbf86bb + f9173f18d54ab4e842be4b5d0a0df47323a1451b + f9173f18d54ab4e842be4b5d0a0df47323a1451b + f9173f18d54ab4e842be4b5d0a0df47323a1451b + f9173f18d54ab4e842be4b5d0a0df47323a1451b - 4.6.0-preview1-26621-01 - 2.2.0-preview1-26621-01 - 99.99.99-master-20180621-0050 - 2.2.0-preview1-26621-01 + 4.6.0-preview1-26627-04 + 3.0.0-preview1-26627-04 + 99.99.99-master-20180627-0051 + 3.0.0-preview1-26627-04 2.2.0-beta2-build3300 2.2.0-preview1-02830-02 1.0.0-beta-build0015 @@ -51,7 +51,7 @@ Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-preview1-02920-01 + 2.2.0-preview1-02928-01 From c2e8151ecbdc2f3380fac2e191605e5abc0f29d4 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 27 Jun 2018 19:39:39 -0500 Subject: [PATCH 2/3] Rename netcoreapp2.2 => netcoreapp3.0 --- tests/publishdependency.targets | 4 ++-- .../build_against_pkg_dependencies.csproj | 2 +- tests/src/Common/test_dependencies/test_dependencies.csproj | 6 +++--- tests/src/Common/test_runtime/test_runtime.csproj | 6 +++--- tests/src/dir.props | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 82f383f2cd59..346b1749f86d 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -3,8 +3,8 @@ - - netcoreapp2.2 + + netcoreapp3.0 diff --git a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj index fac75781a5c8..e4b1af713020 100644 --- a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj +++ b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj @@ -25,7 +25,7 @@ - netcoreapp2.2 + netcoreapp3.0 .NETCoreApp $(PackageTargetFallback);portable-net45+win8 win-arm;win-arm64;win-x64;win-x86;$(TargetRid) diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj index 3bdca6de208f..cc4d1a7ff8f4 100644 --- a/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -5,8 +5,8 @@ Debug AnyCPU BuildOnly - .NETCoreApp,Version=v2.2 - netcoreapp2.2 + .NETCoreApp,Version=v3.0 + netcoreapp3.0 false @@ -30,7 +30,7 @@ - netcoreapp2.2 + netcoreapp3.0 .NETCoreApp $(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8 win-arm;win-arm64;win-x64;win-x86;$(TargetRid) diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj index 7405edcbff7c..761d44d4c6a0 100644 --- a/tests/src/Common/test_runtime/test_runtime.csproj +++ b/tests/src/Common/test_runtime/test_runtime.csproj @@ -5,8 +5,8 @@ Debug AnyCPU BuildOnly - .NETCoreApp,Version=v2.2 - netcoreapp2.2 + .NETCoreApp,Version=v3.0 + netcoreapp3.0 false @@ -27,7 +27,7 @@ - netcoreapp2.2 + netcoreapp3.0 .NETCoreApp $(PackageTargetFallback);dnxcore50;portable-net45+win8 win-arm;win-arm64;win-x64;win-x86;$(TargetRid) diff --git a/tests/src/dir.props b/tests/src/dir.props index abdb7cc0f574..925e3faba7ca 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -95,8 +95,8 @@ $(MSBuildProjectDirectory)\obj - .NETCoreApp,Version=v2.2 - netcoreapp2.2 + .NETCoreApp,Version=v3.0 + netcoreapp3.0 true From 77ee3a8fb2e24cd7563fc0ef1fe0e8d433b071cd Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 27 Jun 2018 21:53:56 -0700 Subject: [PATCH 3/3] Disable test for CoreFX update --- tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json b/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json index 5518056a1f1d..8c79b9641fa2 100644 --- a/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json +++ b/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json @@ -1264,5 +1264,19 @@ } ] } + }, + { + "name": "System.Security.Cryptography.X509Certificates.Tests", + "enabled": true, + "exclusions": { + "namespaces": null, + "classes": null, + "methods": [ + { + "name": "System.Security.Cryptography.X509Certificates.Tests.X509StoreTests.Constructor_DefaultStoreName", + "reason": "Expected: My\r\nActual: MY\r\n" + } + ] + } } -] \ No newline at end of file +]