Skip to content

Commit 28da491

Browse files
committed
F#10 on net8
1 parent f0a6821 commit 28da491

File tree

4 files changed

+28
-19
lines changed

4 files changed

+28
-19
lines changed

.github/workflows/release-nuget.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Build and Publish NuGet Package
33
on:
44
push:
55
tags:
6+
# does trigger on prerelease tags like 0.30.0-beta1 too
67
- '*.*.*'
78

89
jobs:
@@ -24,7 +25,7 @@ jobs:
2425
$content = $content -replace "<br>", " "
2526
Set-Content -Path README.md -Value $content
2627
27-
- name: Dotnet build FeshHosting for net472
28+
- name: Dotnet build FeshHosting for net8
2829
run: dotnet build FeshHosting.fsproj --configuration Release --output bin/publishNuget
2930

3031

@@ -45,35 +46,35 @@ jobs:
4546
echo "github.ref_name=${{ github.ref_name }}"
4647
echo "Version check of git tag and CHANGELOG.md passed successfully."
4748
48-
- name: Push net472 NuGet package to nuget.org
49+
- name: Push net10 NuGet package to nuget.org
4950
run: |
5051
dotnet nuget push `
5152
./bin/publishNuget/Fesh.${{ github.ref_name }}.symbols.nupkg `
5253
--api-key ${{ secrets.NUGET_API_KEY }} `
5354
--source https://api.nuget.org/v3/index.json
5455
55-
# now that net472 is done do the same for net8.0
56+
# now that net8 is done do the same for net472
5657
# all of this is only needed because <TargetFrameworks>net8.0-windows;net472</TargetFrameworks> does no make a valid nuget package for net48
57-
# so wwe make a separate build for net8.0 and net472
58+
# so we make a separate build for net8.0 and net472
5859

59-
- name: Set target framework to net8.0
60+
- name: Set target framework to net472 in FeshHosting.fsproj
6061
run: |
6162
$projFile = Get-Content -Path FeshHosting.fsproj -Raw
62-
$projFile = $projFile -replace "<TargetFramework>net472</TargetFramework>", "<TargetFramework>net8.0-windows</TargetFramework>"
63+
$projFile = $projFile -replace "<TargetFramework>.*?</TargetFramework>", "<TargetFramework>net472</TargetFramework>"
6364
Set-Content -Path FeshHosting.fsproj -Value $projFile
6465
65-
- name : Set -net8 suffix in changelog
66+
- name : Set -net472 suffix in changelog
6667
run: |
6768
$content = Get-Content -Path CHANGELOG.md -Raw
68-
$content = $content -replace "${{ github.ref_name }}", "${{ github.ref_name }}-net8"
69+
$content = $content -replace "${{ github.ref_name }}", "${{ github.ref_name }}-net472"
6970
Set-Content -Path CHANGELOG.md -Value $content
7071
71-
- name: Dotnet build FeshHosting for net8.0
72+
- name: Dotnet build FeshHosting for net472
7273
run: dotnet build FeshHosting.fsproj --configuration Release --output bin/publishNuget
7374

74-
- name: Push net8.0 NuGet package to nuget.org
75+
- name: Push net472 NuGet package to nuget.org
7576
run: |
7677
dotnet nuget push `
77-
./bin/publishNuget/Fesh.${{ github.ref_name }}-net8.symbols.nupkg `
78+
./bin/publishNuget/Fesh.${{ github.ref_name }}-net472.symbols.nupkg `
7879
--api-key ${{ secrets.NUGET_API_KEY }} `
7980
--source https://api.nuget.org/v3/index.json

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Release with Velopack
33
on:
44
push:
55
tags:
6+
# does not trigger on prerelease tags like 0.30.0-beta1
67
- '[0-9]+.[0-9]+.[0-9]+'
78

89
jobs:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.30.0-alpha1] - 2025-12-19
11+
### Changed
12+
- net472 nuget with suffix, net10 nuget without suffix
13+
1014
## [0.29.3] - 2025-12-15
1115
### Changed
1216
- Build NET core nuget targeting F# 8 and .Net 8 to try fix assembly load issues in Rhino and Revit

FeshHosting.fsproj

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@
33
<PropertyGroup>
44
<!-- https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props-desktop -->
55
<!-- <OutputType>Library</OutputType> not needed -->
6+
<!-- <RuntimeIdentifier>win-x64</RuntimeIdentifier> -->
7+
68
<UseWPF>true</UseWPF>
79
<UseWindowsForms>true</UseWindowsForms><!--inherited from Avalonedit ?-->
8-
<!-- <TargetFrameworks>net472;net8.0-windows</TargetFrameworks> the resultant nuget from multiple target frameworks
10+
<!-- <TargetFrameworks>net472;net8.0-windows</TargetFrameworks> somehow the resultant nuget from multiple target frameworks
911
does get unified to 8.0 and does not work on net48 -->
10-
<!--so the the release-nuget.yml aktion will change this and also publish a net8.0-windows nuget separately: -->
11-
<TargetFramework>net472</TargetFramework>
12+
<!--so the the release-nuget.yml aktion will change this and also publish a net472 nuget separately: -->
13+
<TargetFramework>net8.0-windows</TargetFramework>
14+
1215
<DefineConstants Condition="'$(TargetFramework)' == 'net472'">NETFRAMEWORK</DefineConstants> <!-- so thread.Abort() can be used -->
13-
<!-- <RuntimeIdentifier>win-x64</RuntimeIdentifier> -->
1416

1517
<LangVersion>preview</LangVersion><!-- to enable indexing from end via ^ -->
1618

1719
<NeutralLanguage>en</NeutralLanguage>
1820
<SatelliteResourceLanguages>en</SatelliteResourceLanguages> <!--to only have the English resources-->
1921
<GenerateDocumentationFile>true</GenerateDocumentationFile> <!-- does not work when used in visual studio? only dotnet sdk ?-->
20-
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <!-- for dotnet outdated tool to work -->
22+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference> <!-- for dotnet outdated tool to work, so use Include not Update for FSharp.Core -->
2123

2224
<RootNamespace>Fesh</RootNamespace>
2325
<AssemblyName>Fesh</AssemblyName>
@@ -62,13 +64,14 @@
6264
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" /> <!-- to move files to the recycle bin instead of deleting them -->
6365
<PackageReference Include="System.Private.Uri" Version="4.3.2" /> <!-- warning NU1903: Package 'System.Private.Uri' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-5f2m-466j-3848 -->
6466

65-
67+
<PackageReference Include="FSharp.Compiler.Service" Version="43.10.101" />
68+
<PackageReference Include="FSharp.Core" Version="10.0.101" />
6669

6770
<!-- build the NET core nuget for F#8 so that dependencies like System.Diagnostics.DiagnosticSource are also for Net80 and load properly in Rhino and Revit:-->
68-
<PackageReference Include="FSharp.Compiler.Service" Version="43.10.101" Condition="'$(TargetFramework)' == 'net472'" />
71+
<!-- <PackageReference Include="FSharp.Compiler.Service" Version="43.10.101" Condition="'$(TargetFramework)' == 'net472'" />
6972
<PackageReference Include="FSharp.Compiler.Service" Version="43.8.403" Condition="'$(TargetFramework)' != 'net472'" />
7073
<PackageReference Include="FSharp.Core" Version="10.0.101" Condition="'$(TargetFramework)' == 'net472'"/>
71-
<PackageReference Include="FSharp.Core" Version="8.0.403" Condition="'$(TargetFramework)' != 'net472'"/>
74+
<PackageReference Include="FSharp.Core" Version="8.0.403" Condition="'$(TargetFramework)' != 'net472'"/> -->
7275

7376
<PackageReference Include="Fittings" Version="0.10.0" />
7477
<PackageReference Include="AvalonLog" Version="0.20.0" />

0 commit comments

Comments
 (0)