Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NET 8.0 #173

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"paket": {
"version": "7.1.5",
"version": "8.0.0",
"commands": [
"paket"
]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
dotnet: ['6.0.x']
dotnet: ['8.0.x']
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/net8.0/Myriad.Plugins.dll",
"--inputfile", "${workspaceFolder}/samples/Example/Library.fs",
"--outputfile", "${workspaceFolder}/samples/Example/Verify.fs",
"--namespace", "Test"
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ 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]
## [0.9.0] - 2024-01-09
### Changed
- Updated to dotnet 8.0.100

## [0.8.3]
## Fixed
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<GitHome>https://github.com/$(gitOwner)</GitHome>
<GitUrl>$(gitHome)/$(gitName)</GitUrl>
<NupkgsDir>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)/bin/nupkg"))</NupkgsDir>
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">0.8.3</VersionPrefix>
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">0.9.0</VersionPrefix>
<Version Condition=" '$(Version)' == '' ">$(VersionPrefix)$(VersionSuffix)</Version>
<!-- pack stuff -->
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
<Authors>7sharp9</Authors>
<PackageProjectUrl>$(GitUrl)</PackageProjectUrl>
<PackageTags>fsharp;codegen;generation;metaprogramming</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion Myriad Configuration Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Briefly before we get onto the new configuration I mentioned, I just wanted to q
```xml
<Project>
<ItemGroup>
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/net6.0/Myriad.Plugins.MyPlugin.dll" />
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/net8.0/Myriad.Plugins.MyPlugin.dll" />
</ItemGroup>
</Project>
```
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ The full fsproj is detail below:
```xml
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Library.fs" />
Expand Down
2 changes: 1 addition & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -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 net8.0 --fail-on-focused-tests --summary --project ./test/Myriad.IntegrationPluginTests/Myriad.IntegrationPluginTests.fsproj' IgnoreStandardErrorWarningFormat="true" />
</Target>

<Target Name="Pack" DependsOnTargets="Clean;Restore;Test">
Expand Down
2 changes: 1 addition & 1 deletion docs/content/docs/Tutorials/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<MyriadConfigFile>myConfig.toml</MyriadConfigFile>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.202",
"version": "8.0.100",
"rollForward": "latestFeature"
}
}
4 changes: 2 additions & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version 7.1.5
version 8.0.0
source https://api.nuget.org/v3/index.json
framework: net60, netstandard21, netcoreapp31
framework: net80, net60, netstandard21
storage: none

nuget Argu
Expand Down
645 changes: 72 additions & 573 deletions paket.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/Example/Example.fsproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Library.fs" />
Expand Down
2 changes: 1 addition & 1 deletion src/Myriad.Core/Ast.fs
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ module Ast =
let isMutable = defaultArg isMutable false
let attributes = defaultArg attributes SynAttributes.Empty
let xmldoc = defaultArg xmldoc PreXmlDoc.Empty
let valData = defaultArg valData (SynValData(None, SynValInfo([], SynArgInfo.Empty), None))
let valData = defaultArg valData (SynValData(None, SynValInfo([], SynArgInfo.Empty), None, None))
let headPat = defaultArg pattern SynPat.CreateNull
let expr = defaultArg expr (SynExpr.CreateTyped(SynExpr.CreateNull, SynType.CreateUnit))
let bind = DebugPointAtBinding.NoneAtLet
Expand Down
2 changes: 1 addition & 1 deletion src/Myriad.Core/Myriad.Core.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
<Description>Core Myriad library used for developing plugins</Description>
<DebugType>embedded</DebugType>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Myriad.Plugins/FieldsGenerator.fs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module internal Create =
let valData =
let argInfo = SynArgInfo.CreateIdString "x"
let valInfo = SynValInfo.SynValInfo([[argInfo]], SynArgInfo.Empty)
SynValData.SynValData(None, valInfo, None)
SynValData.SynValData(None, valInfo, None, None)

SynModuleDecl.CreateLet [SynBinding.Let(pattern = pattern, expr = expr, valData = valData)]

Expand Down
2 changes: 1 addition & 1 deletion src/Myriad.Plugins/LensesGenerator.fs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ module internal CreateLenses =
let tuple = SynExpr.CreateTuple [ SynExpr.Ident getterName; setter ]

let getterLet =
let valData = SynValData.SynValData(None, SynValInfo.Empty, None)
let valData = SynValData.SynValData(None, SynValInfo.Empty, None, None)
let synPat = SynPat.CreateParen(SynPat.CreateTyped(SynPat.CreateNamed(Ident.Create "x", false), duType))

let synPat = SynPat.LongIdent (SynLongIdent.CreateString "getter", None, None, SynArgPats.Pats [synPat], None, range0)
Expand Down
2 changes: 1 addition & 1 deletion src/Myriad.Plugins/Myriad.Plugins.fsproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
<Description>Set of built-in Myriad plugins</Description>
<DebugType>embedded</DebugType>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Myriad.Plugins/build/Myriad.Plugins.InTest.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<ItemGroup>
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/net6.0/Myriad.Plugins.dll" />
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/net8.0/Myriad.Plugins.dll" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Myriad.Plugins/build/Myriad.Plugins.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<ItemGroup>
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/net6.0/Myriad.Plugins.dll" />
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/net8.0/Myriad.Plugins.dll" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Myriad.Sdk/Myriad.Sdk.proj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
<IncludeBuildOutput>false</IncludeBuildOutput>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
Expand Down
2 changes: 1 addition & 1 deletion src/Myriad.Sdk/build/Myriad.Sdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<MyriadSdk_Generator_ExeHost>dotnet </MyriadSdk_Generator_ExeHost>
<MyriadSdk_Generator_Exe>$(MSBuildThisFileDirectory)../tools/net6.0/any/Myriad.dll</MyriadSdk_Generator_Exe>
<MyriadSdk_Generator_Exe>$(MSBuildThisFileDirectory)../tools/net8.0/any/Myriad.dll</MyriadSdk_Generator_Exe>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Myriad/Myriad.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackAsTool>true</PackAsTool>
<ToolCommandName>myriad</ToolCommandName>
<Description>Myriad CLI tool</Description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<RollForward>major</RollForward>
Expand Down Expand Up @@ -65,7 +65,7 @@
<!-- use the dll directly rather than using a nuget -->
<PropertyGroup>
<MyriadSdk_Generator_ExeHost>dotnet </MyriadSdk_Generator_ExeHost>
<MyriadSdk_Generator_Exe>../../src/Myriad/bin/$(Configuration)/net6.0/Myriad.dll</MyriadSdk_Generator_Exe>
<MyriadSdk_Generator_Exe>../../src/Myriad/bin/$(Configuration)/net8.0/Myriad.dll</MyriadSdk_Generator_Exe>
</PropertyGroup>
<!-- include to enable the generation of myriad output -->
<Import Project="..\..\src\Myriad.Sdk\build\Myriad.Sdk.targets" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<ItemGroup>
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/net6.0/Myriad.Plugins.Example1.dll" />
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/net8.0/Myriad.Plugins.Example1.dll" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<ItemGroup>
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/net6.0/Myriad.Plugins.Example1.dll" />
<MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/net8.0/Myriad.Plugins.Example1.dll" />
</ItemGroup>
</Project>
Loading