Installer almost done, icon added, version upped to 1.41-beta, slightly cleaned up .csproj
This commit is contained in:
		@@ -18,53 +18,37 @@
 | 
				
			|||||||
    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
 | 
					    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
 | 
				
			||||||
    <AssemblyVersion>1.0.0.0</AssemblyVersion>
 | 
					    <AssemblyVersion>1.0.0.0</AssemblyVersion>
 | 
				
			||||||
    <FileVersion>1.0.0.0</FileVersion>
 | 
					    <FileVersion>1.0.0.0</FileVersion>
 | 
				
			||||||
 | 
					    <ApplicationIcon>nadeko_icon.ico</ApplicationIcon>
 | 
				
			||||||
 | 
					    <RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64;osx.10.10-x64</RuntimeIdentifiers>
 | 
				
			||||||
  </PropertyGroup>
 | 
					  </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <PropertyGroup Condition=" '$(Version)' == '' ">
 | 
					  <PropertyGroup Condition=" '$(Version)' == '' ">
 | 
				
			||||||
    <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">1.4.0</VersionPrefix>
 | 
					    <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">1.4.1</VersionPrefix>
 | 
				
			||||||
    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix).$(VersionSuffix)</Version>
 | 
					    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix).$(VersionSuffix)</Version>
 | 
				
			||||||
    <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
 | 
					    <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
 | 
				
			||||||
  </PropertyGroup>
 | 
					  </PropertyGroup>
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  <ItemGroup>
 | 
					  <ItemGroup>
 | 
				
			||||||
    <Compile Remove="data\**\*;credentials.json;credentials_example.json" />
 | 
					    <Compile Remove="data\**\*;credentials.json" />
 | 
				
			||||||
    <Compile Remove="Modules\Administration\**" />
 | 
					    <None Update="credentials_example.json">
 | 
				
			||||||
    <EmbeddedResource Remove="Modules\Administration\**" />
 | 
					      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
    <None Remove="Modules\Administration\**" />
 | 
					    </None>
 | 
				
			||||||
    <Compile Remove="Modules\Gambling\Commands\Lucky7Commands.cs" />
 | 
					    <None Update="_strings\**">
 | 
				
			||||||
    <Compile Include="Modules\Administration\Administration.cs" />
 | 
					      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\AutoAssignRoleCommands.cs" />
 | 
					    </None>
 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\GameChannelCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\LocalizationCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\LogCommand.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\Migration.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\Migration\0_9..cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\Migration\MigrationException.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\MuteCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\PlayingRotateCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\PrefixCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\ProtectionCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\RatelimitCommand.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\SelfAssignedRolesCommand.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\SelfCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\ServerGreetCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\UserPunishCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\VcRoleCommands.cs" />
 | 
					 | 
				
			||||||
    <Compile Include="Modules\Administration\Commands\VoicePlusTextCommands.cs" />
 | 
					 | 
				
			||||||
    <None Update="libsodium.dll;opus.dll;libsodium.so;libopus.so">
 | 
					    <None Update="libsodium.dll;opus.dll;libsodium.so;libopus.so">
 | 
				
			||||||
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 | 
					      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 | 
				
			||||||
    </None>
 | 
					    </None>
 | 
				
			||||||
 | 
					    <None Update="nadeko_icon.ico">
 | 
				
			||||||
 | 
					      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 | 
				
			||||||
 | 
					    </None>
 | 
				
			||||||
    <None Update="data\**\*">
 | 
					    <None Update="data\**\*">
 | 
				
			||||||
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 | 
					      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 | 
				
			||||||
    </None>
 | 
					    </None>
 | 
				
			||||||
    <None Update="_strings\**">
 | 
					 | 
				
			||||||
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					 | 
				
			||||||
    </None>
 | 
					 | 
				
			||||||
    <None Update="data\musicdata\**\*">
 | 
					    <None Update="data\musicdata\**\*">
 | 
				
			||||||
      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
 | 
					      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
 | 
				
			||||||
    </None>
 | 
					    </None>
 | 
				
			||||||
  </ItemGroup>
 | 
					  </ItemGroup>
 | 
				
			||||||
 | 
					 | 
				
			||||||
  <ItemGroup>
 | 
					  <ItemGroup>
 | 
				
			||||||
    <PackageReference Include="AngleSharp" Version="0.9.9" />
 | 
					    <PackageReference Include="AngleSharp" Version="0.9.9" />
 | 
				
			||||||
    <PackageReference Include="Discord.Net" Version="1.0.0-rc3-00746" />
 | 
					    <PackageReference Include="Discord.Net" Version="1.0.0-rc3-00746" />
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										28
									
								
								src/NadekoBot/NadekoBot.iss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								src/NadekoBot/NadekoBot.iss
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,28 @@
 | 
				
			|||||||
 | 
					; -- Example1.iss --
 | 
				
			||||||
 | 
					; Demonstrates copying 3 files and creating an icon.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 | 
				
			||||||
 | 
					#define sysfolder "system"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[Setup]
 | 
				
			||||||
 | 
					AppName=NadekoBot
 | 
				
			||||||
 | 
					AppVersion=1.41
 | 
				
			||||||
 | 
					DefaultDirName={pf}\NadekoBot
 | 
				
			||||||
 | 
					DefaultGroupName=NadekoBot
 | 
				
			||||||
 | 
					UninstallDisplayIcon={app}\NadekoBot.exe
 | 
				
			||||||
 | 
					Compression=lzma2
 | 
				
			||||||
 | 
					SolidCompression=yes
 | 
				
			||||||
 | 
					OutputDir=userdocs:Inno Setup Examples Output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[Files]
 | 
				
			||||||
 | 
					Source: "bin\Release\PublishOutput\win7-x64\*"; DestDir: "{app}\system"; Flags: recursesubdirs
 | 
				
			||||||
 | 
					Source: "..\..\docs\Readme.md"; DestDir: "{app}"; Flags: isreadme
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[Icons]
 | 
				
			||||||
 | 
					; for pretty install directory
 | 
				
			||||||
 | 
					Name: "{app}\NadekoBot"; Filename: "{app}\{#sysfolder}\NadekoBot.exe"; IconFilename: "{app}\{#sysfolder}\nadeko_icon.ico"
 | 
				
			||||||
 | 
					Name: "{app}\credentials"; Filename: "{app}\{#sysfolder}\credentials.json" 
 | 
				
			||||||
 | 
					Name: "{app}\data"; Filename: "{app}\{#sysfolder}\data" 
 | 
				
			||||||
 | 
					; desktop shortcut 
 | 
				
			||||||
 | 
					Name: "{commondesktop}\NadekoBot"; Filename: "{app}\NadekoBot";
 | 
				
			||||||
@@ -17,7 +17,7 @@ namespace NadekoBot.Services.Impl
 | 
				
			|||||||
        private readonly IBotCredentials _creds;
 | 
					        private readonly IBotCredentials _creds;
 | 
				
			||||||
        private readonly DateTime _started;
 | 
					        private readonly DateTime _started;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public const string BotVersion = "1.41-alpha";
 | 
					        public const string BotVersion = "1.41-beta";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public string Author => "Kwoth#2560";
 | 
					        public string Author => "Kwoth#2560";
 | 
				
			||||||
        public string Library => "Discord.Net";
 | 
					        public string Library => "Discord.Net";
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								src/NadekoBot/nadeko_icon.ico
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/NadekoBot/nadeko_icon.ico
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 381 KiB  | 
		Reference in New Issue
	
	Block a user