include FSharp.Core.xml

goswinr · Feb 16, 2025 · 1f47029 · 1f47029
1 parent d5a9892
commit 1f47029
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 24 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,7 +7,7 @@ updates:
     schedule:
       interval: "weekly"
 
- # don't do nuget here, WPF does not build correctly on linux
+# don't do nuget here, WPF does not build correctly on linux
 # to work on FSharp.Core too the fsproj needs : <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
 # and <PackageReference Include="FSharp.Core" Version= ...
 # see https://github.com/dependabot/dependabot-core/issues/10883

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,23 @@ jobs:
       - name: Build FeshHosting.fsproj
         run: dotnet build FeshHosting.fsproj --configuration Release
 
-      - name: Build FeshStandalone.fsproj
-        run: dotnet build FeshStandalone.fsproj --configuration Release
+      # make sure to match release.yml
+      - name: Run dotnet publish net48
+        run: |
+          dotnet publish FeshStandalone.fsproj `
+            --configuration release `
+            --runtime win-x64 `
+            --output bin/publish/net48 `
+            --framework net48 `
+            --no-self-contained
+
+      - name: Run dotnet publish net9.0
+        run: |
+          dotnet publish FeshStandalone.fsproj `
+            --configuration release `
+            --runtime win-x64 `
+            --output bin/publish/net9.0 `
+            --framework net9.0-windows `
+            --no-self-contained
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [0.23.0] - 2024-02-16
+### Fixed
+- include FSharp.Core.xml
+
 ## [0.22.0] - 2025-02-15
 ### Fixed
 - Completions never replace next word too eagerly
@@ -88,8 +93,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - first public release
 
-[Unreleased]: https://github.com/goswinr/Fesh/compare/0.22.0...HEAD
-[0.22.0]: https://github.com/goswinr/Fesh/compare/0.21.0...0.22.0
+[Unreleased]: https://github.com/goswinr/Fesh/compare/0.23.0...HEAD
+[0.23.0]: https://github.com/goswinr/Fesh/compare/0.22.0...0.23.0
 [0.21.0]: https://github.com/goswinr/Fesh/compare/0.20.0...0.21.0
 [0.20.0]: https://github.com/goswinr/Fesh/compare/0.19.0...0.20.0
 [0.19.0]: https://github.com/goswinr/Fesh/compare/0.16.0...0.19.0

diff --git a/FeshHosting.fsproj b/FeshHosting.fsproj
@@ -63,7 +63,7 @@
     <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 -->
 
     <!-- normally don't include FSharp.Core in a library, but here it needs to match FSharp.Compiler.Service-->
-	  <PackageReference Include="FSharp.Core" Version="9.0.201" />
+	  <PackageReference Include="FSharp.Core" Version="9.0.201" GeneratePathProperty="true" />
 	  <PackageReference Include="FSharp.Compiler.Service" Version="43.9.201" />
 
 	  <PackageReference Include="Fittings" Version="0.10.0" />
@@ -72,14 +72,22 @@
 
   </ItemGroup>
 
+  <Target Name="CopyFSharpCoreXml" BeforeTargets="BeforeBuild">
+    <!--  because Pack="true" PackagePath="\"  fails source $(PkgFSharp_Core) , so copy it first -->
+    <Copy SourceFiles="$(PkgFSharp_Core)/lib/netstandard2.0/FSharp.Core.xml"  DestinationFolder="Src"  ContinueOnError="false" />
+  </Target>
+
   <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="\" />
-    <None Include="Media/logo128.png" Pack="true" PackagePath="\" /> <!--PackagePath = "\" makes the file available to nuget pack tool-->
-    <EmbeddedResource Include="Media/logo.res" />  <!--  for Application Icon in explorer-->
+    <Content Include="README.md" Pack="true" PackagePath="\" />
+    <Content Include="Media/logo128.png" Pack="true" PackagePath="\" /> <!--PackagePath = "\" makes the file available to nuget pack tool-->
     <Resource Include="Media/logo.ico" />          <!--  for Application Icon in primary windows-->
     <Resource Include="Media/logoGray.ico" />      <!--  for Application Icon in secondary PopOut windows-->
+    <EmbeddedResource Include="Media/logo.res" />  <!--  for Application Icon in explorer-->
+
+	  <Content Include="Src/SyntaxHighlightingFSharp.xshd" CopyToOutputDirectory="PreserveNewest" TargetPath="SyntaxHighlightingFSharp.xshd" Pack="true" PackagePath="\" />
 
-	  <None Include="Src/SyntaxHighlightingFSharp.xshd" CopyToOutputDirectory="PreserveNewest" TargetPath="SyntaxHighlightingFSharp.xshd" Pack="true" PackagePath="\" />
+    <!-- so that the hosting app does not need to pull in FSharp.Core separately just for right the xml -->
+    <Content Include="Src/FSharp.Core.xml" CopyToOutputDirectory="Always" TargetPath="FSharp.Core.xml"  Pack="true" PackagePath="\" />
 
     <Compile Include="Src/Util.fs" />
     <Compile Include="Src/ParseFs.fs" />

diff --git a/FeshStandalone.fsproj b/FeshStandalone.fsproj
@@ -65,7 +65,7 @@
     <Resource Include="Media/logo.ico" />            <!--  for Application Icon in primary windows-->
     <Resource Include="Media/logoGray.ico" />        <!--  for Application Icon in secondary PopOut windows-->
 
-    <None Include="Src/SyntaxHighlightingFSharp.xshd" CopyToOutputDirectory="PreserveNewest" TargetPath="SyntaxHighlightingFSharp.xshd" Pack="true" PackagePath="\" />
+    <Content Include="Src/SyntaxHighlightingFSharp.xshd" CopyToOutputDirectory="PreserveNewest" TargetPath="SyntaxHighlightingFSharp.xshd" Pack="true" PackagePath="\" />
 
     <Compile Include="Src/Util.fs" />
     <Compile Include="Src/ParseFs.fs" />
@@ -129,23 +129,18 @@
     <Compile Include="Src/Initialize.fs" />
     <Compile Include="Src/App.fs" />
 
-  </ItemGroup>
+    <Content Include="$(PkgFSharp_Core)/lib/netstandard2.0/FSharp.Core.xml" CopyToOutputDirectory="Always" TargetPath="FSharp.Core.xml"  />
+    <Content Include="$(PkgNETStandard_Library)/build/netstandard2.0/ref/netstandard.dll" Condition="'$(TargetFramework)' == 'net48'" CopyToOutputDirectory="Always" TargetPath="netstandard.dll" />
+    <Content Include="$(PkgNETStandard_Library)/build/netstandard2.0/ref/netstandard.xml" Condition="'$(TargetFramework)' == 'net48'" CopyToOutputDirectory="Always" TargetPath="netstandard.xml" />
 
-  <Target Name="CopyFilesOverAfterBuild" BeforeTargets="AfterBuild">
-    <!-- to check output from Ionide.KeepAChangelog.Tasks current git tag in gh actions -->
-    <WriteLinesToFile File="./bin/ChangelogVersion.txt" Lines="@(CurrentReleaseChangelog)" Overwrite="true" ContinueOnError="false" />
 
-    <!--netstandard dll is needed for editor tooling only, copy it because it might not be installed on host PC . see also  https://github.com/fsprojects/IfSharp/issues/213 -->
-    <Copy SourceFiles="$(PkgNETStandard_Library)/build/netstandard2.0/ref/netstandard.dll" DestinationFiles="$(TargetDir)netstandard.dll" ContinueOnError="false" Condition="'$(TargetFramework)' == 'net48'" />
-    <Copy SourceFiles="$(PkgNETStandard_Library)/build/netstandard2.0/ref/netstandard.xml" DestinationFiles="$(TargetDir)netstandard.xml" ContinueOnError="false" Condition="'$(TargetFramework)' == 'net48'" />
+  </ItemGroup>
 
-    <!--FSharp.Core.xml because <FSharpCoreIncludeDocFileInOutput> does not seem to work add it explicitly: -->
-    <Copy SourceFiles="$(PkgFSharp_Core)/lib/netstandard2.0/FSharp.Core.xml" DestinationFiles="$(TargetDir)FSharp.Core.xml" ContinueOnError="false" />
 
-    <!-- <Copy SourceFiles="$(PkgFSharp_Compiler_Service)/lib/netstandard2.0/FSharp.Compiler.Service.xml" DestinationFiles="$(TargetDir)FSharp.Compiler.Service.xml" ContinueOnError="false" /> -->
-    <!-- <Copy SourceFiles="$(PkgAvalonLog)/lib/net472/AvalonLog.xml" DestinationFiles="$(TargetDir)AvalonLog.xml" ContinueOnError="false" /> -->
-    <!-- <Copy SourceFiles="$(PkgAvalonEditB)/lib/net472/AvalonEditB.xml" DestinationFiles="$(TargetDir)AvalonEditB.xml" ContinueOnError="false" /> -->
-    <!-- <Copy SourceFiles="$(PkgFittings)/lib/net472/Fittings.xml" DestinationFiles="$(TargetDir)Fittings.xml" ContinueOnError="false" /> -->
+  <!-- -->
+  <Target Name="CopyFilesOverAfterBuild" AfterTargets="AfterBuild">
+    <!-- to check output from Ionide.KeepAChangelog.Tasks current git tag in gh actions -->
+    <WriteLinesToFile File="./bin/ChangelogVersion.txt" Lines="@(CurrentReleaseChangelog)" Overwrite="true" ContinueOnError="false" />
   </Target>
 
 </Project>