Fix a bug introduce when rename namespace

andruszd · Dec 5, 2018 · 6666b17 · 6666b17
1 parent 6f97960
commit 6666b17
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Rapr/Program.cs b/Rapr/Program.cs
@@ -6,23 +6,21 @@ namespace Rapr
 {
     public static class Program
     {
-        private static Assembly ResolveEventHandler(Object sender, ResolveEventArgs args)
+        private static Assembly ResolveEventHandler(object sender, ResolveEventArgs args)
         {
             Assembly assembly = Assembly.GetEntryAssembly();
-            String resourceName = string.Format("{0}.{1}.dll", assembly.EntryPoint.DeclaringType.Namespace, new AssemblyName(args.Name).Name);
+            string resourceName = $"{assembly.EntryPoint.DeclaringType.Namespace}.{new AssemblyName(args.Name).Name}.dll";
 
             using (var stream = assembly.GetManifestResourceStream(resourceName))
             {
-                if (stream != null)
-                {
-                    Byte[] assemblyData = new Byte[stream.Length];
-                    stream.Read(assemblyData, 0, assemblyData.Length);
-                    return Assembly.Load(assemblyData);
-                }
-                else
+                if (stream == null)
                 {
                     return null;
                 }
+
+                byte[] assemblyData = new byte[stream.Length];
+                stream.Read(assemblyData, 0, assemblyData.Length);
+                return Assembly.Load(assemblyData);
             }
         }
 

diff --git a/Rapr/Rapr.csproj b/Rapr/Rapr.csproj
@@ -114,7 +114,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -132,7 +134,6 @@
   <ItemGroup>
     <Content Include="icon.ico" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Rapr/TextFileTraceListener.cs b/Rapr/TextFileTraceListener.cs
@@ -33,7 +33,7 @@ public override void TraceEvent(TraceEventCache eventCache, string source, Trace
 
             this.Write($"{DateTime.UtcNow:u} [{eventType}]: ");
 
-            if (args.Length > 0)
+            if (args?.Length > 0)
             {
                 base.WriteLine(string.Format(format, args));
             }

diff --git a/Rapr/app.config b/Rapr/app.config
@@ -11,7 +11,7 @@
   <system.diagnostics>
     <trace autoflush="true" indentsize="4">
       <listeners>
-        <add name="myListener" type="Rapr.Core.TextFileTraceListener, Rapr" initializeData="%LOCALAPPDATA%\\DriverStore Explorer\\Rapr.log" />
+        <add name="myListener" type="Rapr.TextFileTraceListener, Rapr" initializeData="%LOCALAPPDATA%\\DriverStore Explorer\\Rapr.log" />
       </listeners>
     </trace>
   </system.diagnostics>