Removed dependency to Microsoft.Dotnet.Cli.Utils#5482
Removed dependency to Microsoft.Dotnet.Cli.Utils#5482vlada-shubina merged 7 commits intodotnet:mainfrom
Microsoft.Dotnet.Cli.Utils#5482Conversation
295208e to
a657941
Compare
1eeb97c to
6c0d6f8
Compare
|
@JanKrivanek I excluded the tools from source-build in the last commit. If they are needed, we can turn it on again. |
3de3b2a to
a7988b1
Compare
|
we agreed not to create a public package at the time, and include the source code internally instead. |
a7988b1 to
c08fdc0
Compare
|
@JanKrivanek as agreed - moved the utils to shared internal code. |
JanKrivanek
left a comment
There was a problem hiding this comment.
Overall looks good.
I have 2 minor things for considerations - but not strongly opinionated about those.
I'm very much looking forward for this to be merged!! :-) As it will simplify my life in unblocking dogfooding in sdk (need to be able to inject custom environemnt and dotnet assembly)
tools/Shared/Microsoft.TemplateEngine.CommandUtils/NativeMethods.cs
Outdated
Show resolved
Hide resolved
tools/Shared/Microsoft.TemplateEngine.CommandUtils/DotnetCommand.cs
Outdated
Show resolved
Hide resolved
c08fdc0 to
dfc64cb
Compare
dfc64cb to
ff2f459
Compare
|
/backport to release/7.0.2xx |
|
Started backporting to release/7.0.2xx: https://github.com/dotnet/templating/actions/runs/3387467177 |
|
@vlada-shubina 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: removed dependency on Cli.Utils
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
Removing test/Microsoft.TemplateEngine.TestHelper/Commands/SdkCommandSpec.cs
Removing test/Microsoft.TemplateEngine.TestHelper/Commands/DotnetCommand.cs
Removing src/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Commands/TestCommand.cs
Removing src/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Commands/DotnetCommand.cs
Removing src/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Commands/BasicCommand.cs
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 removed dependency on Cli.Utils
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! |
Problem
Microsoft.DotNet.Cli.Utils. #5296Solution
Created separated
CommandUtilspackage usable from CLI and XUnit tests.Removed dependency to
Microsoft.Dotnet.Cli.Utils.Checks:
#nullable enableto all the modified files ?