Skip to content

Commit 6cc0abf

Browse files
syntax-tmsyntax-tm
committed
Updated packages and upgraded to net10.0
1 parent 562519b commit 6cc0abf

8 files changed

Lines changed: 46 additions & 87 deletions

File tree

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
3-
<FrameworkVersion>net9.0</FrameworkVersion>
3+
<FrameworkVersion>net10.0</FrameworkVersion>
44
<TargetFramework>$(FrameworkVersion)-windows</TargetFramework>
55
<LangVersion>preview</LangVersion>
66
<Platforms>x86</Platforms>

‎src/Directory.Build.targets‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup Condition="'$(OutputType)'=='WinExe'">
33
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
44
<PublishReadyToRun>false</PublishReadyToRun>
@@ -26,18 +26,18 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
30-
<PackageReference Include="log4net" Version="3.1.0" />
31-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
32-
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
29+
<PackageReference Include="JetBrains.Annotations" Version="2025.2.4" />
30+
<PackageReference Include="log4net" Version="3.2.0" />
31+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
32+
<!--<PackageReference Include="System.Drawing.Common" Version="9.0.5" />-->
3333
</ItemGroup>
3434

3535
<ItemGroup Condition="'$(UseWPF)'=='true'">
3636
<PackageReference Include="DevExpress.Mvvm.CodeGenerators" Version="22.1.1" />
3737
<PackageReference Include="DevExpressMvvm" Version="24.1.6" />
38-
<PackageReference Include="SharpVectors.Wpf" Version="1.8.4.2" />
38+
<PackageReference Include="SharpVectors.Wpf" Version="1.8.5" />
3939
<PackageReference Include="TextCopy" Version="6.2.1" />
40-
<PackageReference Include="WPF-UI" Version="4.0.2" />
40+
<PackageReference Include="WPF-UI" Version="4.2.0" />
4141
</ItemGroup>
4242

4343
</Project>

‎src/SAM.API/SAM.API.csproj‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
26+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.269">
2727
<PrivateAssets>all</PrivateAssets>
2828
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
2929
</PackageReference>
30-
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="63.0.31-preview" />
31-
<PackageReference Include="ValveKeyValue" Version="0.13.1.398" />
30+
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="69.0.7-preview" />
31+
<PackageReference Include="ValveKeyValue" Version="0.20.0.417" />
3232
</ItemGroup>
3333

3434
<ItemGroup>
@@ -38,16 +38,4 @@
3838
</None>
3939
</ItemGroup>
4040

41-
<ItemGroup>
42-
<PackageReference Update="log4net" Version="3.1.0" />
43-
</ItemGroup>
44-
45-
<ItemGroup>
46-
<PackageReference Update="System.Drawing.Common" Version="9.0.2" />
47-
</ItemGroup>
48-
49-
<ItemGroup>
50-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
51-
</ItemGroup>
52-
5341
</Project>

‎src/SAM.Core/SAM.Core.csproj‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
<ItemGroup>
99
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
1010
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.5" />
11-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
11+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.269">
1212
<PrivateAssets>all</PrivateAssets>
1313
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="63.0.31-preview" />
16-
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
15+
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="69.0.7-preview" />
1716
<PackageReference Include="TextCopy" Version="6.2.1" />
18-
<PackageReference Include="ValveKeyValue" Version="0.13.1.398" />
17+
<PackageReference Include="ValveKeyValue" Version="0.20.0.417" />
1918
</ItemGroup>
2019

2120
<ItemGroup>
@@ -37,16 +36,4 @@
3736
</None>
3837
</ItemGroup>
3938

40-
<ItemGroup>
41-
<PackageReference Update="log4net" Version="3.1.0" />
42-
</ItemGroup>
43-
44-
<ItemGroup>
45-
<PackageReference Update="System.Drawing.Common" Version="9.0.2" />
46-
</ItemGroup>
47-
48-
<ItemGroup>
49-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
50-
</ItemGroup>
51-
5239
</Project>

‎src/SAM/App.xaml.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,9 @@ protected override void OnStartup(StartupEventArgs args)
8888
unsafe
8989
{
9090
// TODO: this output formatting needs to be fixed
91-
var ptr = (uint*) 0;
92-
PInvoke.WriteConsole(handle, "\n", 1, ptr);
93-
PInvoke.WriteConsole(handle, message, (uint) message.Length, ptr);
94-
PInvoke.WriteConsole(handle, "\n", 1, ptr);
91+
PInvoke.WriteConsole(handle, "\n", 1, out var ptr);
92+
PInvoke.WriteConsole(handle, message, (uint) message.Length, out ptr);
93+
PInvoke.WriteConsole(handle, "\n", 1, out ptr);
9594
}
9695
}
9796
else

