Merge branch 'master' of https://github.com/MoiraeSoftware/Myriad

Author: 7sharp9

.github/workflows/build.yml

@@ -13,12 +13,14 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ matrix.dotnet }}
     - name: Restore tools
       run: dotnet tool restore
+    - name: Restore dependencies
+      run: dotnet paket restore
     - name: Run Test
       run: dotnet build -c Release -t:Test

.github/workflows/docs.yml

@@ -50,7 +50,7 @@ jobs:
           cd docs
           hugo \
             --minify \
-            --baseURL "${{ steps.pages.outputs.base_url }}/"
+            --baseURL "${{ steps.pages.outputs.base_url || 'https://moiraesoftware.github.io/Myriad' }}/"
         env:
           HUGO_ENVIRONMENT: production
           HUGO_ENV: production

.github/workflows/publish.yml

@@ -34,16 +34,21 @@ jobs:
     - name: Validate version
       run: |
         VERSION="${{ steps.tag_name.outputs.current_version }}"
-        # Require at least three numeric segments (X.Y.Z), optionally followed by a pre-release suffix.
+        # Require exactly three numeric segments (X.Y.Z), optionally followed by a pre-release suffix.
         # This prevents 2-segment tags like v0.85 (which would publish as 0.85.0 instead of 0.8.5).
-        if ! echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+'; then
+        if ! echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
           echo "::error::Version '$VERSION' does not match the required X.Y.Z format. Did you mean to add a missing segment (e.g. '0.85' should be '0.8.5')?"
           exit 1
         fi
         # Verify the version matches VersionPrefix in Directory.Build.props so that the tag and
         # source code are always in sync.
         EXPECTED=$(sed -n 's/.*<VersionPrefix[^>]*>\([^<]*\)<\/VersionPrefix>.*/\1/p' Directory.Build.props | head -1)
-        if [ "$VERSION" != "$EXPECTED" ] && ! echo "$VERSION" | grep -q "^${EXPECTED}-"; then
+        if [ -z "$EXPECTED" ]; then
+          echo "::error::Could not extract VersionPrefix from Directory.Build.props."
+          exit 1
+        fi
+        EXPECTED_ESCAPED=$(printf '%s' "$EXPECTED" | sed 's/[.]/[.]/g')
+        if [ "$VERSION" != "$EXPECTED" ] && ! echo "$VERSION" | grep -qE "^${EXPECTED_ESCAPED}-"; then
           echo "::error::Tag version '$VERSION' does not match VersionPrefix '$EXPECTED' in Directory.Build.props. Update Directory.Build.props before tagging."
           exit 1
         fi

CHANGELOG.md

@@ -6,11 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.6] - 2026-03-21
 ### Fixed
