From 16912aa534e92695fde9f5a3e0cc14b97cf7efe9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 19 Jul 2021 17:40:51 +0000 Subject: [PATCH 01/17] Update dependencies from https://github.com/dotnet/runtime build 20210718.2 (#25288) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7deb4bcf68f..466d4635116 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 - + https://github.com/dotnet/runtime - 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c + 8d3afa3a4a42021be024ffa4a1dee77e35d33911 diff --git a/eng/Versions.props b/eng/Versions.props index 7ce7f3ec8f5..1d07a84d24d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21361.10 - 6.0.0-preview.7.21361.10 + 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21368.2 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21361.10 - 6.0.0-preview.7.21361.10 - 6.0.0-preview.7.21361.10 - 6.0.0-preview.7.21361.10 - 6.0.0-preview.7.21361.10 - 6.0.0-preview.7.21361.10 - 6.0.0-preview.7.21361.10 + 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21368.2 6.0.0-preview.6.21276.2 From 92746a1d5a0fcd5cbaaf0d2d6279a05d6c205828 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Jul 2021 09:23:00 +0000 Subject: [PATCH 02/17] Update dependencies from https://github.com/dotnet/runtime build 20210719.8 (#25290) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 466d4635116..a0f7e0c5869 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 71c078d515775ecc06619139efa0887d5dbea04c diff --git a/eng/Versions.props b/eng/Versions.props index 1d07a84d24d..ab3394d69ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21368.2 - 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21369.8 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21368.2 - 6.0.0-preview.7.21368.2 - 6.0.0-preview.7.21368.2 - 6.0.0-preview.7.21368.2 - 6.0.0-preview.7.21368.2 - 6.0.0-preview.7.21368.2 - 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21369.8 6.0.0-preview.6.21276.2 From f51784b6bb3e18bfbcc7e057740cd50fb74a38ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Jul 2021 23:23:24 +0000 Subject: [PATCH 03/17] Update dependencies from https://github.com/dotnet/runtime build 20210720.7 (#25298) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0f7e0c5869..a23b7daef3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab - + https://github.com/dotnet/runtime - 71c078d515775ecc06619139efa0887d5dbea04c + d885650ee9ff2d88bbff14984fa92b3af0765eab diff --git a/eng/Versions.props b/eng/Versions.props index ab3394d69ba..2a466c4c384 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21369.8 - 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.7 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21369.8 - 6.0.0-preview.7.21369.8 - 6.0.0-preview.7.21369.8 - 6.0.0-preview.7.21369.8 - 6.0.0-preview.7.21369.8 - 6.0.0-preview.7.21369.8 - 6.0.0-preview.7.21369.8 + 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.7 6.0.0-preview.6.21276.2 From 1c97205a5ad8b6609bc9598e10419430caa084ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 01:34:21 +0000 Subject: [PATCH 04/17] Update dependencies from https://github.com/dotnet/runtime build 20210720.12 (#25299) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a23b7daef3f..a3238eb8742 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d - + https://github.com/dotnet/runtime - d885650ee9ff2d88bbff14984fa92b3af0765eab + 1daca291a44cc38e84d367a4e35309163192ce0d diff --git a/eng/Versions.props b/eng/Versions.props index 2a466c4c384..764a02f6e72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21370.7 - 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.12 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21370.7 - 6.0.0-preview.7.21370.7 - 6.0.0-preview.7.21370.7 - 6.0.0-preview.7.21370.7 - 6.0.0-preview.7.21370.7 - 6.0.0-preview.7.21370.7 - 6.0.0-preview.7.21370.7 + 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.12 6.0.0-preview.6.21276.2 From 425f22e9839a951c8439eaf8939a132d8bfeaf82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 07:58:46 +0000 Subject: [PATCH 05/17] Update dependencies from https://github.com/dotnet/runtime build 20210720.18 (#25301) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3238eb8742..d5e2419be95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 - + https://github.com/dotnet/runtime - 1daca291a44cc38e84d367a4e35309163192ce0d + ba08d9a305e2e0debeed1c96b3137b44305466b8 diff --git a/eng/Versions.props b/eng/Versions.props index 764a02f6e72..8659f1aac6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21370.12 - 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21370.18 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21370.12 - 6.0.0-preview.7.21370.12 - 6.0.0-preview.7.21370.12 - 6.0.0-preview.7.21370.12 - 6.0.0-preview.7.21370.12 - 6.0.0-preview.7.21370.12 - 6.0.0-preview.7.21370.12 + 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21370.18 6.0.0-preview.6.21276.2 From ee385b28c17f524af46d7d4b7559e9b6d2de4566 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Jul 2021 03:40:38 +0000 Subject: [PATCH 06/17] Update dependencies from https://github.com/dotnet/runtime build 20210721.11 (#25312) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5e2419be95..9adceddf795 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee diff --git a/eng/Versions.props b/eng/Versions.props index 8659f1aac6e..a7bce01e4e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21370.18 - 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21371.11 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21370.18 - 6.0.0-preview.7.21370.18 - 6.0.0-preview.7.21370.18 - 6.0.0-preview.7.21370.18 - 6.0.0-preview.7.21370.18 - 6.0.0-preview.7.21370.18 - 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21371.11 6.0.0-preview.6.21276.2 From 96386a475c750e0762701f2bdb6d9bc98883ca40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Jul 2021 22:51:27 +0000 Subject: [PATCH 07/17] [release/6.0-preview7] Update dependencies from dotnet/runtime (#25316) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9adceddf795..3627baf409d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae - + https://github.com/dotnet/runtime - 743bd894c40b00b93e805db9d62664c915e0c0ee + 8766d1d5367da5bc8c70b9bab05cf02650a40cae diff --git a/eng/Versions.props b/eng/Versions.props index a7bce01e4e2..15032143798 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21371.11 - 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.13 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21371.11 - 6.0.0-preview.7.21371.11 - 6.0.0-preview.7.21371.11 - 6.0.0-preview.7.21371.11 - 6.0.0-preview.7.21371.11 - 6.0.0-preview.7.21371.11 - 6.0.0-preview.7.21371.11 + 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.13 6.0.0-preview.6.21276.2 From 79c2a82d01cda6a44b98d921c4263771d84b4688 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Jul 2021 15:08:10 +0000 Subject: [PATCH 08/17] Update dependencies from https://github.com/dotnet/runtime build 20210722.16 (#25317) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3627baf409d..23e6cdbf35f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 - + https://github.com/dotnet/runtime - 8766d1d5367da5bc8c70b9bab05cf02650a40cae + d17b813d431e63dac3db60b03c2afc17881168b8 diff --git a/eng/Versions.props b/eng/Versions.props index 15032143798..0afc3621665 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21372.13 - 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21372.16 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21372.13 - 6.0.0-preview.7.21372.13 - 6.0.0-preview.7.21372.13 - 6.0.0-preview.7.21372.13 - 6.0.0-preview.7.21372.13 - 6.0.0-preview.7.21372.13 - 6.0.0-preview.7.21372.13 + 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21372.16 6.0.0-preview.6.21276.2 From 0eeef0d1de0d2137a5d43cc871a4bd3651afff7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Jul 2021 18:01:59 +0000 Subject: [PATCH 09/17] Update dependencies from https://github.com/dotnet/arcade build 20210722.16 (#25326) [release/6.0-preview7] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 +- eng/common/cross/build-rootfs.sh | 6 +- eng/common/sdl/configure-sdl-tool.ps1 | 109 +++++++++++++++++++ eng/common/sdl/execute-all-sdl-tools.ps1 | 71 ++++++++++-- eng/common/sdl/extract-artifact-archives.ps1 | 63 +++++++++++ eng/common/sdl/run-sdl.ps1 | 50 +++------ eng/common/templates/job/execute-sdl.yml | 108 ++++++++++++++++-- eng/common/templates/steps/source-build.yml | 6 + eng/common/tools.ps1 | 55 +++++++++- eng/common/tools.sh | 4 +- global.json | 8 +- 11 files changed, 418 insertions(+), 70 deletions(-) create mode 100644 eng/common/sdl/configure-sdl-tool.ps1 create mode 100644 eng/common/sdl/extract-artifact-archives.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23e6cdbf35f..93cf93ca9ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 591d8666a84..735a4c82838 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -33,7 +33,6 @@ __AlpinePackages="alpine-base" __AlpinePackages+=" build-base" __AlpinePackages+=" linux-headers" __AlpinePackagesEdgeCommunity=" lldb-dev" -__AlpinePackagesEdgeMain=" llvm10-libs" __AlpinePackagesEdgeMain+=" python3" __AlpinePackagesEdgeMain+=" libedit" @@ -115,6 +114,8 @@ while :; do __UbuntuArch=s390x __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//') + __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//') + __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') unset __LLDB_Package ;; x86) @@ -191,6 +192,8 @@ while :; do __CodeName=alpine __UbuntuRepo= __AlpineVersion=3.9 + __AlpinePackagesEdgeMain+=" llvm11-libs" + __AlpinePackagesEdgeMain+=" clang-libs" ;; alpine3.13) __CodeName=alpine @@ -201,6 +204,7 @@ while :; do __AlpinePackagesEdgeCommunity= __AlpinePackages+=$__AlpinePackagesEdgeMain __AlpinePackagesEdgeMain= + __AlpinePackages+=" llvm10-libs" ;; freebsd11) __FreeBSDBase="11.3-RELEASE" diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 new file mode 100644 index 00000000000..4999c307088 --- /dev/null +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -0,0 +1,109 @@ +Param( + [string] $GuardianCliLocation, + [string] $WorkingDirectory, + [string] $TargetDirectory, + [string] $GdnFolder, + # The list of Guardian tools to configure. For each object in the array: + # - If the item is a [hashtable], it must contain these entries: + # - Name = The tool name as Guardian knows it. + # - Scenario = (Optional) Scenario-specific name for this configuration entry. It must be unique + # among all tool entries with the same Name. + # - Args = (Optional) Array of Guardian tool configuration args, like '@("Target > C:\temp")' + # - If the item is a [string] $v, it is treated as '@{ Name="$v" }' + [object[]] $ToolsList, + [string] $GuardianLoggerLevel='Standard', + # Optional: Additional params to add to any tool using CredScan. + [string[]] $CrScanAdditionalRunConfigParams, + # Optional: Additional params to add to any tool using PoliCheck. + [string[]] $PoliCheckAdditionalRunConfigParams +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 +$disableConfigureToolsetImport = $true +$global:LASTEXITCODE = 0 + +try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + # Normalize tools list: all in [hashtable] form with defined values for each key. + $ToolsList = $ToolsList | + ForEach-Object { + if ($_ -is [string]) { + $_ = @{ Name = $_ } + } + + if (-not ($_['Scenario'])) { $_.Scenario = "" } + if (-not ($_['Args'])) { $_.Args = @() } + $_ + } + + Write-Host "List of tools to configure:" + $ToolsList | ForEach-Object { $_ | Out-String | Write-Host } + + # We store config files in the r directory of .gdn + $gdnConfigPath = Join-Path $GdnFolder 'r' + $ValidPath = Test-Path $GuardianCliLocation + + if ($ValidPath -eq $False) + { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Invalid Guardian CLI Location." + ExitWithExitCode 1 + } + + foreach ($tool in $ToolsList) { + # Put together the name and scenario to make a unique key. + $toolConfigName = $tool.Name + if ($tool.Scenario) { + $toolConfigName += "_" + $tool.Scenario + } + + Write-Host "=== Configuring $toolConfigName..." + + $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig" + + # For some tools, add default and automatic args. + if ($tool.Name -eq 'credscan') { + if ($targetDirectory) { + $tool.Args += "TargetDirectory < $TargetDirectory" + } + $tool.Args += "OutputType < pre" + $tool.Args += $CrScanAdditionalRunConfigParams + } elseif ($tool.Name -eq 'policheck') { + if ($targetDirectory) { + $tool.Args += "Target < $TargetDirectory" + } + $tool.Args += $PoliCheckAdditionalRunConfigParams + } + + # Create variable pointing to the args array directly so we can use splat syntax later. + $toolArgs = $tool.Args + + # Configure the tool. If args array is provided or the current tool has some default arguments + # defined, add "--args" and splat each element on the end. Arg format is "{Arg id} < {Value}", + # one per parameter. Doc page for "guardian configure": + # https://dev.azure.com/securitytools/SecurityIntegration/_wiki/wikis/Guardian/1395/configure + Exec-BlockVerbosely { + & $GuardianCliLocation configure ` + --working-directory $WorkingDirectory ` + --tool $tool.Name ` + --output-path $gdnConfigFile ` + --logger-level $GuardianLoggerLevel ` + --noninteractive ` + --force ` + $(if ($toolArgs) { "--args" }) @toolArgs + Exit-IfNZEC "Sdl" + } + + Write-Host "Created '$toolConfigName' configuration file: $gdnConfigFile" + } +} +catch { + Write-Host $_.ScriptStackTrace + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 2881a56083c..1157151f486 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -7,8 +7,17 @@ Param( [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault - [string[]] $SourceToolsList, # Optional: list of SDL tools to run on source code - [string[]] $ArtifactToolsList, # Optional: list of SDL tools to run on built artifacts + + # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list + # format. + [object[]] $SourceToolsList, + # Optional: list of SDL tools to run on built artifacts. See 'configure-sdl-tool.ps1' for tools + # list format. + [object[]] $ArtifactToolsList, + # Optional: list of SDL tools to run without automatically specifying a target directory. See + # 'configure-sdl-tool.ps1' for tools list format. + [object[]] $CustomToolsList, + [bool] $TsaPublish=$False, # Optional: true will publish results to TSA; only set to true after onboarding to TSA; TSA is the automated framework used to upload test results as bugs. [string] $TsaBranchName=$env:BUILD_SOURCEBRANCH, # Optional: required for TSA publish; defaults to $(Build.SourceBranchName); TSA is the automated framework used to upload test results as bugs. [string] $TsaRepositoryName=$env:BUILD_REPOSITORY_NAME, # Optional: TSA repository name; will be generated automatically if not submitted; TSA is the automated framework used to upload test results as bugs. @@ -63,13 +72,16 @@ try { ExitWithExitCode 1 } - & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel + Exec-BlockVerbosely { + & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel + } $gdnFolder = Join-Path $workingDirectory '.gdn' if ($TsaOnboard) { if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) { - Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel" - & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel + Exec-BlockVerbosely { + & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel + } if ($LASTEXITCODE -ne 0) { Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-onboard failed with exit code $LASTEXITCODE." ExitWithExitCode $LASTEXITCODE @@ -80,11 +92,41 @@ try { } } - if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + # Configure a list of tools with a default target directory. Populates the ".gdn/r" directory. + function Configure-ToolsList([object[]] $tools, [string] $targetDirectory) { + if ($tools -and $tools.Count -gt 0) { + Exec-BlockVerbosely { + & $(Join-Path $PSScriptRoot 'configure-sdl-tool.ps1') ` + -GuardianCliLocation $guardianCliLocation ` + -WorkingDirectory $workingDirectory ` + -TargetDirectory $targetDirectory ` + -GdnFolder $gdnFolder ` + -ToolsList $tools ` + -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` + -GuardianLoggerLevel $GuardianLoggerLevel ` + -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` + -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + if ($BreakOnFailure) { + Exit-IfNZEC "Sdl" + } + } + } } - if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + + # Configure Artifact and Source tools with default Target directories. + Configure-ToolsList $ArtifactToolsList $ArtifactsDirectory + Configure-ToolsList $SourceToolsList $SourceDirectory + # Configure custom tools with no default Target directory. + Configure-ToolsList $CustomToolsList $null + + # At this point, all tools are configured in the ".gdn" directory. Run them all in a single call. + # (If we used "run" multiple times, each run would overwrite data from earlier runs.) + Exec-BlockVerbosely { + & $(Join-Path $PSScriptRoot 'run-sdl.ps1') ` + -GuardianCliLocation $guardianCliLocation ` + -WorkingDirectory $workingDirectory ` + -UpdateBaseline $UpdateBaseline ` + -GdnFolder $gdnFolder } if ($TsaPublish) { @@ -92,8 +134,9 @@ try { if (-not $TsaRepositoryName) { $TsaRepositoryName = "$($Repository)-$($BranchName)" } - Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel" - & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel + Exec-BlockVerbosely { + & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel + } if ($LASTEXITCODE -ne 0) { Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian tsa-publish failed with exit code $LASTEXITCODE." ExitWithExitCode $LASTEXITCODE @@ -106,7 +149,11 @@ try { if ($BreakOnFailure) { Write-Host "Failing the build in case of breaking results..." - & $guardianCliLocation break + Exec-BlockVerbosely { + & $guardianCliLocation break --working-directory $workingDirectory --logger-level $GuardianLoggerLevel + } + } else { + Write-Host "Letting the build pass even if there were breaking results..." } } catch { diff --git a/eng/common/sdl/extract-artifact-archives.ps1 b/eng/common/sdl/extract-artifact-archives.ps1 new file mode 100644 index 00000000000..68da4fbf257 --- /dev/null +++ b/eng/common/sdl/extract-artifact-archives.ps1 @@ -0,0 +1,63 @@ +# This script looks for each archive file in a directory and extracts it into the target directory. +# For example, the file "$InputPath/bin.tar.gz" extracts to "$ExtractPath/bin.tar.gz.extracted/**". +# Uses the "tar" utility added to Windows 10 / Windows 2019 that supports tar.gz and zip. +param( + # Full path to directory where archives are stored. + [Parameter(Mandatory=$true)][string] $InputPath, + # Full path to directory to extract archives into. May be the same as $InputPath. + [Parameter(Mandatory=$true)][string] $ExtractPath +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +$disableConfigureToolsetImport = $true + +try { + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + Measure-Command { + $jobs = @() + + # Find archive files for non-Windows and Windows builds. + $archiveFiles = @( + Get-ChildItem (Join-Path $InputPath "*.tar.gz") + Get-ChildItem (Join-Path $InputPath "*.zip") + ) + + foreach ($targzFile in $archiveFiles) { + $jobs += Start-Job -ScriptBlock { + $file = $using:targzFile + $fileName = [System.IO.Path]::GetFileName($file) + $extractDir = Join-Path $using:ExtractPath "$fileName.extracted" + + New-Item $extractDir -ItemType Directory -Force | Out-Null + + Write-Host "Extracting '$file' to '$extractDir'..." + + # Pipe errors to stdout to prevent PowerShell detecting them and quitting the job early. + # This type of quit skips the catch, so we wouldn't be able to tell which file triggered the + # error. Save output so it can be stored in the exception string along with context. + $output = tar -xf $file -C $extractDir 2>&1 + # Handle NZEC manually rather than using Exit-IfNZEC: we are in a background job, so we + # don't have access to the outer scope. + if ($LASTEXITCODE -ne 0) { + throw "Error extracting '$file': non-zero exit code ($LASTEXITCODE). Output: '$output'" + } + + Write-Host "Extracted to $extractDir" + } + } + + Receive-Job $jobs -Wait + } +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index 3d9c87aba6a..2eac8c78f10 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -1,13 +1,9 @@ Param( [string] $GuardianCliLocation, [string] $WorkingDirectory, - [string] $TargetDirectory, [string] $GdnFolder, - [string[]] $ToolsList, [string] $UpdateBaseline, - [string] $GuardianLoggerLevel='Standard', - [string[]] $CrScanAdditionalRunConfigParams, - [string[]] $PoliCheckAdditionalRunConfigParams + [string] $GuardianLoggerLevel='Standard' ) $ErrorActionPreference = 'Stop' @@ -23,7 +19,6 @@ try { . $PSScriptRoot\..\tools.ps1 # We store config files in the r directory of .gdn - Write-Host $ToolsList $gdnConfigPath = Join-Path $GdnFolder 'r' $ValidPath = Test-Path $GuardianCliLocation @@ -33,37 +28,18 @@ try { ExitWithExitCode 1 } - $configParam = @('--config') - - foreach ($tool in $ToolsList) { - $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig" - Write-Host $tool - # We have to manually configure tools that run on source to look at the source directory only - if ($tool -eq 'credscan') { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian configure for $tool failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - } - if ($tool -eq 'policheck') { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams}) - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian configure for $tool failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE - } - } - - $configParam+=$gdnConfigFile - } - - Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam" - & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam - if ($LASTEXITCODE -ne 0) { - Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE." - ExitWithExitCode $LASTEXITCODE + $gdnConfigFiles = Get-ChildItem $gdnConfigPath -Recurse -Include '*.gdnconfig' + Write-Host "Discovered Guardian config files:" + $gdnConfigFiles | Out-String | Write-Host + + Exec-BlockVerbosely { + & $GuardianCliLocation run ` + --working-directory $WorkingDirectory ` + --baseline mainbaseline ` + --update-baseline $UpdateBaseline ` + --logger-level $GuardianLoggerLevel ` + --config @gdnConfigFiles + Exit-IfNZEC "Sdl" } } catch { diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 4a32181fd8f..69eb67849d7 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -2,17 +2,41 @@ parameters: enable: 'false' # Whether the SDL validation job should execute or not overrideParameters: '' # Optional: to override values for parameters. additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth + # diagnosis of problems with specific tool configurations. + publishGuardianDirectoryToPipeline: false + # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL + # parameters rather than relying on YAML. It may be better to use a local script, because you can + # reproduce results locally without piecing together a command based on the YAML. + executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named # 'continueOnError', the parameter value is not correctly picked up. # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; - downloadArtifacts: true # optional: determines if the artifacts should be dowloaded + # optional: determines if build artifacts should be downloaded. + downloadArtifacts: true + # optional: determines if this job should search the directory of downloaded artifacts for + # 'tar.gz' and 'zip' archive files and extract them before running SDL validation tasks. + extractArchiveArtifacts: false dependsOn: '' # Optional: dependencies of the job artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts # Usage: # artifactNames: # - 'BlobArtifacts' # - 'Artifacts_Windows_NT_Release' + # Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts, + # not pipeline artifacts, so doesn't affect the use of this parameter. + pipelineArtifactNames: [] + # Optional: location and ID of the AzDO build that the build/pipeline artifacts should be + # downloaded from. By default, uses runtime expressions to decide based on the variables set by + # the 'setupMaestroVars' dependency. Overriding this parameter is necessary if SDL tasks are + # running without Maestro++/BAR involved, or to download artifacts from a specific existing build + # to iterate quickly on SDL changes. + AzDOProjectName: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] + AzDOPipelineId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] + AzDOBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] jobs: - job: Run_SDL @@ -22,16 +46,29 @@ jobs: variables: - group: DotNet-VSTS-Bot - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] + value: ${{ parameters.AzDOProjectName }} - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] + value: ${{ parameters.AzDOPipelineId }} - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] + value: ${{ parameters.AzDOBuildId }} + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.53.3 + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config pool: - name: Hosted VS2017 + # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. + ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: + name: Hosted VS2017 + ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: + vmImage: windows-2019 steps: - checkout: self clean: true + - ${{ if ne(parameters.downloadArtifacts, 'false')}}: - ${{ if ne(parameters.artifactNames, '') }}: - ${{ each artifactName in parameters.artifactNames }}: @@ -59,16 +96,51 @@ jobs: itemPattern: "**" downloadPath: $(Build.ArtifactStagingDirectory)\artifacts checkDownloadedFiles: true + + - ${{ each artifactName in parameters.pipelineArtifactNames }}: + - task: DownloadPipelineArtifact@2 + displayName: Download Pipeline Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + checkDownloadedFiles: true + - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts displayName: Extract Blob Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} + - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts displayName: Extract Package Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} + + - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: + - powershell: eng/common/sdl/extract-artifact-archives.ps1 + -InputPath $(Build.ArtifactStagingDirectory)\artifacts + -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts + displayName: Extract Archive Artifacts + continueOnError: ${{ parameters.sdlContinueOnError }} + + - ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - powershell: | + $content = Get-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content was:`n$content" + + $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') + $content | Set-Content $(GuardianPackagesConfigFile) + + Write-Host "packages.config content updated to:`n$content" + displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} + - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' - task: NuGetCommand@2 @@ -79,15 +151,35 @@ jobs: nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config externalFeedCredentials: GuardianConnect restoreDirectory: $(Build.SourcesDirectory)\.packages + - ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }} + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} displayName: Execute SDL continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.53.3 + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL continueOnError: ${{ parameters.sdlContinueOnError }} + + - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index e20637ed6a1..705b7a1c847 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -29,6 +29,11 @@ steps: officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' fi + internalRuntimeDownloadArgs= + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + fi + targetRidArgs= if [ '${{ parameters.platform.targetRID }}' != '' ]; then targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' @@ -43,6 +48,7 @@ steps: --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ + $internalRuntimeDownloadArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4b255203249..5d526c74d51 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dot.net/v1/dotnet-install.ps1 +# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -106,6 +106,46 @@ function Exec-Process([string]$command, [string]$commandArgs) { } } +# Take the given block, print it, print what the block probably references from the current set of +# variables using low-effort string matching, then run the block. +# +# This is intended to replace the pattern of manually copy-pasting a command, wrapping it in quotes, +# and printing it using "Write-Host". The copy-paste method is more readable in build logs, but less +# maintainable and less reliable. It is easy to make a mistake and modify the command without +# properly updating the "Write-Host" line, resulting in misleading build logs. The probability of +# this mistake makes the pattern hard to trust when it shows up in build logs. Finding the bug in +# existing source code can also be difficult, because the strings are not aligned to each other and +# the line may be 300+ columns long. +# +# By removing the need to maintain two copies of the command, Exec-BlockVerbosely avoids the issues. +# +# In Bash (or any posix-like shell), "set -x" prints usable verbose output automatically. +# "Set-PSDebug" appears to be similar at first glance, but unfortunately, it isn't very useful: it +# doesn't print any info about the variables being used by the command, which is normally the +# interesting part to diagnose. +function Exec-BlockVerbosely([scriptblock] $block) { + Write-Host "--- Running script block:" + $blockString = $block.ToString().Trim() + Write-Host $blockString + + Write-Host "--- List of variables that might be used:" + # For each variable x in the environment, check the block for a reference to x via simple "$x" or + # "@x" syntax. This doesn't detect other ways to reference variables ("${x}" nor "$variable:x", + # among others). It only catches what this function was originally written for: simple + # command-line commands. + $variableTable = Get-Variable | + Where-Object { + $blockString.Contains("`$$($_.Name)") -or $blockString.Contains("@$($_.Name)") + } | + Format-Table -AutoSize -HideTableHeaders -Wrap | + Out-String + Write-Host $variableTable.Trim() + + Write-Host "--- Executing:" + & $block + Write-Host "--- Done running script block!" +} + # createSdkLocationFile parameter enables a file being generated under the toolset directory # which writes the sdk's location into. This is only necessary for cmd --> powershell invocations # as dot sourcing isn't possible. @@ -223,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" @@ -632,6 +672,17 @@ function ExitWithExitCode([int] $exitCode) { exit $exitCode } +# Check if $LASTEXITCODE is a nonzero exit code (NZEC). If so, print a Azure Pipeline error for +# diagnostics, then exit the script with the $LASTEXITCODE. +function Exit-IfNZEC([string] $category = "General") { + Write-Host "Exit code $LASTEXITCODE" + if ($LASTEXITCODE -ne 0) { + $message = "Last command failed with exit code $LASTEXITCODE." + Write-PipelineTelemetryError -Force -Category $category -Message $message + ExitWithExitCode $LASTEXITCODE + } +} + function Stop-Processes() { Write-Host 'Killing running build processes...' foreach ($processName in $processesToStopOnExit) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 05ca99c6b28..828119be411 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dot.net/v1/dotnet-install.sh +# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dot.net/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index c523b66f938..40ceb84331f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.5.21302.13", + "dotnet": "6.0.100-preview.6.21355.2", "runtimes": { "dotnet": [ "3.1.16", @@ -13,12 +13,12 @@ } }, "sdk": { - "version": "6.0.100-preview.5.21302.13", + "version": "6.0.100-preview.6.21355.2", "allowPrerelease": true, "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21357.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21372.16", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16" } } From 131d5da01257f2f59f90a5f020df6ec262323af9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Jul 2021 03:48:34 +0000 Subject: [PATCH 10/17] Update dependencies from https://github.com/dotnet/runtime build 20210723.17 (#25328) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93cf93ca9ff..ea514e96ba0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,46 +6,46 @@ https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef https://github.com/dotnet/runtime 293d47286161827ecc0d6e96f9eb7b82dafe8307 - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef diff --git a/eng/Versions.props b/eng/Versions.props index 0afc3621665..d4e931b2064 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,16 +15,16 @@ False - 6.0.0-preview.7.21372.16 - 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21373.17 + 6.0.0-preview.7.21373.17 6.0.0-preview.6.21276.2 - 6.0.0-preview.7.21372.16 - 6.0.0-preview.7.21372.16 - 6.0.0-preview.7.21372.16 - 6.0.0-preview.7.21372.16 - 6.0.0-preview.7.21372.16 - 6.0.0-preview.7.21372.16 - 6.0.0-preview.7.21372.16 + 6.0.0-preview.7.21373.17 + 6.0.0-preview.7.21373.17 + 6.0.0-preview.7.21373.17 + 6.0.0-preview.7.21373.17 + 6.0.0-preview.7.21373.17 + 6.0.0-preview.7.21373.17 + 6.0.0-preview.7.21373.17 6.0.0-preview.6.21276.2 From 4950317d851134be064afa746a94ec9f478a2132 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 26 Jul 2021 02:12:37 -0700 Subject: [PATCH 11/17] [preview7] Unpin Microsoft.Extensions.Caching.Memory and Microsoft.Extensions.Logging (#25324) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Andriy Svyryd --- Directory.Build.props | 2 +- eng/Version.Details.xml | 10 ++-- eng/Versions.props | 4 +- global.json | 4 +- .../Internal/ObservableBackedBindingList.cs | 4 +- src/EFCore/Metadata/Builders/IndexBuilder.cs | 2 +- .../Query/NorthwindSelectQueryCosmosTest.cs | 42 ++++++++--------- .../Metadata/RelationalIndexTest.cs | 5 +- .../EFCore.Specification.Tests.csproj | 1 - .../Query/NorthwindSelectQueryTestBase.cs | 47 ++++++++++--------- .../NorthwindSelectQuerySqlServerTest.cs | 38 +++++++-------- 11 files changed, 78 insertions(+), 81 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index af76358b8be..85815da8f08 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,7 +21,7 @@ Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore Microsoft Entity Framework Core true - 9.0 + 10.0 portable https://docs.microsoft.com/ef/core/ diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea514e96ba0..b0b8c16aa4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,10 +1,9 @@ - - + https://github.com/dotnet/runtime - 293d47286161827ecc0d6e96f9eb7b82dafe8307 + d17b813d431e63dac3db60b03c2afc17881168b8 https://github.com/dotnet/runtime @@ -34,10 +33,9 @@ https://github.com/dotnet/runtime 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - - + https://github.com/dotnet/runtime - 293d47286161827ecc0d6e96f9eb7b82dafe8307 + d17b813d431e63dac3db60b03c2afc17881168b8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d4e931b2064..42b201b745c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 6.0.0-preview.7.21373.17 6.0.0-preview.7.21373.17 - 6.0.0-preview.6.21276.2 + 6.0.0-preview.7.21373.17 6.0.0-preview.7.21373.17 6.0.0-preview.7.21373.17 6.0.0-preview.7.21373.17 @@ -25,7 +25,7 @@ 6.0.0-preview.7.21373.17 6.0.0-preview.7.21373.17 6.0.0-preview.7.21373.17 - 6.0.0-preview.6.21276.2 + 6.0.0-preview.7.21373.17 3.7.0 diff --git a/global.json b/global.json index 40ceb84331f..a07b40231de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.6.21355.2", + "dotnet": "6.0.100-preview.7.21373.8", "runtimes": { "dotnet": [ "3.1.16", @@ -13,7 +13,7 @@ } }, "sdk": { - "version": "6.0.100-preview.6.21355.2", + "version": "6.0.100-preview.7.21373.8", "allowPrerelease": true, "rollForward": "latestMajor" }, diff --git a/src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs b/src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs index b2ed5da62a4..703bc4f9b2c 100644 --- a/src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs +++ b/src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs @@ -46,10 +46,10 @@ public ObservableBackedBindingList(ICollection observableCollection) /// any release. You should only use it directly in your code with extreme caution and knowing that /// doing so can result in application failures when updating to a new Entity Framework Core release. /// - protected override object AddNewCore() + protected override object? AddNewCore() { _addingNewInstance = true; - _addNewInstance = (T)base.AddNewCore(); + _addNewInstance = (T?)base.AddNewCore(); return _addNewInstance; } diff --git a/src/EFCore/Metadata/Builders/IndexBuilder.cs b/src/EFCore/Metadata/Builders/IndexBuilder.cs index 1fd76b246ae..08a8ae75183 100644 --- a/src/EFCore/Metadata/Builders/IndexBuilder.cs +++ b/src/EFCore/Metadata/Builders/IndexBuilder.cs @@ -28,7 +28,7 @@ public class IndexBuilder : IInfrastructure [EntityFrameworkInternal] public IndexBuilder(IMutableIndex index) { - Builder = ((Index)index).Builder; + Builder = ((Internal.Index)index).Builder; } /// diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs index 392f068c624..e00c74725d1 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs @@ -1098,27 +1098,27 @@ public override Task Project_keyless_entity_FirstOrDefault_without_orderby(bool return base.Project_keyless_entity_FirstOrDefault_without_orderby(async); } - public override async Task Reverse_changes_asc_order_to_desc(bool async) - { - await base.Reverse_changes_asc_order_to_desc(async); - - AssertSql( - @"SELECT c[""EmployeeID""] -FROM root c -WHERE (c[""Discriminator""] = ""Employee"") -ORDER BY c[""EmployeeID""] DESC"); - } - - public override async Task Reverse_changes_desc_order_to_asc(bool async) - { - await base.Reverse_changes_desc_order_to_asc(async); - - AssertSql( - @"SELECT c[""EmployeeID""] -FROM root c -WHERE (c[""Discriminator""] = ""Employee"") -ORDER BY c[""EmployeeID""]"); - } +// public override async Task Reverse_changes_asc_order_to_desc(bool async) +// { +// await base.Reverse_changes_asc_order_to_desc(async); + +// AssertSql( +// @"SELECT c[""EmployeeID""] +//FROM root c +//WHERE (c[""Discriminator""] = ""Employee"") +//ORDER BY c[""EmployeeID""] DESC"); +// } + +// public override async Task Reverse_changes_desc_order_to_asc(bool async) +// { +// await base.Reverse_changes_desc_order_to_asc(async); + +// AssertSql( +// @"SELECT c[""EmployeeID""] +//FROM root c +//WHERE (c[""Discriminator""] = ""Employee"") +//ORDER BY c[""EmployeeID""]"); +// } [ConditionalTheory(Skip = "Issue#17246")] public override Task Projection_AsEnumerable_projection(bool async) diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalIndexTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalIndexTest.cs index 608c2eb6bd9..06eac791aaf 100644 --- a/test/EFCore.Relational.Tests/Metadata/RelationalIndexTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/RelationalIndexTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; -using Microsoft.EntityFrameworkCore.Metadata.Internal; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit; @@ -28,7 +27,7 @@ public void IndexAttribute_database_name_can_be_overriden_using_fluent_api() modelBuilder.Model.FinalizeModel(); - var index0 = (Index)entityBuilder.Metadata.GetIndexes().First(); + var index0 = (Internal.Index)entityBuilder.Metadata.GetIndexes().First(); Assert.Equal(ConfigurationSource.DataAnnotation, index0.GetConfigurationSource()); Assert.Equal("IndexOnAAndB", index0.Name); Assert.Equal("MyIndexOnAAndB", index0.GetDatabaseName()); @@ -40,7 +39,7 @@ public void IndexAttribute_database_name_can_be_overriden_using_fluent_api() prop0 => Assert.Equal("A", prop0.Name), prop1 => Assert.Equal("B", prop1.Name)); - var index1 = (Index)entityBuilder.Metadata.GetIndexes().Skip(1).First(); + var index1 = (Internal.Index)entityBuilder.Metadata.GetIndexes().Skip(1).First(); Assert.Equal(ConfigurationSource.DataAnnotation, index1.GetConfigurationSource()); Assert.Equal("IndexOnBAndC", index1.Name); Assert.Equal("MyIndexOnBAndC", index1.GetDatabaseName()); diff --git a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj index 981d083d827..76cbcfbfdf1 100644 --- a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj +++ b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj @@ -3,7 +3,6 @@ Shared test suite for Entity Framework Core database providers. net6.0 - 9.0 Microsoft.EntityFrameworkCore.Specification.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Specification.Tests/Query/NorthwindSelectQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/NorthwindSelectQueryTestBase.cs index 6e997b744e2..9fbefbd3014 100644 --- a/test/EFCore.Specification.Tests/Query/NorthwindSelectQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/NorthwindSelectQueryTestBase.cs @@ -894,29 +894,30 @@ public virtual Task Projection_in_a_subquery_should_be_liftable(bool async) .Skip(1)); } - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Reverse_changes_asc_order_to_desc(bool async) - { - return AssertQuery( - async, - ss => ss.Set().OrderBy(e => e.EmployeeID) - .Reverse() - .Select(e => $"{e.EmployeeID}"), - assertOrder: true); - } - - [ConditionalTheory] - [MemberData(nameof(IsAsyncData))] - public virtual Task Reverse_changes_desc_order_to_asc(bool async) - { - return AssertQuery( - async, - ss => ss.Set().OrderByDescending(e => e.EmployeeID) - .Select(e => $"{e.EmployeeID}") - .Reverse(), - assertOrder: true); - } + // Doesn't work in .NET 6 + //[ConditionalTheory] + //[MemberData(nameof(IsAsyncData))] + //public virtual Task Reverse_changes_asc_order_to_desc(bool async) + //{ + // return AssertQuery( + // async, + // ss => ss.Set().OrderBy(e => e.EmployeeID) + // .Reverse() + // .Select(e => $"{e.EmployeeID}"), + // assertOrder: true); + //} + + //[ConditionalTheory] + //[MemberData(nameof(IsAsyncData))] + //public virtual Task Reverse_changes_desc_order_to_asc(bool async) + //{ + // return AssertQuery( + // async, + // ss => ss.Set().OrderByDescending(e => e.EmployeeID) + // .Select(e => $"{e.EmployeeID}") + // .Reverse(), + // assertOrder: true); + //} [ConditionalTheory] [MemberData(nameof(IsAsyncData))] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs index f9dc1d7a5d1..171c35b97bd 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs @@ -1361,25 +1361,25 @@ LEFT JOIN ( ) AS [t0] ON [c].[CompanyName] = [t0].[CompanyName]"); } - public override async Task Reverse_changes_asc_order_to_desc(bool async) - { - await base.Reverse_changes_asc_order_to_desc(async); - - AssertSql( - @"SELECT [e].[EmployeeID] -FROM [Employees] AS [e] -ORDER BY [e].[EmployeeID] DESC"); - } - - public override async Task Reverse_changes_desc_order_to_asc(bool async) - { - await base.Reverse_changes_desc_order_to_asc(async); - - AssertSql( - @"SELECT [e].[EmployeeID] -FROM [Employees] AS [e] -ORDER BY [e].[EmployeeID]"); - } +// public override async Task Reverse_changes_asc_order_to_desc(bool async) +// { +// await base.Reverse_changes_asc_order_to_desc(async); + +// AssertSql( +// @"SELECT [e].[EmployeeID] +//FROM [Employees] AS [e] +//ORDER BY [e].[EmployeeID] DESC"); +// } + +// public override async Task Reverse_changes_desc_order_to_asc(bool async) +// { +// await base.Reverse_changes_desc_order_to_asc(async); + +// AssertSql( +// @"SELECT [e].[EmployeeID] +//FROM [Employees] AS [e] +//ORDER BY [e].[EmployeeID]"); +// } public override async Task Projection_AsEnumerable_projection(bool async) { From 8f08a188473e20cfd0d585964372524106e5f20a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 26 Jul 2021 09:34:47 -0700 Subject: [PATCH 12/17] Update dependencies from latest p7 runtime (#25337) --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0b8c16aa4e..d6ae371b899 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef https://github.com/dotnet/runtime @@ -33,9 +33,9 @@ https://github.com/dotnet/runtime 46b249d7a1b2708ea62319d021fc8e61cb6e02ef - + https://github.com/dotnet/runtime - d17b813d431e63dac3db60b03c2afc17881168b8 + 46b249d7a1b2708ea62319d021fc8e61cb6e02ef https://github.com/dotnet/runtime From 74915d4a34ae456dd070711355ad2e47eab401aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 08:03:31 +0000 Subject: [PATCH 13/17] [release/6.0-preview7] Update dependencies from dotnet/runtime (#25338) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6ae371b899..a070f6b9c8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,49 @@ - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a - + https://github.com/dotnet/runtime - 46b249d7a1b2708ea62319d021fc8e61cb6e02ef + ae003344a51bdfad153c4c995851f5652d28836a diff --git a/eng/Versions.props b/eng/Versions.props index 42b201b745c..d777aacd4a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,17 +15,17 @@ False - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 - 6.0.0-preview.7.21373.17 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21376.23 3.7.0 From 2d603e937e021dde9519835eb8ff0fd0a3b36770 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 16:42:51 +0000 Subject: [PATCH 14/17] Update dependencies from https://github.com/dotnet/runtime build 20210727.4 (#25341) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a070f6b9c8d..654cdb6df13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,49 @@ - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 - + https://github.com/dotnet/runtime - ae003344a51bdfad153c4c995851f5652d28836a + d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 diff --git a/eng/Versions.props b/eng/Versions.props index d777aacd4a9..ea631d5f07b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,17 +15,17 @@ False - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 - 6.0.0-preview.7.21376.23 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.4 3.7.0 From bfcdda4dbbc8fb6d23179c9fddb65556d4db1655 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 13:55:29 -0700 Subject: [PATCH 15/17] Update dependencies from https://github.com/dotnet/runtime build 20210727.12 (#25342) Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Logging , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.DependencyModel , System.Collections.Immutable , System.Diagnostics.DiagnosticSource From Version 6.0.0-preview.7.21377.4 -> To Version 6.0.0-preview.7.21377.12 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 654cdb6df13..77febb61140 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,49 @@ - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a - + https://github.com/dotnet/runtime - d9c55e8e8f6be11ec54983db6bbed35cdc2c1897 + d5e38a60fd747ca35386fbf50389fca0ce0dc58a diff --git a/eng/Versions.props b/eng/Versions.props index ea631d5f07b..9ccf9953854 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,17 +15,17 @@ False - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 - 6.0.0-preview.7.21377.4 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.12 3.7.0 From 02c913dc8e95e34916f61720d239459e8db9224e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Jul 2021 18:47:48 +0000 Subject: [PATCH 16/17] Update dependencies from https://github.com/dotnet/runtime build 20210727.19 (#25353) [release/6.0-preview7] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77febb61140..1569202565e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,49 @@ - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da - + https://github.com/dotnet/runtime - d5e38a60fd747ca35386fbf50389fca0ce0dc58a + 91ba01788d4d83475fec3aea7c830376e08585da diff --git a/eng/Versions.props b/eng/Versions.props index 9ccf9953854..be926fb2913 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,17 +15,17 @@ False - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 - 6.0.0-preview.7.21377.12 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 + 6.0.0-preview.7.21377.19 3.7.0 From 9832e7bb75507d321e029b7caa7cccd92bca3755 Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Thu, 29 Jul 2021 09:14:52 -0700 Subject: [PATCH 17/17] Update to .NET 6 Preview 7 Resolves #25148 --- global.json | 4 +- .../Query/NorthwindSelectQueryCosmosTest.cs | 42 ++++++++--------- .../Query/NorthwindSelectQueryTestBase.cs | 47 +++++++++---------- .../NorthwindSelectQuerySqlServerTest.cs | 38 +++++++-------- 4 files changed, 65 insertions(+), 66 deletions(-) diff --git a/global.json b/global.json index 018ea7054fa..6953c069d02 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.7.21373.8", + "dotnet": "6.0.100-preview.7.21377.35", "runtimes": { "dotnet": [ "3.1.16", @@ -13,7 +13,7 @@ } }, "sdk": { - "version": "6.0.100-preview.7.21373.8", + "version": "6.0.100-preview.7.21377.35", "allowPrerelease": true, "rollForward": "latestMajor" }, diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs index efd140e912a..f5def3009fc 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs @@ -1098,27 +1098,27 @@ public override Task Project_keyless_entity_FirstOrDefault_without_orderby(bool return base.Project_keyless_entity_FirstOrDefault_without_orderby(async); } -// public override async Task Reverse_changes_asc_order_to_desc(bool async) -// { -// await base.Reverse_changes_asc_order_to_desc(async); - -// AssertSql( -// @"SELECT c[""EmployeeID""] -//FROM root c -//WHERE (c[""Discriminator""] = ""Employee"") -//ORDER BY c[""EmployeeID""] DESC"); -// } - -// public override async Task Reverse_changes_desc_order_to_asc(bool async) -// { -// await base.Reverse_changes_desc_order_to_asc(async); - -// AssertSql( -// @"SELECT c[""EmployeeID""] -//FROM root c -//WHERE (c[""Discriminator""] = ""Employee"") -//ORDER BY c[""EmployeeID""]"); -// } + public override async Task Reverse_changes_asc_order_to_desc(bool async) + { + await base.Reverse_changes_asc_order_to_desc(async); + + AssertSql( + @"SELECT c[""EmployeeID""] +FROM root c +WHERE (c[""Discriminator""] = ""Employee"") +ORDER BY c[""EmployeeID""] DESC"); + } + + public override async Task Reverse_changes_desc_order_to_asc(bool async) + { + await base.Reverse_changes_desc_order_to_asc(async); + + AssertSql( + @"SELECT c[""EmployeeID""] +FROM root c +WHERE (c[""Discriminator""] = ""Employee"") +ORDER BY c[""EmployeeID""]"); + } [ConditionalTheory(Skip = "Issue#17246")] public override Task Projection_AsEnumerable_projection(bool async) diff --git a/test/EFCore.Specification.Tests/Query/NorthwindSelectQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/NorthwindSelectQueryTestBase.cs index 154c5b9bfb5..11fdc69177f 100644 --- a/test/EFCore.Specification.Tests/Query/NorthwindSelectQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/NorthwindSelectQueryTestBase.cs @@ -894,30 +894,29 @@ public virtual Task Projection_in_a_subquery_should_be_liftable(bool async) .Skip(1)); } - // Doesn't work in .NET 6 - //[ConditionalTheory] - //[MemberData(nameof(IsAsyncData))] - //public virtual Task Reverse_changes_asc_order_to_desc(bool async) - //{ - // return AssertQuery( - // async, - // ss => ss.Set().OrderBy(e => e.EmployeeID) - // .Reverse() - // .Select(e => $"{e.EmployeeID}"), - // assertOrder: true); - //} - - //[ConditionalTheory] - //[MemberData(nameof(IsAsyncData))] - //public virtual Task Reverse_changes_desc_order_to_asc(bool async) - //{ - // return AssertQuery( - // async, - // ss => ss.Set().OrderByDescending(e => e.EmployeeID) - // .Select(e => $"{e.EmployeeID}") - // .Reverse(), - // assertOrder: true); - //} + [ConditionalTheory] + [MemberData(nameof(IsAsyncData))] + public virtual Task Reverse_changes_asc_order_to_desc(bool async) + { + return AssertQuery( + async, + ss => ss.Set().OrderBy(e => e.EmployeeID) + .Reverse() + .Select(e => $"{e.EmployeeID}"), + assertOrder: true); + } + + [ConditionalTheory] + [MemberData(nameof(IsAsyncData))] + public virtual Task Reverse_changes_desc_order_to_asc(bool async) + { + return AssertQuery( + async, + ss => ss.Set().OrderByDescending(e => e.EmployeeID) + .Select(e => $"{e.EmployeeID}") + .Reverse(), + assertOrder: true); + } [ConditionalTheory] [MemberData(nameof(IsAsyncData))] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs index 9271a56e2aa..cee456f864b 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindSelectQuerySqlServerTest.cs @@ -1361,25 +1361,25 @@ LEFT JOIN ( ) AS [t0] ON [c].[CompanyName] = [t0].[CompanyName]"); } -// public override async Task Reverse_changes_asc_order_to_desc(bool async) -// { -// await base.Reverse_changes_asc_order_to_desc(async); - -// AssertSql( -// @"SELECT [e].[EmployeeID] -//FROM [Employees] AS [e] -//ORDER BY [e].[EmployeeID] DESC"); -// } - -// public override async Task Reverse_changes_desc_order_to_asc(bool async) -// { -// await base.Reverse_changes_desc_order_to_asc(async); - -// AssertSql( -// @"SELECT [e].[EmployeeID] -//FROM [Employees] AS [e] -//ORDER BY [e].[EmployeeID]"); -// } + public override async Task Reverse_changes_asc_order_to_desc(bool async) + { + await base.Reverse_changes_asc_order_to_desc(async); + + AssertSql( + @"SELECT [e].[EmployeeID] +FROM [Employees] AS [e] +ORDER BY [e].[EmployeeID] DESC"); + } + + public override async Task Reverse_changes_desc_order_to_asc(bool async) + { + await base.Reverse_changes_desc_order_to_asc(async); + + AssertSql( + @"SELECT [e].[EmployeeID] +FROM [Employees] AS [e] +ORDER BY [e].[EmployeeID]"); + } public override async Task Projection_AsEnumerable_projection(bool async) {