Skip to content

Commit 3e52783

Browse files
lucaspimentellucaspimentel
authored
restore separate x64/x86 configurations (DataDog#264)
* restore <Platforms> (removed in DataDog#262) and add <PlatformTarget> * restore distinct x64 and x86 build configurations for sample projects * move most platform, target framework, and runtime identifier elements into a shared file * move the sample libs into a folder separate from sample apps, so they can have separate shared properties * also move the `<ProjectReference>` into the shared props file * remove unused `GlobalSuppressions.cs` files (StyleCop is not loaded in these folders)
1 parent 4f5d5c1 commit 3e52783

File tree

18 files changed

+97
-145
lines changed

18 files changed

+97
-145
lines changed

‎Datadog.Trace.sln

Lines changed: 71 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.N
8080
EndProject
8181
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Datadog.Trace.ClrProfiler.Native.DLL", "src\Datadog.Trace.ClrProfiler.Native\Datadog.Trace.ClrProfiler.Native.DLL.vcxproj", "{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A}"
8282
EndProject
83-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibrary", "samples\Samples.ExampleLibrary\Samples.ExampleLibrary.csproj", "{FDB5C8D0-018D-4FF9-9680-C6A5078F819B}"
83+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibrary", "sample-libs\Samples.ExampleLibrary\Samples.ExampleLibrary.csproj", "{FDB5C8D0-018D-4FF9-9680-C6A5078F819B}"
8484
EndProject
85-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibraryTracer", "samples\Samples.ExampleLibraryTracer\Samples.ExampleLibraryTracer.csproj", "{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}"
85+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.ExampleLibraryTracer", "sample-libs\Samples.ExampleLibraryTracer\Samples.ExampleLibraryTracer.csproj", "{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}"
8686
EndProject
8787
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.ClrProfiler.IntegrationTests", "test\Datadog.Trace.ClrProfiler.IntegrationTests\Datadog.Trace.ClrProfiler.IntegrationTests.csproj", "{0D546118-B70A-44D0-B675-39EDB99FCEEE}"
8888
ProjectSection(ProjectDependencies) = postProject
@@ -124,6 +124,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.MongoDB", "samples\
124124
EndProject
125125
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Npgsql", "samples\Samples.Npgsql\Samples.Npgsql.csproj", "{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}"
126126
EndProject
127+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample-libs", "sample-libs", "{FA03944C-2391-4C25-8979-2E078A8CE0DD}"
128+
ProjectSection(SolutionItems) = preProject
129+
sample-libs\Directory.Build.props = sample-libs\Directory.Build.props
130+
EndProjectSection
131+
EndProject
127132
Global
128133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
129134
Debug|Any CPU = Debug|Any CPU
@@ -242,18 +247,16 @@ Global
242247
{3C6DD42E-9214-4747-92BA-78DE29AACE59}.Release|x64.Build.0 = Release|x64
243248
{3C6DD42E-9214-4747-92BA-78DE29AACE59}.Release|x86.ActiveCfg = Release|x86
244249
{3C6DD42E-9214-4747-92BA-78DE29AACE59}.Release|x86.Build.0 = Release|x86
245-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
246-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|Any CPU.Build.0 = Debug|Any CPU
247-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x64.ActiveCfg = Debug|Any CPU
248-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x64.Build.0 = Debug|Any CPU
249-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x86.ActiveCfg = Debug|Any CPU
250-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x86.Build.0 = Debug|Any CPU
251-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|Any CPU.ActiveCfg = Release|Any CPU
252-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|Any CPU.Build.0 = Release|Any CPU
253-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x64.ActiveCfg = Release|Any CPU
254-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x64.Build.0 = Release|Any CPU
255-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x86.ActiveCfg = Release|Any CPU
256-
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x86.Build.0 = Release|Any CPU
250+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|Any CPU.ActiveCfg = Debug|x86
251+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x64.ActiveCfg = Debug|x64
252+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x64.Build.0 = Debug|x64
253+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x86.ActiveCfg = Debug|x86
254+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Debug|x86.Build.0 = Debug|x86
255+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|Any CPU.ActiveCfg = Release|x64
256+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x64.ActiveCfg = Release|x64
257+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x64.Build.0 = Release|x64
258+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x86.ActiveCfg = Release|x86
259+
{9951A03A-AD1B-48D8-A96D-B85532BEDADD}.Release|x86.Build.0 = Release|x86
257260
{3054DE0E-F140-4758-B2DA-0B9470C6EDE1}.Debug|Any CPU.ActiveCfg = Debug|x86
258261
{3054DE0E-F140-4758-B2DA-0B9470C6EDE1}.Debug|x64.ActiveCfg = Debug|x64
259262
{3054DE0E-F140-4758-B2DA-0B9470C6EDE1}.Debug|x86.ActiveCfg = Debug|x86
@@ -314,54 +317,46 @@ Global
314317
{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}.Release|x64.Build.0 = Release|Any CPU
315318
{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}.Release|x86.ActiveCfg = Release|Any CPU
316319
{4B243CF1-4269-45C6-A238-1A9BFA58B8CC}.Release|x86.Build.0 = Release|Any CPU
317-
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
318-
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
320+
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Debug|Any CPU.ActiveCfg = Debug|x86
319321
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Debug|x64.ActiveCfg = Debug|x64
320322
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Debug|x64.Build.0 = Debug|x64
321323
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Debug|x86.ActiveCfg = Debug|x86
322324
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Debug|x86.Build.0 = Debug|x86
323-
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
324-
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Release|Any CPU.Build.0 = Release|Any CPU
325+
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Release|Any CPU.ActiveCfg = Release|x86
325326
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Release|x64.ActiveCfg = Release|x64
326327
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Release|x64.Build.0 = Release|x64
327328
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Release|x86.ActiveCfg = Release|x86
328329
{0D546118-B70A-44D0-B675-39EDB99FCEEE}.Release|x86.Build.0 = Release|x86
329-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
330-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|Any CPU.Build.0 = Debug|Any CPU
331-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|x64.ActiveCfg = Debug|Any CPU
332-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|x64.Build.0 = Debug|Any CPU
333-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|x86.ActiveCfg = Debug|Any CPU
334-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|x86.Build.0 = Debug|Any CPU
335-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|Any CPU.ActiveCfg = Release|Any CPU
336-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|Any CPU.Build.0 = Release|Any CPU
337-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|x64.ActiveCfg = Release|Any CPU
338-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|x64.Build.0 = Release|Any CPU
339-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|x86.ActiveCfg = Release|Any CPU
340-
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|x86.Build.0 = Release|Any CPU
341-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
342-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
343-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|x64.ActiveCfg = Debug|Any CPU
344-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|x64.Build.0 = Debug|Any CPU
345-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|x86.ActiveCfg = Debug|Any CPU
346-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|x86.Build.0 = Debug|Any CPU
347-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
348-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|Any CPU.Build.0 = Release|Any CPU
349-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|x64.ActiveCfg = Release|Any CPU
350-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|x64.Build.0 = Release|Any CPU
351-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|x86.ActiveCfg = Release|Any CPU
352-
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|x86.Build.0 = Release|Any CPU
353-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
354-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
355-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|x64.ActiveCfg = Debug|Any CPU
356-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|x64.Build.0 = Debug|Any CPU
357-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|x86.ActiveCfg = Debug|Any CPU
358-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|x86.Build.0 = Debug|Any CPU
359-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
360-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|Any CPU.Build.0 = Release|Any CPU
361-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|x64.ActiveCfg = Release|Any CPU
362-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|x64.Build.0 = Release|Any CPU
363-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|x86.ActiveCfg = Release|Any CPU
364-
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|x86.Build.0 = Release|Any CPU
330+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|Any CPU.ActiveCfg = Debug|x86
331+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|x64.ActiveCfg = Debug|x64
332+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|x64.Build.0 = Debug|x64
333+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|x86.ActiveCfg = Debug|x86
334+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Debug|x86.Build.0 = Debug|x86
335+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|Any CPU.ActiveCfg = Release|x64
336+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|x64.ActiveCfg = Release|x64
337+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|x64.Build.0 = Release|x64
338+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|x86.ActiveCfg = Release|x86
339+
{086FF8A0-9CEE-470A-9751-78B0F1340649}.Release|x86.Build.0 = Release|x86
340+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|Any CPU.ActiveCfg = Debug|x86
341+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|x64.ActiveCfg = Debug|x64
342+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|x64.Build.0 = Debug|x64
343+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|x86.ActiveCfg = Debug|x86
344+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Debug|x86.Build.0 = Debug|x86
345+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|Any CPU.ActiveCfg = Release|x64
346+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|x64.ActiveCfg = Release|x64
347+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|x64.Build.0 = Release|x64
348+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|x86.ActiveCfg = Release|x86
349+
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A}.Release|x86.Build.0 = Release|x86
350+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|Any CPU.ActiveCfg = Debug|x86
351+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|x64.ActiveCfg = Debug|x64
352+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|x64.Build.0 = Debug|x64
353+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|x86.ActiveCfg = Debug|x86
354+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Debug|x86.Build.0 = Debug|x86
355+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|Any CPU.ActiveCfg = Release|x64
356+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|x64.ActiveCfg = Release|x64
357+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|x64.Build.0 = Release|x64
358+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|x86.ActiveCfg = Release|x86
359+
{C98950B1-DC4B-43DA-974F-EF2CF325EC2B}.Release|x86.Build.0 = Release|x86
365360
{6D86109F-B7C9-477D-86D7-45735A3A0818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
366361
{6D86109F-B7C9-477D-86D7-45735A3A0818}.Debug|Any CPU.Build.0 = Debug|Any CPU
367362
{6D86109F-B7C9-477D-86D7-45735A3A0818}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -398,30 +393,26 @@ Global
398393
{5B52C0C0-A554-4E53-9D17-B121E78FF919}.Release|x64.Build.0 = Release|Any CPU
399394
{5B52C0C0-A554-4E53-9D17-B121E78FF919}.Release|x86.ActiveCfg = Release|Any CPU
400395
{5B52C0C0-A554-4E53-9D17-B121E78FF919}.Release|x86.Build.0 = Release|Any CPU
401-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
402-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|Any CPU.Build.0 = Debug|Any CPU
403-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|x64.ActiveCfg = Debug|Any CPU
404-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|x64.Build.0 = Debug|Any CPU
405-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|x86.ActiveCfg = Debug|Any CPU
406-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|x86.Build.0 = Debug|Any CPU
407-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|Any CPU.ActiveCfg = Release|Any CPU
408-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|Any CPU.Build.0 = Release|Any CPU
409-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|x64.ActiveCfg = Release|Any CPU
410-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|x64.Build.0 = Release|Any CPU
411-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|x86.ActiveCfg = Release|Any CPU
412-
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|x86.Build.0 = Release|Any CPU
413-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
414-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
415-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|x64.ActiveCfg = Debug|Any CPU
416-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|x64.Build.0 = Debug|Any CPU
417-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|x86.ActiveCfg = Debug|Any CPU
418-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|x86.Build.0 = Debug|Any CPU
419-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
420-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|Any CPU.Build.0 = Release|Any CPU
421-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|x64.ActiveCfg = Release|Any CPU
422-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|x64.Build.0 = Release|Any CPU
423-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|x86.ActiveCfg = Release|Any CPU
424-
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|x86.Build.0 = Release|Any CPU
396+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|Any CPU.ActiveCfg = Debug|x86
397+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|x64.ActiveCfg = Debug|x64
398+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|x64.Build.0 = Debug|x64
399+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|x86.ActiveCfg = Debug|x86
400+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Debug|x86.Build.0 = Debug|x86
401+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|Any CPU.ActiveCfg = Release|x64
402+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|x64.ActiveCfg = Release|x64
403+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|x64.Build.0 = Release|x64
404+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|x86.ActiveCfg = Release|x86
405+
{3493346B-44F6-4F50-8FB4-51D0090DF544}.Release|x86.Build.0 = Release|x86
406+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|Any CPU.ActiveCfg = Debug|x86
407+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|x64.ActiveCfg = Debug|x64
408+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|x64.Build.0 = Debug|x64
409+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|x86.ActiveCfg = Debug|x86
410+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Debug|x86.Build.0 = Debug|x86
411+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|Any CPU.ActiveCfg = Release|x64
412+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|x64.ActiveCfg = Release|x64
413+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|x64.Build.0 = Release|x64
414+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|x86.ActiveCfg = Release|x86
415+
{DD3E8ED8-A0E4-482E-A5ED-115E21D543C0}.Release|x86.Build.0 = Release|x86
425416
EndGlobalSection
426417
GlobalSection(SolutionProperties) = preSolution
427418
HideSolutionNode = FALSE
@@ -441,8 +432,8 @@ Global
441432
{5728056A-51AA-4FF5-AD0C-E86E44E36102} = {8CEC2042-F11C-49F5-A674-2355793B600A}
442433
{91B6272F-5780-4C94-8071-DBBA7B4F67F3} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
443434
{C0C8D381-D6B9-4C76-9428-F40F2FA93A9A} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
444-
{FDB5C8D0-018D-4FF9-9680-C6A5078F819B} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
445-
{4B243CF1-4269-45C6-A238-1A9BFA58B8CC} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
435+
{FDB5C8D0-018D-4FF9-9680-C6A5078F819B} = {FA03944C-2391-4C25-8979-2E078A8CE0DD}
436+
{4B243CF1-4269-45C6-A238-1A9BFA58B8CC} = {FA03944C-2391-4C25-8979-2E078A8CE0DD}
446437
{0D546118-B70A-44D0-B675-39EDB99FCEEE} = {8CEC2042-F11C-49F5-A674-2355793B600A}
447438
{086FF8A0-9CEE-470A-9751-78B0F1340649} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}
448439
{F5B27CC4-1DF6-4ECD-A4FD-8200152F9A5A} = {AA6F5582-3B71-49AC-AA39-8F7815AC46BE}

‎sample-libs/Directory.Build.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<!--
3+
This file intentionally left blank...
4+
to stop msbuild from looking up the folder hierarchy
5+
-->
6+
</Project>

‎samples/Samples.ExampleLibrary/Class1.cs renamed to ‎sample-libs/Samples.ExampleLibrary/Class1.cs

File renamed without changes.

‎samples/Samples.ExampleLibrary/Samples.ExampleLibrary.csproj renamed to ‎sample-libs/Samples.ExampleLibrary/Samples.ExampleLibrary.csproj

File renamed without changes.

‎samples/Samples.ExampleLibraryTracer/Class1.cs renamed to ‎sample-libs/Samples.ExampleLibraryTracer/Class1.cs

File renamed without changes.

‎samples/Samples.ExampleLibraryTracer/Samples.ExampleLibraryTracer.csproj renamed to ‎sample-libs/Samples.ExampleLibraryTracer/Samples.ExampleLibraryTracer.csproj

File renamed without changes.

‎samples/Directory.Build.props

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
<Project>
22
<PropertyGroup>
3+
<OutputType>Exe</OutputType>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net452;net461;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
6+
<Platforms>x64;x86</Platforms>
7+
<PlatformTarget>$(Platform)</PlatformTarget>
8+
<RuntimeIdentifiers Condition="'$(TargetFramework)' == 'netcoreapp2.1'">win-x64;win-x86;linux-x64</RuntimeIdentifiers>
9+
<RuntimeIdentifier Condition="'$(TargetFramework)' != 'netcoreapp2.1'">win-$(Platform)</RuntimeIdentifier>
10+
311
<IsPackable>false</IsPackable>
412
<GenerateDocumentationFile>false</GenerateDocumentationFile>
513
</PropertyGroup>
6-
</Project>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\..\src\Datadog.Trace.ClrProfiler.Managed\Datadog.Trace.ClrProfiler.Managed.csproj" />
17+
</ItemGroup>
18+
</Project>

‎samples/GlobalSuppressions.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎samples/Samples.AspNetCoreMvc2/Samples.AspNetCoreMvc2.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4+
<!-- override to remove net452 -->
45
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
6+
67
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
78
</PropertyGroup>
89

@@ -16,8 +17,4 @@
1617
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.4" />
1718
</ItemGroup>
1819

19-
<ItemGroup>
20-
<ProjectReference Include="..\..\src\Datadog.Trace.ClrProfiler.Managed\Datadog.Trace.ClrProfiler.Managed.csproj" />
21-
</ItemGroup>
22-
2320
</Project>

‎samples/Samples.Elasticsearch/Samples.Elasticsearch.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
7-
</PropertyGroup>
8-
93
<ItemGroup>
104
<PackageReference Include="Elasticsearch.Net" Version="6.1.0" />
115
<PackageReference Include="NEST" Version="6.1.0" />
126
</ItemGroup>
137

14-
<ItemGroup>
15-
<ProjectReference Include="..\..\src\Datadog.Trace.ClrProfiler.Managed\Datadog.Trace.ClrProfiler.Managed.csproj" />
16-
</ItemGroup>
17-
188
</Project>

‎samples/Samples.MongoDB/Samples.MongoDB.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
7-
</PropertyGroup>
8-
93
<ItemGroup>
104
<PackageReference Include="MongoDB.Driver" Version="2.7.2" />
115
</ItemGroup>
126

13-
<ItemGroup>
14-
<ProjectReference Include="..\..\src\Datadog.Trace.ClrProfiler.Managed\Datadog.Trace.ClrProfiler.Managed.csproj" />
15-
</ItemGroup>
16-
177
</Project>

‎samples/Samples.Npgsql/Samples.Npgsql.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
7-
</PropertyGroup>
8-
93
<ItemGroup>
104
<PackageReference Include="Npgsql" Version="4.0.4" />
115
</ItemGroup>
126

13-
<ItemGroup>
14-
<ProjectReference Include="..\..\src\Datadog.Trace.ClrProfiler.Managed\Datadog.Trace.ClrProfiler.Managed.csproj" />
15-
</ItemGroup>
16-
177
</Project>

0 commit comments

Comments
 (0)