Serraniel/DiscordMediaLoader
1
0
Fork 0
Code Issues 30 Pull requests 16 Packages Projects Releases 18 Wiki Activity

Merge branch 'develop'

Browse source 
* develop:
  Changed target framework
This commit is contained in:
Serraniel 2017-01-29 10:30:53 +01:00
parent 8f84544af0 1b1ca8847e
commit 025c53f0ff
6 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Discord Media Loader.sln
View file

@ -19,12 +19,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(AutomaticVersions) = postSolution
UpdateAssemblyVersion.Release|Any CPU = True
UpdateAssemblyFileVersion.Release|Any CPU = True
UpdateAssemblyInfoVersion.Release|Any CPU = True
AssemblyVersionSettings.Release|Any CPU = None.IncrementOnDemand.MonthStamp.Increment
AssemblyFileVersionSettings.Release|Any CPU = None.IncrementOnDemand.MonthStamp.Increment
AssemblyInfoVersionSettings.Release|Any CPU = None.IncrementOnDemand.MonthStamp.Increment
EndGlobalSection
EndGlobal

12
Discord Media Loader/App.config
View file

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="Discord_Media_Loader.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Discord_Media_Loader.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
</startup>
<userSettings>
<Discord_Media_Loader.Properties.Settings>
<setting name="email" serializeAs="String">
<value />
<value/>
</setting>
</Discord_Media_Loader.Properties.Settings>
</userSettings>
</configuration>
</configuration>

3
Discord Media Loader/Discord Media Loader.csproj
View file

@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Discord_Media_Loader</RootNamespace>
<AssemblyName>Discord Media Loader</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>

4
Discord Media Loader/Properties/AssemblyInfo.cs
View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.1.1.54")]
[assembly: AssemblyFileVersion("0.1.1.54")]
[assembly: AssemblyVersion("0.1.1.57")]
[assembly: AssemblyFileVersion("0.1.1.57")]

1
Discord Media Loader/Properties/Resources.Designer.cs generated
View file

@ -68,6 +68,7 @@ namespace Discord_Media_Loader.Properties {
///Discord.Net (Copyright (c) 2015 RogueException - MIT License)
///Newtonsoft.Json (Copyright (c) 2007 James Newton-King - MIT License)
///Nito.AsyncEx (Copyright (c) 2014 StephenCleary - MIT License)
///RestSharp (Copyright (c) restsharp - Apache 2.0 License)
///WebSocket4Net (Copyright (c) kerryjiang - Apache 2.0 License) ähnelt.
/// </summary>
internal static string AboutString {

1
Discord Media Loader/Properties/Resources.resx
View file

@ -125,6 +125,7 @@ Made with:
Discord.Net (Copyright (c) 2015 RogueException - MIT License)
Newtonsoft.Json (Copyright (c) 2007 James Newton-King - MIT License)
Nito.AsyncEx (Copyright (c) 2014 StephenCleary - MIT License)
RestSharp (Copyright (c) restsharp - Apache 2.0 License)
WebSocket4Net (Copyright (c) kerryjiang - Apache 2.0 License)</value>
</data>
</root>