Skip to content

Commit 2d12d3b

Browse files
committed
Upgrade to .NET 7 and latest Avalonia
1 parent 6dd1d74 commit 2d12d3b

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup .NET Core SDK
2020
uses: actions/setup-dotnet@v1
2121
with:
22-
dotnet-version: '6.0.x'
22+
dotnet-version: '7.0.x'
2323
- name: Restore
2424
run: dotnet restore
2525
- name: Build
@@ -33,11 +33,11 @@ jobs:
3333
uses: actions/upload-artifact@v2
3434
with:
3535
name: "OpenLauncher-${{ matrix.rid }}"
36-
path: src/openlauncher/bin/Release/net6.0/${{ matrix.rid }}/publish/**/*
36+
path: src/openlauncher/bin/Release/net7.0/${{ matrix.rid }}/publish/**/*
3737
- name: Create release
3838
uses: softprops/action-gh-release@v1
3939
if: startsWith(github.ref, 'refs/tags/v')
4040
with:
4141
files: |
42-
src/openlauncher/bin/Release/net6.0/${{ matrix.rid }}/publish/openlauncher
43-
src/openlauncher/bin/Release/net6.0/${{ matrix.rid }}/publish/openlauncher.exe
42+
src/openlauncher/bin/Release/net7.0/${{ matrix.rid }}/publish/openlauncher
43+
src/openlauncher/bin/Release/net7.0/${{ matrix.rid }}/publish/openlauncher.exe

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "coreclr",
1010
"request": "launch",
1111
"preLaunchTask": "build",
12-
"program": "${workspaceFolder}/src/openlauncher/bin/Debug/net6.0/openlauncher.dll",
12+
"program": "${workspaceFolder}/src/openlauncher/bin/Debug/net7.0/openlauncher.dll",
1313
"args": [],
1414
"cwd": "${workspaceFolder}",
1515
"console": "internalConsole",

src/openlauncher/openlauncher.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77
<PropertyGroup>
88
<OutputType>WinExe</OutputType>
9-
<TargetFramework>net6.0</TargetFramework>
9+
<TargetFramework>net7.0</TargetFramework>
1010
<Nullable>enable</Nullable>
1111

1212
<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
@@ -42,11 +42,11 @@
4242
<ProjectReference Include="..\IntelOrca.OpenLauncher.Core\IntelOrca.OpenLauncher.Core.csproj" />
4343
</ItemGroup>
4444
<ItemGroup>
45-
<PackageReference Include="Avalonia" Version="0.10.14" />
46-
<PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
45+
<PackageReference Include="Avalonia" Version="0.10.18" />
46+
<PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
4747
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
48-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.14" />
49-
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
48+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
49+
<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
5050
</ItemGroup>
5151
<ItemGroup>
5252
<!--This helps with theme dll-s trimming.

test/IntelOrca.OpenLauncher.Tests/IntelOrca.OpenLauncher.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<Nullable>enable</Nullable>
66

77
<IsPackable>false</IsPackable>

0 commit comments

Comments
 (0)