Skip to content

Commit 9f7e866

Browse files
gleocadiegleocadie
authoredNov 23, 2023
[Profiler] Update managed projects to net462 (DataDog#4683)
* Update managed projects to net462 * Fix tests * Address PR comment
·
v3.3.1v2.43.0
1 parent 2bfef69 commit 9f7e866

File tree

22 files changed

+80
-151
lines changed

22 files changed

+80
-151
lines changed
 

‎Datadog.Profiler.sln

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{D2476213-2D12-43A8-966C-BCFCE098FD63}"
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Computer01", "profiler\src\Demos\Samples.Computer01\Samples.Computer01.csproj", "{D0B50192-CE1D-43E2-AC4A-9B6037AAAB7D}"
11-
ProjectSection(ProjectDependencies) = postProject
12-
{0831386B-1A96-443F-B02B-C1D2B65FD845} = {0831386B-1A96-443F-B02B-C1D2B65FD845}
13-
EndProjectSection
1411
EndProject
1512
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{882D9CEA-09AD-4C08-B737-9E6E04563AB6}"
1613
EndProject
@@ -45,9 +42,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DeployResources", "DeployRe
4542
EndProjectSection
4643
EndProject
4744
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.WindowsService01", "profiler\src\Demos\Samples.WindowsService01\Samples.WindowsService01.csproj", "{A2FCEEF7-975E-495C-AD0D-6A79176B3A44}"
48-
ProjectSection(ProjectDependencies) = postProject
49-
{0831386B-1A96-443F-B02B-C1D2B65FD845} = {0831386B-1A96-443F-B02B-C1D2B65FD845}
50-
EndProjectSection
5145
EndProject
5246
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{5E111292-1382-45DA-9BB6-3558CD529F3B}"
5347
EndProject
@@ -123,6 +117,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dd-prof-etw-client", "profi
123117
EndProject
124118
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{C1D06C89-E4D1-4E09-9AB6-35BB5A1DEB04}"
125119
EndProject
120+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{EACEAEE9-23A6-448F-A56E-39FE4E837FA6}"
121+
ProjectSection(SolutionItems) = preProject
122+
profiler\src\Demos\Directory.Build.props = profiler\src\Demos\Directory.Build.props
123+
EndProjectSection
124+
EndProject
126125
Global
127126
GlobalSection(SolutionConfigurationPlatforms) = preSolution
128127
Debug|Any CPU = Debug|Any CPU
@@ -586,6 +585,7 @@ Global
586585
{3FD8A994-8EDC-4EDD-95C5-E664D205A401} = {C1D06C89-E4D1-4E09-9AB6-35BB5A1DEB04}
587586
{97DD3E31-0922-455E-A308-E0C798E84476} = {C1D06C89-E4D1-4E09-9AB6-35BB5A1DEB04}
588587
{C1D06C89-E4D1-4E09-9AB6-35BB5A1DEB04} = {D2476213-2D12-43A8-966C-BCFCE098FD63}
588+
{EACEAEE9-23A6-448F-A56E-39FE4E837FA6} = {3437D742-5FB6-4457-8291-1EBBADBEE1BC}
589589
EndGlobalSection
590590
GlobalSection(ExtensibilityGlobals) = postSolution
591591
SolutionGuid = {917C242A-028D-42FD-BA47-E7317B6A36B4}

‎profiler/src/Demos/Directory.Build.props

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
5+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
6+
7+
<PropertyGroup>
8+
<!-- only run .NET Framework tests on Windows -->
9+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net462;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
10+
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
11+
<Platforms>AnyCPU;x64;x86</Platforms>
12+
13+
<!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp3.0) -->
14+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
15+
</PropertyGroup>
16+
17+
<!-- Those platform options have been added to have a output build path per platform
18+
This way, it's easier to test and investigate if needed.
19+
-->
20+
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
21+
<PlatformTarget>AnyCPU</PlatformTarget>
22+
</PropertyGroup>
23+
24+
<PropertyGroup Condition=" '$(Platform)' == 'x64' ">
25+
<PlatformTarget>x64</PlatformTarget>
26+
</PropertyGroup>
27+
28+
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
29+
<PlatformTarget>x86</PlatformTarget>
30+
</PropertyGroup>
31+
</Project>

‎profiler/src/Demos/NoOpWcfService/NoOpWcfService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net46</TargetFrameworks>
5+
<TargetFrameworks>net462</TargetFrameworks>
66
<Platforms>AnyCPU</Platforms>
77
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
88
<AssemblyName>Datadog.Demos.NoOpWcfService</AssemblyName>

