Skip to content

Commit 88631f0

Browse files
SAMDestroySAMDestroy
committed
Upgrade project to .NET 9, High-DPI and arm64 support
1 parent 2eef3cb commit 88631f0

16 files changed

Lines changed: 2779 additions & 1503 deletions

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# --- Visual Studio Standard ---
21
bin/
32
obj/
43
packages/
@@ -8,6 +7,7 @@ packages/
87
*.userosscache
98
*.sln.docstates
109

11-
# --- Temporäre Dateien ---
1210
*.log
13-
*.tmp
11+
*.tmp
12+
13+
*.pubxml.user

‎AVRControl.Designer.cs‎

Lines changed: 1250 additions & 1206 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AVRControl.Installer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private void RefreshInstallState()
6464
CheckForGitHubUpdate();
6565

6666
string mode = isRunningFromRoaming ? "[Installed]" : "[Portable]";
67-
this.Text = $"AVRControl v{Application.ProductVersion} {mode}";
67+
this.Text = $"AVRControl v{typeof(Program).Assembly.GetName().Version} {mode}";
6868
}
6969

7070
// Github Update Part
@@ -106,8 +106,8 @@ private async Task<Version> GetGitHubVersionAsync()
106106
private async void CheckForGitHubUpdate()
107107
{
108108
Version githubVersion = await GetGitHubVersionAsync();
109-
Version localVersion = new Version(Application.ProductVersion);
110-
//Version localVersion = new Version("0.0.1"); // lokal test
109+
//Version localVersion = typeof(Program).Assembly.GetName().Version;
110+
Version localVersion = new Version("1.5.0.0"); // lokal test
111111

112112
if (githubVersion != null && githubVersion > localVersion)
113113
{

‎AVRControl.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public AVRControl()
6464

6565
_appIcon = (Icon)Properties.Resources.AVRControl.Clone();
6666
this.Icon = _appIcon;
67-
this.Text = $"AVRControl v{Application.ProductVersion}";
67+
this.Text = $"AVRControl v{typeof(Program).Assembly.GetName().Version}";
6868

6969
this.notifyIcon1.Icon = _appIcon;
7070
this.notifyIcon1.Text = this.Text;
@@ -509,7 +509,7 @@ private void btnInstall_Click(object sender, EventArgs e)
509509
currentConfigPath = targetCfg;
510510

511511
ConfigManager.SaveValue(currentConfigPath, "IP", tbIP.Text);
512-
ConfigManager.SaveValue(currentConfigPath, "Systray", cbSysTray.Checked.ToString());
512+
ConfigManager.SaveValue(currentConfigPath, "Systray", "TRUE");
513513
}
514514

515515
using (RegistryKey key = Registry.CurrentUser.OpenSubKey(registryPath, true))

‎AVRControl.csproj‎

Lines changed: 31 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -1,189 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{4CBF32B9-8194-4117-9AB4-10FB1D908658}</ProjectGuid>
8-
<OutputType>WinExe</OutputType>
9-
<RootNamespace>AVRControl</RootNamespace>
10-
<AssemblyName>AVRControl</AssemblyName>
11-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
12-
<LangVersion>8.0</LangVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<Deterministic>true</Deterministic>
16-
<IsWebBootstrapper>false</IsWebBootstrapper>
17-
<TargetFrameworkProfile />
18-
<NuGetPackageImportStamp>
19-
</NuGetPackageImportStamp>
20-
<PublishUrl>publish\</PublishUrl>
21-
<Install>true</Install>
22-
<InstallFrom>Disk</InstallFrom>
23-
<UpdateEnabled>false</UpdateEnabled>
24-
<UpdateMode>Foreground</UpdateMode>
25-
<UpdateInterval>7</UpdateInterval>
26-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
27-
<UpdatePeriodically>false</UpdatePeriodically>
28-
<UpdateRequired>false</UpdateRequired>
29-
<MapFileExtensions>true</MapFileExtensions>
30-
<ApplicationRevision>0</ApplicationRevision>
31-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
32-
<UseApplicationTrust>false</UseApplicationTrust>
33-
<BootstrapperEnabled>true</BootstrapperEnabled>
34-
</PropertyGroup>
35-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
36-
<PlatformTarget>AnyCPU</PlatformTarget>
37-
<DebugSymbols>true</DebugSymbols>
38-
<DebugType>full</DebugType>
39-
<Optimize>false</Optimize>
40-
<OutputPath>bin\Debug\</OutputPath>
41-
<DefineConstants>DEBUG;TRACE</DefineConstants>
42-
<ErrorReport>prompt</ErrorReport>
43-
<WarningLevel>4</WarningLevel>
44-
</PropertyGroup>
45-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
46-
<PlatformTarget>AnyCPU</PlatformTarget>
47-
<DebugType>pdbonly</DebugType>
48-
<Optimize>true</Optimize>
49-
<OutputPath>bin\Release\</OutputPath>
50-
<DefineConstants>TRACE</DefineConstants>
51-
<ErrorReport>prompt</ErrorReport>
52-
<WarningLevel>4</WarningLevel>
53-
</PropertyGroup>
54-
<PropertyGroup>
55-
<ApplicationIcon>AVRControl.ico</ApplicationIcon>
56-
</PropertyGroup>
57-
<ItemGroup>
58-
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=10.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
59-
<HintPath>packages\Microsoft.Bcl.AsyncInterfaces.10.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
60-
</Reference>
61-
<Reference Include="System" />
62-
<Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
63-
<HintPath>packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
64-
</Reference>
65-
<Reference Include="System.Core" />
66-
<Reference Include="System.IO.Pipelines, Version=10.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
67-
<HintPath>packages\System.IO.Pipelines.10.0.2\lib\net462\System.IO.Pipelines.dll</HintPath>
68-
</Reference>
69-
<Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
70-
<HintPath>packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
71-
</Reference>
72-
<Reference Include="System.Numerics" />
73-
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74-
<HintPath>packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
75-
</Reference>
76-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
77-
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
78-
</Reference>
79-
<Reference Include="System.Text.Encodings.Web, Version=10.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
80-
<HintPath>packages\System.Text.Encodings.Web.10.0.2\lib\net462\System.Text.Encodings.Web.dll</HintPath>
81-
</Reference>
82-
<Reference Include="System.Text.Json, Version=10.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
83-
<HintPath>packages\System.Text.Json.10.0.2\lib\net462\System.Text.Json.dll</HintPath>
84-
</Reference>
85-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
86-
<HintPath>packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
87-
</Reference>
88-
<Reference Include="System.Xml.Linq" />
89-
<Reference Include="System.Data.DataSetExtensions" />
90-
<Reference Include="Microsoft.CSharp" />
91-
<Reference Include="System.Data" />
92-
<Reference Include="System.Deployment" />
93-
<Reference Include="System.Drawing" />
94-
<Reference Include="System.Net.Http" />
95-
<Reference Include="System.Windows.Forms" />
96-
<Reference Include="System.Xml" />
97-
</ItemGroup>
98-
<ItemGroup>
99-
<Compile Include="AVRControl.cs">
100-
<SubType>Form</SubType>
101-
</Compile>
102-
<Compile Include="AVRControl.Designer.cs">
103-
<DependentUpon>AVRControl.cs</DependentUpon>
104-
</Compile>
105-
<Compile Include="AVRControl.Helpers.cs">
106-
<DependentUpon>AVRControl.cs</DependentUpon>
107-
<SubType>Form</SubType>
108-
</Compile>
109-
<Compile Include="AVRControl.HeosUI.cs">
110-
<DependentUpon>AVRControl.cs</DependentUpon>
111-
<SubType>Form</SubType>
112-
</Compile>
113-
<Compile Include="AVRControl.Installer.cs">
114-
<DependentUpon>AVRControl.cs</DependentUpon>
115-
<SubType>Form</SubType>
116-
</Compile>
117-
<Compile Include="AVRControl.Parser.cs">
118-
<DependentUpon>AVRControl.cs</DependentUpon>
119-
<SubType>Form</SubType>
120-
</Compile>
121-
<Compile Include="AVRControl.Toggles.cs">
122-
<DependentUpon>AVRControl.cs</DependentUpon>
123-
<SubType>Form</SubType>
124-
</Compile>
125-
<Compile Include="ConfigManager.cs" />
126-
<Compile Include="Program.cs" />
127-
<Compile Include="Properties\AssemblyInfo.cs" />
128-
<Compile Include="TelnetClient.cs" />
129-
<EmbeddedResource Include="AVRControl.resx">
130-
<DependentUpon>AVRControl.cs</DependentUpon>
131-
<SubType>Designer</SubType>
132-
</EmbeddedResource>
133-
<EmbeddedResource Include="Properties\Resources.resx">
134-
<Generator>PublicResXFileCodeGenerator</Generator>
135-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
136-
<SubType>Designer</SubType>
137-
</EmbeddedResource>
138-
<Compile Include="Properties\Resources.Designer.cs">
139-
<AutoGen>True</AutoGen>
140-
<DependentUpon>Resources.resx</DependentUpon>
141-
<DesignTime>True</DesignTime>
142-
</Compile>
143-
<None Include="LICENSE" />
144-
<None Include="packages.config" />
145-
<None Include="README.md" />
146-
</ItemGroup>
147-
<ItemGroup>
148-
<None Include="App.config" />
149-
</ItemGroup>
150-
<ItemGroup>
151-
<Content Include=".gitattributes" />
152-
<Content Include=".gitignore" />
153-
<Content Include="AVRControl.ico" />
154-
<Content Include="res\apple_klein.png" />
155-
<Content Include="res\BackIcon.png" />
156-
<Content Include="res\PauseIcon.png" />
157-
<Content Include="res\PlayIcon.png" />
158-
<Content Include="res\PlayPauseButton.png" />
159-
<Content Include="res\RepeatAllIcon.png" />
160-
<Content Include="res\RepeatOneIcon.png" />
161-
<Content Include="res\ShuffleIcon.png" />
162-
<Content Include="res\SkipIcon.png" />
163-
<Content Include="res\Vol_Down.png" />
164-
<Content Include="res\Vol_Mute.png" />
165-
<Content Include="res\Vol_Up.png" />
166-
<Content Include="Screenshot1.png" />
167-
<Content Include="Screenshot2.png" />
168-
</ItemGroup>
169-
<ItemGroup>
170-
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
171-
<Visible>False</Visible>
172-
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 und x64%29</ProductName>
173-
<Install>true</Install>
174-
</BootstrapperPackage>
175-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
176-
<Visible>False</Visible>
177-
<ProductName>.NET Framework 3.5 SP1</ProductName>
178-
<Install>false</Install>
179-
</BootstrapperPackage>
180-
</ItemGroup>
181-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
182-
<Import Project="packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
183-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
184-
<PropertyGroup>
185-
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlende(n) Datei(en) herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
186-
</PropertyGroup>
187-
<Error Condition="!Exists('packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
188-
</Target>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net9.0-windows</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
<UseWindowsForms>true</UseWindowsForms>
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
<RootNamespace>AVRControl</RootNamespace>
10+
<AssemblyName>AVRControl</AssemblyName>
11+
<ApplicationIcon>AVRControl.ico</ApplicationIcon>
12+
<Deterministic>true</Deterministic>
13+
14+
<Version>1.5.1</Version>
15+
<Authors>SAMDestroy</Authors>
16+
<Company>SAMDestroy</Company>
17+
<Product>AVRControl</Product>
18+
<Description>Control your Denon or Marantz AVR via Telnet</Description>
19+
<Copyright>Copyright © 2026 SAMDestroy</Copyright>
20+
21+
<ComVisible>false</ComVisible>
22+
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
23+
</PropertyGroup>
24+
25+
<ItemGroup>
26+
<EmbeddedResource Update="Properties\Resources.resx">
27+
<CustomToolNamespace>Properties</CustomToolNamespace>
28+
</EmbeddedResource>
29+
</ItemGroup>
30+
31+
18932
</Project>

0 commit comments

Comments
 (0)