add System.Diagnostics.DiagnosticSource.dll and remove unused files (#…

…629)
DataDog · Feb 5, 2020 · 4823144 · 4823144
1 parent ffdf4ff
commit 4823144
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/Files.Managed.Net45.GAC.wxs b/deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/Files.Managed.Net45.GAC.wxs
@@ -35,6 +35,11 @@
               Source="$(var.ManagedDllPath)\net45\Sigil.dll"
               KeyPath="yes" Checksum="yes" Assembly=".net"/>
       </Component>
+      <Component Win64="$(var.Win64)">
+        <File Id="net45_GAC_System.Diagnostics.DiagnosticSource.dll"
+              Source="$(var.ManagedDllPath)\net45\System.Diagnostics.DiagnosticSource.dll"
+              KeyPath="yes" Checksum="yes" Assembly=".net"/>
+      </Component>
       <Component Win64="$(var.Win64)">
         <File Id="net45_GAC_System.Runtime.InteropServices.RuntimeInformation.dll"
               Source="$(var.ManagedDllPath)\net45\System.Runtime.InteropServices.RuntimeInformation.dll"

diff --git a/deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/Files.Managed.Net45.wxs b/deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/Files.Managed.Net45.wxs
@@ -35,6 +35,11 @@
               Source="$(var.ManagedDllPath)\net45\Sigil.dll"
               KeyPath="yes" Checksum="yes"/>
       </Component>
+      <Component Win64="$(var.Win64)">
+        <File Id="net45_System.Diagnostics.DiagnosticSource.dll"
+              Source="$(var.ManagedDllPath)\net45\System.Diagnostics.DiagnosticSource.dll"
+              KeyPath="yes" Checksum="yes"/>
+      </Component>
       <Component Win64="$(var.Win64)">
         <File Id="net45_System.Runtime.InteropServices.RuntimeInformation.dll"
               Source="$(var.ManagedDllPath)\net45\System.Runtime.InteropServices.RuntimeInformation.dll"

diff --git a/deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/Files.Managed.Net461.wxs b/deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/Files.Managed.Net461.wxs
@@ -36,35 +36,15 @@
               KeyPath="yes" Checksum="yes"/>
       </Component>
       <Component Win64="$(var.Win64)">
-        <File Id="net461_System.Net.Http.dll"
-              Source="$(var.ManagedDllPath)\net461\System.Net.Http.dll"
+        <File Id="net461_System.Diagnostics.DiagnosticSource.dll"
+              Source="$(var.ManagedDllPath)\net461\System.Diagnostics.DiagnosticSource.dll"
               KeyPath="yes" Checksum="yes"/>
       </Component>
       <Component Win64="$(var.Win64)">
         <File Id="net461_System.Runtime.InteropServices.RuntimeInformation.dll"
               Source="$(var.ManagedDllPath)\net461\System.Runtime.InteropServices.RuntimeInformation.dll"
               KeyPath="yes" Checksum="yes"/>
       </Component>
-      <Component Win64="$(var.Win64)">
-        <File Id="net461_System.Security.Cryptography.Algorithms.dll"
-              Source="$(var.ManagedDllPath)\net461\System.Security.Cryptography.Algorithms.dll"
-              KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Win64="$(var.Win64)">
-        <File Id="net461_System.Security.Cryptography.Encoding.dll"
-              Source="$(var.ManagedDllPath)\net461\System.Security.Cryptography.Encoding.dll"
-              KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Win64="$(var.Win64)">
-        <File Id="net461_System.Security.Cryptography.Primitives.dll"
-              Source="$(var.ManagedDllPath)\net461\System.Security.Cryptography.Primitives.dll"
-              KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Win64="$(var.Win64)">
-        <File Id="net461_System.Security.Cryptography.X509Certificates.dll"
-              Source="$(var.ManagedDllPath)\net461\System.Security.Cryptography.X509Certificates.dll"
-              KeyPath="yes" Checksum="yes"/>
-      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>