‎profiler/src/Demos/Samples.BuggyBits/Samples.BuggyBits.csproj

-15
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,6 @@
1010
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
1111
</PropertyGroup>
1212

13-
<!-- Those platform options have been added to have a output build path per platform
14-
This way, it's easier to test and investigate if needed.
15-
-->
16-
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
</PropertyGroup>
19-
20-
<PropertyGroup Condition=" '$(Platform)' == 'x64' ">
21-
<PlatformTarget>x64</PlatformTarget>
22-
</PropertyGroup>
23-
24-
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
25-
<PlatformTarget>x86</PlatformTarget>
26-
</PropertyGroup>
27-
2813
<ItemGroup>
2914
<ProjectReference Include="..\Shared\Util\Datadog.Demos.Util.csproj" />
3015
</ItemGroup>

‎profiler/src/Demos/Samples.Computer01/Samples.Computer01.csproj

+2-18
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,10 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
7-
<Platforms>AnyCPU;x64;x86</Platforms>
8-
95
<!--This is required for smoke test assembly discovery-->
106
<AssemblyName>Samples.Computer01</AssemblyName>
117
</PropertyGroup>
128

13-
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
14-
<PlatformTarget>AnyCPU</PlatformTarget>
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition=" '$(Platform)' == 'x64' ">
18-
<PlatformTarget>x64</PlatformTarget>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
22-
<PlatformTarget>x86</PlatformTarget>
23-
</PropertyGroup>
24-
259
<ItemGroup>
2610
<PackageReference Include="Aspose.PDF" Version="23.10.0" />
2711
</ItemGroup>
@@ -30,10 +14,10 @@
3014
<ProjectReference Include="..\Shared\RuntimeMetrics\RuntimeMetrics.csproj" />
3115
<ProjectReference Include="..\Shared\Util\Datadog.Demos.Util.csproj" />
3216
</ItemGroup>
33-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
17+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
3418
<Reference Include="System.ServiceProcess" />
3519
</ItemGroup>
36-
<ItemGroup Condition=" '$(TargetFramework)' != 'net45' ">
20+
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' ">
3721
<PackageReference Include="System.ServiceProcess.ServiceController">
3822
<Version>5.0.0</Version>
3923
</PackageReference>

‎profiler/src/Demos/Samples.ExceptionGenerator/Samples.ExceptionGenerator.csproj

-16
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,10 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
7-
<Platforms>AnyCPU;x64;x86</Platforms>
8-
95
<!--This is required for smoke test assembly discovery-->
106
<AssemblyName>Samples.ExceptionGenerator</AssemblyName>
117
</PropertyGroup>
128

13-
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
14-
<PlatformTarget>AnyCPU</PlatformTarget>
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition=" '$(Platform)' == 'x64' ">
18-
<PlatformTarget>x64</PlatformTarget>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
22-
<PlatformTarget>x86</PlatformTarget>
23-
</PropertyGroup>
24-
259
<PropertyGroup>
2610
<RootNamespace>Samples.ExceptionGenerator</RootNamespace>
2711
</PropertyGroup>

‎profiler/src/Demos/Samples.FileAccess/Program.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System.Linq;
1111
using System.Runtime.CompilerServices;
1212
using System.Text;
13-
#if (!NET45)
13+
#if (!NETFRAMEWORK)
1414
using System.Text.Json;
1515
#endif
1616
using System.Threading;
@@ -30,12 +30,12 @@ public enum Scenario
3030
ReadWriteText = 2,
3131
ReadWriteFileStream = 4,
3232
ReadWriteAsync = 8,
33-
#if (!NET45)
33+
#if (!NETFRAMEWORK)
3434
ReadWriteLinesAsync = 16,
3535
#endif
3636
ReadWriteXml = 32,
3737
ReadWriteXmlAsync = 64,
38-
#if (!NET45)
38+
#if (!NETFRAMEWORK)
3939
ReadWriteJson = 128,
4040
#endif
4141
}
@@ -299,7 +299,7 @@ private static async Task ReadWriteAsync(CancellationToken token)
299299
File.Delete(filename);
300300
}
301301

302-
#if (!NET45)
302+
#if (!NETFRAMEWORK)
303303
[MethodImpl(MethodImplOptions.NoInlining)]
304304
private static async Task ReadWriteLineAsync(CancellationToken token)
305305
{
@@ -336,7 +336,7 @@ private static IEnumerable<string> GetLines()
336336
}
337337
#endif
338338

