diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 16303472e..c35a963a8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rid: [win-x64, linux-x64, osx-x64]
+        rid: [win-x64, linux-x64, osx-x64, win-arm64, linux-arm64, osx-arm64]
 
     env:
       # Set the build number in MinVer.
@@ -41,7 +41,7 @@ jobs:
         with:
           upload_url: ${{ github.event.release.upload_url }}
           asset_path: ./bin/*
-          asset_name: component-detection-${{ matrix.rid }}${{ matrix.rid == 'win-x64' && '.exe' || '' }}
+          asset_name: component-detection-${{ matrix.rid }}${{ (matrix.rid == 'win-x64' || matrix.rid == 'win-arm64') && '.exe' || '' }}
 
       - name: Build NuGet packages
         run: dotnet pack --configuration Release --output ./out
diff --git a/ComponentDetection.sln b/ComponentDetection.sln
index 9b9cfbc3a..4c632d5ae 100644
--- a/ComponentDetection.sln
+++ b/ComponentDetection.sln
@@ -44,129 +44,171 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM64= Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM64= Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Debug|x86.Build.0 = Debug|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Release|ARM64.ActiveCfg= Release|Any CPU
+		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Release|ARM64.Build.0= Release|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Release|x64.ActiveCfg = Release|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Release|x64.Build.0 = Release|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Release|x86.ActiveCfg = Release|Any CPU
 		{4DF6C2D6-B231-4A03-BBDE-44D9980B5F0A}.Release|x86.Build.0 = Release|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Debug|x64.Build.0 = Debug|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Debug|x86.Build.0 = Debug|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Release|ARM64.Build.0 = Release|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Release|x64.ActiveCfg = Release|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Release|x64.Build.0 = Release|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Release|x86.ActiveCfg = Release|Any CPU
 		{15A2FC95-1232-45BF-A732-7B5CE96F7173}.Release|x86.Build.0 = Release|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Debug|x86.Build.0 = Debug|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Release|ARM64.Build.0= Release|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Release|x64.ActiveCfg = Release|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Release|x64.Build.0 = Release|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Release|x86.ActiveCfg = Release|Any CPU
 		{F0C6D4D7-3F14-4DCA-A5FC-050D987247FC}.Release|x86.Build.0 = Release|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Debug|ARM64.ActiveCfg= Debug|Any CPU
+		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Debug|ARM64.Build.0= Debug|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Debug|x86.Build.0 = Debug|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Release|ARM64.ActiveCfg= Release|Any CPU
+		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Release|ARM64.Build.0= Release|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Release|x64.ActiveCfg = Release|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Release|x64.Build.0 = Release|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Release|x86.ActiveCfg = Release|Any CPU
 		{4B3F743B-7729-48D7-B43E-AEC22AD83DE0}.Release|x86.Build.0 = Release|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Debug|x86.Build.0 = Debug|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Release|ARM64.ActiveCfg= Release|Any CPU
+		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Release|ARM64.Build.0= Release|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Release|x64.Build.0 = Release|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Release|x86.ActiveCfg = Release|Any CPU
 		{4A109A41-C5A9-4C59-B7CE-F168CBADCC83}.Release|x86.Build.0 = Release|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Debug|x64.Build.0 = Debug|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Debug|x86.Build.0 = Debug|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Release|ARM64.ActiveCfg= Release|Any CPU
+		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Release|ARM64.Build.0= Release|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Release|x64.ActiveCfg = Release|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Release|x64.Build.0 = Release|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Release|x86.ActiveCfg = Release|Any CPU
 		{6DF72D9F-7FE6-4250-8837-64AB50AA85EA}.Release|x86.Build.0 = Release|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Debug|ARM64.Build.0= Debug|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Debug|x64.Build.0 = Debug|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Debug|x86.Build.0 = Debug|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Release|ARM64.ActiveCfg= Release|Any CPU
+		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Release|ARM64.Build.0= Release|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Release|x64.ActiveCfg = Release|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Release|x64.Build.0 = Release|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Release|x86.ActiveCfg = Release|Any CPU
 		{E1EE8396-BDA6-4BE3-BA79-29889DAFA871}.Release|x86.Build.0 = Release|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Debug|ARM64.ActiveCfg= Debug|Any CPU
+		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Debug|ARM64.Build.0= Debug|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Debug|x64.Build.0 = Debug|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Debug|x86.Build.0 = Debug|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Release|ARM64.ActiveCfg= Release|Any CPU
+		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Release|ARM64.Build.0= Release|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Release|x64.ActiveCfg = Release|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Release|x64.Build.0 = Release|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Release|x86.ActiveCfg = Release|Any CPU
 		{5CC31737-F845-4056-9DD1-8F8838DD4EBD}.Release|x86.Build.0 = Release|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Debug|ARM64.ActiveCfg= Debug|Any CPU
+		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Debug|ARM64.Build.0= Debug|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Debug|x64.Build.0 = Debug|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Debug|x86.Build.0 = Debug|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Release|ARM64.ActiveCfg= Release|Any CPU
+		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Release|ARM64.Build.0= Release|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Release|x64.ActiveCfg = Release|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Release|x64.Build.0 = Release|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Release|x86.ActiveCfg = Release|Any CPU
 		{411CBBC3-DA4B-4922-B5D9-3FEFC0A7696F}.Release|x86.Build.0 = Release|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Debug|ARM64.ActiveCfg= Debug|Any CPU
+		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Debug|ARM64.Build.0= Debug|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Debug|x86.Build.0 = Debug|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Release|ARM64.ActiveCfg= Release|Any CPU
+		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Release|ARM64.Build.0= Release|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Release|x64.ActiveCfg = Release|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Release|x64.Build.0 = Release|Any CPU
 		{AB674039-1D82-43CF-BDE5-21A14FE1B1F0}.Release|x86.ActiveCfg = Release|Any CPU
diff --git a/src/Microsoft.ComponentDetection.Detectors/Microsoft.ComponentDetection.Detectors.csproj b/src/Microsoft.ComponentDetection.Detectors/Microsoft.ComponentDetection.Detectors.csproj
index f50084046..a0fb3f5e4 100644
--- a/src/Microsoft.ComponentDetection.Detectors/Microsoft.ComponentDetection.Detectors.csproj
+++ b/src/Microsoft.ComponentDetection.Detectors/Microsoft.ComponentDetection.Detectors.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
+
     <ItemGroup>
         <PackageReference Include="DotNet.Glob" />
         <PackageReference Include="Microsoft.Extensions.Logging" />
diff --git a/src/Microsoft.ComponentDetection/Microsoft.ComponentDetection.csproj b/src/Microsoft.ComponentDetection/Microsoft.ComponentDetection.csproj
index 3540ab1b9..300fb14ca 100644
--- a/src/Microsoft.ComponentDetection/Microsoft.ComponentDetection.csproj
+++ b/src/Microsoft.ComponentDetection/Microsoft.ComponentDetection.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;win-arm64;linux-arm64;osx-arm64</RuntimeIdentifiers>
         <RootProjectDirectory>$(MSBuildThisFileDirectory)..\..\</RootProjectDirectory>
     </PropertyGroup>
 
diff --git a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj
index c92dc5a57..6b82c81f4 100644
--- a/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj
+++ b/test/Microsoft.ComponentDetection.Orchestrator.Tests/Microsoft.ComponentDetection.Orchestrator.Tests.csproj
@@ -11,8 +11,8 @@
         <PackageReference Include="Spectre.Console.Cli" />
         <PackageReference Include="Spectre.Console.Testing" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
-        <PackageReference Include="MSTest.TestAdapter "/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk "/>
+        <PackageReference Include="MSTest.TestAdapter " />
+        <PackageReference Include="Microsoft.NET.Test.Sdk " />
         <PackageReference Include="FluentAssertions.Analyzers" PrivateAssets="all" />
     </ItemGroup>