Work around dotnet/msbuild#3274 #39146
Merged
Conversation
This file contains hidden or 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
- #38547 - handle a ApiDescription.Client code generator that uses `%(OutputPath)` as a directory - see also <https://stackoverflow.com/questions/48868060/can-a-task-itemgroup-glob-files> - add tests for Microsoft.Extensions.ApiDescription.Client.targets - make `TemporaryCSharpProject` slightly extensible - allow project additions to `TemporaryDirectory` after `Create()` nits: - add comment about batching w/ a code generator that uses `%(OutputPath)` as a directory - fix `%(SourceDocument)` metadata - primarily for back-tracing in detailed / binary logs - remove useless `%(OutputPathExtension)` metadata; use `%(Extension)` - remove useless `ConsoleClient` test asset project
dougbu
requested review from
a team,
captainsafia,
halter73 and
rafikiassumani-msft
ghost
added
the
area-commandlinetools
Contributor
Author
|
@dotnet/aspnet-build mainly including you to double-check my |
dougbu
commented
Dec 22, 2021
|
|
||
| <Target Name="_InnerGenerateOpenApiCode" DependsOnTargets="_GetCurrentOpenApiReference;$(GeneratorTarget)" /> | ||
|
|
||
| <!-- Note target will **always** execute when generator uses the OutputPath as a directory. --> |
Contributor
Author
There was a problem hiding this comment.
Noticed while testing other changes. After an email conversation w/ msbuild team, I doubt this will change because directory timestamps aren't updated when files in them are added or changed but docs might be improved.
| <_Metadata>$(_Metadata) Options: '%(CurrentOpenApiReference.Options)'</_Metadata> | ||
| <_Metadata>$(_Metadata) OutputPath: '%(CurrentOpenApiReference.OutputPath)'</_Metadata> | ||
| <_Message>@(_Metadata, ' ')</_Message> | ||
| <_Lines>@(_HeaderMetadata -> '// %(Identity)', '%0A') |
Contributor
Author
There was a problem hiding this comment.
Generated C# files contain just enough content to compile.
| return WithCSharpProject(project); | ||
| } | ||
|
|
||
| public TemporaryCSharpProject WithCSharpProject(string name, out TemporaryCSharpProject project, string sdk = "Microsoft.NET.Sdk") |
Contributor
Author
There was a problem hiding this comment.
This overload was fairly silly and completely unused
- e.g. on macOS /var/folders resolves to /private/var/folders
wtgodbe
reviewed
Dec 29, 2021
...xtensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets
Show resolved
Hide resolved
wtgodbe
approved these changes
Dec 29, 2021
Contributor
Author
|
/backport to release/6.0 |
Contributor
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1635791981 |
Contributor
|
@dougbu backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Work around dotnet/msbuild#3274 - #38547 - handle a ApiDescription.Client code generator that uses `%(OutputPath)` as a directory - see also <https://stackoverflow.com/questions/48868060/can-a-task-itemgroup-glob-files> - add tests for Microsoft.Extensions.ApiDescription.Client.targets - make `TemporaryCSharpProject` slightly extensible - allow project additions to `TemporaryDirectory` after `Create()`
Using index info to reconstruct a base tree...
M src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/Program.cs
M src/Tools/Shared/TestHelpers/TemporaryCSharpProject.cs
M src/Tools/Shared/TestHelpers/TemporaryDirectory.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Tools/Shared/TestHelpers/TemporaryDirectory.cs
CONFLICT (content): Merge conflict in src/Tools/Shared/TestHelpers/TemporaryDirectory.cs
Auto-merging src/Tools/Shared/TestHelpers/TemporaryCSharpProject.cs
CONFLICT (content): Merge conflict in src/Tools/Shared/TestHelpers/TemporaryCSharpProject.cs
CONFLICT (modify/delete): src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/Program.cs deleted in Work around dotnet/msbuild#3274 - #38547 - handle a ApiDescription.Client code generator that uses `%(OutputPath)` as a directory - see also <https://stackoverflow.com/questions/48868060/can-a-task-itemgroup-glob-files> - add tests for Microsoft.Extensions.ApiDescription.Client.targets - make `TemporaryCSharpProject` slightly extensible - allow project additions to `TemporaryDirectory` after `Create()` and modified in HEAD. Version HEAD of src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/Program.cs left in tree.
Removing src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/ConsoleClient.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 Work around dotnet/msbuild#3274 - #38547 - handle a ApiDescription.Client code generator that uses `%(OutputPath)` as a directory - see also <https://stackoverflow.com/questions/48868060/can-a-task-itemgroup-glob-files> - add tests for Microsoft.Extensions.ApiDescription.Client.targets - make `TemporaryCSharpProject` slightly extensible - allow project additions to `TemporaryDirectory` after `Create()`
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! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
%(OutputPath)as a directoryTemporaryCSharpProjectslightly extensibleTemporaryDirectoryafterCreate()nits:
%(OutputPath)as a directory%(SourceDocument)metadata%(OutputPathExtension)metadata; use%(Extension)ConsoleClienttest asset project