Skip to content

Commit a971489

Browse files
nguyenquyhynguyenquyhy
committedDec 16, 2024
Upgrade to .NET 9 and remove AppCenter
1 parent d9a5534 commit a971489

File tree

7 files changed

+24
-33
lines changed

7 files changed

+24
-33
lines changed
 

‎FlightStreamDeck.AddOn/App.xaml.cs

-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
using FlightStreamDeck.Logics;
22
using FlightStreamDeck.Logics.Actions;
33
using FlightStreamDeck.SimConnectFSX;
4-
using Microsoft.AppCenter;
5-
using Microsoft.AppCenter.Analytics;
6-
using Microsoft.AppCenter.Crashes;
74
using Microsoft.Extensions.Configuration;
85
using Microsoft.Extensions.DependencyInjection;
96
using Microsoft.Extensions.Hosting;
@@ -28,12 +25,6 @@ public partial class App : Application
2825

2926
protected override void OnStartup(StartupEventArgs e)
3027
{
31-
#if DEBUG
32-
AppCenter.Start("9343b8d4-4141-40c9-9758-5c7e2fb3a1a0", typeof(Analytics), typeof(Crashes));
33-
#else
34-
AppCenter.Start("0d85baad-aa1e-4694-ae3b-c6fed2056656",typeof(Analytics), typeof(Crashes));
35-
#endif
36-
3728
var builder = new ConfigurationBuilder()
3829
.SetBasePath(Directory.GetCurrentDirectory())
3930
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);

‎FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net7.0-windows</TargetFramework>
5+
<TargetFramework>net9.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<PlatformTarget>x64</PlatformTarget>
88
<ApplicationIcon>icon.ico</ApplicationIcon>
@@ -15,17 +15,15 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.123" />
19-
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
20-
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
25-
<PackageReference Include="Serilog" Version="3.1.1" />
26-
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
27-
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
28-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
18+
<PackageReference Include="H.NotifyIcon.Wpf" Version="2.2.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
23+
<PackageReference Include="Serilog" Version="4.2.0" />
24+
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
25+
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
26+
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
2927
<PackageReference Include="System.IO" Version="4.3.0" />
3028
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
3129
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
@@ -223,4 +221,6 @@
223221
<Folder Include="Profiles\" />
224222
</ItemGroup>
225223

224+
<ProjectExtensions><VisualStudio><UserProperties manifest_1json__JsonSchema="https://github.com/GeekyEggo/SharpDeck/raw/src/SharpDeck.PropertyInspector/manifest-schema.json" /></VisualStudio></ProjectExtensions>
225+
226226
</Project>

‎FlightStreamDeck.Core/FlightStreamDeck.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

‎FlightStreamDeck.Logics/FlightStreamDeck.Logics.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0-windows</TargetFramework>
4+
<TargetFramework>net9.0-windows</TargetFramework>
55
<UseWPF>true</UseWPF>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎FlightStreamDeck.LogicsTests/FlightStreamDeck.LogicsTests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0-windows</TargetFramework>
4+
<TargetFramework>net9.0-windows</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
10-
<PackageReference Include="Moq" Version="4.18.4" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
12-
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
13-
<PackageReference Include="coverlet.collector" Version="6.0.0">
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
10+
<PackageReference Include="Moq" Version="4.20.72" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
12+
<PackageReference Include="MSTest.TestFramework" Version="3.6.4" />
13+
<PackageReference Include="coverlet.collector" Version="6.0.2">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

‎FlightStreamDeck.SimConnectFSX/FlightStreamDeck.SimConnectFSX.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0-windows</TargetFramework>
4+
<TargetFramework>net9.0-windows</TargetFramework>
55
<Nullable>enable</Nullable>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
10+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎build.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
rd build /s /q
22
mkdir build
3-
dotnet publish FlightStreamDeck.AddOn\FlightStreamDeck.AddOn.csproj -c Release -r win10-x64 --self-contained
4-
XCopy FlightStreamDeck.AddOn\bin\Release\net7.0-windows\win10-x64\publish build\tech.flighttracker.streamdeck.sdPlugin /e /h /c /i
3+
dotnet publish FlightStreamDeck.AddOn\FlightStreamDeck.AddOn.csproj -c Release -r win-x64 --self-contained
4+
XCopy FlightStreamDeck.AddOn\bin\Release\net9.0-windows\win-x64\publish build\tech.flighttracker.streamdeck.sdPlugin /e /h /c /i
55
cd build
66
DistributionTool.exe -b -i tech.flighttracker.streamdeck.sdPlugin -o .
77
cd ..

0 commit comments

Comments
 (0)
Please sign in to comment.