diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index cfb0e4e046..bd66729778 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -52,9 +52,15 @@ Copyright (c) .NET Foundation. All rights reserved.
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorGenerateWithTargetPath.xaml">
       <Context>Project</Context>
     </PropertyPageSchema>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Rules\RazorComponentWithTargetPath.xaml">
+      <Context>Project</Context>
+    </PropertyPageSchema>
   </ItemGroup>
 
-  <Target Name="RazorGenerateDesignTime" DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths" Returns="@(RazorGenerateWithTargetPath)">
+  <Target 
+    Name="RazorGenerateDesignTime" 
+    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
+    Returns="@(RazorGenerateWithTargetPath);@(RazorComponentWithTargetPath)">
   </Target>
 
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
new file mode 100644
index 0000000000..14a479afe3
--- /dev/null
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule
+  Description="Razor Document Properties"
+  DisplayName="Razor Document Properties"
+  Name="RazorGenerateWithTargetPath"
+  PageTemplate="generic"
+  xmlns="http://schemas.microsoft.com/build/2009/properties">
+  <Rule.DataSource>
+    <DataSource
+      Persistence="ProjectFile"
+      ItemType="RazorComponentWithTargetPath"
+      MSBuildTarget="RazorGenerateDesignTime"
+      HasConfigurationCondition="False"
+      SourceOfDefaultValue="AfterContext"
+      SourceType="TargetResults" />
+  </Rule.DataSource>
+
+  <Rule.Categories>
+    <Category
+      Name="General"
+      DisplayName="General" />
+  </Rule.Categories>
+  
+  <StringProperty
+    Category="General"
+    Name="TargetPath"
+    ReadOnly="True"
+    Visible="False" />
+
+</Rule>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
index 673a61d3da..71100e6541 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.props
@@ -68,11 +68,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
     <RazorGenerateOutputFileExtension>.g.cs</RazorGenerateOutputFileExtension>
 
-    <!--
-    Configures the file extension used for the generated C# definition files.
-    -->
-    <RazorGenerateOutputDefinitionFileExtension>.g.i.cs</RazorGenerateOutputDefinitionFileExtension>
-
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
index 6514e73057..7d5f88d9fb 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -64,5 +64,29 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                     $@"RazorGenerateWithTargetPath: {filePath} {filePath} {Path.Combine(RazorIntermediateOutputPath, filePath + ".g.cs")}");
             }
         }
+
+        [Fact]
+        [InitializeTestProject("ComponentLibrary")]
+        public async Task RazorGenerateDesignTime_ReturnsRazorComponentWithTargetPath()
+        {
+            TargetFramework = "netstandard2.0";
+
+            var result = await DotnetMSBuild("RazorGenerateDesignTime;_IntrospectRazorComponentWithTargetPath");
+
+            Assert.BuildPassed(result);
+
+            var filePaths = new string[]
+            {
+                Path.Combine("MyComponent.cshtml"),
+                Path.Combine("GenericComponent.razor"),
+            };
+
+            foreach (var filePath in filePaths)
+            {
+                Assert.BuildOutputContainsLine(
+                    result,
+                    $@"RazorComponentWithTargetPath: {filePath} {filePath} {Path.Combine(RazorIntermediateOutputPath, filePath + ".g.cs")} {Path.Combine(RazorComponentIntermediateOutputPath, filePath + ".g.cs")}");
+            }
+        }
     }
 }
diff --git a/src/Razor/test/testassets/RazorTest.Introspection.targets b/src/Razor/test/testassets/RazorTest.Introspection.targets
index f0e8f860ab..b3e93737f3 100644
--- a/src/Razor/test/testassets/RazorTest.Introspection.targets
+++ b/src/Razor/test/testassets/RazorTest.Introspection.targets
@@ -3,6 +3,10 @@
     <Message Text="RazorGenerateWithTargetPath: %(RazorGenerateWithTargetPath.Identity) %(RazorGenerateWithTargetPath.TargetPath) %(RazorGenerateWithTargetPath.GeneratedOutput)" Importance="High" />
   </Target>
 
+  <Target Name="_IntrospectRazorComponentWithTargetPath">
+    <Message Text="RazorComponentWithTargetPath: %(RazorComponentWithTargetPath.Identity) %(RazorComponentWithTargetPath.TargetPath) %(RazorComponentWithTargetPath.GeneratedOutput) %(RazorComponentWithTargetPath.GeneratedDeclaration)" Importance="High" />
+  </Target>
+
   <Target Name="_IntrospectRazorEmbeddedResources">
     <Message Text="CompileResource: %(_RazorCoreCompileResourceInputs.Identity) %(_RazorCoreCompileResourceInputs.LogicalName)" Importance="High" />
   </Target>