From 6442d94dd82e30d0b6537e97eddbcccedd799ef9 Mon Sep 17 00:00:00 2001 From: Craigory Coppola Date: Mon, 26 Apr 2021 16:30:35 -0500 Subject: [PATCH] feat(core): tag nx-dotnet projects NxDotnet needs to be able to identify projects it created when analyzing the dependency graph. Adding this tag allows filtering for projects created by nx-dotnet. --- .../core/src/generators/utils/generate-project.spec.ts | 6 ++++++ packages/core/src/generators/utils/generate-project.ts | 1 + packages/core/src/graph/process-project-graph.ts | 9 ++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/core/src/generators/utils/generate-project.spec.ts b/packages/core/src/generators/utils/generate-project.spec.ts index bcbeaf75..596b68bf 100644 --- a/packages/core/src/generators/utils/generate-project.spec.ts +++ b/packages/core/src/generators/utils/generate-project.spec.ts @@ -42,6 +42,12 @@ describe('nx-dotnet project generator', () => { expect(config).toBeDefined(); }); + it('should tag generated projects', async () => { + await GenerateProject(appTree, options, dotnetClient, 'library'); + const config = readProjectConfiguration(appTree, 'test'); + expect(config.tags).toContain('nx-dotnet'); + }); + it('should run successfully for applications', async () => { await GenerateProject(appTree, options, dotnetClient, 'application'); const config = readProjectConfiguration(appTree, 'test'); diff --git a/packages/core/src/generators/utils/generate-project.ts b/packages/core/src/generators/utils/generate-project.ts index 3348b737..028f524f 100644 --- a/packages/core/src/generators/utils/generate-project.ts +++ b/packages/core/src/generators/utils/generate-project.ts @@ -55,6 +55,7 @@ function normalizeOptions( const parsedTags = options.tags ? options.tags.split(',').map((s) => s.trim()) : []; + parsedTags.push('nx-dotnet'); const npmScope = names(readWorkspaceConfiguration(host).npmScope).className; const featureScope = projectDirectory diff --git a/packages/core/src/graph/process-project-graph.ts b/packages/core/src/graph/process-project-graph.ts index 724f18e5..223ca5e3 100644 --- a/packages/core/src/graph/process-project-graph.ts +++ b/packages/core/src/graph/process-project-graph.ts @@ -16,9 +16,13 @@ export function processProjectGraph( Object.entries(context.workspace.projects).forEach(([name, project]) => { try { - visitProject(builder, context, project, name); + if (project.tags?.some((x) => x === 'nx-dotnet')) { + visitProject(builder, context, project, name); + } } catch { - console.warn(`Failed to generate .NET dependencies for ${name}`); + console.warn( + `nx-dotnet encountered an error parsing dependencies for ${name}` + ); } }); @@ -31,7 +35,6 @@ function visitProject( project: ProjectConfiguration, projectName: string ) { - console.log('Looking for dependencies for ', projectName); getDependantProjectsForNxProject( projectName, context.workspace,