+- Build CI workflow (`build.yml`) now uses `actions/checkout@v4` and `actions/setup-dotnet@v4` (previously v3/v2) and includes an explicit `dotnet paket restore` step.
+- `Myriad.Sdk` `PackageDownload` is now conditional — skipped when consumers override `MyriadSdk_Generator_Exe`, preventing unnecessary network downloads and offline build failures.
+- Package ID casing normalised to `Myriad` in `Myriad.Sdk.props` (was `myriad`).
+- Publish workflow version validation hardened: regex anchored with `$`, dots escaped in grep, early failure on missing `VersionPrefix`.
+- Plugin loader now logs `ReflectionTypeLoadException.LoaderExceptions` to stderr in `--verbose` mode.
+- Removed orphaned `Quotations.fs` (dead code referencing non-existent `Microsoft.FSharp.Compiler.*` namespaces).
+- Sample project updated from stale NuGet v0.5.1 references to local `ProjectReference` imports.
 - Publish workflow now supports manual dispatch via `workflow_dispatch` input, uses `$GITHUB_OUTPUT` instead of deprecated `::set-output`, and replaces archived GitHub Actions with `softprops/action-gh-release@v2`. A missing `dotnet paket restore` step was also added before build and test steps. (#234)
 - `Myriad.Sdk.proj` now uses `PackageDownload` instead of `PackageReference` for the `Myriad` tool dependency, resolving **NU1102** and **NU1212** errors that caused every publish attempt to fail since v0.8.4. Consumers of `Myriad.Sdk` also get the matching `Myriad` package placed in the NuGet cache automatically via a `PackageDownload` item in `Myriad.Sdk.props`. (#236)
 - `build.proj` Pack target now normalises 2-segment version numbers (e.g. `0.85`) to 3-segment (`0.85.0`) before passing them to `dotnet pack`/`dotnet restore`, preventing a Paket nuspec filename mismatch that caused pack to fail when using versions like `/p:Version=0.85`. (#238)
-- Publish workflow now requires 3-segment version tags (e.g. `v0.8.5`, not `v0.85`) and validates that the tag version matches `VersionPrefix` in `Directory.Build.props`, preventing accidental releases under the wrong version number (e.g. `0.85.0` instead of `0.8.5`). (#239)
+- Publish workflow now requires 3-segment version tags (e.g. `v0.8.5`, not `v0.85`) and validates that the tag version matches `VersionPrefix` in `Directory.Build.props`, preventing accidental releases under the wrong version number (e.g. `0.85.0` instead of `0.8.5`). (#239, #252)
+
+### Changed
+- `Ast.extractTypeDefn` and `Ast.ModuleOrNamespace.getTypeDefns` now share a single private `extractTypesFromDecls` helper, eliminating an identical nested `extractTypes` definition that was duplicated in both functions. (#262)
+- `resolveCaseIdent` helper extracted from `DUCasesGenerator` into `GeneratorHelpers`, eliminating duplication with `LensesGenerator`. (#253)
+- `generateModules` and `filterByAttribute` helpers extracted into `GeneratorHelpers`, eliminating the duplicate `Generate` pipeline boilerplate in `DUCasesGenerator` and `FieldsGenerator`. (#241, #255, #257, #258)
+- `createTypedNamedParen` helper extracted into `GeneratorHelpers`, eliminating thirteen identical `SynPat.CreateNamed |> SynPat.CreateTyped |> SynPat.CreateParen` expressions. (#265)
+- `filterTypes` helper extracted into `Ast`, eliminating five identical inline filter expressions. (#250)
+- Expecto test framework updated from 10.2.1 to 10.2.3 (patch). (#243)
 
 ## [0.8.5]
 ### Fixed

Directory.Build.props

@@ -5,7 +5,7 @@
         <GitHome>https://github.com/$(gitOwner)</GitHome>
         <GitUrl>$(gitHome)/$(gitName)</GitUrl>
         <NupkgsDir>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)/bin/nupkg"))</NupkgsDir>
-        <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">0.8.5</VersionPrefix>
+        <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">0.8.6</VersionPrefix>
         <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)$(VersionSuffix)</Version>
         <!-- pack stuff -->
         <TargetFrameworks>net9.0</TargetFrameworks>

README.md

@@ -21,8 +21,8 @@ If you enjoy this repo and wanted to shown your appriciation etc then I do have
 To use Myriad via its MSBuild support you add the `Myriad.Core` and `Myriad.Sdk` package references:
 ```xml
     <ItemGroup>
-      <PackageReference Include="Myriad.Core" Version="0.8.4" />
-      <PackageReference Include="Myriad.Sdk" Version="0.8.4" />
+      <PackageReference Include="Myriad.Core" Version="0.8.6" />
+      <PackageReference Include="Myriad.Sdk" Version="0.8.6" />
     </ItemGroup>
 ```
 
@@ -158,8 +158,8 @@ The full fsproj is detail below:
         </Compile>
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Myriad.Core" Version="0.8.4" />
-      <PackageReference Include="Myriad.Sdk" Version="0.8.4" />
+      <PackageReference Include="Myriad.Core" Version="0.8.6" />
+      <PackageReference Include="Myriad.Sdk" Version="0.8.6" />
     </ItemGroup>
 </Project>
 ```
@@ -210,7 +210,7 @@ Then add a new folder `build` with the `Generator.props` file within:
 ```xml
 <Project>
     <ItemGroup>
-        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/netstandard2.1/Generator.dll" />
+        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/net9.0/Generator.dll" />
     </ItemGroup>
 </Project>
 ```
@@ -220,7 +220,7 @@ Often an additional props file (In this sample the file would be `Generator.InTe
 ```xml
 <Project>
     <ItemGroup>
-        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/netstandard2.1/Generator.dll" />
+        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/net9.0/Generator.dll" />
     </ItemGroup>
 </Project>
 ```
@@ -248,18 +248,18 @@ The nuget package for Myriad can be found here:
 [Nuget package](https://www.nuget.org/packages/myriad/).
 
 ## Dotnet template
-A dotnet template for a Myriad plugin/generator is available here:
+A dotnet template for a Myriad plugin/generator is available on NuGet:
 ```
 #install dotnet template
-dotnet new -i Myriad.Templates
+dotnet new install Myriad.Templates
 
 #create myriad generator from the template
 dotnet new myriadgenerator -n myMyriadPlugin
 ```
 
 ## How to build and test
 
-1. Make sure you have .Net Core SDK installed - check required version in [global.json](global.json)
+1. Make sure you have .NET SDK installed - check required version in [global.json](global.json)
 2. Run `dotnet tool restore`
 3. Run `dotnet build -c Release -t:Build`
 

docs/.gitmodules

@@ -13,10 +13,10 @@ menu:
 
 There is currently an introduction to Myriad and a How to guide on creating a simple generator
 
-[Applied Metaprogramming with Myriad and Falanx](https://7sharp9.github.io/fsharp/2019-04-24-applied-metaprogramming-with-myriad/)  - This is a video I made for my YouTube channel which covers some details on Myriad.  
+[Applied Metaprogramming with Myriad and Falanx](https://7sharp9.dev/programming/2019-04-24-applied-metaprogramming-with-myriad/)  - This is a video I made for my YouTube channel which covers some details on Myriad.
 
 
-[Myriad Intro](https://7sharp9.github.io/fsharp/2019-11-06-myriad-intro/) - This is a blog post I wrote around the time of Applied Metaprogramming with Myriad and Falanx which has details of making a generator that produces this simple module:
+[Myriad Intro](https://7sharp9.dev/programming/2019-11-06-myriad-intro/) - This is a blog post I wrote around the time of Applied Metaprogramming with Myriad and Falanx which has details of making a generator that produces this simple module:
 
 
 ```fsharp

docs/content/docs/External Resources/index.md

@@ -58,11 +58,17 @@ type GeneratorContext = {
     ConfigKey: string option
     ConfigGetter: string -> (string * obj) seq
     InputFilename: string
+    ProjectContext: ProjectContext option
+    AdditionalParameters: IDictionary<string, string>
 }
 
+type Output =
+    | Ast of SynModuleOrNamespace list
+    | Source of string
+
 type IMyriadGenerator =
     abstract member ValidInputExtensions: string seq
-    abstract member Generate: GeneratorContext -> FsAst.AstRcd.SynModuleOrNamespaceRcd list
+    abstract member Generate: GeneratorContext -> Output
 ```
 
 ValidInputExtensions is used so a plugin is tied to certain file types as input, if you plugin generating ast fragments from java files then you would add `.java` to the `ValidInputExtensions` implementation for example.  

docs/content/docs/Tutorials/configuration.md

@@ -43,7 +43,7 @@ Then add a new folder `build` with the `Generator.props` file within:
 ```xml
 <Project>
     <ItemGroup>
-        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/netstandard2.1/Generator.dll" />
+        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/net9.0/Generator.dll" />
     </ItemGroup>
 </Project>
 ```
@@ -53,7 +53,7 @@ Often an additional props file (In this smaple the file would be `Generator.InTe
 ```xml
 <Project>
     <ItemGroup>
-        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/netstandard2.1/Generator.dll" />
+        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/net9.0/Generator.dll" />
     </ItemGroup>
 </Project>
 ```