fix package id not being used

Author: popcron

manager/Commands/Generate.cs

@@ -159,9 +159,17 @@ private static void GenerateTargetsFile(Runner runner, ReadOnlySpan<Repository>
                             Directory.CreateDirectory(buildFolder);
                         }
 
-                        string targetsPath = Path.Combine(buildFolder, project.Name.ToString() + ".targets");
+                        string packageId = project.PackageId.ToString();
+                        string projectName = project.Name.ToString();
+                        if (string.IsNullOrEmpty(packageId))
+                        {
+                            packageId = projectName;
+                        }
+
+                        string targetsPath = Path.Combine(buildFolder, packageId + ".targets");
                         string content = TargetsTemplate.Source;
-                        content = content.Replace("{{ProjectName}}", project.Name.ToString());
+                        content = content.Replace("{{ProjectName}}", projectName);
+                        content = content.Replace("{{PackageId}}", packageId);
                         File.WriteAllText(targetsPath, content);
                     }
                 }
@@ -386,15 +394,15 @@ private static string GetSource(string source, Project project)
                 source = source.Replace("{{ProjectFolderName}}", folderName);
             }
 
-            if (source.Contains("{{PackageID}}"))
+            if (source.Contains("{{PackageId}}"))
             {
                 Text.Borrowed packageId = project.PackageId;
                 if (packageId.IsEmpty)
                 {
                     packageId.CopyFrom(project.Name);
                 }
 
-                source = source.Replace("{{PackageID}}", packageId.ToString());
+                source = source.Replace("{{PackageId}}", packageId.ToString());
             }
 
             return source;

manager/Commands/UpdateProjectFiles.cs

@@ -67,16 +67,21 @@ readonly void ICommand.Execute(Runner runner, Arguments arguments)
         private static bool EnsureBuildOutputsArePacked(Project project)
         {
             bool changed = false;
-            string projectName = project.Name.ToString();
-            string debugDllPath = $"bin/Debug/net9.0/{projectName}.dll";
-            string releaseDllPath = $"bin/Release/net9.0/{projectName}.dll";
-            string debugXmlPath = $"bin/Debug/net9.0/{projectName}.xml";
-            string releaseXmlPath = $"bin/Release/net9.0/{projectName}.xml";
-            string targetsPath = $"build/{projectName}.targets";
-            string packageDebugDllPath = $"tools/debug/{projectName}.dll";
-            string packageReleaseDllPath = $"tools/release/{projectName}.dll";
-            string packageDebugXmlPath = $"tools/debug/{projectName}.xml";
-            string packageReleaseXmlPath = $"tools/release/{projectName}.xml";
+            string packageId = project.PackageId.ToString();
+            if (string.IsNullOrEmpty(packageId))
+            {
+                packageId = project.Name.ToString();
+            }
+
+            string debugDllPath = $"bin/Debug/net9.0/{packageId}.dll";
+            string releaseDllPath = $"bin/Release/net9.0/{packageId}.dll";
+            string debugXmlPath = $"bin/Debug/net9.0/{packageId}.xml";
+            string releaseXmlPath = $"bin/Release/net9.0/{packageId}.xml";
+            string targetsPath = $"build/{packageId}.targets";
+            string packageDebugDllPath = $"tools/debug/{packageId}.dll";
+            string packageReleaseDllPath = $"tools/release/{packageId}.dll";
+            string packageDebugXmlPath = $"tools/debug/{packageId}.xml";
+            string packageReleaseXmlPath = $"tools/release/{packageId}.xml";
             string debugXmlCondition = $"Exists('{debugXmlPath}')";
             string releaseXmlCondition = $"Exists('{releaseXmlPath}')";
             XMLNode debugDllPackNode = default;

manager/GitHubWorkflowTemplate.cs

@@ -24,7 +24,7 @@ public static class GitHubWorkflowTemplate
 
         public const string PublishStep = @"
 - name: Publish `{{ProjectName}}`
-  run: dotnet nuget push {{PackageID}}.${VERSION}.nupkg --source github --api-key ${NUGET_TOKEN}
+  run: dotnet nuget push {{PackageId}}.${VERSION}.nupkg --source github --api-key ${NUGET_TOKEN}
   env:
     NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}";
 

manager/TargetsTemplate.cs

@@ -8,14 +8,14 @@ public static class TargetsTemplate
 
     <ItemGroup Condition=""'$(Configuration)' == 'Debug'"">
         <Reference Include=""{{ProjectName}}"">
-            <HintPath>$(MSBuildThisFileDirectory)..\tools\debug\{{ProjectName}}.dll</HintPath>
+            <HintPath>$(MSBuildThisFileDirectory)..\tools\debug\{{PackageId}}.dll</HintPath>
             <Private>True</Private>
         </Reference>
     </ItemGroup>
 
     <ItemGroup Condition=""'$(Configuration)' == 'Release'"">
         <Reference Include=""{{ProjectName}}"">
-            <HintPath>$(MSBuildThisFileDirectory)..\tools\release\{{ProjectName}}.dll</HintPath>
+            <HintPath>$(MSBuildThisFileDirectory)..\tools\release\{{PackageId}}.dll</HintPath>
             <Private>True</Private>
         </Reference>
     </ItemGroup>