Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Rene-Sackers committed Dec 14, 2023
2 parents e1c4a26 + 0a5c308 commit b3eecf0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ jobs:
npm install
gulp default
- name: Setup .NET Core SDK 7.0.x
- name: Setup .NET SDK 8.0.x
uses: actions/[email protected]
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Dotnet publish
run: dotnet publish ./src/TeslaCamPlayer.BlazorHosted/Server -r win-x64 -c Release --self-contained true -p:PublishTrimmed=true -p:DefineConstants=WINDOWS -o ./publish/
Expand All @@ -89,7 +89,7 @@ jobs:
name: release-sc
path: "./publish/${{env.ZIP_FILE_NAME}}"

# Self contained version is larger than self-contained + compressed, no need to build this version
# Dependant version is larger than self-contained + compressed, no need to build this version
windows-dependant:
runs-on: ubuntu-latest
if: false
Expand All @@ -108,10 +108,10 @@ jobs:
npm install
gulp default
- name: Setup .NET Core SDK 7.0.x
- name: Setup .NET SDK 8.0.x
uses: actions/[email protected]
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Dotnet publish
run: dotnet publish ./src/TeslaCamPlayer.BlazorHosted/Server -r win-x64 -c Release -p:DefineConstants=WINDOWS -o ./publish/
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS publish
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS publish
COPY . /src
WORKDIR "/src/TeslaCamPlayer.BlazorHosted/Server"
RUN dotnet restore .
Expand Down

0 comments on commit b3eecf0

Please sign in to comment.