Skip to content

Update IdentityModel to 7.4.1#293

Merged
mthalman merged 8 commits into
dotnet:mainfrom
wtgodbe:wtgodbe/741
Apr 1, 2024
Merged

Update IdentityModel to 7.4.1#293
mthalman merged 8 commits into
dotnet:mainfrom
wtgodbe:wtgodbe/741

Conversation

@wtgodbe

@wtgodbe wtgodbe commented Mar 18, 2024

Copy link
Copy Markdown
Member

@wtgodbe

wtgodbe commented Mar 18, 2024

Copy link
Copy Markdown
Member Author

@mthalman @MichaelSimons PTAL (For some reason I can't request reviews in the PR)

@wtgodbe

wtgodbe commented Mar 18, 2024

Copy link
Copy Markdown
Member Author

Not sure how to investigate this error, did I do something wrong?

EXEC : error : src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj: patch does not apply [/__w/1/s/artifacts/sb/src/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj]

@MichaelSimons

Copy link
Copy Markdown
Member

Not sure how to investigate this error, did I do something wrong?

EXEC : error : src/Microsoft.IdentityModel.Protocols/Microsoft.IdentityModel.Protocols.csproj: patch does not apply [/__w/1/s/artifacts/sb/src/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj]

There are two patches applied to the repo, looks like at least one of them needs updating - https://github.com/dotnet/source-build-externals/tree/main/patches/azure-activedirectory-identitymodel-extensions-for-dotnet. You can test this locally by running the local source-build - build.sh -sb. The repo builds quickly.

@MichaelSimons

Copy link
Copy Markdown
Member

@wtgodbe

wtgodbe commented Mar 29, 2024

Copy link
Copy Markdown
Member Author

@eerhardt @MichaelSimons where can I find info on how to fix the patch files? It's not obvious to me how those get created or what they correspond to. My local build failed in the same way as CI

@ellahathaway

Copy link
Copy Markdown
Member

where can I find info on how to fix the patch files? It's not obvious to me how those get created or what they correspond to. My local build failed in the same way as CI

The patching guidelines documentation described the process pretty well.

When a patch fails, I begin by investigating the content of the patch. If the content is no longer applicable (i.e. the new version implemented the patched code), I'll delete the patch. Otherwise, make the patched changes to the new version, create the new patch, and delete the old patch.

@MichaelSimons

Copy link
Copy Markdown
Member

I just opened a PR to include steps to manually apply patches and the cmd for easily creating/updating patches. #301. Please provide feedback.

@wtgodbe

wtgodbe commented Apr 1, 2024

Copy link
Copy Markdown
Member Author

@MichaelSimons I ran extract-patches.sh from the azure-activedirectory-identitymodel-extensions-for-dotnet dir & it just deleted the pre-existing .patch files without creating any new ones - am I doing something wrong?

@MichaelSimons

Copy link
Copy Markdown
Member

@MichaelSimons I ran extract-patches.sh from the azure-activedirectory-identitymodel-extensions-for-dotnet dir & it just deleted the pre-existing .patch files without creating any new ones - am I doing something wrong?

Did you make any changes? They have to be committed.

@wtgodbe

wtgodbe commented Apr 1, 2024

Copy link
Copy Markdown
Member Author

Looks like they removed updateAssemblyInfo.sh in AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet#2494. I deleted the patch, but @mthalman I see you added that patch in #199 - how can I test if their new method of setting AssemblyVersion will fail in full VMR source build?

@mthalman

mthalman commented Apr 1, 2024

Copy link
Copy Markdown
Member

Looks like they removed updateAssemblyInfo.sh in AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet#2494. I deleted the patch, but @mthalman I see you added that patch in #199 - how can I test if their new method of setting AssemblyVersion will fail in full VMR source build?

It can be verified in this PR build. I peeked at the generated assembly from this build and it has the correct assembly version set. Should be good to go.

@wtgodbe

wtgodbe commented Apr 1, 2024

Copy link
Copy Markdown
Member Author

@mthalman @MichaelSimons I don't have permissions to merge here, could one of you click the button?

@mthalman mthalman merged commit bcd4473 into dotnet:main Apr 1, 2024
@wtgodbe wtgodbe deleted the wtgodbe/741 branch April 2, 2024 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants