Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-68c7e19" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194/nuget/v3/index.json" />
Comment on lines -7 to -10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wtgodbe Any idea if these removals are expected?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, the packages from these feeds are public now, so they're unnecessary

<!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -30,10 +28,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-68c7e19" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-831d23e" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -414,13 +414,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.3.0-preview.1.25156.1">
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.4.0-preview.1.25173.2">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>c221abef4b4f1bf3fcf0bda27490e8b26bb479f4</Sha>
<Sha>6491f22e0a194060d5a7461dacaa4dc0106852d0</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.3.0-preview.1.25156.1">
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.4.0-preview.1.25173.2">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>c221abef4b4f1bf3fcf0bda27490e8b26bb479f4</Sha>
<Sha>6491f22e0a194060d5a7461dacaa4dc0106852d0</Sha>
</Dependency>
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@
<SystemIOHashingVersion>9.0.3</SystemIOHashingVersion>
<SystemRuntimeCachingVersion>9.0.3</SystemRuntimeCachingVersion>
<!-- Packages from dotnet/extensions -->
<MicrosoftExtensionsDiagnosticsTestingVersion>9.3.0-preview.1.25156.1</MicrosoftExtensionsDiagnosticsTestingVersion>
<MicrosoftExtensionsTimeProviderTestingVersion>9.3.0-preview.1.25156.1</MicrosoftExtensionsTimeProviderTestingVersion>
<MicrosoftExtensionsDiagnosticsTestingVersion>9.4.0-preview.1.25173.2</MicrosoftExtensionsDiagnosticsTestingVersion>
<MicrosoftExtensionsTimeProviderTestingVersion>9.4.0-preview.1.25173.2</MicrosoftExtensionsTimeProviderTestingVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>9.0.3</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.3</MicrosoftEntityFrameworkCoreInMemoryVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
using Microsoft.AspNetCore.E2ETesting;
using Microsoft.AspNetCore.InternalTesting;
using TestServer;
using Xunit.Abstractions;
using Components.TestServer.RazorComponents;
Expand Down Expand Up @@ -519,6 +520,7 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_OnlyServerOrWebA
[Theory]
[InlineData("server")]
[InlineData("wasm")]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61143")]
public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWebAssembly(string runtimeThatInvokedNavigation)
{
Navigate($"{ServerPathBase}/nav");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,7 @@ void AssertUiState(string expectedStringValue, bool expectedBoolValue)
}

[Fact]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61144")]
public void RadioButtonGetsResetAfterSubmittingEnhancedForm()
{
GoTo("forms/form-with-checkbox-and-radio-button");
Expand Down
2 changes: 1 addition & 1 deletion src/submodules/googletest
Submodule googletest updated 40 files
+0 −14 BUILD.bazel
+2 −2 CMakeLists.txt
+2 −2 MODULE.bazel
+4 −7 README.md
+6 −5 WORKSPACE
+29 −47 ci/linux-presubmit.sh
+4 −7 ci/macos-presubmit.sh
+13 −25 ci/windows-presubmit.bat
+45 −59 docs/advanced.md
+1 −2 docs/reference/actions.md
+4 −5 docs/reference/matchers.md
+6 −23 googlemock/include/gmock/gmock-actions.h
+4 −14 googlemock/include/gmock/gmock-matchers.h
+5 −4 googlemock/include/gmock/gmock-more-actions.h
+5 −0 googlemock/include/gmock/internal/gmock-internal-utils.h
+3 −3 googlemock/test/gmock-actions_test.cc
+10 −39 googlemock/test/gmock-more-actions_test.cc
+4 −3 googlemock/test/gmock-spec-builders_test.cc
+1 −1 googletest/README.md
+1 −1 googletest/cmake/internal_utils.cmake
+0 −7 googletest/include/gtest/gtest-assertion-result.h
+34 −33 googletest/include/gtest/gtest-param-test.h
+65 −61 googletest/include/gtest/gtest-typed-test.h
+2 −2 googletest/include/gtest/gtest.h
+22 −26 googletest/include/gtest/internal/gtest-internal.h
+64 −2 googletest/include/gtest/internal/gtest-port.h
+0 −4 googletest/src/gtest-internal-inl.h
+27 −97 googletest/src/gtest.cc
+17 −51 googletest/test/BUILD.bazel
+0 −38 googletest/test/googletest-fail-if-no-test-linked-test-with-disabled-test_.cc
+0 −38 googletest/test/googletest-fail-if-no-test-linked-test-with-enabled-test_.cc
+0 −169 googletest/test/googletest-fail-if-no-test-linked-test.py
+0 −19 googletest/test/googletest-filter-unittest.py
+17 −19 googletest/test/googletest-json-output-unittest.py
+1 −7 googletest/test/googletest-printers-test.cc
+2 −2 googletest/test/googletest-setuptestsuite-test_.cc
+4 −3 googletest/test/gtest_unittest.cc
+43 −45 googletest/test/gtest_xml_output_unittest.py
+1 −5 googletest/test/gtest_xml_output_unittest_.cc
+3 −3 googletest_deps.bzl
Loading