diff --git a/VisualStudio.Tests/VisualStudio.Tests.csproj b/VisualStudio.Tests/VisualStudio.Tests.csproj
index a9a0290..822357a 100644
--- a/VisualStudio.Tests/VisualStudio.Tests.csproj
+++ b/VisualStudio.Tests/VisualStudio.Tests.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Moq" Version="4.14.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
diff --git a/VisualStudio/Directory.Build.props b/VisualStudio/Directory.Build.props
index 9f69cc3..0933f97 100644
--- a/VisualStudio/Directory.Build.props
+++ b/VisualStudio/Directory.Build.props
@@ -47,7 +47,6 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <LangVersion>Latest</LangVersion>
 
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
diff --git a/VisualStudio/VisualStudio.csproj b/VisualStudio/VisualStudio.csproj
index 1db5bc5..3c8f3e1 100644
--- a/VisualStudio/VisualStudio.csproj
+++ b/VisualStudio/VisualStudio.csproj
@@ -4,13 +4,13 @@
     <Description>A global tool for managing Visual Studio installations</Description>
 
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
 
     <AssemblyName>vs</AssemblyName>
     <RootNamespace>VisualStudio</RootNamespace>
 
     <PackageId>dotnet-vs</PackageId>
-    <ToolCommandName>vs</ToolCommandName>
+    <ToolCommandName>vs</ToolCommandName> 
     <PackAsTool>true</PackAsTool>
 
     <NoWarn>$(NoWarn);NU5118</NoWarn>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(VSWhereDir)vswhere.exe" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="tools\$(TargetFramework)\any\%(Filename)%(Extension)" />
+    <None Condition="'$(TargetFramework)' != ''" Include="$(VSWhereDir)vswhere.exe" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="tools\$(TargetFramework)\any\%(Filename)%(Extension)" />
     <Content Include="..\docs\img\icon-128.png" Link="icon-128.png" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="%(Filename)%(Extension)" />
     <EmbeddedResource Include="Docs\*.md" />
   </ItemGroup>