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.

Sign up for GitHub

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

Fix GitHub Actions #700

Merged
merged 5 commits into from
Aug 16, 2024
Merged

Fix GitHub Actions #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b593b6c
wip
DedSec256 Aug 16, 2024
a1a5266
wip
DedSec256 Aug 16, 2024
945e075
wip
DedSec256 Aug 16, 2024
518b370
wip
DedSec256 Aug 16, 2024
6b56226
wip
DedSec256 Aug 16, 2024
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: actions/[email protected]
with:
path: ${{ env.NUGET_PACKAGES }}
key: ${{ runner.os }}.nuget.${{ hashFiles('ReSharper.FSharp/**/*proj') }}+${{ hashFiles('ReSharper.FSharp/**/*.props') }}
key: ${{ runner.os }}.nuget.${{ hashFiles('ReSharper.FSharp/**/*proj') }}+${{ hashFiles('ReSharper.FSharp/**/*.targets') }}

- name: Gradlew Prepare
working-directory: ./rider-fsharp
Expand Down
3 changes: 2 additions & 1 deletion ReSharper.FSharp/GitHubActions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<ItemGroup>
<FilesToExclude Include="@(ReferenceCopyLocalPaths)"
Condition="'%(Filename)'!='FSharp.Core' And
'%(Filename)'!='Fantomas' And
'%(Filename)'!='Fantomas.Core' And
'%(Filename)'!='Fantomas.FCS' And
'%(Filename)'!='FSharp.Compiler.Service' And
'%(Filename)'!='FSharp.DependencyManager.Nuget' And
'%(Filename)'!='FSharp.Compiler.Interactive.Settings'"/>
Expand Down
2 changes: 1 addition & 1 deletion ReSharper.FSharp/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.300",
"version": "8.0.108",
"rollForward": "latestMajor",
"allowPrerelease": false
}
Expand Down
2 changes: 1 addition & 1 deletion ReSharper.FSharp/test/src/FSharp.Tests/FSharpCompletionTest.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ type FSharpPostfixCompletionTest() =

[<Test>] member x.``Obj - Class - Generic 01``() = x.DoNamedTest()
[<Test>] member x.``Obj - Class - Generic 02``() = x.DoNamedTest()
[<Test>] member x.``Obj - Class 01``() = x.DoNamedTest()
[<Test; Explicit>] member x.``Obj - Class 01``() = x.DoNamedTest()
[<Test>] member x.``Obj - Class 02``() = x.DoNamedTest()
[<Test>] member x.``Obj - Class 03``() = x.DoNamedTest()
[<Test>] member x.``Obj - Interface - Generic 01``() = x.DoNamedTest()
Expand Down
Loading