v0.5.2

alvr · Jan 27, 2017 · 3182a0f · 3182a0f
1 parent e081ec6
commit 3182a0f
Show file tree

Hide file tree

Showing 9 changed files with 282 additions and 12 deletions.
diff --git a/ASFui/ASFui.csproj b/ASFui/ASFui.csproj
@@ -84,7 +84,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git 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
@@ -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
@@ -4,7 +4,7 @@
   <package id="Fody" version="1.29.4" targetFramework="net461" developmentDependency="true" />
   <package id="ILRepack" version="2.0.12" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="NLog" version="4.4.0" targetFramework="net461" />
-  <package id="NLog.Config" version="4.4.0" targetFramework="net461" />
-  <package id="NLog.Schema" version="4.4.0" targetFramework="net461" />
+  <package id="NLog" version="4.4.1" targetFramework="net461" />
+  <package id="NLog.Config" version="4.4.1" targetFramework="net461" />
+  <package id="NLog.Schema" version="4.4.1" targetFramework="net461" />
 </packages>
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
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target
+    AfterTargets="AfterBuild"
+    Name="FodyPropertyChangedVerification">
+
+    <Error
+      Condition="$(FodyExecutedWeavers) == '*Undefined*'"
+      Text="Could not find `FodyWeaversExecuted` MSBuild property. It is possible you need to update Fody." />
+
+    <Error
+      Condition="!$(FodyExecutedWeavers.Contains('Costura;'))"
+      Text="Costura expected to be executed. You may also need to manually add '&lt;Costura /&gt;' into your FodyWeavers.xml. eg &lt;Weavers&gt;&lt;Costura/&gt;&lt;/Weavers&gt;. See https://github.com/Fody/Fody/wiki/SampleUsage" />
+
+  </Target>
+</Project>
diff --git a/packages/Fody.1.30.0-beta01/build/dotnet/Fody.targets b/packages/Fody.1.30.0-beta01/build/dotnet/Fody.targets
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Choose>
+    <When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(NCrunchOriginalSolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(SolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(MSBuildProjectDirectory)..\..\..\</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(KeyOriginatorFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(AssemblyOriginatorKeyFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <Otherwise >
+      <PropertyGroup>
+        <FodyKeyFilePath></FodyKeyFilePath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <PropertyGroup>
+    <ProjectWeaverXml>$(ProjectDir)FodyWeavers.xml</ProjectWeaverXml>
+    <IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
+    <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
+    <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)..\..\</FodyPath>
+  </PropertyGroup>
+  <UsingTask
+      TaskName="Fody.WeavingTask"
+      AssemblyFile="$(FodyPath)\Fody.dll" />
+  <Target
+      AfterTargets="AfterCompile"
+      Condition="Exists(@(IntermediateAssembly))"
+      Name="FodyTarget"
+      DependsOnTargets="$(FodyDependsOnTargets)"
+      Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
+      Outputs="$(TargetPath)">
+
+    <Fody.WeavingTask
+          AssemblyPath="@(IntermediateAssembly)"
+          IntermediateDir="$(IntermediateDir)"
+          KeyFilePath="$(FodyKeyFilePath)"
+          NuGetPackageRoot="$(NuGetPackageRoot)"
+          ProjectDirectory="$(ProjectDir)"
+          SolutionDir="$(FodySolutionDir)"
+          References="@(ReferencePath)"
+          SignAssembly="$(FodySignAssembly)"
+          ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
+          DefineConstants="$(DefineConstants)"
+      >
+
+      <Output 
+        TaskParameter="ExecutedWeavers"
+        PropertyName="FodyExecutedWeavers" />
+    </Fody.WeavingTask>
+  </Target>
+
+
+  <UsingTask
+    TaskName="Fody.VerifyTask"
+    AssemblyFile="$(FodyPath)\Fody.dll" />
+  <Target Condition="'$(NCrunch)' != '1' And Exists($(TargetPath))"
+      AfterTargets="AfterBuild"
+      Name="FodyVerifyTarget"
+      DependsOnTargets="$(FodyVerifyDependsOnTargets)"
+      Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
+      Outputs="$(TargetPath)">
+
+    <Fody.VerifyTask
+          ProjectDirectory="$(ProjectDir)"
+          TargetPath="$(TargetPath)"
+          SolutionDir="$(FodySolutionDir)"
+          DefineConstants="$(DefineConstants)"
+      />
+  </Target>
+
+
+  <!--Support for ncrunch-->
+  <ItemGroup  Condition="'$(NCrunch)' == '1'">
+    <None Include="$(FodyPath)\*.*" />
+  </ItemGroup>
+
+</Project>
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
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Choose>
+    <When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(NCrunchOriginalSolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(SolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(MSBuildProjectDirectory)..\..\..\</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(KeyOriginatorFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(AssemblyOriginatorKeyFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <Otherwise >
+      <PropertyGroup>
+        <FodyKeyFilePath></FodyKeyFilePath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <PropertyGroup>
+    <ProjectWeaverXml>$(ProjectDir)FodyWeavers.xml</ProjectWeaverXml>
+    <IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
+    <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
+    <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)..\..\</FodyPath>
+  </PropertyGroup>
+  <UsingTask
+      TaskName="Fody.WeavingTask"
+      AssemblyFile="$(FodyPath)\Fody.dll" />
+  <Target
+      AfterTargets="AfterCompile"
+      Condition="Exists(@(IntermediateAssembly))"
+      Name="FodyTarget"
+      DependsOnTargets="$(FodyDependsOnTargets)"
+      Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
+      Outputs="$(TargetPath)">
+
+    <Fody.WeavingTask
+          AssemblyPath="@(IntermediateAssembly)"
+          IntermediateDir="$(IntermediateDir)"
+          KeyFilePath="$(FodyKeyFilePath)"
+          NuGetPackageRoot="$(NuGetPackageRoot)"
+          ProjectDirectory="$(ProjectDir)"
+          SolutionDir="$(FodySolutionDir)"
+          References="@(ReferencePath)"
+          SignAssembly="$(FodySignAssembly)"
+          ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
+          DefineConstants="$(DefineConstants)"
+      >
+
+      <Output 
+        TaskParameter="ExecutedWeavers"
+        PropertyName="FodyExecutedWeavers" />
+    </Fody.WeavingTask>
+  </Target>
+
+
+  <UsingTask
+    TaskName="Fody.VerifyTask"
+    AssemblyFile="$(FodyPath)\Fody.dll" />
+  <Target Condition="'$(NCrunch)' != '1' And Exists($(TargetPath))"
+      AfterTargets="AfterBuild"
+      Name="FodyVerifyTarget"
+      DependsOnTargets="$(FodyVerifyDependsOnTargets)"
+      Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
+      Outputs="$(TargetPath)">
+
+    <Fody.VerifyTask
+          ProjectDirectory="$(ProjectDir)"
+          TargetPath="$(TargetPath)"
+          SolutionDir="$(FodySolutionDir)"
+          DefineConstants="$(DefineConstants)"
+      />
+  </Target>
+
+
+  <!--Support for ncrunch-->
+  <ItemGroup  Condition="'$(NCrunch)' == '1'">
+    <None Include="$(FodyPath)\*.*" />
+  </ItemGroup>
+
+</Project>
diff --git a/packages/Resource.Embedder.1.2.2/build/Resource.Embedder.targets b/packages/Resource.Embedder.1.2.2/build/Resource.Embedder.targets
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<Choose>
+		<When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'">
+			<PropertyGroup>
+				<EmbedderSolutionDir>$(NCrunchOriginalSolutionDir)</EmbedderSolutionDir>
+			</PropertyGroup>
+		</When>
+		<When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'">
+			<PropertyGroup>
+				<EmbedderSolutionDir>$(SolutionDir)</EmbedderSolutionDir>
+			</PropertyGroup>
+		</When>
+		<When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">
+			<PropertyGroup>
+				<EmbedderSolutionDir>$(MSBuildProjectDirectory)..\..\..\</EmbedderSolutionDir>
+			</PropertyGroup>
+		</When>
+	</Choose>
+	<Choose>
+		<When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'">
+			<PropertyGroup>
+				<EmbedderKeyFilePath>$(KeyOriginatorFile)</EmbedderKeyFilePath>
+			</PropertyGroup>
+		</When>
+		<When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'">
+			<PropertyGroup>
+				<EmbedderKeyFilePath>$(AssemblyOriginatorKeyFile)</EmbedderKeyFilePath>
+			</PropertyGroup>
+		</When>
+		<Otherwise>
+			<PropertyGroup>
+				<EmbedderKeyFilePath></EmbedderKeyFilePath>
+			</PropertyGroup>
+		</Otherwise>
+	</Choose>
+	<PropertyGroup>
+		<IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
+		<EmbedderSignAssembly Condition="$(EmbedderSignAssembly) == '' Or $(EmbedderSignAssembly) == '*Undefined*'">$(SignAssembly)</EmbedderSignAssembly>
+		<EmbedderPath Condition="$(EmbedderPath) == '' Or $(EmbedderPath) == '*Undefined*'">$(MSBuildThisFileDirectory)..\</EmbedderPath>
+	</PropertyGroup>
+	<UsingTask TaskName="ResourceEmbedder.MsBuild.SatelliteAssemblyEmbedderTask" AssemblyFile="$(EmbedderPath)ResourceEmbedder.MsBuild.dll" />
+	<UsingTask TaskName="ResourceEmbedder.MsBuild.SatelliteAssemblyCleanupTask" AssemblyFile="$(EmbedderPath)ResourceEmbedder.MsBuild.dll" />
+	<!-- We want to run as soon as the satellite assemblies are generated -->
+	<Target AfterTargets="GenerateSatelliteAssemblies" Name="EmbedderTarget" DependsOnTargets="$(EmbedderDependsOnTargets)">
+		<ResourceEmbedder.MsBuild.SatelliteAssemblyEmbedderTask AssemblyPath="@(IntermediateAssembly)" KeyFilePath="$(EmbedderKeyFilePath)"
+																ProjectDirectory="$(ProjectDir)" TargetPath="$(TargetPath)" SignAssembly="$(EmbedderSignAssembly)" References="@(ReferencePath)"/>
+	</Target>
+	<!--Cleanup after generating -->
+	<Target AfterTargets="AfterBuild" Name="CleanupTarget" DependsOnTargets="$(EmbedderDependsOnTargets)">
+		<ResourceEmbedder.MsBuild.SatelliteAssemblyCleanupTask AssemblyPath="@(IntermediateAssembly)" KeyFilePath="$(EmbedderKeyFilePath)"
+																ProjectDirectory="$(ProjectDir)" TargetPath="$(TargetPath)" SignAssembly="$(EmbedderSignAssembly)"/>
+	</Target>
+	<!--Support for ncrunch-->
+	<ItemGroup  Condition="'$(NCrunch)' == '1'">
+		<None Include="$(EmbedderPath)\*.*" />
+	</ItemGroup>
+
+</Project>
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.5.1.0
+0.5.2.0