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.

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

Update SDK #34236

Merged
merged 3 commits into from
Jul 9, 2021
Merged

Update SDK #34236

merged 3 commits into from
Jul 9, 2021

Conversation

JunTaoLuo
Copy link
Contributor

This ingests the change dotnet/sdk#18459 into our repo.

FYI @captainsafia @Tratcher since this will overlap your ops rotations, probably.

This ingests the global imports change from the SDK
@JunTaoLuo JunTaoLuo requested a review from a team as a code owner July 9, 2021 17:55
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jul 9, 2021
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />

<ItemGroup>
<Import Remove="System.Net.Http" />
Copy link
Member

Choose a reason for hiding this comment

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

?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is a type name conflict between System.Net.Http.HttpMethod and Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod.

Seems like this was the only conflict in our repo so I just removed it for kestrel.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, so this removes the default using System.Net.Http?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes.

Copy link
Member

Choose a reason for hiding this comment

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

This is an interesting problem. It finally bit in the butt.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm impressed that this is the only instance.

@@ -5,5 +5,6 @@
<IsPackable>false</IsPackable>
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
<Nullable>disable</Nullable>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
Copy link
Member

Choose a reason for hiding this comment

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

Why not just web?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The tools use Microsoft.Build.Tasks which conflicts with System.Threading.Tasks. Since it's just tools, I just disabled everything instead of just the specific conflicts.

Copy link
Member

Choose a reason for hiding this comment

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

Why does it conflict? Because we don't have the new compiler that hides these conflict warnings? Can you clarify?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's not a warning, it's an error for ambiguous types.

error CS0104: 'Task' is an ambiguous reference between 'Microsoft.Build.Utilities.Task' and 'System.Threading.Tasks.Task

@JunTaoLuo JunTaoLuo requested a review from a team as a code owner July 9, 2021 20:32
@JunTaoLuo JunTaoLuo merged commit 15949fa into main Jul 9, 2021
@JunTaoLuo JunTaoLuo deleted the johluo/sdk-update branch July 9, 2021 21:55
@ghost ghost added this to the 6.0-preview7 milestone Jul 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants