fix(core): normalize paths in Directory.Build.targets

nx-dotnet · Nov 11, 2022 · e8bf1bc · e8bf1bc
1 parent 3870b55
commit e8bf1bc
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,4 +44,6 @@ Thumbs.db
 .cache-loader/
 
 **/bin
-**/obj
+**/obj
+
+.vs
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,17 @@
+<!-- 
+  This file is imported early in the build order. 
+  Use it to set default property values that can be overridden in specific projects.
+-->
+<Project>
+  <PropertyGroup>
+    <!-- Output path configuration -->
+    <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))</RepoRoot>
+    <ProjectRelativePath>$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))</ProjectRelativePath>
+    <BaseOutputPath>$(RepoRoot)dist/$(ProjectRelativePath)</BaseOutputPath>
+    <OutputPath>$(BaseOutputPath)</OutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,14 @@
+<!-- 
+  This file is imported late in the build order. 
+  Use it to override properties and define dependent properties.
+-->
+<Project>
+  <PropertyGroup>
+    <MSBuildProjectDirRelativePath>$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))</MSBuildProjectDirRelativePath>
+    <NodeModulesRelativePath>$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(RepoRoot)))</NodeModulesRelativePath>
+  </PropertyGroup>
+  <Target Name="CheckNxModuleBoundaries" BeforeTargets="Build">
+    <Exec Command="npx ts-node -r tsconfig-paths/register --project $(NodeModulesRelativePath)/packages/core/tsconfig.lib.json $(NodeModulesRelativePath)/packages/core/src/tasks/check-module-boundaries.ts --project-root &quot;$(MSBuildProjectDirRelativePath)&quot;"
+    />
+  </Target>
+</Project>
diff --git a/packages/core/src/generators/init/generator.ts b/packages/core/src/generators/init/generator.ts
@@ -3,6 +3,7 @@ import {
   generateFiles,
   GeneratorCallback,
   logger,
+  normalizePath,
   NxJsonConfiguration,
   readJson,
   readWorkspaceConfiguration,
@@ -20,7 +21,6 @@ import {
 } from '@nx-dotnet/utils';
 import type { PackageJson } from 'nx/src/utils/package-json';
 import * as path from 'path';
-import { normalize, relative } from 'path';
 
 export async function initGenerator(
   host: Tree,
@@ -133,8 +133,8 @@ function addPrepareScript(host: Tree) {
 function initBuildCustomization(host: Tree) {
   const initialized = host.exists('Directory.Build.props');
   if (!initialized) {
-    const checkModuleBoundariesScriptPath = normalize(
-      relative(
+    const checkModuleBoundariesScriptPath = normalizePath(
+      path.relative(
         host.root,
         resolve('@nx-dotnet/core/src/tasks/check-module-boundaries'),
       ),
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,4 +44,6 @@ Thumbs.db @@
     .cache-loader/
     **/bin
-    **/obj
+    **/obj
+    .vs