Skip to content

Release 3.1 #157

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

Open
d4nt wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Release 3.1 #157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34155c4
Upgrading to .net 8
Dec 20, 2024
2020182
removing whitespace
Dec 20, 2024
c413ae9
Merge branch 'master' into develop
Dec 20, 2024
d68afd4
Adjust column ordering
Dec 20, 2024
781c3bc
Updating .net version
Dec 20, 2024
fecfbbb
Merge branch 'develop' of github.com:d4software/QueryTree into develop
Dec 20, 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
Prev Previous commit
Next Next commit
Updating .net version
  • Loading branch information
Daniel Thompson committed Dec 20, 2024
commit 781c3bcb042e76fa4e2338d1583188340657dc60
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ version: 2
jobs:
build:
docker:
- image: mcr.microsoft.com/dotnet/sdk:6.0
- image: mcr.microsoft.com/dotnet/sdk:8.0
steps:
- checkout
- run: dotnet build ./Web/QueryTree.csproj -v n
test:
docker:
- image: mcr.microsoft.com/dotnet/sdk:6.0
- image: mcr.microsoft.com/dotnet/sdk:8.0
steps:
- checkout
- run: dotnet test ./Tests/Tests.csproj -v n
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0 as builder
FROM mcr.microsoft.com/dotnet/sdk:8.0 as builder
WORKDIR /build
COPY . .
RUN dotnet restore
RUN dotnet publish --no-restore -c Release ./Web/QueryTree.csproj -o /dist

FROM mcr.microsoft.com/dotnet/aspnet:6.0 as runtime
FROM mcr.microsoft.com/dotnet/aspnet:8.0 as runtime
WORKDIR /app
COPY --from=builder /dist .
COPY --from=builder /build/Web/EmailTemplates ./EmailTemplates
Expand Down