Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[automated] Merge branch 'release/9.0' => 'main' #57942

Merged
merged 10 commits into from
Sep 24, 2024
Merged

[automated] Merge branch 'release/9.0' => 'main' #57942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f9b2877
[release/9.0] Update dependencies from dotnet/efcore, dotnet/runtime …
dotnet-maestro[bot] Sep 16, 2024
520517f
[release/9.0] [Templates] Updates libraries dependencies content (#57…
github-actions[bot] Sep 16, 2024
d76a16d
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 16, 2024
0d72ad5
Update branding to rtm (#57907)
wtgodbe Sep 16, 2024
d962763
[release/9.0] Update dependencies from dotnet/efcore, dotnet/runtime …
dotnet-maestro[bot] Sep 18, 2024
e700de8
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 18, 2024
c68cfd0
[release/9.0] Update dependencies from dotnet/efcore, dotnet/runtime …
dotnet-maestro[bot] Sep 20, 2024
6bbc4f1
[release/9.0] Fix skip condition for IIS tests (#57999)
wtgodbe Sep 23, 2024
70dffea
Merge branch 'main' into merge/release/9.0-to-main
wtgodbe Sep 23, 2024
84c9440
Update Versions.props
wtgodbe Sep 23, 2024
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
6 changes: 3 additions & 3 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestPathBaseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;
#endif

[Collection(IISSubAppSiteCollection.Name)]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
public class RequestPathBaseTests : FixtureLoggedTest
{
private readonly IISSubAppSiteFixture _fixture;
Expand All @@ -32,7 +32,7 @@ public RequestPathBaseTests(IISSubAppSiteFixture fixture) : base(fixture)
}

[ConditionalTheory]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
[RequiresNewHandler]
[InlineData("/Sub/App/PathAndPathBase", "/Sub/App/PathAndPathBase", "")]
[InlineData("/SUb/APp/PathAndPAthBase", "/SUb/APp/PathAndPAthBase", "")]
Expand All @@ -53,7 +53,7 @@ public async Task RequestPathBase_Split(string url, string expectedPathBase, str
}

[ConditionalTheory]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
[RequiresNewHandler]
[InlineData("//Sub/App/PathAndPathBase", "//Sub/App/PathAndPathBase", "")]
[InlineData(@"/\Sub/App/PathAndPathBase/", @"/\Sub/App/PathAndPathBase", "/")]
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests;

// Contains all tests related to Startup, requiring starting ANCM/IIS every time.
[Collection(PublishedSitesCollection.Name)]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
public class StartupTests : IISFunctionalTestBase
{
public StartupTests(PublishedSitesFixture fixture) : base(fixture)
Expand Down Expand Up @@ -1297,7 +1297,7 @@ public async Task PreferEnvironmentVariablesOverWebConfigWhenConfigured(HostingM
[ConditionalFact]
[RequiresNewHandler]
[RequiresNewShim]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;")]
[SkipOnHelix("Unsupported queue", Queues = "Windows.Amd64.VS2022.Pre.Open;" + "Windows.Amd64.VS2022.Pre;")]
public async Task ServerAddressesIncludesBaseAddress()
{
var appName = "\u041C\u043E\u0451\u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435";
Expand Down
Loading