diff --git a/ZuneShell/AssemblyInfo.cs b/ZuneShell/AssemblyInfo.cs index 94ed7e9..db0f3a4 100644 --- a/ZuneShell/AssemblyInfo.cs +++ b/ZuneShell/AssemblyInfo.cs @@ -7,7 +7,13 @@ using System.Security.Permissions; [assembly: ComVisible(false)] [assembly: AssemblyProduct("Microsoft (R) Windows (R) Operating System")] [assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyFileVersion("4.8.2345.0")] //[assembly: AssemblyDelaySign(true)] -[assembly: AssemblyVersion("4.7.0.0")] [assembly: SecurityPermission(SecurityAction.RequestMinimum, SkipVerification = true)] + +#if OPENZUNE +[assembly: AssemblyFileVersion("5.0.0.0")] +[assembly: AssemblyVersion("5.0.0.0")] +#else +[assembly: AssemblyFileVersion("4.8.2345.0")] +[assembly: AssemblyVersion("4.7.0.0")] +#endif \ No newline at end of file diff --git a/ZuneShell/Microsoft/Zune/Shell/ZuneApplication.cs b/ZuneShell/Microsoft/Zune/Shell/ZuneApplication.cs index 6704603..1e6148d 100644 --- a/ZuneShell/Microsoft/Zune/Shell/ZuneApplication.cs +++ b/ZuneShell/Microsoft/Zune/Shell/ZuneApplication.cs @@ -64,11 +64,32 @@ namespace Microsoft.Zune.Shell public static string DefaultCommandLineParameterSwitch => "PlayMedia"; + public static Version Version => typeof(ZuneApplication).Assembly.GetName().Version; + public static ZuneLibrary ZuneLibrary => _zuneLibrary; public static Service.Service Service => Zune.Service.Service.Instance; public static IService Service2 => Zune.Service.Service2.Instance; + public static bool IsStrixCompatible + { + get + { +#if OPENZUNE + return true; +#else + return false; +#endif + } + } + + public static Version StrixSdkVersion => +#if OPENZUNE + typeof(ICore).Assembly.GetName().Version; +#else + null; +#endif + #if OPENZUNE public static IStrixDataRoot DataRoot { get; private set; } public static IPlaybackHandlerService PlaybackHandler { get; private set; } @@ -184,7 +205,7 @@ namespace Microsoft.Zune.Shell DataRoot.Library.TracksChanged += LibraryTracksChanged; - await DataRoot.Library.PlayTrackCollectionAsync(); + //await DataRoot.Library.PlayTrackCollectionAsync(); }); #endif diff --git a/ZuneShell/Resources/RCDATA/ABOUTDIALOG.UIX b/ZuneShell/Resources/RCDATA/ABOUTDIALOG.UIX index 06f7d2f..a603134 100644 Binary files a/ZuneShell/Resources/RCDATA/ABOUTDIALOG.UIX and b/ZuneShell/Resources/RCDATA/ABOUTDIALOG.UIX differ diff --git a/ZuneShell/Resources/RCDATA/ABOUTDIALOG.og.UIX b/ZuneShell/Resources/RCDATA/ABOUTDIALOG.og.UIX new file mode 100644 index 0000000..06f7d2f Binary files /dev/null and b/ZuneShell/Resources/RCDATA/ABOUTDIALOG.og.UIX differ diff --git a/ZuneShell/ZuneShell.csproj b/ZuneShell/ZuneShell.csproj index 631973b..f1dd3f1 100644 --- a/ZuneShell/ZuneShell.csproj +++ b/ZuneShell/ZuneShell.csproj @@ -8,6 +8,8 @@ Library ZuneShell 4.7.0.0 + $(ApplicationVersion) + $(ApplicationVersion) net35;net40;net6.0 x64;x86