339-
#if (NET45)
339+
#if (NETFRAMEWORK)
340340
private static Task CompletedTask = Task.FromResult(false);
341341
#endif
342342
[MethodImpl(MethodImplOptions.NoInlining)]
@@ -444,15 +444,15 @@ private static async Task ReadWriteXml(CancellationToken token, bool asynchronou
444444

445445
if (!asynchronous)
446446
{
447-
#if (NET45)
447+
#if (NETFRAMEWORK)
448448
await CompletedTask;
449449
#else
450450
await Task.CompletedTask;
451451
#endif
452452
}
453453
}
454454

455-
#if (!NET45)
455+
#if (!NETFRAMEWORK)
456456
[MethodImpl(MethodImplOptions.NoInlining)]
457457
private static async Task ReadWriteJson(CancellationToken token, bool asynchronous)
458458
{
@@ -497,7 +497,7 @@ private static async Task ReadWriteJson(CancellationToken token, bool asynchrono
497497

498498
if (!asynchronous)
499499
{
500-
#if (NET45)
500+
#if (NETFRAMEWORK)
501501
await CompletedTask;
502502
#else
503503
await Task.CompletedTask;
@@ -552,7 +552,7 @@ private static List<Task> StartScenarios(Scenario scenario, CancellationToken to
552552
TaskCreationOptions.LongRunning));
553553
}
554554

555-
#if (!NET45)
555+
#if (!NETFRAMEWORK)
556556
if ((scenario & Scenario.ReadWriteLinesAsync) == Scenario.ReadWriteLinesAsync)
557557
{
558558
tasks.Add(
@@ -587,7 +587,7 @@ private static List<Task> StartScenarios(Scenario scenario, CancellationToken to
587587
TaskCreationOptions.LongRunning));
588588
}
589589

590-
#if (!NET45)
590+
#if (!NETFRAMEWORK)
591591
if ((scenario & Scenario.ReadWriteJson) == Scenario.ReadWriteJson)
592592
{
593593
tasks.Add(

‎profiler/src/Demos/Samples.FileAccess/Samples.FileAccess.csproj

-20
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,10 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
7-
<Platforms>AnyCPU;x64;x86</Platforms>
8-
95
<!--This is required for smoke test assembly discovery-->
106
<AssemblyName>Samples.FileAccess</AssemblyName>
117
</PropertyGroup>
128

13-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45'">
14-
<DefineConstants>NET45</DefineConstants>
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
18-
<PlatformTarget>AnyCPU</PlatformTarget>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition=" '$(Platform)' == 'x64' ">
22-
<PlatformTarget>x64</PlatformTarget>
23-
</PropertyGroup>
24-
25-
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
26-
<PlatformTarget>x86</PlatformTarget>
27-
</PropertyGroup>
28-
299
<ItemGroup>
3010
<ProjectReference Include="..\Shared\Util\Datadog.Demos.Util.csproj" />
3111
</ItemGroup>

‎profiler/src/Demos/Samples.ParallelCountSites/Samples.ParallelCountSites.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
6-
<Platforms>AnyCPU;x64;x86</Platforms>
76
</PropertyGroup>
87

98
</Project>

‎profiler/src/Demos/Samples.Website-AspNetCore01/Samples.Website-AspNetCore01.csproj

-16
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,6 @@
99
<AssemblyName>Samples.Website-AspNetCore01</AssemblyName>
1010
</PropertyGroup>
1111

12-
13-
<!-- Those platform options have been added to have a output build path per platform
14-
This way, it's easier to test and investigate if needed.
15-
-->
16-
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
</PropertyGroup>
19-
20-
<PropertyGroup Condition=" '$(Platform)' == 'x64' ">
21-
<PlatformTarget>x64</PlatformTarget>
22-
</PropertyGroup>
23-
24-
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
25-
<PlatformTarget>x86</PlatformTarget>
26-
</PropertyGroup>
27-
2812
<ItemGroup>
2913
<ProjectReference Include="..\Shared\Util\Datadog.Demos.Util.csproj" />
3014
</ItemGroup>

‎profiler/src/Demos/Samples.WindowsService01/App.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
55
</startup>
6-
</configuration>
6+
</configuration>

‎profiler/src/Demos/Samples.WindowsService01/Samples.WindowsService01.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@
4444
<OutputType>WinExe</OutputType>
4545
<RootNamespace>Samples.WindowsService01</RootNamespace>
4646
<AssemblyName>Samples.WindowsService01</AssemblyName>
47-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
47+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
4848
<FileAlignment>512</FileAlignment>
4949
<Deterministic>true</Deterministic>
50+
<TargetFrameworkProfile />
5051
</PropertyGroup>
5152
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
5253
<PlatformTarget>AnyCPU</PlatformTarget>

‎profiler/src/Demos/Shared/RuntimeMetrics/RuntimeMetrics.csproj

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net461;netcoreapp3.1;net50;net6.0;net7.0;net8.0</TargetFrameworks>
54
<AssemblyName>Datadog.RuntimeMetrics</AssemblyName>
65
<RootNamespace>Datadog.RuntimeMetrics</RootNamespace>
7-
<Platforms>AnyCPU;x64;x86</Platforms>
86
</PropertyGroup>
97

10-
<!-- for demo apps -->
11-
<ItemGroup Condition="('$(TargetFramework)' == 'net45')">
12-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
13-
</ItemGroup>
14-
158
<!-- for unit tests -->
16-
<ItemGroup Condition="('$(TargetFramework)' == 'net461')">
9+
<ItemGroup Condition="('$(TargetFramework)' == 'net462')">
1710
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
1811
</ItemGroup>
1912
</Project>

‎profiler/src/Demos/Shared/Util/Datadog.Demos.Util.csproj

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<Platforms>AnyCPU;x64;x86</Platforms>
5-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
7-
</PropertyGroup>
8-
93
</Project>

‎profiler/src/Demos/WcfService/Client/App.config

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,43 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
55
</startup>
66
<system.serviceModel>
77
<bindings>
88
<basicHttpBinding>
9-
<binding name="BasicHttpBinding_IStringProvider" />
9+
<binding name="BasicHttpBinding_IStringProvider"/>
1010
</basicHttpBinding>
1111
<basicHttpsBinding>
12-
<binding name="BasicHttpsBinding_IStringProvider" />
12+
<binding name="BasicHttpsBinding_IStringProvider"/>
1313
</basicHttpsBinding>
1414
</bindings>
1515
<client>
16-
<endpoint address="https://localhost:44310/Datadog.Demos.WcfService/StringProvider"
17-
binding="basicHttpsBinding" bindingConfiguration="BasicHttpsBinding_IStringProvider"
18-
contract="Demos.WcfService.IStringProvider" name="BasicHttpsBinding_IStringProvider" />
19-
<endpoint address="http://localhost:8000/Datadog.Demos.WcfService/StringProvider"
20-
binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IStringProvider"
21-
contract="Demos.WcfService.IStringProvider" name="BasicHttpBinding_IStringProvider" />
16+
<endpoint address="https://localhost:44310/Datadog.Demos.WcfService/StringProvider" binding="basicHttpsBinding" bindingConfiguration="BasicHttpsBinding_IStringProvider" contract="Demos.WcfService.IStringProvider" name="BasicHttpsBinding_IStringProvider"/>
17+
<endpoint address="http://localhost:8000/Datadog.Demos.WcfService/StringProvider" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IStringProvider" contract="Demos.WcfService.IStringProvider" name="BasicHttpBinding_IStringProvider"/>
2218
</client>
2319
</system.serviceModel>
2420

2521
<system.diagnostics>
2622
<sources>
2723
<source name="System.ServiceModel.MessageLogging" switchValue="Warning, ActivityTracing">
2824
<listeners>
29-
<add name="ServiceModelTraceListener" />
25+
<add name="ServiceModelTraceListener"/>
3026
</listeners>
3127
</source>
3228
<source name="System.ServiceModel" switchValue="Verbose,ActivityTracing">
3329
<listeners>
34-
<add name="ServiceModelTraceListener" />
30+
<add name="ServiceModelTraceListener"/>
3531
</listeners>
3632
</source>
3733
<source name="System.Runtime.Serialization" switchValue="Verbose,ActivityTracing">
3834
<listeners>
39-
<add name="ServiceModelTraceListener" />
35+
<add name="ServiceModelTraceListener"/>
4036
</listeners>
4137
</source>
4238
</sources>
4339
<sharedListeners>
44-
<add initializeData="App_tracelog.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModelTraceListener" traceOutputOptions="Timestamp" />
40+
<add initializeData="App_tracelog.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModelTraceListener" traceOutputOptions="Timestamp"/>
4541
</sharedListeners>
4642
</system.diagnostics>
47-
</configuration>
43+
</configuration>

‎profiler/src/Demos/WcfService/Client/WcfServiceClient.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>Datadog.Demos.WcfService.Client</RootNamespace>
1010
<AssemblyName>Datadog.Demos.WcfService.Client</AssemblyName>
11-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
@@ -27,6 +27,7 @@
2727
<IsWebBootstrapper>false</IsWebBootstrapper>
2828
<UseApplicationTrust>false</UseApplicationTrust>
2929
<BootstrapperEnabled>true</BootstrapperEnabled>
30+
<TargetFrameworkProfile />
3031
</PropertyGroup>
3132
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3233
<PlatformTarget>AnyCPU</PlatformTarget>

‎profiler/src/Demos/WcfService/Host/App.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
55
</startup>
6-
</configuration>
6+
</configuration>

‎profiler/src/Demos/WcfService/Host/WcfServiceHost.csproj

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>Datadog.Demos.WcfService.Host</RootNamespace>
1010
<AssemblyName>Datadog.Demos.WcfService.Host</AssemblyName>
11-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -53,10 +54,6 @@
5354
<Project>{b0882e91-443b-4161-ab64-07e188067d3f}</Project>
5455
<Name>Datadog.Demos.Util</Name>
5556
</ProjectReference>
56-
<ProjectReference Include="..\Library\WcfServiceLibrary.csproj">
57-
<Project>{9a500962-3469-4921-b43f-6273588ff556}</Project>
58-
<Name>WcfServiceLibrary</Name>
59-
</ProjectReference>
6057
</ItemGroup>
6158
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6259
</Project>

‎profiler/test/Datadog.Profiler.IntegrationTests/Exceptions/ExceptionsTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void ThrowExceptionsInParallel(string appName, string framework, string a
3434
{
3535
StackTrace expectedStack;
3636

37-
if (framework == "net45")
37+
if (framework == "net462")
3838
{
3939
expectedStack = new StackTrace(
4040
new StackFrame("|lm:Samples.ExceptionGenerator |ns:Samples.ExceptionGenerator |ct:ParallelExceptionsScenario |cg: |fn:ThrowExceptions |fg: |sg:(object state)"),

‎profiler/test/Datadog.Profiler.IntegrationTests/GarbageCollections/GarbageCollectorCpuTimeTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void CheckFeatureIsDisabledIfNetCoreVersionIsLessThan_5(string appName, s
146146
SamplesHelper.GetSamples(runner.Environment.PprofDir).Should().NotContain(sample => sample.StackTrace.Equals(gcStack));
147147
}
148148

149-
[TestAppFact("Samples.Computer01", new[] { "net45" })]
149+
[TestAppFact("Samples.Computer01", new[] { "net462" })]
150150
public void CheckFeatureIsDisabledIfDotNetFramework(string appName, string framework, string appAssembly)
151151
{
152152
var runner = new TestApplicationRunner(appName, framework, appAssembly, _output, commandLine: ScenarioGenerics);

‎profiler/test/Datadog.Profiler.IntegrationTests/Threads/ThreadLifetimeProviderTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public ThreadLifetimeProviderTest(ITestOutputHelper output)
2727
_output = output;
2828
}
2929

30-
[TestAppFact("Samples.Computer01", new[] { /*"net45", "net48",*/ "net6.0", "net7.0" })]
30+
[TestAppFact("Samples.Computer01", new[] { /*"net462", "net48",*/ "net6.0", "net7.0" })]
3131
public void ShouldGetThreadLifetimeSamples(string appName, string framework, string appAssembly)
3232
{
3333
var runner = new TestApplicationRunner(appName, framework, appAssembly, _output, commandLine: ScenarioGenerics);
@@ -47,7 +47,7 @@ public void ShouldGetThreadLifetimeSamples(string appName, string framework, str
4747
Assert.True(CheckSamplesAreThreadTimeline(runner.Environment.PprofDir));
4848
}
4949

50-
[TestAppFact("Samples.Computer01", new[] { /*"net45", "net48",*/ "net6.0", "net7.0" })]
50+
[TestAppFact("Samples.Computer01", new[] { /*"net462", "net48",*/ "net6.0", "net7.0" })]
5151
public void ShouldNotGetThreadLifetimeSamplesByDefault(string appName, string framework, string appAssembly)
5252
{
5353
var runner = new TestApplicationRunner(appName, framework, appAssembly, _output, commandLine: ScenarioGenerics);

‎profiler/test/Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
<PropertyGroup>
1414
<!-- only run .NET Framework tests on Windows -->
15-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.1;net6.0</TargetFrameworks>
16-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1;net6.0</TargetFrameworks>
15+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net462;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
16+
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
1717
<!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp3.0) -->
1818
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1919
</PropertyGroup>

0 commit comments

Comments
 (0)
Please sign in to comment.