diff --git a/samples/BuilderApp/BuilderApp.csproj b/samples/BuilderApp/BuilderApp.csproj
index f8adc233..9035d7de 100644
--- a/samples/BuilderApp/BuilderApp.csproj
+++ b/samples/BuilderApp/BuilderApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj b/src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj
index df60f64f..94fef29e 100644
--- a/src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj
+++ b/src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\MSBuildLocator\key.snk</AssemblyOriginatorKeyFile>
diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
index b7c193ef..f375a251 100644
--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net46;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net46;net6.0</TargetFrameworks>
     <DebugType>full</DebugType>
 
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AssemblyName>Microsoft.Build.Locator</AssemblyName>
     <RootNamespace>Microsoft.Build.Locator</RootNamespace>
     <SignAssembly>true</SignAssembly>
@@ -25,6 +25,21 @@
     <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+	<!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
+    <PackageReference Include="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-bionic-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-bionic-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="all" />
     <Content Include="build\Microsoft.Build.Locator.props">
@@ -42,5 +57,5 @@
       <Authenticode>Microsoft400</Authenticode>
     </FilesToSign>
   </ItemGroup>
-
-</Project>
+	
+</Project>
\ No newline at end of file