diff --git a/ASFui/ASFui.csproj b/ASFui/ASFui.csproj index 740390d..eea86d1 100644 --- a/ASFui/ASFui.csproj +++ b/ASFui/ASFui.csproj @@ -84,7 +84,7 @@ True - ..\packages\NLog.4.4.0\lib\net45\NLog.dll + ..\packages\NLog.4.4.1\lib\net45\NLog.dll True diff --git a/ASFui/Properties/AssemblyInfo.cs b/ASFui/Properties/AssemblyInfo.cs index 1125b57..11f9093 100644 --- a/ASFui/Properties/AssemblyInfo.cs +++ b/ASFui/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ // Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión // mediante el carácter '*', como se muestra a continuación: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.5.1.0")] -[assembly: AssemblyFileVersion("0.5.1.0")] +[assembly: AssemblyVersion("0.5.2.0")] +[assembly: AssemblyFileVersion("0.5.2.0")] diff --git a/ASFui/Util.cs b/ASFui/Util.cs index d2bb65e..46c4e15 100644 --- a/ASFui/Util.cs +++ b/ASFui/Util.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Net; using System.ServiceModel; -using System.ServiceModel.Description; using System.Windows.Forms; namespace ASFui @@ -50,8 +49,8 @@ public static string GetEndpointAddress() JObject.Parse( File.ReadAllText(Path.GetDirectoryName(Settings.Default.ASFBinary) + @"/config/ASF.json")); - string hostname= "127.0.0.1"; - string port = "1242"; + var hostname= "127.0.0.1"; + var port = "1242"; try { hostname = json["WCFHost"].ToString(); @@ -60,11 +59,11 @@ public static string GetEndpointAddress() { try { hostname = json["WCFHostname"].ToString(); - } catch { } + } catch { /* Ignore */ } } try { port = json["WCFPort"].ToString(); - }catch { } + } catch { /* Ignore */ } return "net.tcp://" + hostname + ":" + port + "/ASF"; } diff --git a/ASFui/packages.config b/ASFui/packages.config index 4c1d34d..13f2ea1 100644 --- a/ASFui/packages.config +++ b/ASFui/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/packages/Costura.Fody.2.0.0-beta0018/build/Costura.Fody.targets b/packages/Costura.Fody.2.0.0-beta0018/build/Costura.Fody.targets new file mode 100644 index 0000000..fb13d1c --- /dev/null +++ b/packages/Costura.Fody.2.0.0-beta0018/build/Costura.Fody.targets @@ -0,0 +1,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/packages/Fody.1.30.0-beta01/build/dotnet/Fody.targets b/packages/Fody.1.30.0-beta01/build/dotnet/Fody.targets new file mode 100644 index 0000000..53eacd6 --- /dev/null +++ b/packages/Fody.1.30.0-beta01/build/dotnet/Fody.targets @@ -0,0 +1,98 @@ + + + + + + $(NCrunchOriginalSolutionDir) + + + + + $(SolutionDir) + + + + + $(MSBuildProjectDirectory)..\..\..\ + + + + + + + $(KeyOriginatorFile) + + + + + $(AssemblyOriginatorKeyFile) + + + + + + + + + + $(ProjectDir)FodyWeavers.xml + $(ProjectDir)$(IntermediateOutputPath) + $(SignAssembly) + $(MSBuildThisFileDirectory)..\..\ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/Fody.1.30.0-beta01/build/portable-net+sl+win+wpa+wp/Fody.targets b/packages/Fody.1.30.0-beta01/build/portable-net+sl+win+wpa+wp/Fody.targets new file mode 100644 index 0000000..53eacd6 --- /dev/null +++ b/packages/Fody.1.30.0-beta01/build/portable-net+sl+win+wpa+wp/Fody.targets @@ -0,0 +1,98 @@ + + + + + + $(NCrunchOriginalSolutionDir) + + + + + $(SolutionDir) + + + + + $(MSBuildProjectDirectory)..\..\..\ + + + + + + + $(KeyOriginatorFile) + + + + + $(AssemblyOriginatorKeyFile) + + + + + + + + + + $(ProjectDir)FodyWeavers.xml + $(ProjectDir)$(IntermediateOutputPath) + $(SignAssembly) + $(MSBuildThisFileDirectory)..\..\ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/Resource.Embedder.1.2.2/build/Resource.Embedder.targets b/packages/Resource.Embedder.1.2.2/build/Resource.Embedder.targets new file mode 100644 index 0000000..30300ad --- /dev/null +++ b/packages/Resource.Embedder.1.2.2/build/Resource.Embedder.targets @@ -0,0 +1,59 @@ + + + + + + $(NCrunchOriginalSolutionDir) + + + + + $(SolutionDir) + + + + + $(MSBuildProjectDirectory)..\..\..\ + + + + + + + $(KeyOriginatorFile) + + + + + $(AssemblyOriginatorKeyFile) + + + + + + + + + + $(ProjectDir)$(IntermediateOutputPath) + $(SignAssembly) + $(MSBuildThisFileDirectory)..\ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/version.txt b/version.txt index 4103b6d..651fa40 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.5.1.0 \ No newline at end of file +0.5.2.0 \ No newline at end of file