zune/ZuneShell.dll
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneShell.dll.git synced 2026-07-27 13:11:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Target net472, fix WinRT-related conditionals

Browse Source
This commit is contained in:
Joshua "Yoshi" Askharoun
2025-12-07 19:07:10 -06:00
parent ea7ff124d8
commit fd6d4a80a3
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Directory.Build.props
+1 -1
View File
@@ -10,7 +10,7 @@
<DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
<TargetFrameworks>netstandard2.0;net461;net6.0;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net6.0-windows</TargetFrameworks>
<Platforms>x64;x86</Platforms>
<SignAssembly>False</SignAssembly>
ZuneHost.Wpf/MainWindow.xaml.cs
+2 -2
View File
@@ -36,7 +36,7 @@ namespace ZuneHost.Wpf
var dbgconstrArg = args.FirstOrDefault(a => a.StartsWith(ARG_DBGCONSTR));
if (dbgconstrArg is not null)
{
connectionString = dbgconstrArg[ARG_DBGCONSTR.Length..].Trim();
connectionString = dbgconstrArg.Substring(ARG_DBGCONSTR.Length).Trim();
}
string strArgs = string.Join(" ", args.ToArray());
@@ -96,7 +96,7 @@ namespace ZuneHost.Wpf
{
IrisApp.Initialized += delegate
{
UIXControls.Helpers.AddResourceRedirect("res://ZuneShellResources!", "clr-res://ZuneShell!");
IrisApp.AddResourceRedirect("res://ZuneShellResources!", "clr-res://ZuneShell!");
UIXControls.Helpers.AddUIXControlsClrRedirect();
};
ZuneHost.Wpf/ZuneHost.Wpf.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net6.0-windows10.0.22000;net461</TargetFrameworks>
<TargetFrameworks>net6.0-windows10.0.22000;net472</TargetFrameworks>
<LangVersion>11.0</LangVersion>
<UseWPF>true</UseWPF>
<ApplicationIcon>Assets\ZuneFluentGem.ico</ApplicationIcon>
ZuneHost/ZuneHost.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;net6.0-windows10.0.22000;net6.0;</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows10.0.22000;net6.0;</TargetFrameworks>
<Platforms>AnyCPU;x64;x86;ARM32</Platforms>
<LangVersion>11.0</LangVersion>
<AppConfig>App.config</AppConfig>
ZuneImpl/ZuneImpl.csproj
+1 -1
View File
@@ -22,7 +22,7 @@
<IncludeAssets>runtime;build;native;contentfiles;analyzers</IncludeAssets>
</PackageReference>
<ProjectReference Include="..\libs\MicrosoftIris\UIX\UIX.csproj" />
<ProjectReference Include="..\libs\ZuneUIXTools\libs\MicrosoftIris\UIX\UIX.csproj" />
</ItemGroup>
</Project>
ZuneShell/Microsoft/WinRT/ApiInformation.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace Microsoft.WinRT
{
if (Environment.OSVersion.Version >= Win10Version)
{
return global::Windows.Foundation.Metadata.ApiInformation.IsTypePresent(typeName);
return Windows.Foundation.Metadata.ApiInformation.IsTypePresent(typeName);
}
else
{
ZuneShell/ZuneUI/TransportControls/TransportControls.cs
+2 -2
View File
@@ -1569,7 +1569,7 @@ namespace ZuneUI
private void UseSmtc()
{
// Use SMTC when available
#if WINDOWS
#if WINDOWS8
if (Microsoft.WinRT.ApiInformation.IsTypePresent("Windows.Media.SystemMediaTransportControls")
&& !OSVersion.IsLessThanWin10())
{
@@ -1625,7 +1625,7 @@ namespace ZuneUI
private void UpdateSmtcState(PlayerState stateNew)
{
#if WINDOWS
#if WINDOWS8
if (Microsoft.WinRT.ApiInformation.IsTypePresent("Windows.Media.SystemMediaTransportControls")
&& !OSVersion.IsLessThanWin10())
{