diff --git a/.github/workflows/build_profiler.yml b/.github/workflows/build_profiler.yml
index 82fb4d5511..769ea3ab20 100644
--- a/.github/workflows/build_profiler.yml
+++ b/.github/workflows/build_profiler.yml
@@ -92,7 +92,7 @@ jobs:
     needs: check-for-changes
     if: ${{ inputs.force-build || needs.check-for-changes.outputs.profiler_src == 'true' }}
     name: Build Windows Profiler
-    runs-on: windows-2019 # required because it includes Windows SDK 10.0.18362.0
+    runs-on: windows-latest
 
     env:
       profiler_path: ${{ github.workspace }}\src\Agent\NewRelic\Profiler
@@ -158,7 +158,7 @@ jobs:
       - name: Archive Artifacts
         uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
         with:
-          name: profiler
+          name: profiler-windows
           path: ${{ github.workspace }}\src\Agent\_profilerBuild\**\*
           if-no-files-found: error
 
@@ -210,7 +210,7 @@ jobs:
       - name: Archive Artifacts
         uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
         with:
-          name: profiler
+          name: profiler-amd64
           path: ${{ github.workspace }}/src/Agent/_profilerBuild/
           if-no-files-found: error
 
@@ -284,7 +284,7 @@ jobs:
       - name: Archive Artifacts
         uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
         with:
-          name: profiler
+          name: profiler-arm64
           path: ${{ github.workspace }}/src/Agent/_profilerBuild/
           if-no-files-found: error
 
@@ -312,12 +312,24 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Profiler Artifacts to working Directory
-        uses: actions/download-artifact/@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+      - name: Download Windows Profiler Artifacts to working Directory
+        uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
         with:
-          name: profiler
+          name: profiler-windows
           path: ${{ github.workspace }}/_workingDir
       
+      - name: Download Linux amd64 Profiler Artifacts to working Directory
+        uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
+        with:
+          name: profiler-amd64
+          path: ${{ github.workspace }}/_workingDir
+
+      - name: Download Linux arm64 Profiler Artifacts to working Directory
+        uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
+        with:
+          name: profiler-arm64
+          path: ${{ github.workspace }}/_workingDir
+
       - name: Determine Package Version from Git history
         id: agentVersion
         run: |
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a81bd4775e..4b359d006b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -8,6 +8,9 @@ on:
   schedule:
     - cron: '20 3 * * 1'
 
+permissions:
+  contents: read    
+  
 # only allow one instance of this workflow to be running per PR or branch, cancels any that are already running
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -36,7 +39,7 @@ jobs:
         fetch-depth: 0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
       with:
         languages: csharp
 
@@ -46,13 +49,13 @@ jobs:
       shell: powershell
    
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
       with:
         category: "/language:csharp"
 
   analyze-cpp:
     name: Analyze C++
-    runs-on: windows-2019
+    runs-on: windows-latest
     timeout-minutes: 120
     permissions:
       actions: read
@@ -69,7 +72,7 @@ jobs:
         fetch-depth: 0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
       with:
         languages: c-cpp
 
@@ -85,6 +88,6 @@ jobs:
       shell: powershell
    
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
       with:
         category: "/language:c-cpp"
diff --git a/src/Agent/NewRelic/Home/Home.csproj b/src/Agent/NewRelic/Home/Home.csproj
index cd0a2a6772..865f422ea5 100644
--- a/src/Agent/NewRelic/Home/Home.csproj
+++ b/src/Agent/NewRelic/Home/Home.csproj
@@ -13,7 +13,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="NewRelic.Agent.Internal.Profiler" Version="10.20.0.8"/>
+    <PackageReference Include="NewRelic.Agent.Internal.Profiler" Version="10.20.1.27"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Agent/NewRelic/Profiler/Common/Common.vcxproj b/src/Agent/NewRelic/Profiler/Common/Common.vcxproj
index 43fb36af76..f0d58366f2 100644
--- a/src/Agent/NewRelic/Profiler/Common/Common.vcxproj
+++ b/src/Agent/NewRelic/Profiler/Common/Common.vcxproj
@@ -21,32 +21,32 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1FA45857-E2E9-4157-8180-87F4458FA2B1}</ProjectGuid>
     <RootNamespace>Common</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/Common/Common.vcxproj.filters b/src/Agent/NewRelic/Profiler/Common/Common.vcxproj.filters
