From 0381f22166c2d86e233b2166c2d9bc03a61cb80c Mon Sep 17 00:00:00 2001 From: Yoshi Askharoun Date: Fri, 10 Jun 2022 01:01:33 -0500 Subject: [PATCH] Moved ZuneDBApi proxies into separate project --- .../Service2 => ZuneImpl/Service}/Service.cs | 20 ++++----- ZuneImpl/ZuneImpl.csproj | 43 +++++++++++++++++++ ZuneShell.sln | 18 ++++++++ ZuneShell/ZuneShell.csproj | 12 ++++-- 4 files changed, 80 insertions(+), 13 deletions(-) rename {ZuneShell/Microsoft/Zune/Service2 => ZuneImpl/Service}/Service.cs (97%) create mode 100644 ZuneImpl/ZuneImpl.csproj diff --git a/ZuneShell/Microsoft/Zune/Service2/Service.cs b/ZuneImpl/Service/Service.cs similarity index 97% rename from ZuneShell/Microsoft/Zune/Service2/Service.cs rename to ZuneImpl/Service/Service.cs index 2c82d7c..aaa08b5 100644 --- a/ZuneShell/Microsoft/Zune/Service2/Service.cs +++ b/ZuneImpl/Service/Service.cs @@ -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; }; diff --git a/ZuneImpl/ZuneImpl.csproj b/ZuneImpl/ZuneImpl.csproj new file mode 100644 index 0000000..7fa8681 --- /dev/null +++ b/ZuneImpl/ZuneImpl.csproj @@ -0,0 +1,43 @@ + + + + Debug + x64 + Library + ZuneImpl + 4.7.0.0 + + net35;net40;net6.0 + x64;x86 + Microsoft.Zune + + True + ..\libs\MicrosoftIris\36MSApp1024.snk + True + + False + + + + + C:\Program Files\Zune\ZuneDBApi.dll + + + + + + + + True + + + + + + + + 5.0.0.0 + $(DefineConstants);OPENZUNE + + + diff --git a/ZuneShell.sln b/ZuneShell.sln index 6749680..980dca8 100644 --- a/ZuneShell.sln +++ b/ZuneShell.sln @@ -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 diff --git a/ZuneShell/ZuneShell.csproj b/ZuneShell/ZuneShell.csproj index 147ef58..d5b68a1 100644 --- a/ZuneShell/ZuneShell.csproj +++ b/ZuneShell/ZuneShell.csproj @@ -23,13 +23,19 @@ - - C:\Program Files\Zune\ZuneDBApi.dll - C:\Program Files\Zune\UIXcontrols.dll + + + + + C:\Program Files\Zune\ZuneDBApi.dll +