Skip to content
This repository has been archived by the owner on Oct 28, 2024. It is now read-only.

Commit

Permalink
Merge pull request #287 from bacongobbler/dotnet-6
Browse files Browse the repository at this point in the history
upgrade to .NET 6
  • Loading branch information
bacongobbler authored Nov 12, 2021
2 parents ad3dc2f + 149102d commit 8ae0281
Show file tree
Hide file tree
Showing 26 changed files with 49 additions and 1,123 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/dotnet/.devcontainer/base.Dockerfile

ARG VARIANT="5.0"
ARG VARIANT="6.0"
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}

# Install Node.js
Expand Down Expand Up @@ -28,4 +28,4 @@ RUN su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && npm install -g
RUN su vscode -c "umask 0002 && cd /tmp && mkdir rust && cd rust && curl -fsSLo install_rust.sh https://sh.rustup.rs && chmod +x ./install_rust.sh && ./install_rust.sh -y -t wasm32-wasi"
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get -y install --no-install-recommends gcc gcc-multilib

WORKDIR /
WORKDIR /
4 changes: 2 additions & 2 deletions .github/workflows/build-devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:
file: .devcontainer/Dockerfile
context: .devcontainer
build-args: |
VARIANT : 5.0
VARIANT : 6.0
NODE_VERSION: lts/*
HIPPO_VERSION: v0.9.0
BINDLE_VERSION: v0.6.0
WAGI_VERSION: v0.4.0
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/manual-build-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x

- name: Set MINVERBUILDMETADATA and Image Version Tag
run: |
Expand All @@ -40,8 +40,8 @@ jobs:
- name: Copy openssl conf
shell: bash
run: |
mkdir -p ./Hippo/bin/Release/net5.0/linux-x64/publish/certs
cp .github/release-image/localhost.conf ./Hippo/bin/Release/net5.0/linux-x64/publish/certs
mkdir -p ./Hippo/bin/Release/net6.0/linux-x64/publish/certs
cp .github/release-image/localhost.conf ./Hippo/bin/Release/net6.0/linux-x64/publish/certs
- name: Log in to the Container registry
uses: docker/login-action@v1
Expand All @@ -67,7 +67,7 @@ jobs:
uses: docker/build-push-action@v2
with:
file: .github/release-image/Dockerfile
context: ./Hippo/bin/Release/net5.0/linux-x64/publish
context: ./Hippo/bin/Release/net6.0/linux-x64/publish
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
labels: ${{ steps.meta.outputs.labels }}
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x

- name: Set MINVERBUILDMETADATA
run: echo MINVERBUILDMETADATA=$(git rev-parse --short ${GITHUB_SHA}) >> $GITHUB_ENV
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x

- name: Set MINVERBUILDMETADATA
run: echo MINVERBUILDMETADATA=$(git rev-parse --short ${GITHUB_SHA}) >> $GITHUB_ENV
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x

- name: Set MINVERBUILDMETADATA
run: echo MINVERBUILDMETADATA=$(git rev-parse --short ${GITHUB_SHA}) >> $GITHUB_ENV
Expand All @@ -126,8 +126,8 @@ jobs:
- name: Copy openssl conf
shell: bash
run: |
mkdir -p ./Hippo/bin/Release/net5.0/linux-x64/publish/certs
cp .github/release-image/localhost.conf ./Hippo/bin/Release/net5.0/linux-x64/publish/certs
mkdir -p ./Hippo/bin/Release/net6.0/linux-x64/publish/certs
cp .github/release-image/localhost.conf ./Hippo/bin/Release/net6.0/linux-x64/publish/certs
- name: Log in to the Container registry
uses: docker/login-action@v1
Expand All @@ -153,7 +153,7 @@ jobs:
uses: docker/build-push-action@v2
with:
file: .github/release-image/Dockerfile
context: ./Hippo/bin/Release/net5.0/linux-x64/publish
context: ./Hippo/bin/Release/net6.0/linux-x64/publish
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
labels: ${{ steps.meta.outputs.labels }}
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/Hippo/bin/Debug/net5.0/hippo-server.dll",
"program": "${workspaceFolder}/Hippo/bin/Debug/net6.0/hippo-server.dll",
"args": [],
"cwd": "${workspaceFolder}/Hippo",
"stopAtEntry": false,
Expand All @@ -33,4 +33,4 @@
"processId": "${command:pickProcess}"
}
]
}
}
155 changes: 0 additions & 155 deletions Hippo.Tests/ApiControllers/ApplicationControllerTests.cs

This file was deleted.

64 changes: 0 additions & 64 deletions Hippo.Tests/ApiControllers/BaseApiTestFixture.cs

This file was deleted.

Loading

0 comments on commit 8ae0281

Please sign in to comment.