Added support for "source", "project" and "dll" reference directives (#5)

Author: Martin521

.gitignore

@@ -3,6 +3,10 @@
 ##
 ## Get latest from `dotnet new gitignore`
 
+TODO.md
+meeting.md
+dotnet-tools.json
+
 # dotenv files
 .env
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.0.6
+
+### added
+
+* support for "source", "project" and "dll" reference directives
+
 ## 1.0.5
 
 ### changed

README.md

@@ -22,9 +22,9 @@ The following directives (source lines) are recognized by runfs:
 - `#r_package "pp@1.0.0"` - references package pp, version 1.0.0
 - `#r_sdk "mysdk@0.0.1"` - references an sdk
 - `#r_property "myprop=42"` - sets a build property
-- `#r_project "xyz.fsproj"` - references a project [not yet implemented]
-- `#r_dll "mylib.dll"` - references a library [not yet implemented]
-- `#r_source "utilities.fs"` - references a source file [not yet implemented]
+- `#r_project "xyz.fsproj"` - references a project
+- `#r_dll "mylib.dll"` - references a library
+- `#r_source "utilities.fs"` - references a source file
 
 > The above directive syntax is preliminary and made to work with the current F# compiler (the parser accepts and ignores them). Ideally, the syntax defined for "dotnet run app.cs" should be reused, like `#:package pp@1.0.0`, but this needs a compiler fix first.
 
@@ -63,7 +63,7 @@ Main learnings
 Runfs
 - investigate if the "compile only" shortcut can be replicated for F#
 - add more tests, possibly Rid-package, fix case sensitivity issue in Directives.fs
-- implement the #project, #source and #dll directives and `--convert`
+- implement `--convert`
 
 Elsewhere
 - propose and possibly implement a compiler change so that the 'dotnet run app.cs' syntax for directives can be used

src/Runfs/ProjectFile.fs

@@ -27,6 +27,15 @@ let private packageLine (name, version) =
     | None -> $"""        <PackageReference Include="{escape name}" />"""
     | Some v -> $"""        <PackageReference Include="{escape name}" Version="{escape v}"/>"""
 
+let private sourceLine name =
+    $"""        <Compile Include="{escape name}" />"""
+
+let private dllLine name =
+    $"""        <Reference Include="{escape name}" />"""
+
+let private projectLine name =
+    $"""        <ProjectReference Include="{escape name}" />"""
+
 let createProjectFileLines directives entryPointSourceFullPath artifactsPath assemblyName =
     let sdks =
         match directives |> List.choose (function Sdk(n, v) -> Some(n, v) | _ -> None) with
@@ -37,6 +46,9 @@ let createProjectFileLines directives entryPointSourceFullPath artifactsPath ass
     let remainingDefaultProperties =
         DefaultProperties |> List.filter (fun (k, _) -> not (Map.containsKey (k.ToLowerInvariant()) properties))
     let packages = directives |> List.choose (function Package(n, v) -> Some(n, v) | _ -> None)
+    let dlls = directives |> List.choose (function Dll n -> Some n | _ -> None)
+    let sources = directives |> List.choose (function Source n -> Some n | _ -> None)
+    let projects = directives |> List.choose (function Project n -> Some n | _ -> None)
 
     [
         "<Project>"
@@ -56,6 +68,13 @@ let createProjectFileLines directives entryPointSourceFullPath artifactsPath ass
         yield! packages |> List.map packageLine
         "    </ItemGroup>"
         "    <ItemGroup>"
+        yield! dlls |> List.map dllLine
+        "    </ItemGroup>"
+        "    <ItemGroup>"
+        yield! projects |> List.map projectLine
+        "    </ItemGroup>"
+        "    <ItemGroup>"
+        yield! sources |> List.map sourceLine
         $"""        <Compile Include="{escape entryPointSourceFullPath}" />"""
         "    </ItemGroup>"
         yield! sdks |> List.map (sdkLine "Sdk.targets")

src/Runfs/Runfs.fs

@@ -118,7 +118,8 @@ let run (options, sourcePath, args) =
                 let readPreviousSourceHash() = File.ReadAllText sourceHashPath
                 not (File.Exists sourceHashPath && readPreviousSourceHash() = sourceHash)
             let noDll = not (File.Exists dllPath)
-            Ok (dependenciesChanged || noDll, sourceChanged)
+            let hasProjectDirective = directives |> List.exists (function Project _ -> true | _ -> false)
+            Ok (dependenciesChanged || noDll || hasProjectDirective, sourceChanged)
 
         if needsRestore then
             do! guardAndTime "creating and writing project file" <| fun () ->

src/Runfs/Runfs.fsproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- General -->
     <AssemblyName>Runfs</AssemblyName>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
     <Description>"dotnet run app.cs" functionality for F#.</Description>
     <Copyright>Copyright 2025 by Martin521</Copyright>
     <Authors>Martin521 and contributors</Authors>
@@ -14,7 +14,13 @@
     <PackageTags>F#</PackageTags>
     <PackAsTool>True</PackAsTool>
     <ToolCommandName>runfs</ToolCommandName>
-    <PackageReleaseNotes>https://github.com/Martin521/Runfs/blob/main/CHANGELOG.md</PackageReleaseNotes>
+    <PackageReleaseNotes>
+## 1.0.6
+
+### added
+
+* support for "source", "project" and "dll" reference directives
+    </PackageReleaseNotes>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageIcon>
     </PackageIcon>
@@ -39,7 +45,5 @@
 
     <PackageReference Include="Microsoft.Build" Version="17.14.8" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Locator" Version="1.9.1" />
-
-    <!-- <PackageReference Include="Microsoft.Build" Version="17.15.0-preview-25277-114" /> -->
   </ItemGroup>
 </Project>

tests/Runfs.Tests/TestFiles/test1.fs

@@ -1,8 +1,8 @@
 module A =
     open System
 
-#r_project "abc/xyz.fsproj"
-#r_dll "System.dll"
+// #r_project "abc/xyz.fsproj"
+// #r_dll "System.dll"
 #r_property "myprop=43"
 #r_property "TargetFramework=net9.0"