From 7ae8e218d561965acad0fbc5b530942ecab4b8e5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 31 Aug 2023 23:03:10 +0000 Subject: [PATCH 01/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e21b29e5c5a..eb1650b9c8b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,12 @@ - + + + @@ -26,9 +28,11 @@ - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e338eb9b5222..9d37dc7456e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8133d0c827462d8d84e47b70f294fc060a5d7a84 + 8e673cea5dd610473fb242522dcc14dc897e27c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8133d0c827462d8d84e47b70f294fc060a5d7a84 + 8e673cea5dd610473fb242522dcc14dc897e27c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8133d0c827462d8d84e47b70f294fc060a5d7a84 + 8e673cea5dd610473fb242522dcc14dc897e27c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8133d0c827462d8d84e47b70f294fc060a5d7a84 + 8e673cea5dd610473fb242522dcc14dc897e27c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8133d0c827462d8d84e47b70f294fc060a5d7a84 + 8e673cea5dd610473fb242522dcc14dc897e27c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8133d0c827462d8d84e47b70f294fc060a5d7a84 + 8e673cea5dd610473fb242522dcc14dc897e27c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8133d0c827462d8d84e47b70f294fc060a5d7a84 + 8e673cea5dd610473fb242522dcc14dc897e27c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8133d0c827462d8d84e47b70f294fc060a5d7a84 + 8e673cea5dd610473fb242522dcc14dc897e27c3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a5d253183670..9744937e0074 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,14 +125,14 @@ 7.0.4 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 7.0.0-beta.23408.3 7.0.0-beta.23408.3 From 3240a7c2c500536758b25b6b107f9ea1bc6fd7d8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Sep 2023 06:41:58 +0000 Subject: [PATCH 02/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 8 ++------ eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 14 +++++++------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index eb1650b9c8b4..df2b1093c9eb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -31,9 +29,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d37dc7456e1..f1acd8445bf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3f15c71ba0e53d91651b1b874dce162987c614ef https://github.com/dotnet/source-build-externals @@ -256,39 +256,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3f15c71ba0e53d91651b1b874dce162987c614ef https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3f15c71ba0e53d91651b1b874dce162987c614ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3f15c71ba0e53d91651b1b874dce162987c614ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3f15c71ba0e53d91651b1b874dce162987c614ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3f15c71ba0e53d91651b1b874dce162987c614ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3f15c71ba0e53d91651b1b874dce162987c614ef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3f15c71ba0e53d91651b1b874dce162987c614ef https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 9744937e0074..a2f01f2b2f31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,12 +63,12 @@ 7.0.0 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11-servicing.23424.27 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12-servicing.23431.22 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.11-servicing.23424.27 + 7.0.12-servicing.23431.22 7.0.0 7.0.2 7.0.0 From 9bb94f3ef5b825e1ac6d3736775a34c6c4977f11 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 2 Sep 2023 05:04:02 +0000 Subject: [PATCH 03/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index df2b1093c9eb..9801842bc65e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1acd8445bf6..5ee58223c61b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f15c71ba0e53d91651b1b874dce162987c614ef + 87c3030c1336643637eb14bdf6aeeb185063b027 https://github.com/dotnet/source-build-externals @@ -256,7 +256,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f15c71ba0e53d91651b1b874dce162987c614ef + 87c3030c1336643637eb14bdf6aeeb185063b027 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f15c71ba0e53d91651b1b874dce162987c614ef + 87c3030c1336643637eb14bdf6aeeb185063b027 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f15c71ba0e53d91651b1b874dce162987c614ef + 87c3030c1336643637eb14bdf6aeeb185063b027 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f15c71ba0e53d91651b1b874dce162987c614ef + 87c3030c1336643637eb14bdf6aeeb185063b027 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f15c71ba0e53d91651b1b874dce162987c614ef + 87c3030c1336643637eb14bdf6aeeb185063b027 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f15c71ba0e53d91651b1b874dce162987c614ef + 87c3030c1336643637eb14bdf6aeeb185063b027 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3f15c71ba0e53d91651b1b874dce162987c614ef + 87c3030c1336643637eb14bdf6aeeb185063b027 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a2f01f2b2f31..777e6328433a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.12 7.0.12 7.0.12 - 7.0.12-servicing.23431.22 + 7.0.12-servicing.23451.16 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.12-servicing.23431.22 + 7.0.12-servicing.23451.16 7.0.0 7.0.2 7.0.0 From 12f7067ac39cf7907c6a9023a7880ecf76eee0b2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Sep 2023 11:27:34 +0000 Subject: [PATCH 04/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9801842bc65e..d9ad639e2685 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ee58223c61b..7d99b29b045f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e673cea5dd610473fb242522dcc14dc897e27c3 + a81057960c7bfa3decdc605296fc9c7aa7659779 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e673cea5dd610473fb242522dcc14dc897e27c3 + a81057960c7bfa3decdc605296fc9c7aa7659779 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e673cea5dd610473fb242522dcc14dc897e27c3 + a81057960c7bfa3decdc605296fc9c7aa7659779 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e673cea5dd610473fb242522dcc14dc897e27c3 + a81057960c7bfa3decdc605296fc9c7aa7659779 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e673cea5dd610473fb242522dcc14dc897e27c3 + a81057960c7bfa3decdc605296fc9c7aa7659779 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e673cea5dd610473fb242522dcc14dc897e27c3 + a81057960c7bfa3decdc605296fc9c7aa7659779 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e673cea5dd610473fb242522dcc14dc897e27c3 + a81057960c7bfa3decdc605296fc9c7aa7659779 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e673cea5dd610473fb242522dcc14dc897e27c3 + a81057960c7bfa3decdc605296fc9c7aa7659779 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From b056b7af6535c39c5464aff05d6202d807de8af2 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 6 Sep 2023 19:12:43 +0000 Subject: [PATCH 05/20] Prevent submission of EditForm after disposal Prevent submission of EditForm after disposal --- .../Components/src/ComponentBase.cs | 3 ++ src/Components/Components/src/RenderHandle.cs | 3 ++ .../Components/src/RenderTree/Renderer.cs | 4 +++ src/Components/Web/src/Forms/EditForm.cs | 6 ++++ .../test/E2ETest/Tests/FormsTest.cs | 33 +++++++++++++++++++ .../FormsTest/SimpleValidationComponent.razor | 12 +++++++ 6 files changed, 61 insertions(+) diff --git a/src/Components/Components/src/ComponentBase.cs b/src/Components/Components/src/ComponentBase.cs index 1c172a30f54c..a4738625053a 100644 --- a/src/Components/Components/src/ComponentBase.cs +++ b/src/Components/Components/src/ComponentBase.cs @@ -326,4 +326,7 @@ Task IHandleAfterRender.OnAfterRenderAsync() // have to use "async void" and do their own exception handling in // the case where they want to start an async task. } + + // Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards. + internal bool IsComponentDisposed() => _renderHandle.IsComponentDisposed(); } diff --git a/src/Components/Components/src/RenderHandle.cs b/src/Components/Components/src/RenderHandle.cs index 62edaab1d7a2..285ee7d06f56 100644 --- a/src/Components/Components/src/RenderHandle.cs +++ b/src/Components/Components/src/RenderHandle.cs @@ -70,4 +70,7 @@ private static void ThrowNotInitialized() { throw new InvalidOperationException("The render handle is not yet assigned."); } + + // Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards. + internal bool IsComponentDisposed() => _renderer?.IsComponentDisposed(_componentId) ?? false; } diff --git a/src/Components/Components/src/RenderTree/Renderer.cs b/src/Components/Components/src/RenderTree/Renderer.cs index 51550c2b9957..3c91a368f0b8 100644 --- a/src/Components/Components/src/RenderTree/Renderer.cs +++ b/src/Components/Components/src/RenderTree/Renderer.cs @@ -1119,4 +1119,8 @@ public async ValueTask DisposeAsync() } } } + + // Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards. + internal bool IsComponentDisposed(int componentId) + => !_componentStateById.ContainsKey(componentId); } diff --git a/src/Components/Web/src/Forms/EditForm.cs b/src/Components/Web/src/Forms/EditForm.cs index b2f3186daa3b..9b95a45aede3 100644 --- a/src/Components/Web/src/Forms/EditForm.cs +++ b/src/Components/Web/src/Forms/EditForm.cs @@ -136,6 +136,12 @@ private async Task HandleSubmitAsync() { Debug.Assert(_editContext != null); + // Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards. + if (IsComponentDisposed()) + { + return; + } + if (OnSubmit.HasDelegate) { // When using OnSubmit, the developer takes control of the validation lifecycle diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs index 2770ab4ee556..f14bd5cf1c09 100644 --- a/src/Components/test/E2ETest/Tests/FormsTest.cs +++ b/src/Components/test/E2ETest/Tests/FormsTest.cs @@ -809,6 +809,39 @@ public void CanHaveModelLevelValidationErrors() Browser.Collection(logEntries, x => Assert.Equal("OnValidSubmit", x)); } + [Fact] + public async Task CannotSubmitEditFormSynchronouslyAfterItWasRemoved() + { + var appElement = MountSimpleValidationComponent(); + + var submitButtonFinder = By.CssSelector("button[type=submit]"); + Browser.Exists(submitButtonFinder); + + // Remove the form then immediately also submit it, so the server receives both + // the 'remove' and 'submit' commands (in that order) before it updates the UI + appElement.FindElement(By.Id("remove-form")).Click(); + + try + { + appElement.FindElement(submitButtonFinder).Click(); + } + catch (NoSuchElementException) + { + // This should happen on WebAssembly because the form will be removed synchronously + // That means the test has passed + return; + } + + // Wait for the removal to complete, which is intentionally delayed to ensure + // this test can submit a second instruction before the first is processed. Then + // wait a bit more to be really sure the second instruction was processed. + Browser.DoesNotExist(submitButtonFinder); + await Task.Delay(1000); + + // Verify that the form submit event was not processed + Browser.DoesNotExist(By.Id("last-callback")); + } + private Func CreateValidationMessagesAccessor(IWebElement appElement, string messageSelector = ".validation-message") { return () => appElement.FindElements(By.CssSelector(messageSelector)) diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor index 8bceb63f5b71..0428e7baa1d1 100644 --- a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor @@ -1,6 +1,8 @@ @using System.ComponentModel.DataAnnotations @using Microsoft.AspNetCore.Components.Forms +@if (!removeForm) +{ @@ -22,16 +24,20 @@ +} @if (lastCallback != null) { @lastCallback } +

+ @code { protected virtual bool UseExperimentalValidator => false; string lastCallback; + bool removeForm; [Required(ErrorMessage = "Please choose a username")] public string UserName { get; set; } @@ -49,4 +55,10 @@ { lastCallback = "OnInvalidSubmit"; } + + void RemoveForm() + { + removeForm = true; + Thread.Sleep(1000); // To ensure we can dispatch another event before this completes + } } From 7d0ed670ebfbd7bc42fed1e7871d16b9907e3858 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 13 Sep 2023 01:21:52 +0000 Subject: [PATCH 06/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9ad639e2685..b1e8c621480c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d99b29b045f..d8aafa2c3a4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a81057960c7bfa3decdc605296fc9c7aa7659779 + 830d1b2c713417edd02f3f3d108595e3bbef9165 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a81057960c7bfa3decdc605296fc9c7aa7659779 + 830d1b2c713417edd02f3f3d108595e3bbef9165 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a81057960c7bfa3decdc605296fc9c7aa7659779 + 830d1b2c713417edd02f3f3d108595e3bbef9165 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a81057960c7bfa3decdc605296fc9c7aa7659779 + 830d1b2c713417edd02f3f3d108595e3bbef9165 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a81057960c7bfa3decdc605296fc9c7aa7659779 + 830d1b2c713417edd02f3f3d108595e3bbef9165 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a81057960c7bfa3decdc605296fc9c7aa7659779 + 830d1b2c713417edd02f3f3d108595e3bbef9165 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a81057960c7bfa3decdc605296fc9c7aa7659779 + 830d1b2c713417edd02f3f3d108595e3bbef9165 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a81057960c7bfa3decdc605296fc9c7aa7659779 + 830d1b2c713417edd02f3f3d108595e3bbef9165 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 3fc454f070612cd24b08333d25d9e81908293a09 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 13 Sep 2023 13:14:16 +0000 Subject: [PATCH 07/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1e8c621480c..8ebc787550f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8aafa2c3a4a..a78da2183ee7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 830d1b2c713417edd02f3f3d108595e3bbef9165 + f16e454a752548577728fda7a7b20a8ad7405f36 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 830d1b2c713417edd02f3f3d108595e3bbef9165 + f16e454a752548577728fda7a7b20a8ad7405f36 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 830d1b2c713417edd02f3f3d108595e3bbef9165 + f16e454a752548577728fda7a7b20a8ad7405f36 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 830d1b2c713417edd02f3f3d108595e3bbef9165 + f16e454a752548577728fda7a7b20a8ad7405f36 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 830d1b2c713417edd02f3f3d108595e3bbef9165 + f16e454a752548577728fda7a7b20a8ad7405f36 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 830d1b2c713417edd02f3f3d108595e3bbef9165 + f16e454a752548577728fda7a7b20a8ad7405f36 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 830d1b2c713417edd02f3f3d108595e3bbef9165 + f16e454a752548577728fda7a7b20a8ad7405f36 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 830d1b2c713417edd02f3f3d108595e3bbef9165 + f16e454a752548577728fda7a7b20a8ad7405f36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 46170f5979467af9967f81ceea3c10532c580e94 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 14 Sep 2023 01:09:32 +0000 Subject: [PATCH 08/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8ebc787550f9..3590ce632239 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a78da2183ee7..a236a07bde10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 87c3030c1336643637eb14bdf6aeeb185063b027 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 https://github.com/dotnet/source-build-externals @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 87c3030c1336643637eb14bdf6aeeb185063b027 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 87c3030c1336643637eb14bdf6aeeb185063b027 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 87c3030c1336643637eb14bdf6aeeb185063b027 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 87c3030c1336643637eb14bdf6aeeb185063b027 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 87c3030c1336643637eb14bdf6aeeb185063b027 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 87c3030c1336643637eb14bdf6aeeb185063b027 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index f2cd37bc7795..26e709011edb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.12 7.0.12 7.0.12 - 7.0.12-servicing.23451.16 + 7.0.12-servicing.23463.5 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.12-servicing.23451.16 + 7.0.12-servicing.23463.5 7.0.0 7.0.2 7.0.0 From 3b98a551683f4a78926f61dc1860f9ae89be2b3d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Fri, 15 Sep 2023 17:01:19 +0000 Subject: [PATCH 09/20] Merged PR 33717: Updated Version.Details.xml - revert sha for System.Threading.RateLimiting Updated Version.Details.xml - revert System.Threading.RateLimiting sha to ecb34f85ec92e1b3c814edf7da83337e199e7f66 found here: https://nuget.info/packages/System.Threading.RateLimiting/7.0.1 --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a236a07bde10..3defd2458780 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,7 +256,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 87c3030c1336643637eb14bdf6aeeb185063b027 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From a0f21aa90898bc155ef2b4510947b19423fe5416 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 11 Oct 2023 03:08:19 +0000 Subject: [PATCH 10/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3590ce632239..26efb9dfdb9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,11 @@ - + + @@ -26,9 +27,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3defd2458780..4097f41c9615 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f16e454a752548577728fda7a7b20a8ad7405f36 + c52b33c7863c7d966c38c46ddcd5519fc596c25d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f16e454a752548577728fda7a7b20a8ad7405f36 + c52b33c7863c7d966c38c46ddcd5519fc596c25d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f16e454a752548577728fda7a7b20a8ad7405f36 + c52b33c7863c7d966c38c46ddcd5519fc596c25d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f16e454a752548577728fda7a7b20a8ad7405f36 + c52b33c7863c7d966c38c46ddcd5519fc596c25d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f16e454a752548577728fda7a7b20a8ad7405f36 + c52b33c7863c7d966c38c46ddcd5519fc596c25d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f16e454a752548577728fda7a7b20a8ad7405f36 + c52b33c7863c7d966c38c46ddcd5519fc596c25d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f16e454a752548577728fda7a7b20a8ad7405f36 + c52b33c7863c7d966c38c46ddcd5519fc596c25d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f16e454a752548577728fda7a7b20a8ad7405f36 + c52b33c7863c7d966c38c46ddcd5519fc596c25d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ce6cbf994a35..6223ddf87e28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,14 +125,14 @@ 7.0.4 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 7.0.0-beta.23408.3 7.0.0-beta.23408.3 From cfc713fa500d22896747f3cb38a423a5382ab38e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 Oct 2023 19:34:13 +0000 Subject: [PATCH 11/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 8 ++------ eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 26efb9dfdb9e..653f692eab7f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,9 @@ - + - - @@ -27,11 +25,9 @@ - + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4097f41c9615..558b53ecd995 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c52b33c7863c7d966c38c46ddcd5519fc596c25d + ad47bd318603216c6491787152a88edd278fb240 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c52b33c7863c7d966c38c46ddcd5519fc596c25d + ad47bd318603216c6491787152a88edd278fb240 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c52b33c7863c7d966c38c46ddcd5519fc596c25d + ad47bd318603216c6491787152a88edd278fb240 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c52b33c7863c7d966c38c46ddcd5519fc596c25d + ad47bd318603216c6491787152a88edd278fb240 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c52b33c7863c7d966c38c46ddcd5519fc596c25d + ad47bd318603216c6491787152a88edd278fb240 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c52b33c7863c7d966c38c46ddcd5519fc596c25d + ad47bd318603216c6491787152a88edd278fb240 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c52b33c7863c7d966c38c46ddcd5519fc596c25d + ad47bd318603216c6491787152a88edd278fb240 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c52b33c7863c7d966c38c46ddcd5519fc596c25d + ad47bd318603216c6491787152a88edd278fb240 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From fe85e51da53a837edc7786cdb74a9413b96492bf Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 Oct 2023 21:11:59 +0000 Subject: [PATCH 12/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 653f692eab7f..a71a665ffc25 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 558b53ecd995..f07ed81cd73b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ad47bd318603216c6491787152a88edd278fb240 + e3a58ca67dba627be605dc5e9b43b59f7c632d4f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ad47bd318603216c6491787152a88edd278fb240 + e3a58ca67dba627be605dc5e9b43b59f7c632d4f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ad47bd318603216c6491787152a88edd278fb240 + e3a58ca67dba627be605dc5e9b43b59f7c632d4f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ad47bd318603216c6491787152a88edd278fb240 + e3a58ca67dba627be605dc5e9b43b59f7c632d4f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ad47bd318603216c6491787152a88edd278fb240 + e3a58ca67dba627be605dc5e9b43b59f7c632d4f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ad47bd318603216c6491787152a88edd278fb240 + e3a58ca67dba627be605dc5e9b43b59f7c632d4f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ad47bd318603216c6491787152a88edd278fb240 + e3a58ca67dba627be605dc5e9b43b59f7c632d4f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ad47bd318603216c6491787152a88edd278fb240 + e3a58ca67dba627be605dc5e9b43b59f7c632d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From e2ba90c24d00766c9a980621f688bfd84f29cc26 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 17 Oct 2023 00:45:53 +0000 Subject: [PATCH 13/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ecf11c3e4032..6331ede36585 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + @@ -26,6 +27,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de482b57a926..01d17daee360 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 https://github.com/dotnet/source-build-externals @@ -262,33 +262,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8ac3b9fa5afa..3f6754eeb738 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,12 +63,12 @@ 7.0.0 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12-servicing.23477.20 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13-servicing.23513.5 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.12-servicing.23477.20 + 7.0.13-servicing.23513.5 7.0.0 7.0.2 7.0.0 From 466459f06622cdf9c3d036a52375cb271de22134 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 17 Oct 2023 11:28:04 +0000 Subject: [PATCH 14/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6331ede36585..d85f837531b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01d17daee360..87e2827f844f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 + 282d49406e510cf9aac323caafc9aa15fdbb456c https://github.com/dotnet/source-build-externals @@ -242,9 +242,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + 282d49406e510cf9aac323caafc9aa15fdbb456c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 + 282d49406e510cf9aac323caafc9aa15fdbb456c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 + 282d49406e510cf9aac323caafc9aa15fdbb456c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 + 282d49406e510cf9aac323caafc9aa15fdbb456c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 + 282d49406e510cf9aac323caafc9aa15fdbb456c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 62f4e1697cc31ec78a65d9dee90d9c336d6b9721 + 282d49406e510cf9aac323caafc9aa15fdbb456c https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 3f6754eeb738..50b92c6807b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.13 7.0.13 7.0.13 - 7.0.13-servicing.23513.5 + 7.0.13-servicing.23516.30 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.13-servicing.23513.5 + 7.0.13-servicing.23516.30 7.0.0 7.0.2 7.0.0 @@ -118,7 +118,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.3 + 7.0.4 7.0.1 7.0.0 7.0.1 From d4f96fa31d4ffb68cd053196a11824b8589d7879 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Oct 2023 06:27:59 +0000 Subject: [PATCH 15/20] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20231017.18 Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json From Version 7.0.13-servicing.23516.30 -> To Version 7.0.13-servicing.23517.18 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index d85f837531b5..1441606b73b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87e2827f844f..9807ec016515 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://github.com/dotnet/source-build-externals @@ -244,7 +244,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 50b92c6807b5..b8b7c91298b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.13 7.0.13 7.0.13 - 7.0.13-servicing.23516.30 + 7.0.13-servicing.23517.18 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.13-servicing.23516.30 + 7.0.13-servicing.23517.18 7.0.0 7.0.2 7.0.0 From a888aa5356b82788321b2f60e75e4c2555e61a40 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 19 Oct 2023 06:33:47 +0000 Subject: [PATCH 16/20] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 14 +++++++------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1441606b73b7..a453bfcb6619 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9807ec016515..4b26f9ce42c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 https://github.com/dotnet/source-build-externals @@ -244,7 +244,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -262,33 +262,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b8b7c91298b1..4c77975cf607 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,12 +63,12 @@ 7.0.0 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13-servicing.23517.18 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14-servicing.23518.19 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.13-servicing.23517.18 + 7.0.14-servicing.23518.19 7.0.0 7.0.2 7.0.0 From 825db077904f95af264e3e0f682c08506303702d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 03:57:41 +0000 Subject: [PATCH 17/20] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20231019.10 Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json From Version 7.0.14-servicing.23518.19 -> To Version 7.0.14-servicing.23519.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index a453bfcb6619..cb0a4aff2236 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b26f9ce42c0..8c7b9a84b02b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://github.com/dotnet/source-build-externals @@ -244,7 +244,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index f586b04b3298..4ba3e89e105d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.14 7.0.14 7.0.14 - 7.0.14-servicing.23518.19 + 7.0.14-servicing.23519.10 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.14-servicing.23518.19 + 7.0.14-servicing.23519.10 7.0.0 7.0.2 7.0.0 From c91ac8e573a51b5102ce4ea3bca5deeec6d0c0ae Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 23 Oct 2023 20:15:42 +0000 Subject: [PATCH 18/20] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20231023.13 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 7.0.12 -> To Version 7.0.14 --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index cb0a4aff2236..5a4f8306a391 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -25,6 +26,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c7b9a84b02b..920538445b6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c20ecc79b7df3657e186ac52e7fc050beea36c92 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c20ecc79b7df3657e186ac52e7fc050beea36c92 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c20ecc79b7df3657e186ac52e7fc050beea36c92 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c20ecc79b7df3657e186ac52e7fc050beea36c92 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c20ecc79b7df3657e186ac52e7fc050beea36c92 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c20ecc79b7df3657e186ac52e7fc050beea36c92 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c20ecc79b7df3657e186ac52e7fc050beea36c92 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - c20ecc79b7df3657e186ac52e7fc050beea36c92 + 31662b30f1a4497db482b3aed8ed4c4aa6de801b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4ba3e89e105d..77449d052dd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,14 +125,14 @@ 7.0.4 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 7.0.0-beta.23511.9 7.0.0-beta.23511.9 From 8d157a1aebc3351430a439c1a92ccd5506503412 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 14 Nov 2023 13:24:54 -0800 Subject: [PATCH 19/20] Update baseline, SDK --- eng/Baseline.Designer.props | 428 ++++++++++++++++++------------------ eng/Baseline.xml | 208 +++++++++--------- eng/Versions.props | 4 +- global.json | 4 +- 4 files changed, 322 insertions(+), 322 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 61d7f2813e8c..b03207e20d0c 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - - - + + + @@ -35,105 +35,105 @@ - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 @@ -141,121 +141,121 @@ - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 - - + + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - - + + - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 - - - + + + - 7.0.12 + 7.0.14 - - + + - 7.0.12 + 7.0.14 - - + + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - - + + @@ -263,7 +263,7 @@ - 7.0.12 + 7.0.14 @@ -272,50 +272,50 @@ - 7.0.12 + 7.0.14 - + - + - + - + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - - + + @@ -325,8 +325,8 @@ - - + + @@ -334,8 +334,8 @@ - - + + @@ -346,58 +346,58 @@ - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - - + + - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 @@ -414,7 +414,7 @@ - 7.0.12 + 7.0.14 @@ -422,71 +422,71 @@ - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - + - + - + - + - 7.0.12 + 7.0.14 - - + + - + - - + + - 7.0.12 + 7.0.14 - - + + - 7.0.12 + 7.0.14 - - + + - 7.0.12 + 7.0.14 @@ -502,27 +502,27 @@ - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 @@ -531,151 +531,151 @@ - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - - + + - - + + - - + + - 7.0.12 + 7.0.14 - - + + - - + + - - + + - - + + - 7.0.12 + 7.0.14 - + - + - + - + - + - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - - - - + + + + - 7.0.12 + 7.0.14 @@ -684,60 +684,60 @@ - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 @@ -756,7 +756,7 @@ - 7.0.12 + 7.0.14 @@ -778,7 +778,7 @@ - 7.0.12 + 7.0.14 @@ -794,46 +794,46 @@ - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - - - + + + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 @@ -843,7 +843,7 @@ - 7.0.12 + 7.0.14 @@ -852,73 +852,73 @@ - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - + - + - + - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 @@ -947,11 +947,11 @@ - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 @@ -969,13 +969,13 @@ - 7.0.12 + 7.0.14 - 7.0.12 + 7.0.14 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 55daaf5598e6..c6150314843e 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,109 +4,109 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index e0ab58b8bdec..853e4681b6dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 7 0 15 - false + true @@ -238,7 +238,7 @@ 5.0.17-servicing-22215-7 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) - 6.0.22-servicing-23424-15 + 6.0.25-servicing-23523-15 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version) diff --git a/global.json b/global.json index e35b08d604e5..d28f803d7fac 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "7.0.112" + "version": "7.0.114" }, "tools": { - "dotnet": "7.0.112", + "dotnet": "7.0.114", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" From 4f873f6cbcdaab267aacd0d0db4a73db3fb964c8 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 15 Nov 2023 13:20:42 -0800 Subject: [PATCH 20/20] Pass dotnetEfVersion in Helix test runner --- eng/helix/content/runtests.cmd | 5 +++-- eng/helix/content/runtests.sh | 4 ++-- eng/targets/Helix.targets | 4 ++-- eng/tools/HelixTestRunner/HelixTestRunnerOptions.cs | 10 +++++++++- eng/tools/HelixTestRunner/TestRunner.cs | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index 8fd9e85596ce..bbdac7d80453 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -9,6 +9,7 @@ set $arch=%4 set $quarantined=%5 set $helixTimeout=%6 set $installPlaywright=%7 +set $dotnetEfVersion=%8 REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -24,8 +25,8 @@ echo. set exit_code=0 -echo "Running tests: dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%" -dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright% +echo "Running tests: dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright% --dotnetEf %$dotnetEfVersion%" +dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright% --dotnetEf %$dotnetEfVersion% if not errorlevel 0 ( set exit_code=%errorlevel% ) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index ba9ce79418ef..23f4229c2175 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -78,8 +78,8 @@ sync exit_code=0 -echo "Running tests: dotnet $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright" -dotnet $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright +echo "Running tests: dotnet $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright --dotnetEf $8" +dotnet $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright --dotnetEf $8 exit_code=$? echo "Finished tests...exit_code=$exit_code" diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 84eaa3bba42c..f189c471caa5 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -221,8 +221,8 @@ When the targeting pack builds, it has exactly the same version as the shared framework. Passing SharedFxVersion because that's needed even when the targeting pack isn't building. --> - call runtests.cmd $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(_TestingArchitecture) $(RunQuarantinedTests) $(HelixTimeout) $(TestDependsOnPlaywright) - ./runtests.sh $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(_TestingArchitecture) $(RunQuarantinedTests) $(HelixTimeout) $(TestDependsOnPlaywright) + call runtests.cmd $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(_TestingArchitecture) $(RunQuarantinedTests) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotnetEfVersion) + ./runtests.sh $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(_TestingArchitecture) $(RunQuarantinedTests) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotnetEfVersion) $(HelixCommand) $(HelixTimeout) diff --git a/eng/tools/HelixTestRunner/HelixTestRunnerOptions.cs b/eng/tools/HelixTestRunner/HelixTestRunnerOptions.cs index 13d483d64caf..3de5d928c725 100644 --- a/eng/tools/HelixTestRunner/HelixTestRunnerOptions.cs +++ b/eng/tools/HelixTestRunner/HelixTestRunnerOptions.cs @@ -55,11 +55,17 @@ public static HelixTestRunnerOptions Parse(string[] args) new Option( aliases: new string[] { "--source" }, description: "The restore sources to use during testing") - { Argument = new Argument() { Arity = ArgumentArity.ZeroOrMore }, Required = true } + { Argument = new Argument() { Arity = ArgumentArity.ZeroOrMore }, Required = true }, + + new Option( + aliases: new string[] { "--dotnetEf" }, + description: "The version of the dotnet-ef tool being installed and used") + { Argument = new Argument(), Required = true } }; var parseResult = command.Parse(args); var sharedFxVersion = parseResult.ValueForOption("--runtime"); + var dotnetEfVersion = parseResult.ValueForOption("--dotnetEf"); var options = new HelixTestRunnerOptions { Architecture = parseResult.ValueForOption("--arch"), @@ -67,6 +73,7 @@ public static HelixTestRunnerOptions Parse(string[] args) InstallPlaywright = parseResult.ValueForOption("--playwright"), Quarantined = parseResult.ValueForOption("--quarantined"), RuntimeVersion = sharedFxVersion, + DotnetEfVersion = dotnetEfVersion, Target = parseResult.ValueForOption("--target"), Timeout = TimeSpan.Parse(parseResult.ValueForOption("--helixTimeout"), CultureInfo.InvariantCulture), @@ -87,6 +94,7 @@ public static HelixTestRunnerOptions Parse(string[] args) public bool InstallPlaywright { get; private set; } public bool Quarantined { get; private set; } public string RuntimeVersion { get; private set; } + public string DotnetEfVersion { get; private set; } public string Target { get; private set; } public TimeSpan Timeout { get; private set; } diff --git a/eng/tools/HelixTestRunner/TestRunner.cs b/eng/tools/HelixTestRunner/TestRunner.cs index 30285e90ee1e..2202ec79606b 100644 --- a/eng/tools/HelixTestRunner/TestRunner.cs +++ b/eng/tools/HelixTestRunner/TestRunner.cs @@ -134,7 +134,7 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet", cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token); await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet", - $"tool install dotnet-ef --tool-path {Options.HELIX_WORKITEM_ROOT} --add-source {correlationPayload}", + $"tool install dotnet-ef --tool-path {Options.HELIX_WORKITEM_ROOT} --add-source {correlationPayload} --version {Options.DotnetEfVersion}", environmentVariables: EnvironmentVariables, outputDataReceived: ProcessUtil.PrintMessage, errorDataReceived: ProcessUtil.PrintErrorMessage,