Skip to content

Commit e1efc31

Browse files
trgibeautrgibeau
authored
Merge pull request #126 from microsoft/utilitiesSharedProject
Convert Utilities to Shared Project
2 parents 2fd3417 + 5e5806f commit e1efc31

File tree

11 files changed

+53
-49
lines changed

11 files changed

+53
-49
lines changed

‎LTTngCds/LTTngCds.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333

3434
<ItemGroup>
3535
<ProjectReference Include="..\CtfPlayback\CtfPlayback.csproj" />
36-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
3736
</ItemGroup>
3837

38+
<Import Project="..\Utilities\Utilities.projitems" Label="Shared" />
39+
3940
</Project>

‎LTTngDataExtensions/LTTngDataExtensions.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868

6969
<ItemGroup>
7070
<ProjectReference Include="..\LTTngCds\LTTngCds.csproj" />
71-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
7271
</ItemGroup>
7372

7473
<ItemGroup>

‎LinuxLogParsers/LinuxLogParser/LinuxLogParser.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<ProjectReference Include="..\..\Utilities\Utilities.csproj" />
2423
<ProjectReference Include="..\LinuxLogParserCore\LinuxLogParserCore.csproj" />
2524
</ItemGroup>
2625

@@ -31,4 +30,6 @@
3130
</None>
3231
</ItemGroup>
3332

33+
<Import Project="..\..\Utilities\Utilities.projitems" Label="Shared" />
34+
3435
</Project>

‎Microsoft-Perf-Tools-Linux-Android.sln

