diff --git a/Directory.Build.props b/Directory.Build.props
index 4cba664f8..aecb5d4ab 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -17,7 +17,6 @@
     <GenerateTestProjection Condition="'$(GenerateTestProjection)$(Configuration)' == 'Release'">true</GenerateTestProjection>
     <GenerateTestProjection Condition="'$(GenerateTestProjection)' == ''">false</GenerateTestProjection>
     <CsWinRTGenerateProjection>$(GenerateTestProjection)</CsWinRTGenerateProjection>
-    <!--<CsWinRTGeneratedFilesDir>$([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)', '$(IntermediateOutputPath)', 'Generated Files', '$(TargetFramework)'))</CsWinRTGeneratedFilesDir>-->
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
diff --git a/Directory.Build.targets b/Directory.Build.targets
index f9eb57374..f2de06480 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -10,6 +10,17 @@
     </RestoreSources>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'" >
+    <GeneratedFilesRootDir>$([MSBuild]::NormalizeDirectory('$(MSBuildProjectDirectory)', 'Generated Files'))</GeneratedFilesRootDir>
+    <GeneratedFilesDir>$([MSBuild]::NormalizeDirectory('$(GeneratedFilesRootDir)', '$(TargetFramework)'))</GeneratedFilesDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="$(GeneratedFilesRootDir)**/*.cs" />
+    <None Include="$(GeneratedFilesRootDir)**/*.cs" />
+    <Compile Condition="'$(GeneratedFilesDir)' != '$(GeneratedFilesRootDir)'" Include="$(GeneratedFilesDir)*.cs" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
     <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0-4.20472.6" />
   </ItemGroup>