‎src/SAM/Properties/launchSettings.json‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,102 @@
1-
{
1+
{
22
"profiles": {
33
"Default": {
44
"commandName": "Project",
55
"nativeDebugging": true
66
},
77
"Cities: Skylines 2": {
88
"commandName": "Project",
9-
"commandLineArgs": "305620",
9+
"commandLineArgs": "manage 305620",
1010
"nativeDebugging": false
1111
},
1212
"Counter-Strike 2": {
1313
"commandName": "Project",
14-
"commandLineArgs": "730",
14+
"commandLineArgs": "manage 730",
1515
"nativeDebugging": false
1616
},
1717
"Counter-Strike: Source": {
1818
"commandName": "Project",
19-
"commandLineArgs": "240",
19+
"commandLineArgs": "manage 240",
2020
"nativeDebugging": false
2121
},
2222
"Cyberpunk 2077": {
2323
"commandName": "Project",
24-
"commandLineArgs": "1091500",
24+
"commandLineArgs": "manage 1091500",
2525
"nativeDebugging": false
2626
},
2727
"Fallout 4": {
2828
"commandName": "Project",
29-
"commandLineArgs": "377160",
29+
"commandLineArgs": "manage 377160",
3030
"nativeDebugging": false
3131
},
3232
"Half-Life 2": {
3333
"commandName": "Project",
34-
"commandLineArgs": "220",
34+
"commandLineArgs": "manage 220",
3535
"nativeDebugging": false
3636
},
3737
"Halo Infinite": {
3838
"commandName": "Project",
39-
"commandLineArgs": "1240440",
39+
"commandLineArgs": "manage 1240440",
4040
"nativeDebugging": false
4141
},
4242
"Left 4 Dead": {
4343
"commandName": "Project",
44-
"commandLineArgs": "500",
44+
"commandLineArgs": "manage 500",
4545
"nativeDebugging": false
4646
},
4747
"Left 4 Dead 2": {
4848
"commandName": "Project",
49-
"commandLineArgs": "550",
49+
"commandLineArgs": "manage 550",
5050
"nativeDebugging": false
5151
},
5252
"Red Dead Redemption 2": {
5353
"commandName": "Project",
54-
"commandLineArgs": "1174180",
54+
"commandLineArgs": "manage 1174180",
5555
"nativeDebugging": false
5656
},
5757
"Resident Evil 0": {
5858
"commandName": "Project",
59-
"commandLineArgs": "339340",
59+
"commandLineArgs": "manage 339340",
6060
"nativeDebugging": false
6161
},
6262
"Resident Evil 2": {
6363
"commandName": "Project",
64-
"commandLineArgs": "883710",
64+
"commandLineArgs": "manage 883710",
6565
"nativeDebugging": false
6666
},
6767
"Resident Evil 4 (2023)": {
6868
"commandName": "Project",
69-
"commandLineArgs": "2050650",
69+
"commandLineArgs": "manage 2050650",
7070
"nativeDebugging": false
7171
},
7272
"Resident Evil 5": {
7373
"commandName": "Project",
74-
"commandLineArgs": "21690",
74+
"commandLineArgs": "manage 21690",
7575
"nativeDebugging": false
7676
},
7777
"Resident Evil 7: Biohazard": {
7878
"commandName": "Project",
79-
"commandLineArgs": "418370",
79+
"commandLineArgs": "manage 418370",
8080
"nativeDebugging": false
8181
},
8282
"Rust": {
8383
"commandName": "Project",
84-
"commandLineArgs": "252490",
84+
"commandLineArgs": "manage 252490",
8585
"nativeDebugging": false
8686
},
8787
"Team Fortress 2": {
8888
"commandName": "Project",
89-
"commandLineArgs": "440",
89+
"commandLineArgs": "manage 440",
9090
"nativeDebugging": false
9191
},
9292
"The Long Dark": {
9393
"commandName": "Project",
94-
"commandLineArgs": "305620",
94+
"commandLineArgs": "manage 305620",
95+
"nativeDebugging": false
96+
},
97+
"Call of Duty: Black Ops Cold War": {
98+
"commandName": "Project",
99+
"commandLineArgs": "manage 1985810",
95100
"nativeDebugging": false
96101
}
97102
}

‎src/SAM/SAM.csproj‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<ItemGroup>
1212
<PackageReference Include="CommandLineParser" Version="2.9.1" />
1313
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.5" />
14-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
14+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.269">
1515
<PrivateAssets>all</PrivateAssets>
1616
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
1717
</PackageReference>
18-
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="63.0.31-preview" />
19-
<PackageReference Include="ValveKeyValue" Version="0.13.1.398" />
18+
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="69.0.7-preview" />
19+
<PackageReference Include="ValveKeyValue" Version="0.20.0.417" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
@@ -45,24 +45,4 @@
4545
<PackageReference Update="DevExpressMvvm" Version="24.1.6" />
4646
</ItemGroup>
4747

48-
<ItemGroup>
49-
<PackageReference Update="log4net" Version="3.1.0" />
50-
</ItemGroup>
51-
52-
<ItemGroup>
53-
<PackageReference Update="System.Drawing.Common" Version="9.0.2" />
54-
</ItemGroup>
55-
56-
<ItemGroup>
57-
<PackageReference Update="WPF-UI" Version="4.0.2" />
58-
</ItemGroup>
59-
60-
<ItemGroup>
61-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
62-
</ItemGroup>
63-
64-
<ItemGroup>
65-
<PackageReference Update="SharpVectors.Wpf" Version="1.8.4.2" />
66-
</ItemGroup>
67-
6848
</Project>

‎src/SAM/ViewModels/SteamGameViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ private void ManagerAchievementsChanged(SteamStatsManager obj)
313313

314314
private void OnAchievementModifiedHandler(ObservableCollection<SteamAchievement> arg1, SteamAchievement arg2)
315315
{
316-
Refresh();
316+
//Refresh();
317317
}
318318

319319
protected void OnSearchTextChanged()

0 commit comments

Comments
 (0)