From 90b94289e7dc215e41ae3c28aadfe5dd6cc8407d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 9 Jun 2020 22:07:04 +0000 Subject: [PATCH 1/7] Merge pull request 8351 from darc-internal/release/3.1-2d140ad5-16f8-41ee-b14c-9a358be887c9 into internal/release/3.1 --- NuGet.config | 3 +++ eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3bcd259e940..1f4f7080bd5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 692a4afb685..d64bbe5e56b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,47 +27,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3e8d1ac162a69a4300f54a27c1e980a27171d6da - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + + https://github.com/dotnet/extensions + d69469ab7a97c7ad147d8f1b728bb4283cbafbae - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + + https://github.com/dotnet/extensions + d69469ab7a97c7ad147d8f1b728bb4283cbafbae - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + + https://github.com/dotnet/extensions + d69469ab7a97c7ad147d8f1b728bb4283cbafbae - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + + https://github.com/dotnet/extensions + d69469ab7a97c7ad147d8f1b728bb4283cbafbae - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + + https://github.com/dotnet/extensions + d69469ab7a97c7ad147d8f1b728bb4283cbafbae https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3e8d1ac162a69a4300f54a27c1e980a27171d6da - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + + https://github.com/dotnet/extensions + d69469ab7a97c7ad147d8f1b728bb4283cbafbae - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + + https://github.com/dotnet/extensions + d69469ab7a97c7ad147d8f1b728bb4283cbafbae https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3e8d1ac162a69a4300f54a27c1e980a27171d6da - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3e8d1ac162a69a4300f54a27c1e980a27171d6da https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index 253c81897e4..ad5928d2712 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,13 +32,13 @@ 1.0.19269.1 - 3.1.5 - 3.1.5 - 3.1.5 - 3.1.5 - 3.1.5 - 3.1.5-servicing.20270.9 - 3.1.5 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6-servicing.20309.3 + 3.1.6 1.1.1 @@ -56,7 +56,7 @@ 3.1.5 3.1.0 3.1.5 - 3.1.5-servicing.20270.5 + 3.1.5-servicing.20302.2 2.1.0 From 4474832e12243eb051f5eb0958a10705f7403342 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Jun 2020 08:28:53 +0000 Subject: [PATCH 2/7] Merge pull request 8459 from darc-internal/release/3.1-4c0259e4-de99-4f88-b645-0ae11bb5f91d into internal/release/3.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++----- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f4f7080bd5..555c167a201 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d64bbe5e56b..51c7922feb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,49 +25,49 @@ https://github.com/dotnet/corefx 8a3ffed558ddf943c1efa87d693227722d6af094 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 3e8d1ac162a69a4300f54a27c1e980a27171d6da + 357f073821523c579f83b13802b754bc77d3a0f5 - https://github.com/dotnet/extensions - d69469ab7a97c7ad147d8f1b728bb4283cbafbae + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 5402aed8d1a34971d16a73b52b750bd718ba6f1f - https://github.com/dotnet/extensions - d69469ab7a97c7ad147d8f1b728bb4283cbafbae + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 5402aed8d1a34971d16a73b52b750bd718ba6f1f - https://github.com/dotnet/extensions - d69469ab7a97c7ad147d8f1b728bb4283cbafbae + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 5402aed8d1a34971d16a73b52b750bd718ba6f1f - https://github.com/dotnet/extensions - d69469ab7a97c7ad147d8f1b728bb4283cbafbae + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 5402aed8d1a34971d16a73b52b750bd718ba6f1f - https://github.com/dotnet/extensions - d69469ab7a97c7ad147d8f1b728bb4283cbafbae + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 5402aed8d1a34971d16a73b52b750bd718ba6f1f - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 3e8d1ac162a69a4300f54a27c1e980a27171d6da + 357f073821523c579f83b13802b754bc77d3a0f5 - - https://github.com/dotnet/extensions - d69469ab7a97c7ad147d8f1b728bb4283cbafbae + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 5402aed8d1a34971d16a73b52b750bd718ba6f1f - https://github.com/dotnet/extensions - d69469ab7a97c7ad147d8f1b728bb4283cbafbae + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 5402aed8d1a34971d16a73b52b750bd718ba6f1f - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 3e8d1ac162a69a4300f54a27c1e980a27171d6da + 357f073821523c579f83b13802b754bc77d3a0f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 3e8d1ac162a69a4300f54a27c1e980a27171d6da + 357f073821523c579f83b13802b754bc77d3a0f5 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index ad5928d2712..afe0a8e5fd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.1.6 3.1.6 3.1.6 - 3.1.6-servicing.20309.3 + 3.1.6-servicing.20312.2 3.1.6 @@ -52,11 +52,11 @@ 4.7.1 - 3.1.5 - 3.1.5 + 3.1.6 + 3.1.6 3.1.0 - 3.1.5 - 3.1.5-servicing.20302.2 + 3.1.6 + 3.1.6-servicing.20311.2 2.1.0 From 23d8eb13a391747fefc0ab7068984d45ec9d00a9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Jun 2020 21:53:43 +0000 Subject: [PATCH 3/7] Merge pull request 8496 from darc-internal/release/3.1-94c68a85-3e34-4a24-a9ff-6c68bfe6f6f3 into internal/release/3.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 555c167a201..c92a9fd7ccf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51c7922feb7..1dee043d213 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,47 +27,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 357f073821523c579f83b13802b754bc77d3a0f5 + 5c605c4f1703725e2d0b6c523b55f91109138653 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5402aed8d1a34971d16a73b52b750bd718ba6f1f + 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5402aed8d1a34971d16a73b52b750bd718ba6f1f + 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5402aed8d1a34971d16a73b52b750bd718ba6f1f + 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5402aed8d1a34971d16a73b52b750bd718ba6f1f + 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5402aed8d1a34971d16a73b52b750bd718ba6f1f + 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 357f073821523c579f83b13802b754bc77d3a0f5 + 5c605c4f1703725e2d0b6c523b55f91109138653 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5402aed8d1a34971d16a73b52b750bd718ba6f1f + 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5402aed8d1a34971d16a73b52b750bd718ba6f1f + 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 357f073821523c579f83b13802b754bc77d3a0f5 + 5c605c4f1703725e2d0b6c523b55f91109138653 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 357f073821523c579f83b13802b754bc77d3a0f5 + 5c605c4f1703725e2d0b6c523b55f91109138653 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index afe0a8e5fd8..80c0a58d0e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.1.6 3.1.6 3.1.6 - 3.1.6-servicing.20312.2 + 3.1.6-servicing.20312.5 3.1.6 @@ -56,7 +56,7 @@ 3.1.6 3.1.0 3.1.6 - 3.1.6-servicing.20311.2 + 3.1.6-servicing.20312.2 2.1.0 From ba3b140a00aca2fc8e786bced8ed265a3c452632 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Jun 2020 01:40:28 +0000 Subject: [PATCH 4/7] Merge pull request 8566 from darc-internal/release/3.1-f2e4ec1c-ab5b-441a-a333-70dab70ee677 into internal/release/3.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index c92a9fd7ccf..ee823d4c765 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1dee043d213..fbaa4ba0da6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,47 +27,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 5c605c4f1703725e2d0b6c523b55f91109138653 + a8ac54c83e7ed2fc8785777c7b103667029b5b0b https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 + ef51f45ca057ffb97ac7b7f07192ebe465531c40 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 + ef51f45ca057ffb97ac7b7f07192ebe465531c40 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 + ef51f45ca057ffb97ac7b7f07192ebe465531c40 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 + ef51f45ca057ffb97ac7b7f07192ebe465531c40 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 + ef51f45ca057ffb97ac7b7f07192ebe465531c40 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 5c605c4f1703725e2d0b6c523b55f91109138653 + a8ac54c83e7ed2fc8785777c7b103667029b5b0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 + ef51f45ca057ffb97ac7b7f07192ebe465531c40 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 5feb433e4d3c35dc2807c5bbc64bc8c2796ae769 + ef51f45ca057ffb97ac7b7f07192ebe465531c40 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 5c605c4f1703725e2d0b6c523b55f91109138653 + a8ac54c83e7ed2fc8785777c7b103667029b5b0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 5c605c4f1703725e2d0b6c523b55f91109138653 + a8ac54c83e7ed2fc8785777c7b103667029b5b0b https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index 80c0a58d0e9..f9000243be4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.1.6 3.1.6 3.1.6 - 3.1.6-servicing.20312.5 + 3.1.6-servicing.20316.3 3.1.6 @@ -56,7 +56,7 @@ 3.1.6 3.1.0 3.1.6 - 3.1.6-servicing.20312.2 + 3.1.6-servicing.20316.2 2.1.0 From 509fe041d6d740af8122cae870bf58f2c33c38f3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Jun 2020 07:38:17 +0000 Subject: [PATCH 5/7] Merge pull request 8580 from darc-internal/release/3.1-23370735-7458-44f2-9cd6-53ae25394c9c into internal/release/3.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index ee823d4c765..4f7d481ff74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbaa4ba0da6..cc0ebc387bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,47 +27,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a8ac54c83e7ed2fc8785777c7b103667029b5b0b + 3acd9b0cd16596bad450c82be08780875a73c05c https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ef51f45ca057ffb97ac7b7f07192ebe465531c40 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ef51f45ca057ffb97ac7b7f07192ebe465531c40 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ef51f45ca057ffb97ac7b7f07192ebe465531c40 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ef51f45ca057ffb97ac7b7f07192ebe465531c40 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ef51f45ca057ffb97ac7b7f07192ebe465531c40 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a8ac54c83e7ed2fc8785777c7b103667029b5b0b + 3acd9b0cd16596bad450c82be08780875a73c05c - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ef51f45ca057ffb97ac7b7f07192ebe465531c40 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ef51f45ca057ffb97ac7b7f07192ebe465531c40 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a8ac54c83e7ed2fc8785777c7b103667029b5b0b + 3acd9b0cd16596bad450c82be08780875a73c05c - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a8ac54c83e7ed2fc8785777c7b103667029b5b0b + 3acd9b0cd16596bad450c82be08780875a73c05c https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index f9000243be4..82344073fe3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.1.6 3.1.6 3.1.6 - 3.1.6-servicing.20316.3 + 3.1.6-servicing.20316.5 3.1.6 @@ -56,7 +56,7 @@ 3.1.6 3.1.0 3.1.6 - 3.1.6-servicing.20316.2 + 3.1.6-servicing.20316.4 2.1.0 From fcb7c94377ad068688c254a53a6a51a3bed24a05 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 14 Jul 2020 12:21:33 -0700 Subject: [PATCH 6/7] Fixup nuget.config --- NuGet.config | 3 --- 1 file changed, 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4f7d481ff74..3bcd259e940 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,6 @@ - - - From be15feeb2c96ba73b34a0fc6368cd1507e616633 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 14 Jul 2020 12:21:48 -0700 Subject: [PATCH 7/7] Update branding to 3.1.7 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 82344073fe3..a5dec5c0a02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 3.1.6 + 3.1.7 servicing False true