Merge pull request #182 from techiedesu/road_to_net_9

.NET 9

Author: 7sharp9

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.1.5",
+      "version": "9.0.2",
       "commands": [
         "paket"
       ]

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
-        dotnet: ['6.0.x']
+        dotnet: ['9.0.x']
     runs-on: ${{ matrix.os }}
 
     steps:

.paket/Paket.Restore.targets

@@ -235,20 +235,26 @@
         <Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+        <Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
         <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
         <CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
         <OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
         <ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
+        <Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
       </PaketReferencesFileLinesInfo>
-      <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
-        <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+      <PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
+        <Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
         <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
         <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
         <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
         <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.ImportTargets) == 'false'">$(ExcludeAssets);build;buildMultitargeting;buildTransitive</ExcludeAssets>
+        <Aliases Condition=" %(PaketReferencesFileLinesInfo.Aliases) != ''">%(PaketReferencesFileLinesInfo.Aliases)</Aliases>
         <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
         <AllowExplicitVersion>true</AllowExplicitVersion>
       </PackageReference>
+      <PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
+        <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+      </PackageVersion>
     </ItemGroup>
 
     <PropertyGroup>

.vscode/launch.json

@@ -17,7 +17,7 @@
             "preLaunchTask": "build",
             "program": "${workspaceFolder}/src/myriad/bin/Debug/netcoreapp3.0/myriad.dll",
             "args": [
-                "--plugin", "${workspaceFolder}/src/Myriad.Plugins/bin/Debug/net6.0/Myriad.Plugins.dll",
+                "--plugin", "${workspaceFolder}/src/Myriad.Plugins/bin/Debug/net9.0/Myriad.Plugins.dll",
                 "--inputfile", "${workspaceFolder}/samples/Example/Library.fs",
                 "--outputfile",  "${workspaceFolder}/samples/Example/Verify.fs",
                 "--namespace", "Test"

CHANGELOG.md

@@ -5,7 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-
+## Changed
+- Upgraded to net9.0
+  - Updated Nuget packages
+    Fantomas.Core to 7.0.0
+    - FSharp.Core 9.0.101
+    - Argu 6.2.5
+    - FSharp.Compiler.Service 43.9.101
+    - Tomlyn 0.18.0
+    - Expecto 10.2.1
+    - Aether 8.3.1
+    - McMaster.NETCore.Plugins 2.0.0
 ## [0.8.3]
 ## Fixed
 Nuget package now has correct link to changelog

Directory.Build.props

@@ -8,7 +8,7 @@
         <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">0.8.3</VersionPrefix>
         <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)$(VersionSuffix)</Version>
         <!-- pack stuff -->
-        <TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net9.0</TargetFrameworks>
         <Authors>7sharp9</Authors>
         <PackageProjectUrl>$(GitUrl)</PackageProjectUrl>
         <PackageTags>fsharp;codegen;generation;metaprogramming</PackageTags>

README.md

@@ -145,7 +145,7 @@ The full fsproj is detail below:
 ```xml
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="Library.fs" />

build.proj

@@ -16,7 +16,7 @@
 
   <Target Name="Test">
     <Exec Command='dotnet build src/Myriad/Myriad.fsproj -c $(Configuration)' />
-    <Exec Command='dotnet run --framework net6.0 --fail-on-focused-tests --summary --project ./test/Myriad.IntegrationPluginTests/Myriad.IntegrationPluginTests.fsproj -c $(Configuration)' IgnoreStandardErrorWarningFormat="true" />
+    <Exec Command='dotnet run --framework net9.0 --fail-on-focused-tests --summary --project ./test/Myriad.IntegrationPluginTests/Myriad.IntegrationPluginTests.fsproj -c $(Configuration)' IgnoreStandardErrorWarningFormat="true" />
   </Target>
 
   <Target Name="Pack" DependsOnTargets="Clean;Restore;Test">

docs/content/docs/Tutorials/configuration.md

@@ -14,7 +14,7 @@ Myriad uses a configuration file called `myriad.toml` which uses the [toml forma
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <MyriadConfigFile>myConfig.toml</MyriadConfigFile>
   </PropertyGroup>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.202",
+    "version": "9.0.101",
     "rollForward": "latestFeature"
   }
 }