Skip to content

Commit

Permalink
.NET 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gluschenko committed Jun 4, 2023
1 parent ea129eb commit 2ef30c8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: .NET Core Desktop

on:
push:
branches: [ release ]
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:
Expand All @@ -18,18 +18,18 @@ jobs:
- name: 📂 Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 7.0.x

- name: 📂 Files
working-directory: ${{env.ROOT}}
run: ls -R

- name: 🚀 Building RenderBox
working-directory: ${{env.ROOT}}/RenderBox
run: dotnet publish -c RELEASE -o out
run: dotnet publish -p:PublishProfile=FolderProfile -c RELEASE -o out

- uses: actions/upload-artifact@v2
if: github.ref == 'refs/heads/release'
if: github.ref == 'refs/heads/master'
with:
name: builds
path: ${{env.ROOT}}/**/out
Expand All @@ -39,7 +39,7 @@ jobs:

runs-on: ubuntu-latest
needs: build
if: github.ref == 'refs/heads/release'
if: github.ref == 'refs/heads/master'
env:
ROOT: ./src
NUGET_AUTH_TOKEN: ${{secrets.token}}
Expand All @@ -55,7 +55,7 @@ jobs:
- name: 📂 Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 7.0.x

- name: 📂 Pack RenderBox
working-directory: ${{env.ROOT}}/RenderBox/out
Expand Down
4 changes: 2 additions & 2 deletions src/RenderBox.Benchmarks/RenderBox.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/RenderBox.Shared/RenderBox.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

Expand Down
10 changes: 5 additions & 5 deletions src/RenderBox/RenderBox.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>Resources\RenderBoxLogo.ico</ApplicationIcon>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -27,10 +27,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 2ef30c8

Please sign in to comment.