Skip to content

Commit

Permalink
Merge pull request #21 from AlphaCentaury/v1.5-beta-2
Browse files Browse the repository at this point in the history
v1.5 beta 1 SP1a
  • Loading branch information
AlphaCentaury authored Mar 30, 2020
2 parents 573b13a + e7ac81a commit ef181aa
Show file tree
Hide file tree
Showing 41 changed files with 281 additions and 144 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -158,7 +158,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="packages.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -83,7 +83,6 @@
<Compile Include="ExpandDependencies.cs" />
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="packages.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -92,7 +92,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions 1.5 'Kruger 60'/Assemblies/DvbStpClient/DvbStpClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -81,7 +81,6 @@
<Content Include="licensing.xml" />
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="packages.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -130,7 +130,6 @@
<Compile Include="v010501\XmlSerialization\TvAnytime\Mpeg7\TermUse.cs" />
<Compile Include="v010501\XmlSerialization\TvAnytime\Mpeg7\TextualBase.cs" />
<Compile Include="v010501\XmlSerialization\TvAnytime\Mpeg7\TextualData.cs" />
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="v010501\Xsd.Unified\sdns_v1.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down Expand Up @@ -78,7 +78,6 @@
<Content Include="licensing.xml" />
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="packages.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -124,7 +124,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="app.config" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -86,7 +86,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="packages.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -110,7 +110,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -106,7 +106,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Win32.TaskScheduler, Version=2.8.17.0, Culture=neutral, PublicKeyToken=c416bc1b32d97233, processorArchitecture=MSIL">
Expand Down Expand Up @@ -98,7 +98,6 @@
<Content Include="licensing.xml" />
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="packages.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -70,7 +70,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -212,7 +212,6 @@
<Link>Resources\WaitClock_Icon.ico</Link>
</Content>
<Content Include="License.txt" />
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="packages.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -306,7 +306,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="packages.config" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -302,7 +302,6 @@
<Link>Resources\Status_Success_24x24.png</Link>
</Content>
<Content Include="License.txt" />
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="Resources\MissingLogo256.png" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.ExceptionMessageBox, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
Expand Down Expand Up @@ -147,7 +147,6 @@
<Content Include="Resources\NetworkInternetIcon_256x256.png" />
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="Resources\GuiaResolucionProblemas.rtf" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<DelaySign>false</DelaySign>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -244,7 +244,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -139,7 +139,6 @@
<ItemGroup>
<Content Include="License.txt" />
<Content Include="licensing.xml" />
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
<None Include="Resources\Action_Run_16x16.png" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.ExceptionMessageBox, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
Expand Down Expand Up @@ -303,7 +303,6 @@
<Content Include="Resources\Status_Warning_16x16.png" />
</ItemGroup>
<ItemGroup>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="LICENSE.ES.MD" />
<None Include="LICENSE.MD" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions 1.5 'Kruger 60'/AssemblySolutionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
11 changes: 8 additions & 3 deletions 1.5 'Kruger 60'/ChannelList/ChannelList.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Users\Developer\source\repos\AlphaCentaury\secrets\AlphaCentaury_MovistarTV.snk.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -168,7 +168,6 @@
<None Include="..\solution-license_es.rtf">
<Link>Resources\solution-license_es.rtf</Link>
</None>
<None Include="AlphaCentaury_MovistarTV.snk.pfx" />
<None Include="app.config" />
<Compile Include="ChannelListForm.ListManager.cs">
<SubType>Form</SubType>
Expand Down Expand Up @@ -310,6 +309,12 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>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)"
)</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
8 changes: 0 additions & 8 deletions 1.5 'Kruger 60'/ChannelList/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,9 @@ internal static void StartTelemetry()
// start telemetry
AppTelemetry.Start(new TelemetryFactory(), telemetryConfiguration, new Dictionary<string, IReadOnlyDictionary<string, string>>
{
{
"IpTviewr.Telemetry.VsAppCenter", new Dictionary<string, string>
{
{"AppSecret", InvariantTexts.TelemetryAppCenter_AppSecret}
}

},
{
"IpTviewr.Telemetry.GoogleAnalytics", new Dictionary<string, string>
{
{"TrackingId", InvariantTexts.TelemetryGoogleAnalytics_TrackingId},
{"ClientId", Settings.Default.Telemetry_GoogleAnalyticsClientId}
}
}
Expand Down
Loading

0 comments on commit ef181aa

Please sign in to comment.