Skip to content

Commit

Permalink
Update Installer & Shoko.Commons.
Browse files Browse the repository at this point in the history
  • Loading branch information
ElementalCrisis committed Aug 2, 2018
1 parent ee100b5 commit 5bcef92
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 25 deletions.
32 changes: 16 additions & 16 deletions Installers/ShokoDesktop.iss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

AppId={{EFA49A76-085F-4E64-AEC4-6ACA707A5D91}
AppName=Shoko Desktop
AppVersion=3.9.1.0
AppVersion=3.9.2.0
AppVerName=Shoko Desktop
AppPublisher=Shoko Team
AppPublisherURL=https://ShokoAnime.com/
Expand All @@ -31,20 +31,6 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1

[Files]
Source: "..\Shoko.Desktop\bin\Release\System.Diagnostics.DiagnosticSource.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Diagnostics.DiagnosticSource.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.IO.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Net.Http.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Runtime.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Security.Cryptography.Algorithms.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Security.Cryptography.Encoding.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Security.Cryptography.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Security.Cryptography.X509Certificates.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Spatial.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Spatial.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Windows.Interactivity.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\Xceed.Wpf.AvalonDock.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\Xceed.Wpf.DataGrid.dll"; DestDir: "{app}"; Flags: ignoreversion
Expand Down Expand Up @@ -107,6 +93,20 @@ Source: "..\Shoko.Desktop\bin\Release\Shoko.Models.pdb"; DestDir: "{app}"; Flags
Source: "..\Shoko.Desktop\bin\Release\ShokoDesktop.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\ShokoDesktop.exe.config"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\ShokoDesktop.pdb"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Diagnostics.DiagnosticSource.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Diagnostics.DiagnosticSource.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.IO.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Net.Http.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Runtime.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Security.Cryptography.Algorithms.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Security.Cryptography.Encoding.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Security.Cryptography.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Security.Cryptography.X509Certificates.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Spatial.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Spatial.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\System.Windows.Interactivity.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\Xceed.Wpf.AvalonDock.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\Shoko.Desktop\bin\Release\de\*"; DestDir: "{app}\de"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "..\Shoko.Desktop\bin\Release\en-gb\*"; DestDir: "{app}\en-gb"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "..\Shoko.Desktop\bin\Release\es\*"; DestDir: "{app}\es"; Flags: ignoreversion recursesubdirs createallsubdirs
Expand All @@ -131,7 +131,7 @@ Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Shoko Desktop"; Fi
[Run]
Filename: "{app}\FixPermissions.bat";
Filename: "{app}\ShokoDesktop.exe"; Flags: nowait postinstall skipifsilent shellexec; Description: "{cm:LaunchProgram,Shoko Desktop}"
Filename: "https://shokoanime.com/shoko-version-3-9-1-released/"; Flags: shellexec runasoriginaluser postinstall; Description: "View 3.9.1 Release Notes"
Filename: "https://shokoanime.com/shoko-version-3-9-2-released/"; Flags: shellexec runasoriginaluser postinstall; Description: "View 3.9.2 Release Notes"

[Dirs]
Name: "{app}"; Permissions: users-full
Expand Down
2 changes: 1 addition & 1 deletion Shoko.Commons
6 changes: 0 additions & 6 deletions Shoko.Desktop/Forms/AboutForm.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@
<usercontrols:HyperLinkStandard Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="5,5,5,6" DisplayText="{Resx ResxName=Shoko.Commons.Properties.Resources, Key=Link_Blog}"
URL="{Resx ResxName=Shoko.Commons.Properties.Resources, Key=Link_Blog}"/>

<TextBlock Grid.Row="3" Grid.Column="0" Margin="5,6" Text="{Resx ResxName=Shoko.Commons.Properties.Resources, Key=About_MediaPortal}" VerticalAlignment="Center"/>
<usercontrols:HyperLinkStandard Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" Margin="5,5,5,6" DisplayText="MyAnime 3"
URL="https://forum.team-mediaportal.com/threads/my-anime-3.107475/"/>



</Grid>


Expand Down
4 changes: 2 additions & 2 deletions Shoko.Desktop/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.9.1.0")]
[assembly: AssemblyFileVersion("3.9.1.0")]
[assembly: AssemblyVersion("3.9.2.0")]
[assembly: AssemblyFileVersion("3.9.2.0")]
[assembly: AllowPartiallyTrustedCallers]
[assembly: SecurityRules(SecurityRuleSet.Level1)]

0 comments on commit 5bcef92

Please sign in to comment.