Skip to content

Commit 58d9020

Browse files
author
Gordon Phoon
authored
Merge pull request microsoft#466 from cablooshe/feature/arm64
Added arm64 support to nuget and headers package projects
2 parents 351c426 + 60e5287 commit 58d9020

File tree

4 files changed

+79
-7
lines changed

4 files changed

+79
-7
lines changed

‎src/InstrumentationEngine.NuGet.Headers/InstrumentationEngine.Headers.ARM64.nuspec

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0"?>
2+
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
3+
Licensed under the MIT License. -->
4+
<package>
5+
<metadata>
6+
<id>$packageid$</id>
7+
<version>$version$</version>
8+
<title>Microsoft Instrumentation Engine Headers</title>
9+
<authors>$authors$</authors>
10+
<owners>$authors$</owners>
11+
<projectUrl>https://github.com/Microsoft/CLRInstrumentationEngine</projectUrl>
12+
<license type="file">$licenseFile$</license>
13+
<icon>icon.png</icon>
14+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
15+
<description>NuGet package for the Microsoft Instrumentation Engine Headers.</description>
16+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
17+
<tags>native</tags>
18+
<dependencies>
19+
<group targetFramework="native0.0" />
20+
</dependencies>
21+
</metadata>
22+
<files>
23+
<!-- See http://docs.nuget.org/consume/support-for-native-projects -->
24+
<file src="$apidir$\InstrumentationEngine.h" target="lib\native\ARM64\include" />
25+
<file src="$apidir$\InstrumentationEngine_i.cpp" target="lib\native\ARM64\include" />
26+
27+
<!-- Support installation on managed projects -->
28+
<file src="" target="lib\net40\_._" />
29+
<file src="" target="lib\portable-net4+win8\_._" />
30+
31+
<!-- Licensing -->
32+
<file src="$enlistmentroot$\$licenseFile$*" target="" />
33+
34+
<!-- Icon -->
35+
<file src="$enlistmentroot$\src\SharedNuGetAssets\icon.png" target="" />
36+
</files>
37+
</package>

‎src/InstrumentationEngine.NuGet.Headers/InstrumentationEngine.Nuget.Headers.csproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,21 @@
22
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
33
Licensed under the MIT License. -->
44
<Project>
5+
<PropertyGroup Condition="'$(Platform)'=='ARM64'">
6+
<PackageId>Microsoft.InstrumentationEngine.Headers.ARM64</PackageId>
7+
<NuspecFile>InstrumentationEngine.Headers.ARM64.nuspec</NuspecFile>
8+
</PropertyGroup>
9+
<PropertyGroup Condition="'$(Platform)'!='ARM64'">
10+
<PackageId>Microsoft.InstrumentationEngine.Headers</PackageId>
11+
<NuspecFile>InstrumentationEngine.Headers.nuspec</NuspecFile>
12+
</PropertyGroup>
513
<PropertyGroup>
614
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
715
<TargetExt>.nupkg</TargetExt>
8-
<PackageId>Microsoft.InstrumentationEngine.Headers</PackageId>
916
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
1017
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
1118
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
19+
<Platforms>AnyCPU;x64;x86;ARM64</Platforms>
1220
</PropertyGroup>
1321
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'EnlistmentRoot.marker'))\build\Common.props" />
1422
<Import Project="$(EnlistmentRoot)\build\Packaging.props" />
@@ -17,11 +25,9 @@
1725
<ResolveNuGetPackages>true</ResolveNuGetPackages>
1826
<TargetFramework>netstandard2.0</TargetFramework>
1927
<IncludeBuildOutput>false</IncludeBuildOutput>
20-
<NuspecFile>InstrumentationEngine.Headers.nuspec</NuspecFile>
2128
<NuspecProperties>$(NuspecProperties);apidir=$(InstrumentationEngineApiInc)</NuspecProperties>
2229
<ProjectGuid>{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}</ProjectGuid>
2330
<OutputType>Library</OutputType>
24-
<Platforms>AnyCPU;x64;x86</Platforms>
2531
</PropertyGroup>
2632
<PropertyGroup>
2733
<EnableDefaultItems>false</EnableDefaultItems>

