Bugfix: Pack TemplateVerifier as standard package #5422
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vlada-shubina
approved these changes
Oct 12, 2022
|
/backport to release/7.0.2xx |
|
Started backporting to release/7.0.2xx: https://github.com/dotnet/templating/actions/runs/3240360774 |
|
@JanKrivanek backporting to release/7.0.2xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Pack TemplateVerifier as standard package
Using index info to reconstruct a base tree...
A src/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.TemplateEngine.TemplateLocalizer/Microsoft.TemplateEngine.TemplateLocalizer.csproj
CONFLICT (content): Merge conflict in src/Microsoft.TemplateEngine.TemplateLocalizer/Microsoft.TemplateEngine.TemplateLocalizer.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Pack TemplateVerifier as standard package
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
JanKrivanek
added a commit
to JanKrivanek/templating
that referenced
this pull request
Oct 13, 2022
JanKrivanek
added a commit
that referenced
this pull request
Oct 14, 2022
* Test framework on main (#5399) * repurposed existing CLI tool and MSBuild tasks for authoring * Initial implementation of the test command and API (#5263) * Initial implementation of the test command and API * Disable diff tool in CI * Use new Verifier, Add verification options * Add 3rd party signing info * Remove dependency on test project * Use custom exceptions for exit expectations failed * Improve engine API, add API tests * Add localizations, move types * Various improvements for PR * Add the uninstalled template testing option * Add integration tests and unit tests * Add VerifyEngine unit tests, add ability to place expectations in code base or current dir * Add sample usage in unit test * Adjust assertions (OS agnostic) * Fix code locations * Fix analyzer errors * Adjust sample dogfood test for CI Co-authored-by: Vlada Shubina <vshubina@microsoft.com> * Pack TemplateVerifier as standard package (#5422) Co-authored-by: Vlada Shubina <vshubina@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Cannot reference TemplateVerifier from sdk unit tests as it's packed as tool
Solution
removing
PackAsToolChecks: N/A
#nullable enableto all the modified files ?