fix(core): fall back to root if source root null (#408)

nx-dotnet · Apr 5, 2022 · 53bdc17 · 53bdc17
1 parent 035675e
commit 53bdc17
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/packages/core/src/generators/restore/generator.ts b/packages/core/src/generators/restore/generator.ts
@@ -12,8 +12,8 @@ export default async function (
   dotnetClient = new DotNetClient(dotnetFactory()),
 ) {
   const projects = await getNxDotnetProjects(host);
-  for (const project of projects.values()) {
-    const projectFiles = getProjectFilesForProject(host, project);
+  for (const [projectName, project] of projects.entries()) {
+    const projectFiles = getProjectFilesForProject(host, project, projectName);
     for (const file of projectFiles) {
       dotnetClient.restorePackages(file);
     }

diff --git a/packages/core/src/generators/sync/generator.ts b/packages/core/src/generators/sync/generator.ts
@@ -18,7 +18,11 @@ export default async function (host: Tree) {
   const projects = await getNxDotnetProjects(host);
 
   for (const [projectName, configuration] of projects.entries()) {
-    const projectFiles = getProjectFilesForProject(host, configuration);
+    const projectFiles = getProjectFilesForProject(
+      host,
+      configuration,
+      projectName,
+    );
     for (const f of projectFiles) {
       const xmldoc = readXml(host, f);
       console.log(`Scanning packages for ${projectName} (${f})`);

diff --git a/packages/core/src/generators/utils/update-dependency-version.ts b/packages/core/src/generators/utils/update-dependency-version.ts
@@ -14,7 +14,11 @@ export async function updateDependencyVersions(
 ) {
   const projects = await getNxDotnetProjects(host);
   for (const [projectName, configuration] of projects.entries()) {
-    const projectFiles = getProjectFilesForProject(host, configuration);
+    const projectFiles = getProjectFilesForProject(
+      host,
+      configuration,
+      projectName,
+    );
     for (const f of projectFiles) {
       const xmldoc = readXml(host, f);
       let updateFile = false;

diff --git a/packages/utils/src/lib/utility-functions/workspace.ts b/packages/utils/src/lib/utility-functions/workspace.ts
@@ -115,12 +115,13 @@ export async function getNxDotnetProjects(
 export function getProjectFilesForProject(
   host: Tree,
   project: ProjectConfiguration | undefined,
+  projectName: string,
 ) {
-  if (!project?.sourceRoot) {
-    throw new Error('Unable to read source root for project!');
+  if (!project?.sourceRoot && !project?.root) {
+    throw new Error(`Unable to read source root for project ${projectName}`);
   }
   return host
-    .children(project.sourceRoot)
+    .children(project.sourceRoot ?? project.root)
     .filter((x) => x.endsWith('proj'))
     .map((x) => `${project.sourceRoot}/${x}`);
 }