Skip to content

Upgrade to a 6.0 SDK #22918

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
merged 3 commits into from
Oct 12, 2020
Merged

Upgrade to a 6.0 SDK #22918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d98217
Upgrade to a 6.0 SDK
dougbu Oct 7, 2020
889e295
Check for `IOException` instead of missing `NetworkException`
dougbu Oct 10, 2020
8bbc8c4
Update .NET SDK version used in Helix tests
dougbu Oct 10, 2020
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
2 changes: 1 addition & 1 deletion eng/helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<IncludeDotNetCli>true</IncludeDotNetCli>
<DotNetCliPackageType>sdk</DotNetCliPackageType>
<DotNetCliVersion>5.0.100-rc.1.20452.10</DotNetCliVersion>
<DotNetCliVersion>$(NETCoreSdkVersion)</DotNetCliVersion>
Copy link
Contributor

@bricelam bricelam Oct 12, 2020

Choose a reason for hiding this comment

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

Oh funny, I thought we had to do a bunch of extra work to make this work. Awesome that it just works...


<EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
<FailOnTestFailure>true</FailOnTestFailure>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "5.0.100-rc.1.20452.10",
"dotnet": "6.0.100-alpha.1.20472.11",
"runtimes": {
"dotnet": [
"3.1.8"
Expand All @@ -11,7 +11,7 @@
}
},
"sdk": {
"version": "5.0.100-rc.1.20452.10",
"version": "6.0.100-alpha.1.20472.11",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

#if NET5_0
using System.Net;
using System.IO;
#endif

namespace Microsoft.EntityFrameworkCore.TestUtilities
Expand Down Expand Up @@ -73,7 +73,7 @@ private static bool IsNotConfigured(Exception exception)
{
HttpRequestException re => re.InnerException is SocketException
#if NET5_0
|| (re.InnerException is NetworkException networkException
|| (re.InnerException is IOException networkException
&& networkException.InnerException is SocketException)
Copy link
Contributor Author

@dougbu dougbu Oct 10, 2020

Choose a reason for hiding this comment

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

More specifically @geoffkizer @ericstj, is this extra HttpRequestException ➡️ IOException ➡️ SocketException check worth doing❔

Copy link
Contributor Author

@dougbu dougbu Oct 10, 2020

Choose a reason for hiding this comment

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

@bricelam the good news here is this is a test-only change and doesn't imply a breaking change that will impact earlier EF packages when running against recent a shared framework from dotnet/runtime.

#endif
,
Expand Down