index 3cb9331d1e..73bc8113de 100644
--- a/src/Agent/NewRelic/Profiler/Common/Common.vcxproj.filters
+++ b/src/Agent/NewRelic/Profiler/Common/Common.vcxproj.filters
@@ -8,4 +8,7 @@
     <ClInclude Include="xplat.h" />
     <ClInclude Include="AssemblyVersion.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Agent/NewRelic/Profiler/CommonTest/CommonTest.vcxproj b/src/Agent/NewRelic/Profiler/CommonTest/CommonTest.vcxproj
index 6a9d8c7a64..926b62fe30 100644
--- a/src/Agent/NewRelic/Profiler/CommonTest/CommonTest.vcxproj
+++ b/src/Agent/NewRelic/Profiler/CommonTest/CommonTest.vcxproj
@@ -22,27 +22,27 @@
     <ProjectGuid>{63F87CD5-23F2-42C2-AFA2-25B11A51CF12}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CommonTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
diff --git a/src/Agent/NewRelic/Profiler/Configuration/Configuration.vcxproj b/src/Agent/NewRelic/Profiler/Configuration/Configuration.vcxproj
index 1d05602a76..b91f46ce83 100644
--- a/src/Agent/NewRelic/Profiler/Configuration/Configuration.vcxproj
+++ b/src/Agent/NewRelic/Profiler/Configuration/Configuration.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{E6F0388D-31E5-44A4-8144-162219474ED4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Configuration</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj b/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj
index 734aec067c..aa2930722e 100644
--- a/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj
+++ b/src/Agent/NewRelic/Profiler/ConfigurationTest/ConfigurationTest.vcxproj
@@ -22,27 +22,27 @@
     <ProjectGuid>{B3E977A1-D335-4C2E-9758-EFCAB3E645C5}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ConfigurationTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
diff --git a/src/Agent/NewRelic/Profiler/Logging/Logging.vcxproj b/src/Agent/NewRelic/Profiler/Logging/Logging.vcxproj
index 021e1f19da..36705854eb 100644
--- a/src/Agent/NewRelic/Profiler/Logging/Logging.vcxproj
+++ b/src/Agent/NewRelic/Profiler/Logging/Logging.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{8846B4D5-2945-4D91-900A-28C8610CB04A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Logging</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj b/src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj
index 6d8789a220..bf40c43240 100644
--- a/src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj
+++ b/src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj
@@ -22,27 +22,27 @@
     <ProjectGuid>{B423913C-9FC4-4CB9-AE4F-8F2B9BFF16AB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>LoggingTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
diff --git a/src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj.filters b/src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj.filters
index 8c5a0b7e02..a91dc7dbd9 100644
--- a/src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj.filters
+++ b/src/Agent/NewRelic/Profiler/LoggingTest/LoggingTest.vcxproj.filters
@@ -12,4 +12,7 @@
     <ClCompile Include="TestModuleAttributes.cpp" />
     <ClCompile Include="DefaultFileLogLocationTest.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriter/MethodRewriter.vcxproj b/src/Agent/NewRelic/Profiler/MethodRewriter/MethodRewriter.vcxproj
index 3d2b3e015d..b0943e2277 100644
--- a/src/Agent/NewRelic/Profiler/MethodRewriter/MethodRewriter.vcxproj
+++ b/src/Agent/NewRelic/Profiler/MethodRewriter/MethodRewriter.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{E0696C0C-175A-4CB7-AD59-612E057B7B1A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>MethodRewriter</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.vcxproj b/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.vcxproj
index 1c79257ea6..4d69869534 100644
--- a/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.vcxproj
+++ b/src/Agent/NewRelic/Profiler/MethodRewriterTest/MethodRewriterTest.vcxproj
@@ -22,27 +22,27 @@
     <ProjectGuid>{A3F9C160-59AF-4613-9A83-24B77BFA6D4A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>MethodRewriterTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriterTest/TestTemplates.h b/src/Agent/NewRelic/Profiler/MethodRewriterTest/TestTemplates.h
index d547350869..9f018bc6ba 100644
--- a/src/Agent/NewRelic/Profiler/MethodRewriterTest/TestTemplates.h
+++ b/src/Agent/NewRelic/Profiler/MethodRewriterTest/TestTemplates.h
@@ -77,7 +77,7 @@ namespace Microsoft { namespace VisualStudio { namespace CppUnitTestFramework
         }
     }
 
-    template<> std::wstring ToString<uint16_t> (const uint16_t& t) { RETURN_WIDE_STRING(t); }
+    //template<> std::wstring ToString<uint16_t> (const uint16_t& t) { RETURN_WIDE_STRING(t); }
 
     template <> std::wstring ToString<std::vector<uint8_t>>(const std::vector<uint8_t>& t)
     {
diff --git a/src/Agent/NewRelic/Profiler/MockCore/MockCore.csproj b/src/Agent/NewRelic/Profiler/MockCore/MockCore.csproj
index a62ceffad3..722f683843 100644
--- a/src/Agent/NewRelic/Profiler/MockCore/MockCore.csproj
+++ b/src/Agent/NewRelic/Profiler/MockCore/MockCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net48</TargetFrameworks>
     <RootNamespace>NewRelic.Agent.Core</RootNamespace>
     <AssemblyName>NewRelic.Agent.Core</AssemblyName>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/ModuleInjector/ModuleInjector.vcxproj b/src/Agent/NewRelic/Profiler/ModuleInjector/ModuleInjector.vcxproj
index 02db155bd6..0c1f1fffe4 100644
--- a/src/Agent/NewRelic/Profiler/ModuleInjector/ModuleInjector.vcxproj
+++ b/src/Agent/NewRelic/Profiler/ModuleInjector/ModuleInjector.vcxproj
@@ -21,32 +21,32 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{56D5651F-A24B-4369-B9FC-1BD5B1959C0B}</ProjectGuid>
     <RootNamespace>ModuleInjector</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/ModuleInjector/ModuleInjector.vcxproj.filters b/src/Agent/NewRelic/Profiler/ModuleInjector/ModuleInjector.vcxproj.filters
index f7be332f35..792fdf7e73 100644
--- a/src/Agent/NewRelic/Profiler/ModuleInjector/ModuleInjector.vcxproj.filters
+++ b/src/Agent/NewRelic/Profiler/ModuleInjector/ModuleInjector.vcxproj.filters
@@ -5,4 +5,7 @@
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="IModule.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Agent/NewRelic/Profiler/ProfiledMethods/ProfiledMethods.csproj b/src/Agent/NewRelic/Profiler/ProfiledMethods/ProfiledMethods.csproj
index f09eb0effd..ea2631a193 100644
--- a/src/Agent/NewRelic/Profiler/ProfiledMethods/ProfiledMethods.csproj
+++ b/src/Agent/NewRelic/Profiler/ProfiledMethods/ProfiledMethods.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ProfiledMethods</RootNamespace>
     <AssemblyName>ProfiledMethods</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -23,6 +23,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <StartArguments>/C $(OutputPath)debug.bat</StartArguments>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DebugSymbols>true</DebugSymbols>
@@ -135,11 +136,11 @@
     <MakeDir Directories="$(TestNewRelicHomeExtensionsDirectory)" />
   </Target>
   <Target Name="MyCopyFiles" DependsOnTargets="MyCreateDirectories">
-    <Copy SourceFiles="$(SolutionDir)MockCore\bin\$(Configuration)\net45\NewRelic.Agent.Core.dll" DestinationFolder="$(TestNewRelicHomeDirectory)" />
+    <Copy SourceFiles="$(SolutionDir)MockCore\bin\$(Configuration)\net48\NewRelic.Agent.Core.dll" DestinationFolder="$(TestNewRelicHomeDirectory)" />
     <Copy SourceFiles="$(ProjectDir)\..\..\..\_profilerBuild\$(Platform)-$(Configuration)\NewRelic.Profiler.dll" DestinationFolder="$(TestNewRelicHomeDirectory)" />
     <Copy SourceFiles="$(OutDir)\Instrumentation.xml" DestinationFolder="$(TestNewRelicHomeExtensionsDirectory)" />
     <Copy SourceFiles="$(OutDir)\newrelic.config" DestinationFolder="$(TestNewRelicHomeDirectory)" />
     <Copy SourceFiles="debug-$(Platform).bat" DestinationFiles="$(OutDir)\debug.bat" />
   </Target>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'FullAgent.sln'))\build\StyleCop.props" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Agent/NewRelic/Profiler/Profiler/Profiler.vcxproj b/src/Agent/NewRelic/Profiler/Profiler/Profiler.vcxproj
index 9cf5470a99..71e3b40a74 100644
--- a/src/Agent/NewRelic/Profiler/Profiler/Profiler.vcxproj
+++ b/src/Agent/NewRelic/Profiler/Profiler/Profiler.vcxproj
@@ -41,32 +41,32 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>TestProfiler</RootNamespace>
     <ProjectName>Profiler</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/RapidXML/RapidXML.vcxproj b/src/Agent/NewRelic/Profiler/RapidXML/RapidXML.vcxproj
index 42b8294e33..7583fb6935 100644
--- a/src/Agent/NewRelic/Profiler/RapidXML/RapidXML.vcxproj
+++ b/src/Agent/NewRelic/Profiler/RapidXML/RapidXML.vcxproj
@@ -21,32 +21,32 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A9DAD133-1A59-4A55-B0CE-214D3880AAE6}</ProjectGuid>
     <RootNamespace>RapidXML</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/RapidXML/RapidXML.vcxproj.filters b/src/Agent/NewRelic/Profiler/RapidXML/RapidXML.vcxproj.filters
index 6b35152255..f328ef33fb 100644
--- a/src/Agent/NewRelic/Profiler/RapidXML/RapidXML.vcxproj.filters
+++ b/src/Agent/NewRelic/Profiler/RapidXML/RapidXML.vcxproj.filters
@@ -6,4 +6,7 @@
     <ClInclude Include="rapidxml_print.hpp" />
     <ClInclude Include="rapidxml_utils.hpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Agent/NewRelic/Profiler/Sicily/Sicily.vcxproj b/src/Agent/NewRelic/Profiler/Sicily/Sicily.vcxproj
index 4a8e8b297e..ddaabcc7b2 100644
--- a/src/Agent/NewRelic/Profiler/Sicily/Sicily.vcxproj
+++ b/src/Agent/NewRelic/Profiler/Sicily/Sicily.vcxproj
@@ -21,28 +21,28 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{27654994-8403-4BD4-9D1D-4BCCC4E93DE6}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/src/Agent/NewRelic/Profiler/Sicily/SicilyTest/SicilyTest.vcxproj b/src/Agent/NewRelic/Profiler/Sicily/SicilyTest/SicilyTest.vcxproj
index 796b13f096..5027678109 100644
--- a/src/Agent/NewRelic/Profiler/Sicily/SicilyTest/SicilyTest.vcxproj
+++ b/src/Agent/NewRelic/Profiler/Sicily/SicilyTest/SicilyTest.vcxproj
@@ -22,27 +22,27 @@
     <ProjectGuid>{891B6B58-6798-4D7F-B840-C6C856DDE527}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>sicily.Test</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
diff --git a/src/Agent/NewRelic/Profiler/Sicily/SicilyTest/TestTemplates.h b/src/Agent/NewRelic/Profiler/Sicily/SicilyTest/TestTemplates.h
index 900e678fc8..d7bcbcf785 100644
--- a/src/Agent/NewRelic/Profiler/Sicily/SicilyTest/TestTemplates.h
+++ b/src/Agent/NewRelic/Profiler/Sicily/SicilyTest/TestTemplates.h
@@ -21,10 +21,10 @@ namespace Microsoft
             using namespace sicily::ast;
             using namespace sicily::codegen;
 
-            template<> std::wstring ToString<uint16_t>(const uint16_t& t)
-            {
-                RETURN_WIDE_STRING(t);
-            }
+            //template<> std::wstring ToString<uint16_t>(const uint16_t& t)
+            //{
+            //    RETURN_WIDE_STRING(t);
+            //}
 
             template<> std::wstring ToString<Type::Kind>(const Type::Kind& t)
             {
diff --git a/src/Agent/NewRelic/Profiler/SignatureParser/SignatureParser.vcxproj b/src/Agent/NewRelic/Profiler/SignatureParser/SignatureParser.vcxproj
index d4bbceda69..9cc275920b 100644
--- a/src/Agent/NewRelic/Profiler/SignatureParser/SignatureParser.vcxproj
+++ b/src/Agent/NewRelic/Profiler/SignatureParser/SignatureParser.vcxproj
@@ -21,32 +21,32 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1315E082-31E5-49A6-86E6-BD8357CFA8C1}</ProjectGuid>
     <RootNamespace>SignatureParser</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/SignatureParser/SignatureParser.vcxproj.filters b/src/Agent/NewRelic/Profiler/SignatureParser/SignatureParser.vcxproj.filters
index 0c0fb3886c..da3c964b23 100644
--- a/src/Agent/NewRelic/Profiler/SignatureParser/SignatureParser.vcxproj.filters
+++ b/src/Agent/NewRelic/Profiler/SignatureParser/SignatureParser.vcxproj.filters
@@ -8,4 +8,7 @@
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="ByteVectorManipulator.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Agent/NewRelic/Profiler/SignatureParserTest/SignatureParserTest.vcxproj b/src/Agent/NewRelic/Profiler/SignatureParserTest/SignatureParserTest.vcxproj
index 7af8c15558..035ee3281b 100644
--- a/src/Agent/NewRelic/Profiler/SignatureParserTest/SignatureParserTest.vcxproj
+++ b/src/Agent/NewRelic/Profiler/SignatureParserTest/SignatureParserTest.vcxproj
@@ -22,27 +22,27 @@
     <ProjectGuid>{C73C1AF5-E6F0-4632-9FD8-B67628B65DAF}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>SignatureParserTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
diff --git a/src/Agent/NewRelic/Profiler/SignatureParserTest/SignatureParserTest.vcxproj.filters b/src/Agent/NewRelic/Profiler/SignatureParserTest/SignatureParserTest.vcxproj.filters
index 02c4991782..b20af46acb 100644
--- a/src/Agent/NewRelic/Profiler/SignatureParserTest/SignatureParserTest.vcxproj.filters
+++ b/src/Agent/NewRelic/Profiler/SignatureParserTest/SignatureParserTest.vcxproj.filters
@@ -12,4 +12,7 @@
     <ClCompile Include="SignatureParserTest.cpp" />
     <ClCompile Include="TestModuleAttributes.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Agent/NewRelic/Profiler/ThreadProfiler/ThreadProfiler.vcxproj b/src/Agent/NewRelic/Profiler/ThreadProfiler/ThreadProfiler.vcxproj
index 07c68407b8..5a728a7b30 100644
--- a/src/Agent/NewRelic/Profiler/ThreadProfiler/ThreadProfiler.vcxproj
+++ b/src/Agent/NewRelic/Profiler/ThreadProfiler/ThreadProfiler.vcxproj
@@ -21,32 +21,32 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{DA0F7BC8-ECBC-4045-989F-0FEFEFC394EB}</ProjectGuid>
     <RootNamespace>ThreadProfiler</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/src/Agent/NewRelic/Profiler/ThreadProfiler/ThreadProfiler.vcxproj.filters b/src/Agent/NewRelic/Profiler/ThreadProfiler/ThreadProfiler.vcxproj.filters
index 7c69cb1571..4b6a949f81 100644
--- a/src/Agent/NewRelic/Profiler/ThreadProfiler/ThreadProfiler.vcxproj.filters
+++ b/src/Agent/NewRelic/Profiler/ThreadProfiler/ThreadProfiler.vcxproj.filters
@@ -4,4 +4,7 @@
     <ClInclude Include="ThreadProfiler.h" />
     <ClInclude Include="namecache.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)newrelic-icon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Agent/NewRelic/Profiler/VersionFileGenerator/VersionFileGenerator.csproj b/src/Agent/NewRelic/Profiler/VersionFileGenerator/VersionFileGenerator.csproj
index 6dc9e7ce5a..eb53f33795 100644
--- a/src/Agent/NewRelic/Profiler/VersionFileGenerator/VersionFileGenerator.csproj
+++ b/src/Agent/NewRelic/Profiler/VersionFileGenerator/VersionFileGenerator.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net48</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GitTagPrefix>v</GitTagPrefix>
   </PropertyGroup>