‎src/InstrumentationEngine.NuGet/InstrumentationEngine.Nuget.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<RootNamespace>Microsoft.Diagnostics.InstrumentationEngine.NuGet</RootNamespace>
2828
<!-- NU5100: Package is used as a means to acquire the engine and not to have its assets referenced directly. -->
2929
<NoWarn>$(NoWarn);NU5100</NoWarn>
30-
<Platforms>AnyCPU;x64;x86</Platforms>
30+
<Platforms>AnyCPU;x64;x86;ARM64</Platforms>
3131
</PropertyGroup>
3232
<PropertyGroup>
3333
<EnableDefaultItems>false</EnableDefaultItems>
@@ -42,7 +42,7 @@
4242
<PrivateAssets>all</PrivateAssets>
4343
</PackageReference>
4444
</ItemGroup>
45-
<ItemGroup Condition="'$(PlatformOS)'!='Linux'">
45+
<ItemGroup Condition="'$(PlatformOS)'!='Linux' and '$(Platform)'!='ARM64'">
4646
<Content Include="$(InputBinCfgRoot)\$(Platform)\Microsoft.InstrumentationEngine.Extensions.config">
4747
<Link>InstrumentationEngine\$(Platform)\Microsoft.InstrumentationEngine.Extensions.config</Link>
4848
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -63,6 +63,8 @@
6363
<Link>InstrumentationEngine\$(Platform)\Microsoft.Diagnostics.Instrumentation.Extensions.Base.pdb</Link>
6464
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6565
</Content>
66+
</ItemGroup>
67+
<ItemGroup Condition="'$(PlatformOS)'!='Linux'">
6668
<Content Include="$(InputBinCfgRoot)\$(Platform)\MicrosoftInstrumentationEngine_$(Platform).dll">
6769
<Link>InstrumentationEngine\$(Platform)\MicrosoftInstrumentationEngine_$(Platform).dll</Link>
6870
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎src/InstrumentationEngine.Packages.sln

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29407.136
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.2.32207.482
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstrumentationEngine.SiteExtension", "InstrumentationEngine.SiteExtension\InstrumentationEngine.SiteExtension.csproj", "{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -47,95 +47,122 @@ EndProject
4747
Global
4848
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4949
Debug|Any CPU = Debug|Any CPU
50+
Debug|ARM64 = Debug|ARM64
5051
Debug|x64 = Debug|x64
5152
Debug|x86 = Debug|x86
5253
Release|Any CPU = Release|Any CPU
54+
Release|ARM64 = Release|ARM64
5355
Release|x64 = Release|x64
5456
Release|x86 = Release|x86
5557
EndGlobalSection
5658
GlobalSection(ProjectConfigurationPlatforms) = postSolution
5759
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5860
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Debug|Any CPU.Build.0 = Debug|Any CPU
61+
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Debug|ARM64.ActiveCfg = Debug|Any CPU
5962
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Debug|x64.ActiveCfg = Debug|Any CPU
6063
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Debug|x86.ActiveCfg = Debug|Any CPU
6164
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Release|Any CPU.ActiveCfg = Release|Any CPU
6265
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Release|ARM64.ActiveCfg = Release|Any CPU
67+
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Release|ARM64.Build.0 = Release|Any CPU
6368
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Release|x64.ActiveCfg = Release|Any CPU
6469
{0CA8A56A-B19D-4B69-82A2-3DCBD95F8A05}.Release|x86.ActiveCfg = Release|Any CPU
6570
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6671
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Debug|ARM64.ActiveCfg = Debug|arm64
73+
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Debug|ARM64.Build.0 = Debug|arm64
6774
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Debug|x64.ActiveCfg = Debug|x64
6875
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Debug|x86.ActiveCfg = Debug|x86
6976
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Release|Any CPU.ActiveCfg = Release|Any CPU
7077
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Release|ARM64.ActiveCfg = Release|Any CPU
79+
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Release|ARM64.Build.0 = Release|Any CPU
7180
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Release|x64.ActiveCfg = Release|x64
7281
{3D3BA42C-4A1E-4135-B750-4D8CB0A7117F}.Release|x86.ActiveCfg = Release|x86
7382
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Debug|ARM64.ActiveCfg = Debug|ARM64
84+
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Debug|ARM64.Build.0 = Debug|ARM64
7485
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Debug|x64.ActiveCfg = Debug|x64
7586
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Debug|x64.Build.0 = Debug|x64
7687
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Debug|x86.ActiveCfg = Debug|x86
7788
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Debug|x86.Build.0 = Debug|x86
7889
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Release|Any CPU.ActiveCfg = Release|Any CPU
90+
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Release|ARM64.ActiveCfg = Release|ARM64
91+
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Release|ARM64.Build.0 = Release|ARM64
7992
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Release|x64.ActiveCfg = Release|x64
8093
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Release|x64.Build.0 = Release|x64
8194
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Release|x86.ActiveCfg = Release|x86
8295
{0B12FD8F-83DE-4A80-9BC1-ABE67E0E808A}.Release|x86.Build.0 = Release|x86
8396
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8497
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
98+
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
8599
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Debug|x64.ActiveCfg = Debug|Any CPU
86100
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Debug|x64.Build.0 = Debug|Any CPU
87101
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Debug|x86.ActiveCfg = Debug|Any CPU
88102
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Debug|x86.Build.0 = Debug|Any CPU
89103
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
90104
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Release|Any CPU.Build.0 = Release|Any CPU
105+
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Release|ARM64.ActiveCfg = Release|Any CPU
106+
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Release|ARM64.Build.0 = Release|Any CPU
91107
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Release|x64.ActiveCfg = Release|Any CPU
92108
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Release|x64.Build.0 = Release|Any CPU
93109
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Release|x86.ActiveCfg = Release|Any CPU
94110
{F11B4D26-CADD-4F9C-9F69-D2737F8122F7}.Release|x86.Build.0 = Release|Any CPU
95111
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Debug|Any CPU.ActiveCfg = Debug|x86
112+
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Debug|ARM64.ActiveCfg = Debug|x86
96113
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Debug|x64.ActiveCfg = Debug|x64
97114
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Debug|x64.Build.0 = Debug|x64
98115
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Debug|x86.ActiveCfg = Debug|x86
99116
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Debug|x86.Build.0 = Debug|x86
100117
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Release|Any CPU.ActiveCfg = Release|x86
118+
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Release|ARM64.ActiveCfg = Release|x86
101119
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Release|x64.ActiveCfg = Release|x64
102120
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Release|x64.Build.0 = Release|x64
103121
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Release|x86.ActiveCfg = Release|x86
104122
{1224C7A6-57C8-4758-8FE8-C8AF4A3DA2AD}.Release|x86.Build.0 = Release|x86
105123
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Debug|Any CPU.ActiveCfg = Debug|x86
124+
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Debug|ARM64.ActiveCfg = Debug|x86
106125
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Debug|x64.ActiveCfg = Debug|x64
107126
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Debug|x64.Build.0 = Debug|x64
108127
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Debug|x86.ActiveCfg = Debug|x86
109128
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Debug|x86.Build.0 = Debug|x86
110129
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Release|Any CPU.ActiveCfg = Release|x86
130+
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Release|ARM64.ActiveCfg = Release|x86
111131
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Release|x64.ActiveCfg = Release|x64
112132
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Release|x64.Build.0 = Release|x64
113133
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Release|x86.ActiveCfg = Release|x86
114134
{B3EF81C4-2AFC-4134-969C-785F46B6E1EB}.Release|x86.Build.0 = Release|x86
115135
{2F7E3158-2868-4F83-B44B-908D92121574}.Debug|Any CPU.ActiveCfg = Debug|x86
136+
{2F7E3158-2868-4F83-B44B-908D92121574}.Debug|ARM64.ActiveCfg = Debug|x86
116137
{2F7E3158-2868-4F83-B44B-908D92121574}.Debug|x64.ActiveCfg = Debug|x64
117138
{2F7E3158-2868-4F83-B44B-908D92121574}.Debug|x64.Build.0 = Debug|x64
118139
{2F7E3158-2868-4F83-B44B-908D92121574}.Debug|x86.ActiveCfg = Debug|x86
119140
{2F7E3158-2868-4F83-B44B-908D92121574}.Debug|x86.Build.0 = Debug|x86
120141
{2F7E3158-2868-4F83-B44B-908D92121574}.Release|Any CPU.ActiveCfg = Release|x86
142+
{2F7E3158-2868-4F83-B44B-908D92121574}.Release|ARM64.ActiveCfg = Release|x86
121143
{2F7E3158-2868-4F83-B44B-908D92121574}.Release|x64.ActiveCfg = Release|x64
122144
{2F7E3158-2868-4F83-B44B-908D92121574}.Release|x64.Build.0 = Release|x64
123145
{2F7E3158-2868-4F83-B44B-908D92121574}.Release|x86.ActiveCfg = Release|x86
124146
{2F7E3158-2868-4F83-B44B-908D92121574}.Release|x86.Build.0 = Release|x86
125147
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Debug|Any CPU.ActiveCfg = Debug|x64
148+
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Debug|ARM64.ActiveCfg = Debug|x64
126149
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Debug|x64.ActiveCfg = Debug|x64
127150
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Debug|x64.Build.0 = Debug|x64
128151
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Debug|x86.ActiveCfg = Debug|x64
129152
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Release|Any CPU.ActiveCfg = Release|x64
153+
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Release|ARM64.ActiveCfg = Release|x64
130154
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Release|x64.ActiveCfg = Release|x64
131155
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Release|x64.Build.0 = Release|x64
132156
{59CC768D-2E07-4FD9-8013-2EBC3898FEED}.Release|x86.ActiveCfg = Release|x64
133157
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
134158
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Debug|Any CPU.Build.0 = Debug|Any CPU
159+
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Debug|ARM64.ActiveCfg = Debug|Any CPU
135160
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Debug|x64.ActiveCfg = Debug|Any CPU
136161
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Debug|x86.ActiveCfg = Debug|Any CPU
137162
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Release|Any CPU.ActiveCfg = Release|Any CPU
138163
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Release|Any CPU.Build.0 = Release|Any CPU
164+
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Release|ARM64.ActiveCfg = Release|Any CPU
165+
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Release|ARM64.Build.0 = Release|Any CPU
139166
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Release|x64.ActiveCfg = Release|Any CPU
140167
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Release|x64.Build.0 = Release|Any CPU
141168
{B65F21F7-AB90-4DA1-BD95-A29879DD1C21}.Release|x86.ActiveCfg = Release|Any CPU

0 commit comments

Comments
 (0)