Skip to content
Merged
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
18 changes: 1 addition & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,10 @@ jobs:
ci:
runs-on: ubuntu-latest
steps:
# Ionide SDK
- name: Checkout ionide/FSharp.Analyzers.SDK
uses: actions/checkout@v3
with:
repository: ionide/FSharp.Analyzers.SDK
path: FSharp.Analyzers.SDK
ref: master
- name: Setup .NET for ionide/FSharp.Analyzers.SDK
uses: actions/setup-dotnet@v3
with:
global-json-file: FSharp.Analyzers.SDK/global.json
- name: Build ionide/FSharp.Analyzers.SDK
working-directory: FSharp.Analyzers.SDK
run: dotnet fsi build.fsx

# G-Research analyzers
- uses: actions/checkout@v3
with:
path: g-research-fsharp-analyzers
- name: Setup .NET for ionide/FSharp.Analyzers.SDK
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
global-json-file: g-research-fsharp-analyzers/global.json
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ F# analyzers used within G-Research.
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<WarningsAsErrors>FS0025</WarningsAsErrors>
<WarnOn>1182;3390;$(WarnOn)</WarnOn>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<RestoreLockedMode>true</RestoreLockedMode>
<RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
<RestoreLockedMode>false</RestoreLockedMode>
<NoWarn>NU1603;NETSDK1057</NoWarn>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<!-- https://www.gresearch.co.uk/blog/article/improve-nuget-restores-with-static-graph-evaluation/ -->
Expand Down
3 changes: 2 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>
<ItemGroup>
<!-- locking the version of F# Core as FCS does this anyway and in practise all will be using the same version -->
<PackageVersion Include="FSharp.Analyzers.SDK" Version="0.14.1" />
<PackageVersion Include="FSharp.Analyzers.SDK.Testing" Version="0.14.1" />
<PackageVersion Include="FSharp.Core" Version="[7.0.400]" />
<PackageVersion Include="FSharp.Compiler.Service" Version="[43.7.400]" />
<PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" />
Expand Down
5 changes: 1 addition & 4 deletions src/FSharp.Analyzers/FSharp.Analyzers.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@
<Compile Include="StringAnalyzers.fs"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\FSharp.Analyzers.SDK\src\FSharp.Analyzers.SDK\FSharp.Analyzers.SDK.fsproj"/>
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core"/>
<PackageReference Include="FSharp.Analyzers.SDK" />
<PackageReference Include="FSharp.Compiler.Service"/>
</ItemGroup>

Expand Down
Loading