Skip to content

Commit 095c7cb

Browse files
authored
Merge pull request #3934 from RosarioPulella/inheritDoc-fix
InheritDoc fails when there are more than one source xml doc for a specified target. This is from "Nerdbank.GitVersioning" project and is not an issue here. <!-- 🚨 Please Do Not skip any instructions and information mentioned below as they are all required and essential to evaluate and test the PR. By fulfilling all the required information you will be able to reduce the volume of questions and most likely help merge the PR faster 🚨 --> <!-- 📝 It is preferred if you keep the "☑️ Allow edits by maintainers" checked in the Pull Request Template as it increases collaboration with the Toolkit maintainers by permitting commits to your PR branch (only) created from your fork. This can let us quickly make fixes for minor typos or forgotten StyleCop issues during review without needing to wait on you doing extra work. Let us help you help us! 🎉 --> ## Fixes InheritDoc build issue <!-- Add the relevant issue number after the "#" mentioned above (for ex: Fixes #1234) which will automatically close the issue once the PR is merged. --> <!-- Add a brief overview here of the feature/bug & fix. --> The inherit doc step started to fail, this fixes it. ## PR Type What kind of change does this PR introduce? <!-- Please uncomment one or more that apply to this PR. --> - Bugfix <!-- - Feature --> <!-- - Code style update (formatting) --> <!-- - Refactoring (no functional changes, no api changes) --> - Build or CI related changes <!-- - Documentation content changes --> <!-- - Sample app changes --> <!-- - Other... Please describe: --> ## What is the current behavior? <!-- Please describe the current behavior that you are modifying, or link to a relevant issue. --> All branches without this change are failing the inherit doc build step. ## What is the new behavior? <!-- Describe how was this issue resolved or changed? --> Inherit doc build step doesn't fail ## PR Checklist Please check if your PR fulfills the following requirements: - [ ] Tested code with current [supported SDKs](../readme.md#supported) - [ ] Pull Request has been submitted to the documentation repository [instructions](..\contributing.md#docs). Link: <!-- docs PR link --> - [ ] Sample in sample app has been added / updated (for bug fixes / features) - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets) - [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/windows-toolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc... - [ ] Tests for the changes have been added (for bug fixes / features) (if applicable) - [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*) - [ ] Contains **NO** breaking changes <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. --> ## Other information
2 parents e1ddd52 + f6dbce0 commit 095c7cb

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

build/build.cake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ var stylerFile = baseDir + "/settings.xamlstyler";
4343
string Version = null;
4444

4545
var inheritDoc = toolsDir + "/InheritDoc/tools/InheritDoc.exe";
46-
var inheritDocExclude = "Foo.*";
46+
47+
// Ignoring NerdBank until this is merged and we can use a new version of inheridoc:
48+
// https://github.com/firesharkstudios/InheritDoc/pull/27
49+
var inheritDocExclude = "Nerdbank.GitVersioning.ManagedGit.GitRepository";
4750

4851
//////////////////////////////////////////////////////////////////////
4952
// METHODS

0 commit comments

Comments
 (0)