diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index c2ee2dbf2a2..1300b5e770d 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -97,7 +97,7 @@
 
     <TargetFramework>net5.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -111,6 +111,27 @@
     <HighEntropyVA>true</HighEntropyVA>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <StronglyTypedOutputFolder>gen</StronglyTypedOutputFolder>
+  </PropertyGroup>
+
+  <Target Name = "CreateDirectories" BeforeTargets = "BeforeResGen">
+    <MakeDir
+       Directories = "$(StronglyTypedOutputFolder)"/>
+  </Target>
+
+  <ItemGroup>
+    <!-- We skip this for Microsoft.Management.UI.Internal because we have to use a workaround for WPF project. See https://github.com/microsoft/msbuild/issues/4751 -->
+    <EmbeddedResource Update = "resources/*.resx" Condition = "'$(MSBuildProjectName)' != 'Microsoft.Management.UI.Internal'">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <StronglyTypedLanguage>CSharp</StronglyTypedLanguage>
+
+      <StronglyTypedFileName>$(StronglyTypedOutputFolder)/%(Filename).cs</StronglyTypedFileName>
+      <StronglyTypedClassName>%(Filename)</StronglyTypedClassName>
+      <StronglyTypedManifestPrefix>$(RootNamespace).resources</StronglyTypedManifestPrefix>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
     <IsWindows Condition="'$(IsWindows)' =='true' or ( '$(IsWindows)' == '' and '$(OS)' == 'Windows_NT')">true</IsWindows>
diff --git a/build.psm1 b/build.psm1
index 2454ada262b..bb5e90649e8 100644
--- a/build.psm1
+++ b/build.psm1
@@ -430,10 +430,10 @@ Fix steps:
 
     # handle ResGen
     # Heuristic to run ResGen on the fresh machine
-    if ($ResGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.ConsoleHost/gen")) {
-        Write-Log -message "Run ResGen (generating C# bindings for resx files)"
-        Start-ResGen
-    }
+    #if ($ResGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.ConsoleHost/gen")) {
+    #    Write-Log -message "Run ResGen (generating C# bindings for resx files)"
+    #    Start-ResGen
+    #}
 
     # Handle TypeGen
     # .inc file name must be different for Windows and Linux to allow build on Windows and WSL.
diff --git a/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj b/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
index 466511d6d22..5063d5aaca1 100644
--- a/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
+++ b/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="15.0" InitialTargets = "PSResources">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>Assembly containing WPF code for Out-GridView, HelpWindow, and Show-Command</Description>
@@ -12,6 +12,66 @@
     <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <StronglyTypedOutputFolder>gen</StronglyTypedOutputFolder>
+    <SkipWPFcsproj>$([System.String]::Copy('$(MSBuildProjectFile)').Contains('wpftmp'))</SkipWPFcsproj>
+  </PropertyGroup>
+
+  <Target Name = "CreateDirectories" BeforeTargets = "PSResources">
+    <MakeDir
+       Directories = "$(StronglyTypedOutputFolder)"/>
+  </Target>
+
+  <ItemGroup>
+    <!-- We have to use the workaround for the WPF project.
+        .Net 5 Preview.2 has some issues with WPF projects:
+          - Strong typed resources does not work as expected out of box.
+            (Really they are not generated at all.)
+            So we assign items in 'PSEmbeddedResource' to expected format
+            and explicitly call 'GenerateResource' task from custom 'PSResources' target.
+          - .Net 5 Preview.2 generates a temporory csproj file
+            that duplicates call our custom 'PSResources' target.
+            To avoid this we skip a project with 'wpftmp' in name.
+    -->
+    <PSEmbeddedResource Include = "resources/*.resx" Condition = "'$(SkipWPFcsproj)' == 'false'">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <StronglyTypedLanguage>CSharp</StronglyTypedLanguage>
+
+      <PublicClass>$([System.String]::new('%(Filename)').StartsWith('Public', System.StringComparison.OrdinalIgnoreCase))</PublicClass>
+
+      <StronglyTypedManifestPrefix>$(RootNamespace).resources</StronglyTypedManifestPrefix>
+      <StronglyTypedManifestPrefix Condition = "'%(PublicClass)' == 'true'">$(RootNamespace).resources.public</StronglyTypedManifestPrefix>
+
+      <StronglyTypedFileName>$(StronglyTypedOutputFolder)/%(Filename).cs</StronglyTypedFileName>
+      <StronglyTypedFileName Condition = "'%(PublicClass)' == 'true'">$(StronglyTypedOutputFolder)/$([System.String]::Copy('%(Filename)').Substring(7)).cs</StronglyTypedFileName>
+
+      <StronglyTypedClassName>%(Filename)</StronglyTypedClassName>
+      <StronglyTypedClassName Condition = "'%(PublicClass)' == 'true'">$([System.String]::Copy('%(Filename)').Substring(7))</StronglyTypedClassName>
+
+      <ManifestResourceName>$(RootNamespace).resources.%(PSEmbeddedResource.StronglyTypedClassName)</ManifestResourceName>
+      <ManifestResourceName Condition = "'%(PublicClass)' == 'true'">$(RootNamespace).resources.public.%(PSEmbeddedResource.StronglyTypedClassName)</ManifestResourceName>
+    </PSEmbeddedResource>
+  </ItemGroup>
+
+  <Target Name="PSResources" Condition = "'$(SkipWPFcsproj)' == 'false'">
+    <GenerateResource
+      Sources="@(PSEmbeddedResource)"
+      UseSourcePath="true"
+      StateFile="$(StronglyTypedOutputFolder)/$(MSBuildProjectFile).GenerateResource.cache"
+      StronglyTypedClassName="%(PSEmbeddedResource.StronglyTypedClassName)"
+      StronglyTypedFileName="%(PSEmbeddedResource.StronglyTypedFileName)"
+      StronglyTypedLanguage="%(PSEmbeddedResource.StronglyTypedLanguage)"
+      StronglyTypedNamespace="%(PSEmbeddedResource.StronglyTypedNamespace)"
+      StronglyTypedManifestPrefix="%(PSEmbeddedResource.StronglyTypedManifestPrefix)"
+      PublicClass="%(PSEmbeddedResource.PublicClass)"
+      OutputResources="@(PSEmbeddedResource->'$(StronglyTypedOutputFolder)/%(ManifestResourceName).resources')"
+      ExecuteAsTool="false"
+      MSBuildRuntime="$(GenerateResourceMSBuildRuntime)"
+      MSBuildArchitecture="$(GenerateResourceMSBuildArchitecture)">
+
+    </GenerateResource>
+  </Target>
+
   <ItemGroup>
     <Resource Include="resources\Graphics\Add16.png" />
     <Resource Include="resources\Graphics\CloseTile16.png" />