Skip to content

Commit

Permalink
Update some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
NicoVIII committed Dec 7, 2020
1 parent fda4c7e commit e74de62
Show file tree
Hide file tree
Showing 14 changed files with 254 additions and 811 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.20.3",
"version": "5.20.4-alpha.1642",
"commands": [
"fake"
]
},
"paket": {
"version": "5.249.2",
"version": "6.0.0-beta4",
"commands": [
"paket"
]
Expand Down
32 changes: 9 additions & 23 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
# [Choice] .NET Core version: 3.1, 2.1
ARG VARIANT="3.1"
FROM mcr.microsoft.com/dotnet/core/sdk:${VARIANT}-bionic

# [Option] Install zsh
ARG INSTALL_ZSH="true"
# [Option] Upgrade OS packages to their latest versions
ARG UPGRADE_PACKAGES="true"

# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
ARG USERNAME=vscode
ARG USER_UID=1000
ARG USER_GID=$USER_UID
COPY library-scripts/common-debian.sh /tmp/library-scripts/
RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts

# [Optional] Uncomment this section to install additional OS packages.
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends bash-completion nano

# Add autocomplete for git in terminal
RUN echo "source /usr/share/bash-completion/completions/git" > /root/.bashrc
# [Choice] .NET version: 5.0, 3.1, 2.1
ARG VARIANT="5.0"
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:${VARIANT}

# We need to install .NET Core 3.1 for fornax
RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends dotnet-runtime-3.1
4 changes: 1 addition & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"dockerfile": "Dockerfile",
"args": {
// Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1
"VARIANT": "3.1.302",
// Options
"UPGRADE_PACKAGES": "false"
"VARIANT": "0.153.0-5.0",
}
},
// Set container specific defaults for F# in .NET Core 2.1+
Expand Down
195 changes: 0 additions & 195 deletions .devcontainer/library-scripts/common-debian.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
dotnet: [3.1.302]
dotnet: [5.0.100]
runs-on: ${{ matrix.os }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
dotnet: [3.1.302]
dotnet: [5.0.100]
runs-on: ${{ matrix.os }}

steps:
Expand Down
5 changes: 0 additions & 5 deletions global.json

This file was deleted.

13 changes: 7 additions & 6 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
version 5.251.0

source https://api.nuget.org/v3/index.json

storage: none
framework: netcoreapp3.1, netstandard2.0, netstandard2.1
framework: net5.0, netstandard2.1, netstandard2.0

nuget FSharp.Core
nuget FSharpPlus
nuget Expecto
nuget FsCheck 2.14.0
nuget FsCheck
nuget Expecto.FsCheck
nuget FSharp.Json

group Docs
source https://api.nuget.org/v3/index.json

framework: netstandard2.0
framework: netcoreapp3.1, netstandard2.1, netstandard2.0
storage: symlink

nuget FSharp.Compiler.Service ~> 35.0
Expand All @@ -24,9 +24,10 @@ group Docs
group Build
source https://api.nuget.org/v3/index.json

framework: netstandard2.0
framework: netstandard2.1, netstandard2.0
storage: none

nuget FSharp.Core ~> 4.7
nuget Fake.Core.Target
nuget Fake.Core.Process
nuget Fake.DotNet.Cli
Expand Down

0 comments on commit e74de62

Please sign in to comment.