Skip to content

Merge dotnet/templating catch-up: 4 commits missed in Phase 1#53734

Merged
MichaelSimons merged 4 commits intodotnet:mainfrom
MichaelSimons:merge-templating-catchup
Apr 7, 2026
Merged

Merge dotnet/templating catch-up: 4 commits missed in Phase 1#53734
MichaelSimons merged 4 commits intodotnet:mainfrom
MichaelSimons:merge-templating-catchup

Conversation

@MichaelSimons
Copy link
Copy Markdown
Member

@MichaelSimons MichaelSimons commented Apr 7, 2026

Migrates 4 commits from dotnet/templating that were not included in the Phase 1 merge (#53647).

Commits

Original SHA Author Description
dotnet/templating@2eeb88874 @lewing Fix MockTemplateInfo for System.Text.Json serialization
dotnet/templating@a7fa48a6e @NikolaMilosavljevic Specify target framework (search-cache-pipeline)
dotnet/templating@89cd90392 @NikolaMilosavljevic Use NetCurrent (search-cache-pipeline)
dotnet/templating@9c09d7680 @NikolaMilosavljevic Run once a day (search-cache-pipeline)

All commits follow the Phase 1 conventions:

  • Paths mapped per the Phase 1 mapping (test/test/TemplateEngine/, search-cache-pipeline.ymleng/pipelines/search-cache-pipeline.yml)
  • #NNN references fully qualified to dotnet/templating#NNN
  • Migration note appended: Commit migrated from https://github.com/dotnet/templating/commit/<sha>
  • Original author and date preserved

This accounts for all commits on dotnet/templating main that touch migrated paths (src/, test/, tools/, template_feed/, docs/, dotnet-template-samples/, Microsoft.TemplateEngine.sln, search-cache-pipeline.yml) since the Phase 1 cutoff.

Related: #53647

lewing and others added 4 commits April 7, 2026 19:14
After the Newtonsoft.Json → System.Text.Json migration (dotnet/templating#9956),
MockTemplateInfo's explicit ITemplateInfo.Tags and CacheParameters
implementations throw NotImplementedException. Newtonsoft never hit
these during serialization, but System.Text.Json walks all interface
properties, causing TemplateDiscoveryMetadata.ToJObject() to crash
in the SDK's CacheSearchCoordinatorTests.

Return empty dictionaries instead of throwing. Both properties are
[Obsolete] and the mock's real data lives in TagsCollection.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Commit migrated from dotnet/templating@2eeb888
@MichaelSimons MichaelSimons requested a review from MiYanni as a code owner April 7, 2026 19:19
Copilot AI review requested due to automatic review settings April 7, 2026 19:19
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Migrates four missed pre-Phase-1 dotnet/templating commits into dotnet/sdk, covering a test mock update to support System.Text.Json serialization and several operational updates to the templating search-cache pipeline (schedule + framework selection).

Changes:

  • Update MockTemplateInfo to avoid exceptions during System.Text.Json serialization of ITemplateInfo.
  • Adjust eng/pipelines/search-cache-pipeline.yml to run daily and resolve NetCurrent for running the cache updater tool.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File Description
test/TemplateEngine/Microsoft.TemplateEngine.Mocks/MockTemplateInfo.cs Changes obsolete ITemplateInfo members to stop throwing during serialization.
eng/pipelines/search-cache-pipeline.yml Changes schedule to daily and updates the cache updater invocation to use the resolved NetCurrent framework.

Comment thread eng/pipelines/search-cache-pipeline.yml
Comment thread eng/pipelines/search-cache-pipeline.yml
@MichaelSimons
Copy link
Copy Markdown
Member Author

/ba-g known windows agent machine outage. Other legs provide sufficient coverage for this change.

@MichaelSimons MichaelSimons merged commit 168a809 into dotnet:main Apr 7, 2026
28 of 29 checks passed
@MichaelSimons MichaelSimons deleted the merge-templating-catchup branch April 7, 2026 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants