Skip to content

Commit

Permalink
simpler
Browse files Browse the repository at this point in the history
  • Loading branch information
goswinr committed Feb 16, 2025
1 parent 1f47029 commit adb1935
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
9 changes: 1 addition & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,4 @@ updates:
schedule:
interval: "weekly"

# 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
# - package-ecosystem: "nuget"
# directory: "/"
# schedule:
# interval: "daily"
# don't do nuget here, WPF does not build correctly on linux
4 changes: 2 additions & 2 deletions FeshHosting.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
<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="\" />
<Content Include="Src/SyntaxHighlightingFSharp.xshd" CopyToOutputDirectory="PreserveNewest" 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="\" />
<Content Include="Src/FSharp.Core.xml" CopyToOutputDirectory="Always" Pack="true" PackagePath="\" />

<Compile Include="Src/Util.fs" />
<Compile Include="Src/ParseFs.fs" />
Expand Down
6 changes: 3 additions & 3 deletions FeshStandalone.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@
<Compile Include="Src/Initialize.fs" />
<Compile Include="Src/App.fs" />

<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" />
<Content Include="$(PkgFSharp_Core)/lib/netstandard2.0/FSharp.Core.xml" CopyToOutputDirectory="Always" />
<Content Include="$(PkgNETStandard_Library)/build/netstandard2.0/ref/netstandard.dll" Condition="'$(TargetFramework)' == 'net48'" CopyToOutputDirectory="Always" />
<Content Include="$(PkgNETStandard_Library)/build/netstandard2.0/ref/netstandard.xml" Condition="'$(TargetFramework)' == 'net48'" CopyToOutputDirectory="Always" />


</ItemGroup>
Expand Down

0 comments on commit adb1935

Please sign in to comment.