sln2csproj 0.2.0 → 0.3.1

package/README.md

@@ -262,12 +262,15 @@ git tag v0.2.0
 git push origin v0.2.0
 ```
 
-The workflow will:
+The workflow will always:
 
 - install dependencies
 - run tests
-- publish the npm package
 - build a Windows `exe`
-- attach the Windows `exe` and `.zip` to the GitHub Release when triggered by a version tag
+
+When triggered by a version tag such as `v0.3.0`, it will also:
+
+- publish the npm package
+- attach the Windows `exe` and `.zip` to the GitHub Release
 
 The Windows executable is built with Node.js Single Executable Applications (SEA), so Windows users can download it from GitHub Releases without installing Node first.

package/bin/cli.js

@@ -158,6 +158,11 @@ function main() {
     (0, io_1.mkdirp)(fakeDirAbs);
     const websiteAbs = path.join(slnDir, website.physicalPath);
     const websiteRelFromFake = path.relative(fakeDirAbs, websiteAbs).replace(/\//g, '\\') || '.';
+    for (const ref of website.projectReferences) {
+        if (!ref.projectPath)
+            continue;
+        ref.projectPath = path.relative(fakeDirAbs, path.resolve(slnDir, ref.projectPath)).replace(/\//g, '\\') || '.';
+    }
     const mode = opt.mode || 'copy';
     const refsDirAbs = path.join(fakeDirAbs, 'refs');
     const hintByDll = (0, resolver_1.materializeRefs)(mode, fakeDirAbs, refsDirAbs, websiteAbs, websiteRelFromFake, website);

package/bin/generator.js

@@ -44,7 +44,7 @@ function esc(s) {
         .replace(/'/g, ''');
 }
 /**
- * websiteRelFromFake: 例如 "..\\..\\..\\HCT.WebSite"
+ * websiteRelFromFake: e.g. "..\\..\\..\\HCT.WebSite"
  * hintByDll: dllName -> HintPath (relative to fake project dir)
  */
 function generateFakeCsproj(website, websiteRelFromFake, hintByDll) {
@@ -64,7 +64,23 @@ function generateFakeCsproj(website, websiteRelFromFake, hintByDll) {
         const inc = esc(path.join(prefix, '**', `*.${ext}`)).replace(/\//g, '\\');
         return `    <Content Include="${inc}" />`;
     }).join('\n');
-    const references = Array.from(hintByDll.entries()).map(([dllName, hintPath]) => {
+    const projectReferences = website.projectReferences
+        .filter(ref => ref.projectPath)
+        .map(ref => {
+        const include = esc(ref.projectPath || '');
+        const projectGuid = esc(ref.guid.toUpperCase());
+        const projectName = esc(path.basename(ref.projectPath || '', path.extname(ref.projectPath || '')));
+        return `    <ProjectReference Include="${include}">
+      <Project>{${projectGuid}}</Project>
+      <Name>${projectName}</Name>
+    </ProjectReference>`;
+    }).join('\n');
+    const projectDllNames = new Set(website.projectReferences
+        .filter(ref => ref.projectPath)
+        .map(ref => ref.dllName.toLowerCase()));
+    const references = Array.from(hintByDll.entries())
+        .filter(([dllName]) => !projectDllNames.has(dllName.toLowerCase()))
+        .map(([dllName, hintPath]) => {
         const includeName = esc(dllName.replace(/\.dll$/i, ''));
         const hint = esc(hintPath || path.join(prefix, 'Bin', dllName)).replace(/\//g, '\\');
         return `    <Reference Include="${includeName}">
@@ -73,8 +89,8 @@ function generateFakeCsproj(website, websiteRelFromFake, hintByDll) {
     </Reference>`;
     }).join('\n');
     return `<?xml version="1.0" encoding="utf-8"?>
-<!-- ⚠️ 此檔案由 sln2csproj 自動產生 -->
-<!-- ⚠️ 僅供 IntelliSense 使用，請勿拿來 build -->
+<!-- Generated by sln2csproj -->
+<!-- IntelliSense only; do not use for real builds -->
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -87,7 +103,6 @@ function generateFakeCsproj(website, websiteRelFromFake, hintByDll) {
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- 基本 Framework refs -->
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -98,10 +113,13 @@ function generateFakeCsproj(website, websiteRelFromFake, hintByDll) {
     <Reference Include="System.Configuration" />
     <Reference Include="System.Xml.Linq" />
 
-    <!-- 從 sln 解析出的 refs -->
 ${references}
   </ItemGroup>
 
+  <ItemGroup>
+${projectReferences}
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="${compileInclude}" Exclude="${esc(compileExclude)}" />
   </ItemGroup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sln2csproj",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Generate a fake csproj for legacy ASP.NET WebSite projects in a .sln.",
   "type": "commonjs",
   "bin": {