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

Moved ZuneDBApi proxies into separate project

Browse Source
This commit is contained in:
Yoshi Askharoun
2022-06-10 01:01:33 -05:00
parent b92de10fc0
commit 0381f22166
4 changed files with 80 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZuneShell/Microsoft/Zune/Service2/Service.cs → ZuneImpl/Service/Service.cs
+10 -10
View File
@@ -1,7 +1,7 @@
using Microsoft.Zune.Service;
using Microsoft.Zune.Util;
using Microsoft.Zune.Util;
using System;
using System.Collections;
using System.Globalization;
using ZuneUI;
namespace Microsoft.Zune.Service
@@ -56,7 +56,7 @@ namespace Microsoft.Zune.Service
return keyValUri;
string uri = null;
string culture = CultureHelper.GetCulture(null).ToString();
string culture = CultureInfo.CurrentCulture.ToString();
switch (eServiceEndpointId)
{
case EServiceEndpointId.SEID_RootCatalog:
@@ -69,7 +69,7 @@ namespace Microsoft.Zune.Service
uri = "https://stat.zunes.me";
break;
case EServiceEndpointId.SEID_ImageCatalog:
uri = "https://image.catalog.zunes.me" + culture;
uri = "https://image.catalog.zunes.me/" + culture;
break;
case EServiceEndpointId.SEID_Comments:
uri = "https://comments.zunes.me";
@@ -82,10 +82,10 @@ namespace Microsoft.Zune.Service
break;
case EServiceEndpointId.SEID_Commerce:
case EServiceEndpointId.SEID_CommerceV3:
uri = "https://commerce.zunes.me/v3.2" + culture;
uri = "https://commerce.zunes.me/v3.2/" + culture;
break;
case EServiceEndpointId.SEID_CommerceV2:
uri = "https://stat.zunes.me/v2.0" + culture;
uri = "https://stat.zunes.me/v2.0/" + culture;
break;
case EServiceEndpointId.SEID_WindowsLiveSignup:
uri = "https://login.zunes.me";
@@ -100,22 +100,22 @@ namespace Microsoft.Zune.Service
uri = "https://metaservices.zunes.me/image";
break;
case EServiceEndpointId.SEID_Tuners:
uri = "https://tuners.zunes.me" + culture;
uri = "https://tuners.zunes.me/" + culture;
break;
case EServiceEndpointId.SEID_Resources:
uri = "https://resources.zunes.me";
break;
case EServiceEndpointId.SEID_ZuneNet:
uri = "https://zunes.me" + culture;
uri = "https://zunes.me/" + culture;
break;
case EServiceEndpointId.SEID_Messaging:
uri = "https://messaging.zunes.me";
break;
case EServiceEndpointId.SEID_SocialApi:
uri = "https://socialapi.zunes.me" + culture;
uri = "https://socialapi.zunes.me/" + culture;
break;
case EServiceEndpointId.SEID_Forums:
uri = "https://forums.zunes.me" + culture;
uri = "https://forums.zunes.me/" + culture;
break;
};
ZuneImpl/ZuneImpl.csproj
+43
View File
@@ -0,0 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<OutputType>Library</OutputType>
<AssemblyName>ZuneImpl</AssemblyName>
<ApplicationVersion>4.7.0.0</ApplicationVersion>
<TargetFrameworks>net35;net40;net6.0</TargetFrameworks>
<Platforms>x64;x86</Platforms>
<RootNamespace>Microsoft.Zune</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\libs\MicrosoftIris\36MSApp1024.snk</AssemblyOriginatorKeyFile>
<DelaySign>True</DelaySign>
<UseOpenZune>False</UseOpenZune>
</PropertyGroup>
<ItemGroup>
<Reference Include="ZuneDBApi">
<HintPath>C:\Program Files\Zune\ZuneDBApi.dll</HintPath>
</Reference>
<!-- This is the last version of NAudio to support net35 and net6.0 -->
<PackageReference Include="NAudio" Version="1.10.0" />
</ItemGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<UseOpenZune>True</UseOpenZune>
</PropertyGroup>
<ItemGroup Condition="$(UseOpenZune)">
<PackageReference Include="StrixMusic.Sdk" Version="0.0.2-alpha" />
</ItemGroup>
<PropertyGroup Condition=" $(UseOpenZune) ">
<ApplicationVersion>5.0.0.0</ApplicationVersion>
<DefineConstants>$(DefineConstants);OPENZUNE</DefineConstants>
</PropertyGroup>
</Project>
ZuneShell.sln
+18
View File
@@ -16,6 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZuneHost.Wpf", "ZuneHost.Wp
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIX.Debug", "libs\MicrosoftIris\UIX.Debug\UIX.Debug.csproj", "{8479F68C-4234-425E-93E7-71597AF528E9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZuneImpl", "ZuneImpl\ZuneImpl.csproj", "{0B309776-6424-48C4-838A-224E41F793EE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -124,6 +126,22 @@ Global
{8479F68C-4234-425E-93E7-71597AF528E9}.Release|x64.Build.0 = Release|Any CPU
{8479F68C-4234-425E-93E7-71597AF528E9}.Release|x86.ActiveCfg = Release|Any CPU
{8479F68C-4234-425E-93E7-71597AF528E9}.Release|x86.Build.0 = Release|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Debug|ARM32.ActiveCfg = Debug|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Debug|ARM32.Build.0 = Debug|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Debug|x64.ActiveCfg = Debug|x64
{0B309776-6424-48C4-838A-224E41F793EE}.Debug|x64.Build.0 = Debug|x64
{0B309776-6424-48C4-838A-224E41F793EE}.Debug|x86.ActiveCfg = Debug|x86
{0B309776-6424-48C4-838A-224E41F793EE}.Debug|x86.Build.0 = Debug|x86
{0B309776-6424-48C4-838A-224E41F793EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Release|Any CPU.Build.0 = Release|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Release|ARM32.ActiveCfg = Release|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Release|ARM32.Build.0 = Release|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Release|x64.ActiveCfg = Release|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Release|x64.Build.0 = Release|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Release|x86.ActiveCfg = Release|Any CPU
{0B309776-6424-48C4-838A-224E41F793EE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
ZuneShell/ZuneShell.csproj
+9 -3
View File
@@ -23,13 +23,19 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ZuneDBApi">
<HintPath>C:\Program Files\Zune\ZuneDBApi.dll</HintPath>
</Reference>
<Reference Include="UIXControls">
<HintPath>C:\Program Files\Zune\UIXcontrols.dll</HintPath>
</Reference>
<ProjectReference Include="..\libs\MicrosoftIris\UIX\UIX.csproj" />
<!--
Reference both the real and proxy ZuneDBApi, to make sure we have all the types.
Use the version from ZuneImpl when available.
-->
<ProjectReference Include="..\ZuneImpl\ZuneImpl.csproj" />
<Reference Include="ZuneDBApi">
<HintPath>C:\Program Files\Zune\ZuneDBApi.dll</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">