Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add vcruntime140_1.dll for amd64 #1274

Merged
merged 1 commit into from
Sep 17, 2020
Merged

Add vcruntime140_1.dll for amd64 #1274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<!-- versions of dependencies that more than one project use -->
<PropertyGroup>
<PerfViewSupportFilesVersion>1.0.7</PerfViewSupportFilesVersion>
<MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion>1.0.21</MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion>
<MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion>1.0.22</MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion>
<MicrosoftDiagnosticsTracingTraceEventAutomatedAnalysisRulesVersion>0.1.0</MicrosoftDiagnosticsTracingTraceEventAutomatedAnalysisRulesVersion>
<MicrosoftDiagnosticsRuntimeVersion>1.1.37504</MicrosoftDiagnosticsRuntimeVersion>
<XunitVersion>2.3.0</XunitVersion>
Expand Down
7 changes: 7 additions & 0 deletions src/PerfView/PerfView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,13 @@
<Link>amd64\vcruntime140.dll</Link>
<Visible>False</Visible>
</EmbeddedResource>
<EmbeddedResource Include="$(TraceEventSupportFilesBase)native\amd64\vcruntime140_1.dll">
<Type>Non-Resx</Type>
<WithCulture>false</WithCulture>
<LogicalName>.\amd64\vcruntime140_1.dll</LogicalName>
<Link>amd64\vcruntime140_1.dll</Link>
<Visible>False</Visible>
</EmbeddedResource>
<EmbeddedResource Include="..\HeapDump\bin\x64\$(Configuration)\net45\HeapDump.exe">
<Type>Non-Resx</Type>
<WithCulture>false</WithCulture>
Expand Down
1 change: 1 addition & 0 deletions src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<file src="$OutDir$netstandard2.0\amd64\msdia140.dll" target="lib\native\amd64\msdia140.dll" />
<file src="$OutDir$netstandard2.0\amd64\msvcp140.dll" target="lib\native\amd64\msvcp140.dll" />
<file src="$OutDir$netstandard2.0\amd64\vcruntime140.dll" target="lib\native\amd64\vcruntime140.dll" />
<file src="$OutDir$netstandard2.0\amd64\vcruntime140_1.dll" target="lib\native\amd64\vcruntime140_1.dll" />

<file src="$OutDir$netstandard2.0\x86\KernelTraceControl.dll" target="lib\native\x86\KernelTraceControl.dll" />
<file src="$OutDir$netstandard2.0\x86\KernelTraceControl.Win61.dll" target="lib\native\x86\KernelTraceControl.Win61.dll" />
Expand Down
5 changes: 5 additions & 0 deletions src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</None>
<None Condition="Exists('$(MSBuildThisFileDirectory)..\lib\native\amd64\vcruntime140_1.dll')" Include="$(MSBuildThisFileDirectory)..\lib\native\amd64\vcruntime140_1.dll">
<Link>amd64\vcruntime140_1.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</None>

<!-- There are no static references to these so I need to copy them explicitly.
The first two COM interop assemblies so they are the same for all targets, I pick netstandard1.6 pretty arbitraily
Expand Down
5 changes: 5 additions & 0 deletions src/TraceEvent/TraceEvent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</None>
<None Include="$(TraceEventSupportFilesBase)native\amd64\vcruntime140_1.dll">
<Link>amd64\vcruntime140_1.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>False</Visible>
</None>
<None Include="$(TraceEventSupportFilesBase)native\x86\KernelTraceControl.dll">
<Link>x86\KernelTraceControl.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down