Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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
8 changes: 1 addition & 7 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@
"isRoot": true,
"tools": {
"paket": {
"version": "5.257.0",
"version": "8.0.0",
"commands": [
"paket"
]
},
"fake-cli": {
"version": "5.20.4",
"commands": [
"fake"
]
}
}
}
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ data/
packages/
obj/
bin/
.paket/paket.exe
*.svclog
temp
web/content/dist
Expand Down Expand Up @@ -54,5 +53,7 @@ node_modules
.ionide/
/wwwroot
/.farmer
/.paket
/deployed_storage_key.txt

# JetBrains Rider
.idea/
557 changes: 557 additions & 0 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.201-buster as base
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim as base

RUN apt-get update && \
apt-get install -y nodejs npm && \
Expand All @@ -9,7 +9,7 @@ COPY . .

RUN ./build.sh -t deploy

FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim
FROM mcr.microsoft.com/dotnet/core/runtime:8.0-bookworm-slim

WORKDIR /wwwroot
COPY --from=base /wwwroot/deploy_0 .
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ steps:
- task: UseDotNet@2
inputs:
packageType: 'sdk'
version: '7.0.x'
version: '8.0.x'

# This restrictive global.json is needed for the build commands above, but it would prevent the .fsx in the next task from running.
- script: rm global.json
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ stages:
useGlobalJson: true
- script: dotnet tool restore
- script: dotnet paket restore
- script: dotnet fake run build.fsx %*
- script: dotnet fsi build.fsx %*

- task: UseDotNet@2
inputs:
packageType: 'sdk'
version: '7.0.x'
version: '8.0.x'
# This restrictive global.json is needed for the build commands above, but it would prevent the .fsx in the next task from running.
- script: rm global.json

Expand Down
20 changes: 15 additions & 5 deletions build.fsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#r "paket: groupref build //"
#load "./.fake/build.fsx/intellisense.fsx"
#if !NETCOREAPP
#r "System.IO.Compression.FileSystem.dll"
#endif
#r "nuget:MSBuild.StructuredLogger, 2.2.100"
#r "nuget:Fake.Core.UserInput ,6.0.0"
#r "nuget:Fake.Core.Target ,6.0.0"
#r "nuget:Fake.IO.FileSystem ,6.0.0"
#r "nuget:Fake.DotNet.Cli ,6.0.0"
#r "nuget:Fake.JavaScript.Npm ,6.0.0"

open Fake.Core
open Fake.Core.TargetOperators
Expand All @@ -13,6 +14,15 @@ open Fake.JavaScript
open System
open System.IO

#if !FAKE
Environment.GetCommandLineArgs()
|> Array.skip 2
|> Array.toList
|> Fake.Core.Context.FakeExecutionContext.Create false __SOURCE_FILE__
|> Fake.Core.Context.RuntimeContext.Fake
|> Fake.Core.Context.setExecutionContext
#endif

let project = "src/FsSnip.Website"
let publishDirectory = "artifacts"

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ export PAKET_SKIP_RESTORE_TARGETS=true

dotnet tool restore
dotnet paket restore
dotnet fake run build.fsx "$@"
dotnet fsi build.fsx "$@"
2 changes: 1 addition & 1 deletion fssnip.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function Build-App {
Restore-GlobalJson
dotnet tool restore
dotnet paket restore
dotnet fake run build.fsx
dotnet fsi build.fsx
}

function Start-App {
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "3.1.100",
"version": "8.0.100",
"rollForward": "minor"
}
}
4 changes: 2 additions & 2 deletions localfs.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.201-buster as base
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim as base

RUN apt-get update && \
apt-get install -y nodejs npm && \
Expand All @@ -9,7 +9,7 @@ COPY . .

RUN ./build.sh -t download-data-dump && ./build.sh -t deploy

FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim
FROM mcr.microsoft.com/dotnet/runtime:8.0-bookworm-slim

WORKDIR /wwwroot
COPY --from=base /wwwroot/deploy_0 .
Expand Down
Loading