Skip to content

Commit 445f7c2

Browse files
tippmar-nrtippmar-nr
authored
chore: Update Profiler projects to build on VS2022 (#2149)
1 parent 6477a2b commit 445f7c2

31 files changed

+141
-104
lines changed

‎.github/workflows/build_profiler.yml

+19-7
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
needs: check-for-changes
9393
if: ${{ inputs.force-build || needs.check-for-changes.outputs.profiler_src == 'true' }}
9494
name: Build Windows Profiler
95-
runs-on: windows-2019 # required because it includes Windows SDK 10.0.18362.0
95+
runs-on: windows-latest
9696

9797
env:
9898
profiler_path: ${{ github.workspace }}\src\Agent\NewRelic\Profiler
@@ -158,7 +158,7 @@ jobs:
158158
- name: Archive Artifacts
159159
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
160160
with:
161-
name: profiler
161+
name: profiler-windows
162162
path: ${{ github.workspace }}\src\Agent\_profilerBuild\**\*
163163
if-no-files-found: error
164164

@@ -210,7 +210,7 @@ jobs:
210210
- name: Archive Artifacts
211211
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
212212
with:
213-
name: profiler
213+
name: profiler-amd64
214214
path: ${{ github.workspace }}/src/Agent/_profilerBuild/
215215
if-no-files-found: error
216216

@@ -284,7 +284,7 @@ jobs:
284284
- name: Archive Artifacts
285285
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
286286
with:
287-
name: profiler
287+
name: profiler-arm64
288288
path: ${{ github.workspace }}/src/Agent/_profilerBuild/
289289
if-no-files-found: error
290290

@@ -312,12 +312,24 @@ jobs:
312312
with:
313313
fetch-depth: 0
314314

315-
- name: Download Profiler Artifacts to working Directory
316-
uses: actions/download-artifact/@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
315+
- name: Download Windows Profiler Artifacts to working Directory
316+
uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
317317
with:
318-
name: profiler
318+
name: profiler-windows
319319
path: ${{ github.workspace }}/_workingDir
320320

321+
- name: Download Linux amd64 Profiler Artifacts to working Directory
322+
uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
323+
with:
324+
name: profiler-amd64
325+
path: ${{ github.workspace }}/_workingDir
326+
327+
- name: Download Linux arm64 Profiler Artifacts to working Directory
328+
uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
329+
with:
330+
name: profiler-arm64
331+
path: ${{ github.workspace }}/_workingDir
332+
321333
- name: Determine Package Version from Git history
322334
id: agentVersion
323335
run: |

‎.github/workflows/codeql.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
schedule:
99
- cron: '20 3 * * 1'
1010

11+
permissions:
12+
contents: read
13+
1114
# only allow one instance of this workflow to be running per PR or branch, cancels any that are already running
1215
concurrency:
1316
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -36,7 +39,7 @@ jobs:
3639
fetch-depth: 0
3740

3841
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@v3
42+
uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
4043
with:
4144
languages: csharp
4245

@@ -46,13 +49,13 @@ jobs:
4649
shell: powershell
4750

4851
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@v3
52+
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
5053
with:
5154
category: "/language:csharp"
5255

5356
analyze-cpp:
5457
name: Analyze C++
55-
runs-on: windows-2019
58+
runs-on: windows-latest
5659
timeout-minutes: 120
5760
permissions:
5861
actions: read
@@ -69,7 +72,7 @@ jobs:
6972
fetch-depth: 0
7073

7174
- name: Initialize CodeQL
72-
uses: github/codeql-action/init@v3
75+
uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
7376
with:
7477
languages: c-cpp
7578

@@ -85,6 +88,6 @@ jobs:
8588
shell: powershell
8689

8790
- name: Perform CodeQL Analysis
88-
uses: github/codeql-action/analyze@v3
91+
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
8992
with:
9093
category: "/language:c-cpp"

‎src/Agent/NewRelic/Home/Home.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</Target>
1414

1515
<ItemGroup>
16-
<PackageReference Include="NewRelic.Agent.Internal.Profiler" Version="10.20.0.8"/>
16+
<PackageReference Include="NewRelic.Agent.Internal.Profiler" Version="10.20.1.27"/>
1717
</ItemGroup>
1818

1919
</Project>

‎src/Agent/NewRelic/Profiler/Common/Common.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,32 @@
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{1FA45857-E2E9-4157-8180-87F4458FA2B1}</ProjectGuid>
2323
<RootNamespace>Common</RootNamespace>
24-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
24+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2525
</PropertyGroup>
2626
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v142</PlatformToolset>
30+
<PlatformToolset>v143</PlatformToolset>
3131
<CharacterSet>MultiByte</CharacterSet>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v142</PlatformToolset>
36+
<PlatformToolset>v143</PlatformToolset>
3737
<CharacterSet>MultiByte</CharacterSet>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4040
<ConfigurationType>Application</ConfigurationType>
4141
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v142</PlatformToolset>
42+
<PlatformToolset>v143</PlatformToolset>
4343
<WholeProgramOptimization>true</WholeProgramOptimization>
4444
<CharacterSet>MultiByte</CharacterSet>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v142</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>MultiByte</CharacterSet>
5252
</PropertyGroup>

‎src/Agent/NewRelic/Profiler/Common/Common.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@
88
<ClInclude Include="xplat.h" />
99
<ClInclude Include="AssemblyVersion.h" />
1010
</ItemGroup>
11+
<ItemGroup>
12+
<None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
13+
</ItemGroup>
1114
</Project>

‎src/Agent/NewRelic/Profiler/CommonTest/CommonTest.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,35 @@
2222
<ProjectGuid>{63F87CD5-23F2-42C2-AFA2-25B11A51CF12}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>CommonTest</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
<UseOfMfc>false</UseOfMfc>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
3737
<UseDebugLibraries>true</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<CharacterSet>Unicode</CharacterSet>
4040
<UseOfMfc>false</UseOfMfc>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>false</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<UseOfMfc>false</UseOfMfc>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v142</PlatformToolset>
53+
<PlatformToolset>v143</PlatformToolset>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
5656
<UseOfMfc>false</UseOfMfc>

‎src/Agent/NewRelic/Profiler/Configuration/Configuration.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@
2222
<ProjectGuid>{E6F0388D-31E5-44A4-8144-162219474ED4}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>Configuration</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>StaticLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3535
<ConfigurationType>StaticLibrary</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>v142</PlatformToolset>
37+
<PlatformToolset>v143</PlatformToolset>
3838
<CharacterSet>Unicode</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4141
<ConfigurationType>StaticLibrary</ConfigurationType>
4242
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>v142</PlatformToolset>
43+
<PlatformToolset>v143</PlatformToolset>
4444
<WholeProgramOptimization>true</WholeProgramOptimization>
4545
<CharacterSet>Unicode</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>StaticLibrary</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v142</PlatformToolset>
50+
<PlatformToolset>v143</PlatformToolset>
5151
<WholeProgramOptimization>true</WholeProgramOptimization>
5252
<CharacterSet>Unicode</CharacterSet>
5353
</PropertyGroup>

‎src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,35 @@
2222
<ProjectGuid>{B3E977A1-D335-4C2E-9758-EFCAB3E645C5}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>ConfigurationTest</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
<UseOfMfc>false</UseOfMfc>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
3737
<UseDebugLibraries>true</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<CharacterSet>Unicode</CharacterSet>
4040
<UseOfMfc>false</UseOfMfc>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>false</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<UseOfMfc>false</UseOfMfc>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v142</PlatformToolset>
53+
<PlatformToolset>v143</PlatformToolset>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
5656
<UseOfMfc>false</UseOfMfc>

‎src/Agent/NewRelic/Profiler/Logging/Logging.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@
2222
<ProjectGuid>{8846B4D5-2945-4D91-900A-28C8610CB04A}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>Logging</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>StaticLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3535
<ConfigurationType>StaticLibrary</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>v142</PlatformToolset>
37+
<PlatformToolset>v143</PlatformToolset>
3838
<CharacterSet>Unicode</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4141
<ConfigurationType>StaticLibrary</ConfigurationType>
4242
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>v142</PlatformToolset>
43+
<PlatformToolset>v143</PlatformToolset>
4444
<WholeProgramOptimization>true</WholeProgramOptimization>
4545
<CharacterSet>Unicode</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>StaticLibrary</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v142</PlatformToolset>
50+
<PlatformToolset>v143</PlatformToolset>
5151
<WholeProgramOptimization>true</WholeProgramOptimization>
5252
<CharacterSet>Unicode</CharacterSet>
5353
</PropertyGroup>

‎src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,35 @@
2222
<ProjectGuid>{B423913C-9FC4-4CB9-AE4F-8F2B9BFF16AB}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>LoggingTest</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v142</PlatformToolset>
31+
<PlatformToolset>v143</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
<UseOfMfc>false</UseOfMfc>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
3737
<UseDebugLibraries>true</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<CharacterSet>Unicode</CharacterSet>
4040
<UseOfMfc>false</UseOfMfc>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>false</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<UseOfMfc>false</UseOfMfc>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v142</PlatformToolset>
53+
<PlatformToolset>v143</PlatformToolset>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
5656
<UseOfMfc>false</UseOfMfc>

‎src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
<ClCompile Include="TestModuleAttributes.cpp" />
1313
<ClCompile Include="DefaultFileLogLocationTest.cpp" />
1414
</ItemGroup>
15+
<ItemGroup>
16+
<None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
17+
</ItemGroup>
1518
</Project>

0 commit comments

Comments
 (0)