Skip to content

Revert identity package workaround and bump versions #24819

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

Merged
merged 2 commits into from
Aug 28, 2020

Conversation

captainsafia
Copy link
Member

@captainsafia captainsafia commented Aug 11, 2020

Reverts the workaround for identity package dependency mismatch that was introduced in #24600 and updates the package versions.

We should merge this after preview8 is released.

Addresses #24657

@captainsafia captainsafia requested a review from dougbu as a code owner August 11, 2020 23:25
@@ -23,8 +23,6 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="${MicrosoftEntityFrameworkCoreSqlServerPackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="${MicrosoftEntityFrameworkCoreToolsPackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' " />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="${MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion}" Condition=" '$(IndividualB2CAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" NoWarn="NU1605"/>
Copy link
Member

Choose a reason for hiding this comment

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

What package version will the tests get now and from where? The latest version on nuget? The latest in a local feed? The one produced in the same build?

Copy link
Member Author

@captainsafia captainsafia Aug 12, 2020

Choose a reason for hiding this comment

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

It'll use the latest version on NuGet. We'll want to merge this PR after preview8 ships (added a note about this in the PR description).

Edit: the tests will always use the local build. The published bits will use the latest version on NuGet.

@Pilchie Pilchie added the area-identity Includes: Identity and providers label Aug 12, 2020
Copy link
Contributor

@JunTaoLuo JunTaoLuo left a comment

Choose a reason for hiding this comment

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

When preview 8 ships.

@captainsafia captainsafia changed the base branch from master to release/5.0 August 25, 2020 20:32
@captainsafia captainsafia force-pushed the safia/fix-identity-package branch from b04e90f to f40b3d1 Compare August 26, 2020 21:45
@captainsafia captainsafia reopened this Aug 27, 2020
@captainsafia captainsafia reopened this Aug 27, 2020
@mkArtakMSFT
Copy link
Contributor

Thanks for the PR, @captainsafia. It looks like there is a separate PR which takes this a step further. Should we take that one instead: https://github.com/dotnet/aspnetcore/pull/25309/files

@captainsafia
Copy link
Member Author

@mkArtakMSFT We still need this PR because it removes the workaround in the project files for the templates so we'll have to merge both PRs.

@mkArtakMSFT
Copy link
Contributor

Thanks Safia!

@mkArtakMSFT mkArtakMSFT merged commit 97280fe into release/5.0 Aug 28, 2020
@mkArtakMSFT mkArtakMSFT deleted the safia/fix-identity-package branch August 28, 2020 16:00
@mkArtakMSFT mkArtakMSFT added this to the 5.0.0-rc1 milestone Aug 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-identity Includes: Identity and providers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants