Skip to content

Commit 39af11f

Browse files
kMutagenekMutagene
committed
Undo lock file setup as CI fails
1 parent 9c3fd1a commit 39af11f

9 files changed

Lines changed: 7 additions & 2671 deletions

File tree

‎.github/workflows/build-and-test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
- name: Setup .NET 5
2121
uses: actions/setup-dotnet@v1
2222
with:
23-
dotnet-version: '5.0.302'
23+
dotnet-version: '5.0.201'
2424
- name: Restore local tools
2525
run: dotnet tool restore
2626
- name: Build and test
27-
run: dotnet fake build -t BuildAndTestCI
27+
run: dotnet fake build -t runTests
2828

2929
build-and-test-windows:
3030

@@ -39,8 +39,8 @@ jobs:
3939
- name: Setup .NET 5
4040
uses: actions/setup-dotnet@v1
4141
with:
42-
dotnet-version: '5.0.302'
42+
dotnet-version: '5.0.201'
4343
- name: Restore local tools
4444
run: dotnet tool restore
4545
- name: Build and test
46-
run: dotnet fake build -t BuildAndTestCI
46+
run: dotnet fake build -t runTests

‎Plotly.NET.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ EndProject
3232
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".ci", ".ci", "{2461AFBF-6E10-4F7B-A0EA-3D62541C2EB1}"
3333
ProjectSection(SolutionItems) = preProject
3434
.github\workflows\build-and-deploy-docs.yml = .github\workflows\build-and-deploy-docs.yml
35-
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
35+
.circleci\config.yml = .circleci\config.yml
3636
EndProjectSection
3737
EndProject
3838
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Plotly.NET.Interactive", "src\Plotly.NET.Interactive\Plotly.NET.Interactive.fsproj", "{0F135E3B-B0E1-42A9-B180-18C0221DC7B8}"

‎build.fsx‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -116,28 +116,12 @@ module BasicTasks =
116116
|> Shell.cleanDirs
117117
}
118118

119-
let restoreLocked = BuildTask.create "RestoreLocked" [clean] {
120-
solutionFile
121-
|> DotNet.restore (fun p ->
122-
{
123-
p with MSBuildParams = {
124-
p.MSBuildParams with Properties=["RestoreLockedMode","true"]
125-
}
126-
}
127-
)
128-
}
129-
130-
let buildNoRestore = BuildTask.create "BuildNoRestore" [clean; restoreLocked.IfNeeded] {
131-
solutionFile
132-
|> DotNet.build (fun p -> {p with NoRestore=true})
133-
}
134-
135119
let build = BuildTask.create "Build" [clean] {
136120
solutionFile
137121
|> DotNet.build id
138122
}
139123

140-
let copyBinaries = BuildTask.create "CopyBinaries" [clean.Always; build.IfNeeded; buildNoRestore.IfNeeded] {
124+
let copyBinaries = BuildTask.create "CopyBinaries" [clean; build] {
141125
let targets =
142126
!! "src/**/*.??proj"
143127
-- "src/**/*.shproj"
@@ -153,7 +137,7 @@ module TestTasks =
153137
open ProjectInfo
154138
open BasicTasks
155139

156-
let runTests = BuildTask.create "RunTests" [clean; build.IfNeeded; buildNoRestore.IfNeeded; copyBinaries] {
140+
let runTests = BuildTask.create "RunTests" [clean; build; copyBinaries] {
157141
let standardParams = Fake.DotNet.MSBuild.CliArguments.Create ()
158142
Fake.DotNet.DotNet.test(fun testParams ->
159143
{
@@ -419,7 +403,5 @@ let _preReleaseNoDocs =
419403
"PreReleaseNoDocs"
420404
[setPrereleaseTag; clean; build; copyBinaries; runTests; packPrerelease; createPrereleaseTag; publishNugetPrerelease]
421405

422-
let _buildCI = BuildTask.createEmpty "BuildAndTestCI" [clean; restoreLocked; buildNoRestore; copyBinaries; runTests]
423-
424406
// run copyBinaries by default
425407
BuildTask.runOrDefault copyBinaries

‎src/Plotly.NET.ImageExport/Plotly.NET.ImageExport.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<TargetFrameworks>net5.0; netstandard2.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<WarnOn>3390;$(WarnOn)</WarnOn>
7-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
8-
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
97
</PropertyGroup>
108

119
<PropertyGroup>

0 commit comments

Comments
 (0)