diff --git a/build/VStudio/Directory.Build.props b/build/VStudio/Directory.Build.props
deleted file mode 100644
index f22c97d3..00000000
--- a/build/VStudio/Directory.Build.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-    <Choose>
-        <When Condition="$(MSBuildProjectName)=='memfs-dotnet' or $(MSBuildProjectName)=='winfsp.net'">
-            <PropertyGroup>
-                <BaseIntermediateOutputPath>$(SolutionDir)build\$(MSBuildProjectName).build\</BaseIntermediateOutputPath>
-            </PropertyGroup>
-        </When>
-    </Choose>
-</Project>
\ No newline at end of file
diff --git a/build/VStudio/dotnet/winfsp.net.csproj b/build/VStudio/dotnet/winfsp.net.csproj
index 7d1f38d3..9e95bb90 100644
--- a/build/VStudio/dotnet/winfsp.net.csproj
+++ b/build/VStudio/dotnet/winfsp.net.csproj
@@ -1,4 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(MSBuildProjectName).build\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net35</TargetFrameworks>
@@ -78,7 +82,7 @@
     <Copyright>$(MyCopyright)</Copyright>
     <AssemblyVersion>$(MyAssemblyVersion)</AssemblyVersion>
     <FileVersion>$(MyVersion)</FileVersion>
-    
+
     <!-- NuGet metadata -->
     <PackageId>$(MyProductFileName)-msil</PackageId>
     <Version>$(MyVersion)</Version>
@@ -104,4 +108,5 @@ echo !line! &gt;&gt;$(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).con
 "$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.0A\Bin\al.exe" /product:"$(MyProductName)" /title:"$(MyDescription)" /company:"$(MyCompanyName)" /copyright:"$(MyCopyright)" /version:"$(MyAssemblyPolicyVersion)" /fileversion:"$(MyVersion)" /link:$(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).config /out:$(OutDir)policy.$(MyAssemblyPolicyVersion).$(TargetName).dll /keyfile:$(ProjectDir)$(ProjectName).snk
 </PostBuildEvent>
   </PropertyGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
\ No newline at end of file
diff --git a/build/VStudio/testing/memfs-dotnet.csproj b/build/VStudio/testing/memfs-dotnet.csproj
index fe7feabe..e5d728f2 100644
--- a/build/VStudio/testing/memfs-dotnet.csproj
+++ b/build/VStudio/testing/memfs-dotnet.csproj
@@ -1,4 +1,8 @@
-<Project Sdk="Microsoft.NET.SDK">
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>$(SolutionDir)build\$(MSBuildProjectName).build\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.common.props))/build.common.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -34,4 +38,5 @@
   <ItemGroup>
     <Compile Include="..\..\..\tst\memfs-dotnet\Program.cs" />
   </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
\ No newline at end of file