+10-6
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfettoProcessor", "Perfet
5151
EndProject
5252
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfettoUnitTest", "PerfettoUnitTest\PerfettoUnitTest.csproj", "{CF89184C-8CE8-4656-9C5C-3F6C547EF2A3}"
5353
EndProject
54-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utilities", "Utilities\Utilities.csproj", "{0BA62F1B-1456-48FD-B2DE-C9FE1CB94B8B}"
55-
EndProject
5654
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Launcher", "Launcher", "{6A9515FC-D4B2-4221-8E74-78E7AFF0E421}"
5755
EndProject
5856
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{DB7FCF02-C949-4545-B58C-F514E85AB1FA}"
@@ -77,6 +75,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfDataExtension", "PerfDa
7775
EndProject
7876
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfDataUnitTest", "PerfDataUnitTest\PerfDataUnitTest.csproj", "{B57A38CD-9641-476C-A2FB-DF24D1700F41}"
7977
EndProject
78+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Utilities", "Utilities\Utilities.shproj", "{B0F4D7F4-B11C-41B8-96F5-2414174C3E7D}"
79+
EndProject
8080
Global
8181
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8282
Debug|Any CPU = Debug|Any CPU
@@ -155,10 +155,6 @@ Global
155155
{CF89184C-8CE8-4656-9C5C-3F6C547EF2A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
156156
{CF89184C-8CE8-4656-9C5C-3F6C547EF2A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
157157
{CF89184C-8CE8-4656-9C5C-3F6C547EF2A3}.Release|Any CPU.Build.0 = Release|Any CPU
158-
{0BA62F1B-1456-48FD-B2DE-C9FE1CB94B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
159-
{0BA62F1B-1456-48FD-B2DE-C9FE1CB94B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
160-
{0BA62F1B-1456-48FD-B2DE-C9FE1CB94B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
161-
{0BA62F1B-1456-48FD-B2DE-C9FE1CB94B8B}.Release|Any CPU.Build.0 = Release|Any CPU
162158
{9FD0BECC-AC5E-46A8-9749-46CD82BA89DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
163159
{9FD0BECC-AC5E-46A8-9749-46CD82BA89DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
164160
{9FD0BECC-AC5E-46A8-9749-46CD82BA89DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -199,4 +195,12 @@ Global
199195
GlobalSection(ExtensibilityGlobals) = postSolution
200196
SolutionGuid = {E96603EA-8E1D-4AA9-A474-D267A116C316}
201197
EndGlobalSection
198+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
199+
Utilities\Utilities.projitems*{02b6db71-e796-4afe-9e18-334e2f803393}*SharedItemsImports = 5
200+
Utilities\Utilities.projitems*{03dbb240-c4dd-4ff4-9405-f50cbf0a960d}*SharedItemsImports = 5
201+
Utilities\Utilities.projitems*{90fe5422-631f-4b5a-8ef7-88fe542739df}*SharedItemsImports = 5
202+
Utilities\Utilities.projitems*{b0f4d7f4-b11c-41b8-96f5-2414174c3e7d}*SharedItemsImports = 13
203+
Utilities\Utilities.projitems*{b381f72e-335c-4842-9db2-615d5c18a943}*SharedItemsImports = 5
204+
Utilities\Utilities.projitems*{e4eb869c-dbf9-4c7f-95ba-6d28dbc69fd0}*SharedItemsImports = 5
205+
EndGlobalSection
202206
EndGlobal

‎PerfDataExtension/PerfDataExtension.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,10 @@
5959
</Compile>
6060
</ItemGroup>
6161

62-
<ItemGroup>
63-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
64-
</ItemGroup>
65-
6662
<Target Name="CopyToTargetDirTarget" AfterTargets="Build">
6763
<Copy SourceFiles="@(CopyToTargetDir)" DestinationFolder="$(TargetDir)" />
6864
</Target>
6965

66+
<Import Project="..\Utilities\Utilities.projitems" Label="Shared" />
67+
7068
</Project>

‎PerfDataTxtExtension/PerfDataTxtExtension.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@
5555
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
5656
</ItemGroup>
5757

58-
<ItemGroup>
59-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
60-
</ItemGroup>
61-
6258
<ItemGroup>
6359
<None Update="pluginManifest.json">
6460
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -84,5 +80,7 @@
8480
<Target Name="PostBuild" AfterTargets="DeployStagedFiles">
8581
<Exec Command="CALL XCOPY /dickherfy $(ProjectDir)..\LTTngDataExtensions\$(OutDir) $(ProjectDir)$(OutDir)\LTTngDataExtensions" />
8682
</Target>
83+
84+
<Import Project="..\Utilities\Utilities.projitems" Label="Shared" />
8785

8886
</Project>

‎PerfettoCds/PerfettoCds.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
<ItemGroup>
2626
<ProjectReference Include="..\PerfettoProcessor\PerfettoProcessor.csproj" />
27-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
2827
</ItemGroup>
2928

3029
<Target Name="DownloadTraceProcessorShell">
@@ -62,4 +61,5 @@
6261
<!-- Download trace_processor_shell to the output directory if it doesn't exist -->
6362
<CallTarget Condition="!Exists('$(TargetDir)\trace_processor_shell.exe')" Targets="DownloadTraceProcessorShell" />
6463
</Target>
64+
6565
</Project>

‎PerfettoProcessor/PerfettoProcessor.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<ProjectReference Include="..\Utilities\Utilities.csproj" />
25+
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.27" />
2626
</ItemGroup>
27-
27+
2828
<ItemGroup>
2929
<None Include="..\LICENSE.txt">
3030
<Pack>True</Pack>
3131
<PackagePath></PackagePath>
3232
</None>
3333
</ItemGroup>
3434

35+
<Import Project="..\Utilities\Utilities.projitems" Label="Shared" />
36+
3537
</Project>

‎Utilities/Utilities.csproj

-29
This file was deleted.

‎Utilities/Utilities.projitems

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
<HasSharedItems>true</HasSharedItems>
6+
<SharedGUID>b0f4d7f4-b11c-41b8-96f5-2414174c3e7d</SharedGUID>
7+
</PropertyGroup>
8+
<PropertyGroup Label="Configuration">
9+
<Import_RootNamespace>Utilities</Import_RootNamespace>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Include="$(MSBuildThisFileDirectory)AccessProviders\ArrayAccessProvider`1.cs" />
13+
<Compile Include="$(MSBuildThisFileDirectory)Common.cs" />
14+
<Compile Include="$(MSBuildThisFileDirectory)EventProjection.cs" />
15+
<Compile Include="$(MSBuildThisFileDirectory)ProcessingSourceInfoGenerator.cs" />
16+
</ItemGroup>
17+
</Project>

‎Utilities/Utilities.shproj

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<ProjectGuid>b0f4d7f4-b11c-41b8-96f5-2414174c3e7d</ProjectGuid>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
6+
</PropertyGroup>
7+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
8+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
9+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
10+
<PropertyGroup />
11+
<Import Project="Utilities.projitems" Label="Shared" />
12+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
13+
</Project>

0 commit comments

Comments
 (0)