Skip to content

Update to .NET SDK 6.0 Preview 3 #24639

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

Merged
bricelam merged 1 commit into from
May 4, 2021
+6 −6
Merged

Update to .NET SDK 6.0 Preview 3 #24639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"tools": {
"dotnet": "6.0.100-preview.2.21155.3",
"dotnet": "6.0.100-preview.3.21202.5",
"runtimes": {
"dotnet": [
"3.1.14",
"5.0.4"
"5.0.5"
],
"aspnetcore": [
"3.1.14",
"5.0.4"
"5.0.5"
]
}
},
"sdk": {
"version": "6.0.100-preview.2.21155.3",
"version": "6.0.100-preview.3.21202.5",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public async Task Basic_query_single_element_from_set_composite_key()
Assert.Equal("Marcus", result["Nickname"].ToString());
}

[ConditionalFact]
[ConditionalFact(Skip = "OData/WebApi#2437")]
public async Task Complex_query_with_any_on_collection_navigation()
{
var requestUri = string.Format(@"{0}/odata/Gears?$filter=Weapons/any(w: w/Id gt 4)", BaseAddress);
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task Basic_query_select_single_customer()
Assert.Equal("ALFKI", result["CustomerID"].ToString());
}

[ConditionalFact]
[ConditionalFact(Skip = "OData/WebApi#2437")]
public async Task Query_for_alfki_expand_orders()
{
var requestUri = string.Format(@"{0}/odata/Customers?$filter=CustomerID eq 'ALFKI'&$expand=Orders", BaseAddress);
Expand Down