From e7ac81a064d4a2c07346ff5844535a3b67857548 Mon Sep 17 00:00:00 2001 From: AlphaCentaury Date: Mon, 30 Mar 2020 22:34:08 +0200 Subject: [PATCH] v1.5 beta 1 service pack 1 A --- .../AlphaCentaury.Licensing.Data.Ui.csproj | 3 +- .../AlphaCentaury.Licensing.Data.csproj | 3 +- .../IpTviewr.IpTvServices.csproj | 3 +- .../DvbStpClient/DvbStpClient.csproj | 3 +- .../Etsi.Ts102034/Etsi.Ts102034.csproj | 3 +- .../IpTv.MovistarPlus.csproj | 3 +- .../Project.Common/IpTviewr.Common.csproj | 3 +- .../Project.Native/IpTviewr.Native.csproj | 3 +- .../Services.EpgDiscovery.csproj | 3 +- .../Services.Record.Serialization.csproj | 3 +- .../Services.Record/Services.Record.csproj | 3 +- .../Services.SqlServerCE.csproj | 3 +- .../UiServices.Common.csproj | 3 +- .../UiServices.Config.csproj | 3 +- .../UiServices.Discovery.csproj | 3 +- .../UiServices.DvbStpClient.csproj | 3 +- .../UiServices.EPG/UiServices.EPG.csproj | 3 +- .../UiServices.Forms/UiServices.Forms.csproj | 3 +- .../UiServices.Record.csproj | 3 +- 1.5 'Kruger 60'/AssemblySolutionInfo.cs | 6 +- .../ChannelList/ChannelList.csproj | 11 +- 1.5 'Kruger 60'/ChannelList/Program.cs | 8 -- .../Properties/InvariantTexts.Designer.cs | 18 --- .../Properties/InvariantTexts.resx | 8 -- .../Core/IpTViewr.Core/IpTViewr.Core.csproj | 3 +- .../IpTviewr.Telemetry/GoogleAnalytics.cs | 3 +- .../IpTviewr.Telemetry.csproj | 19 ++- .../Properties/Resources.Designer.cs | 75 +++++++++++ .../Properties/Resources.resx | 127 ++++++++++++++++++ ...GoogleAnalytics_MovistarTV_development.txt | 1 + .../Core/IpTviewr.Telemetry/VsAppCenter.cs | 5 +- .../FirstTimeConfig/FirstTimeConfig.csproj | 11 +- 1.5 'Kruger 60'/FirstTimeConfig/Program.cs | 8 +- .../Properties/Resources.Designer.cs | 18 --- .../FirstTimeConfig/Properties/Resources.resx | 8 -- .../FirstTimeConfig/WizardWelcomeDialog.cs | 8 -- .../IpTvRecorderLauncher.csproj | 3 +- 1.5 'Kruger 60'/Logos/Logos.csproj | 3 +- .../Setup/LoadNetFx35/LoadNetFx35.csproj | 3 +- .../Setup/MainSetup/MainSetup.wixproj | 12 +- 1.5 'Kruger 60'/Setup/MainSetup/strings.wxi | 10 +- 41 files changed, 281 insertions(+), 144 deletions(-) create mode 100644 1.5 'Kruger 60'/Core/IpTviewr.Telemetry/Properties/Resources.Designer.cs create mode 100644 1.5 'Kruger 60'/Core/IpTviewr.Telemetry/Properties/Resources.resx create mode 100644 1.5 'Kruger 60'/Core/IpTviewr.Telemetry/Resources/GoogleAnalytics_MovistarTV_development.txt diff --git a/1.5 'Kruger 60'/Assemblies/AlphaCentaury.Licensing.Data.Ui/AlphaCentaury.Licensing.Data.Ui.csproj b/1.5 'Kruger 60'/Assemblies/AlphaCentaury.Licensing.Data.Ui/AlphaCentaury.Licensing.Data.Ui.csproj index 2f47112a..79e76835 100644 --- a/1.5 'Kruger 60'/Assemblies/AlphaCentaury.Licensing.Data.Ui/AlphaCentaury.Licensing.Data.Ui.csproj +++ b/1.5 'Kruger 60'/Assemblies/AlphaCentaury.Licensing.Data.Ui/AlphaCentaury.Licensing.Data.Ui.csproj @@ -36,7 +36,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -158,7 +158,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/AlphaCentaury.Licensing.Data/AlphaCentaury.Licensing.Data.csproj b/1.5 'Kruger 60'/Assemblies/AlphaCentaury.Licensing.Data/AlphaCentaury.Licensing.Data.csproj index 5e1a379c..758c2842 100644 --- a/1.5 'Kruger 60'/Assemblies/AlphaCentaury.Licensing.Data/AlphaCentaury.Licensing.Data.csproj +++ b/1.5 'Kruger 60'/Assemblies/AlphaCentaury.Licensing.Data/AlphaCentaury.Licensing.Data.csproj @@ -36,7 +36,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -83,7 +83,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/Core.IpTvProvider/IpTviewr.IpTvServices.csproj b/1.5 'Kruger 60'/Assemblies/Core.IpTvProvider/IpTviewr.IpTvServices.csproj index 2527d65b..6e86f0c4 100644 --- a/1.5 'Kruger 60'/Assemblies/Core.IpTvProvider/IpTviewr.IpTvServices.csproj +++ b/1.5 'Kruger 60'/Assemblies/Core.IpTvProvider/IpTviewr.IpTvServices.csproj @@ -40,7 +40,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -92,7 +92,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/DvbStpClient/DvbStpClient.csproj b/1.5 'Kruger 60'/Assemblies/DvbStpClient/DvbStpClient.csproj index a96cfc50..2cc182f1 100644 --- a/1.5 'Kruger 60'/Assemblies/DvbStpClient/DvbStpClient.csproj +++ b/1.5 'Kruger 60'/Assemblies/DvbStpClient/DvbStpClient.csproj @@ -40,7 +40,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -81,7 +81,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/Etsi.Ts102034/Etsi.Ts102034.csproj b/1.5 'Kruger 60'/Assemblies/Etsi.Ts102034/Etsi.Ts102034.csproj index 999b33d3..1a0c781d 100644 --- a/1.5 'Kruger 60'/Assemblies/Etsi.Ts102034/Etsi.Ts102034.csproj +++ b/1.5 'Kruger 60'/Assemblies/Etsi.Ts102034/Etsi.Ts102034.csproj @@ -40,7 +40,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -130,7 +130,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/IpTv.MovistarPlus/IpTv.MovistarPlus.csproj b/1.5 'Kruger 60'/Assemblies/IpTv.MovistarPlus/IpTv.MovistarPlus.csproj index 6a1f8b6a..3b745160 100644 --- a/1.5 'Kruger 60'/Assemblies/IpTv.MovistarPlus/IpTv.MovistarPlus.csproj +++ b/1.5 'Kruger 60'/Assemblies/IpTv.MovistarPlus/IpTv.MovistarPlus.csproj @@ -40,7 +40,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -78,7 +78,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/Project.Common/IpTviewr.Common.csproj b/1.5 'Kruger 60'/Assemblies/Project.Common/IpTviewr.Common.csproj index 26389391..63bb25cb 100644 --- a/1.5 'Kruger 60'/Assemblies/Project.Common/IpTviewr.Common.csproj +++ b/1.5 'Kruger 60'/Assemblies/Project.Common/IpTviewr.Common.csproj @@ -52,7 +52,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -124,7 +124,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/Project.Native/IpTviewr.Native.csproj b/1.5 'Kruger 60'/Assemblies/Project.Native/IpTviewr.Native.csproj index 061ea312..ab2356c9 100644 --- a/1.5 'Kruger 60'/Assemblies/Project.Native/IpTviewr.Native.csproj +++ b/1.5 'Kruger 60'/Assemblies/Project.Native/IpTviewr.Native.csproj @@ -40,7 +40,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -86,7 +86,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/Services.EpgDiscovery/Services.EpgDiscovery.csproj b/1.5 'Kruger 60'/Assemblies/Services.EpgDiscovery/Services.EpgDiscovery.csproj index c306d079..33218fb8 100644 --- a/1.5 'Kruger 60'/Assemblies/Services.EpgDiscovery/Services.EpgDiscovery.csproj +++ b/1.5 'Kruger 60'/Assemblies/Services.EpgDiscovery/Services.EpgDiscovery.csproj @@ -34,7 +34,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -110,7 +110,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/Services.Record.Serialization/Services.Record.Serialization.csproj b/1.5 'Kruger 60'/Assemblies/Services.Record.Serialization/Services.Record.Serialization.csproj index f3fd2ce1..0c2e7acd 100644 --- a/1.5 'Kruger 60'/Assemblies/Services.Record.Serialization/Services.Record.Serialization.csproj +++ b/1.5 'Kruger 60'/Assemblies/Services.Record.Serialization/Services.Record.Serialization.csproj @@ -42,7 +42,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -106,7 +106,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/Services.Record/Services.Record.csproj b/1.5 'Kruger 60'/Assemblies/Services.Record/Services.Record.csproj index 241e0b3f..e5bbeee2 100644 --- a/1.5 'Kruger 60'/Assemblies/Services.Record/Services.Record.csproj +++ b/1.5 'Kruger 60'/Assemblies/Services.Record/Services.Record.csproj @@ -42,7 +42,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -98,7 +98,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/Services.SqlServerCE/Services.SqlServerCE.csproj b/1.5 'Kruger 60'/Assemblies/Services.SqlServerCE/Services.SqlServerCE.csproj index f3b24363..4616a572 100644 --- a/1.5 'Kruger 60'/Assemblies/Services.SqlServerCE/Services.SqlServerCE.csproj +++ b/1.5 'Kruger 60'/Assemblies/Services.SqlServerCE/Services.SqlServerCE.csproj @@ -40,7 +40,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -70,7 +70,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/UiServices.Common/UiServices.Common.csproj b/1.5 'Kruger 60'/Assemblies/UiServices.Common/UiServices.Common.csproj index 63d5a507..5cde1e19 100644 --- a/1.5 'Kruger 60'/Assemblies/UiServices.Common/UiServices.Common.csproj +++ b/1.5 'Kruger 60'/Assemblies/UiServices.Common/UiServices.Common.csproj @@ -42,7 +42,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -212,7 +212,6 @@ Resources\WaitClock_Icon.ico - diff --git a/1.5 'Kruger 60'/Assemblies/UiServices.Config/UiServices.Config.csproj b/1.5 'Kruger 60'/Assemblies/UiServices.Config/UiServices.Config.csproj index bcca0da4..b0649855 100644 --- a/1.5 'Kruger 60'/Assemblies/UiServices.Config/UiServices.Config.csproj +++ b/1.5 'Kruger 60'/Assemblies/UiServices.Config/UiServices.Config.csproj @@ -42,7 +42,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -306,7 +306,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/UiServices.Discovery/UiServices.Discovery.csproj b/1.5 'Kruger 60'/Assemblies/UiServices.Discovery/UiServices.Discovery.csproj index 9554d758..a1807e86 100644 --- a/1.5 'Kruger 60'/Assemblies/UiServices.Discovery/UiServices.Discovery.csproj +++ b/1.5 'Kruger 60'/Assemblies/UiServices.Discovery/UiServices.Discovery.csproj @@ -42,7 +42,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -302,7 +302,6 @@ Resources\Status_Success_24x24.png - diff --git a/1.5 'Kruger 60'/Assemblies/UiServices.DvbStpClient/UiServices.DvbStpClient.csproj b/1.5 'Kruger 60'/Assemblies/UiServices.DvbStpClient/UiServices.DvbStpClient.csproj index b9ee0a82..44394862 100644 --- a/1.5 'Kruger 60'/Assemblies/UiServices.DvbStpClient/UiServices.DvbStpClient.csproj +++ b/1.5 'Kruger 60'/Assemblies/UiServices.DvbStpClient/UiServices.DvbStpClient.csproj @@ -40,7 +40,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -147,7 +147,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/UiServices.EPG/UiServices.EPG.csproj b/1.5 'Kruger 60'/Assemblies/UiServices.EPG/UiServices.EPG.csproj index dc1c7866..72c52af0 100644 --- a/1.5 'Kruger 60'/Assemblies/UiServices.EPG/UiServices.EPG.csproj +++ b/1.5 'Kruger 60'/Assemblies/UiServices.EPG/UiServices.EPG.csproj @@ -43,7 +43,7 @@ false - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -244,7 +244,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/UiServices.Forms/UiServices.Forms.csproj b/1.5 'Kruger 60'/Assemblies/UiServices.Forms/UiServices.Forms.csproj index 58c8affc..ed809953 100644 --- a/1.5 'Kruger 60'/Assemblies/UiServices.Forms/UiServices.Forms.csproj +++ b/1.5 'Kruger 60'/Assemblies/UiServices.Forms/UiServices.Forms.csproj @@ -42,7 +42,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -139,7 +139,6 @@ - diff --git a/1.5 'Kruger 60'/Assemblies/UiServices.Record/UiServices.Record.csproj b/1.5 'Kruger 60'/Assemblies/UiServices.Record/UiServices.Record.csproj index c63f8020..f72700be 100644 --- a/1.5 'Kruger 60'/Assemblies/UiServices.Record/UiServices.Record.csproj +++ b/1.5 'Kruger 60'/Assemblies/UiServices.Record/UiServices.Record.csproj @@ -40,7 +40,7 @@ true - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -303,7 +303,6 @@ - diff --git a/1.5 'Kruger 60'/AssemblySolutionInfo.cs b/1.5 'Kruger 60'/AssemblySolutionInfo.cs index c71c6e9f..0912315d 100644 --- a/1.5 'Kruger 60'/AssemblySolutionInfo.cs +++ b/1.5 'Kruger 60'/AssemblySolutionInfo.cs @@ -20,9 +20,9 @@ internal static class SolutionVersion { - public const string DefaultAssemblyVersion = "1.5.1100.0"; - public const string AssemblyFileVersion = "1.5.1100.0"; - public const string AssemblyInformationalVersion = "1.5.1100.0"; + public const string DefaultAssemblyVersion = "1.5.1105.0"; + public const string AssemblyFileVersion = "1.5.1105.0"; + public const string AssemblyInformationalVersion = "1.5.1105.0"; public const string AssemblyProduct = "IPTViewr: virtual decoder for movistar+" + " (v" + ProductVersion + ")"; public const string ProductVersion = "1.5 \"Kruger 60\" beta 1 SP1"; public const string DefaultCopyright = "Copyright (C) 2014-2020, GitHub/Codeplex user AlphaCentaury and contributors"; diff --git a/1.5 'Kruger 60'/ChannelList/ChannelList.csproj b/1.5 'Kruger 60'/ChannelList/ChannelList.csproj index e29bf9ee..34bf9261 100644 --- a/1.5 'Kruger 60'/ChannelList/ChannelList.csproj +++ b/1.5 'Kruger 60'/ChannelList/ChannelList.csproj @@ -69,10 +69,10 @@ Properties\app.manifest - true + false - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -168,7 +168,6 @@ Resources\solution-license_es.rtf - Form @@ -310,6 +309,12 @@ + + if "$(ConfigurationName)" == "Release" ( +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" +signtool sign /sha1 "de3d61baad9b12a4e7c70e068e28d354cdc25f50" /tr "http://time.certum.pl" /fd sha256 "$(TargetPath)" +) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\..\..\..\..\secrets\MicrosoftAppCenter_MovistarTV_v1.5_beta-1.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + + ..\..\..\..\..\secrets\GoogleAnalytics_MovistarTV_v1.5_beta-1.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + \ No newline at end of file diff --git a/1.5 'Kruger 60'/Core/IpTviewr.Telemetry/Resources/GoogleAnalytics_MovistarTV_development.txt b/1.5 'Kruger 60'/Core/IpTviewr.Telemetry/Resources/GoogleAnalytics_MovistarTV_development.txt new file mode 100644 index 00000000..e3676acc --- /dev/null +++ b/1.5 'Kruger 60'/Core/IpTviewr.Telemetry/Resources/GoogleAnalytics_MovistarTV_development.txt @@ -0,0 +1 @@ +UA-66146192-3 \ No newline at end of file diff --git a/1.5 'Kruger 60'/Core/IpTviewr.Telemetry/VsAppCenter.cs b/1.5 'Kruger 60'/Core/IpTviewr.Telemetry/VsAppCenter.cs index 0fff3581..435e262f 100644 --- a/1.5 'Kruger 60'/Core/IpTviewr.Telemetry/VsAppCenter.cs +++ b/1.5 'Kruger 60'/Core/IpTviewr.Telemetry/VsAppCenter.cs @@ -18,6 +18,7 @@ using System.Windows.Forms; using IpTviewr.Common.Telemetry; using IpTviewr.Native; +using IpTviewr.Telemetry.Properties; using Microsoft.AppCenter; using Microsoft.AppCenter.Analytics; using Microsoft.AppCenter.Crashes; @@ -36,8 +37,6 @@ public bool Enabled public void Start(IReadOnlyDictionary properties) { - if (properties == null) throw new InvalidOperationException(); - var countryCode = RegionInfo.CurrentRegion.TwoLetterISORegionName; var exe = Path.GetFileNameWithoutExtension(Application.ExecutablePath); WindowsDesktop.GetDpi(out var dpiX, out var dpiY); @@ -50,7 +49,7 @@ public void Start(IReadOnlyDictionary properties) Crashes.SetEnabledAsync(AppTelemetry.Enabled).Wait(); AppCenter.SetCountryCode(countryCode); - AppCenter.Start(properties["AppSecret"], typeof(Analytics), typeof(Crashes)); + AppCenter.Start(Resources.MicrosoftAppCenter, typeof(Analytics), typeof(Crashes)); Analytics.TrackEvent($"{exe}:Start", new Dictionary { {"CurrentCulture", CultureInfo.CurrentCulture.Name}, diff --git a/1.5 'Kruger 60'/FirstTimeConfig/FirstTimeConfig.csproj b/1.5 'Kruger 60'/FirstTimeConfig/FirstTimeConfig.csproj index 05c76276..75ea3f62 100644 --- a/1.5 'Kruger 60'/FirstTimeConfig/FirstTimeConfig.csproj +++ b/1.5 'Kruger 60'/FirstTimeConfig/FirstTimeConfig.csproj @@ -50,10 +50,10 @@ Properties\app.manifest - true + false - AlphaCentaury_MovistarTV.snk.pfx + C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx @@ -155,7 +155,6 @@ Resources\AppTelemetry_es.rtf - @@ -255,6 +254,12 @@ + + if "$(ConfigurationName)" == "Release" ( +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" +signtool sign /sha1 "de3d61baad9b12a4e7c70e068e28d354cdc25f50" /tr "http://time.certum.pl" /fd sha256 "$(TargetPath)" +) + - - + + - - - + + +