From 064dcd7bdf7f9a83fa52f682a91765e3d4791085 Mon Sep 17 00:00:00 2001
From: ThomasGoulet73 <thomas.goulet-73@outlook.com>
Date: Sat, 1 Apr 2023 00:30:25 -0400
Subject: [PATCH] Cleanup following replacing resource constants with
 properties.

Closes dotnet/wpf#1
---
 eng/WpfArcadeSdk/tools/SystemResources.props  | 27 ++-----------------
 .../src/Common/src/System/SR.cs               |  4 ---
 .../System.Windows.Input.Manipulations.csproj |  3 +++
 .../UIAutomationTypes.csproj                  |  3 +++
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/SystemResources.props b/eng/WpfArcadeSdk/tools/SystemResources.props
index de2392889d7..315f20a6d27 100644
--- a/eng/WpfArcadeSdk/tools/SystemResources.props
+++ b/eng/WpfArcadeSdk/tools/SystemResources.props
@@ -10,37 +10,14 @@
     -->
     <GenerateResxSource>true</GenerateResxSource>
 
-    <_GenerateResourcesCodeAsConstants>true</_GenerateResourcesCodeAsConstants>
-
-    <!-- 
-         Projects that compile XAML must also check for AssemblyName because XAML compilation generates a temporary project with a different project name.
-         We use AssemblyName because AssemblyName is copied from the main project to the generated project.
-    -->
-
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='PresentationBuildTasks'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='PresentationCore'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='PresentationFramework'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='PresentationUI' or '$(AssemblyName)'=='PresentationUI'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='ReachFramework'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='UIAutomationClient'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='UIAutomationClientSideProviders'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='UIAutomationProvider'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='System.Windows.Controls.Ribbon' or '$(AssemblyName)'=='System.Windows.Controls.Ribbon'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='System.Xaml'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='WindowsBase'">false</_GenerateResourcesCodeAsConstants>
-    <_GenerateResourcesCodeAsConstants Condition="'$(MSBuildProjectName)'=='WindowsFormsIntegration'">false</_GenerateResourcesCodeAsConstants>
-
-    <DefineConstants Condition="'$(_GenerateResourcesCodeAsConstants)'=='true'">$(DefineConstants);GENERATE_RESOURCES_CODE_AS_CONSTANTS</DefineConstants>
-
     <!-- We define our own implementation of GetResourceString -->
-    <GenerateResxSourceOmitGetResourceString Condition="'$(_GenerateResourcesCodeAsConstants)'!='true'">true</GenerateResxSourceOmitGetResourceString>
+    <GenerateResxSourceOmitGetResourceString>true</GenerateResxSourceOmitGetResourceString>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
     <EmbeddedResource>
       <GenerateSource>true</GenerateSource>
       <ManifestResourceName>FxResources.$(AssemblyName).SR</ManifestResourceName>
-      <GenerateResourcesCodeAsConstants>$(_GenerateResourcesCodeAsConstants)</GenerateResourcesCodeAsConstants>
 
       <ClassName Condition="'$(AssemblyName)'=='PresentationBuildTasks'">MS.Utility.SR</ClassName>
       <ClassName Condition="'$(AssemblyName)'=='UIAutomationClient'">System.SR</ClassName>
@@ -56,7 +33,7 @@
       <ClassName Condition="'$(AssemblyName)'=='WindowsFormsIntegration'">System.Windows.SR</ClassName>
       <ClassName Condition="'$(AssemblyName)'=='PresentationCore'">MS.Internal.PresentationCore.SR</ClassName>
       <ClassName Condition="'$(AssemblyName)'=='System.Xaml'">System.SR</ClassName>
-      <Classname Condition="'%(ClassName)'==''">System.SRID</Classname>
+      <Classname Condition="'%(ClassName)'==''">System.SR</Classname>
     </EmbeddedResource>
   </ItemDefinitionGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs b/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs
index 18256620e99..8c7a93ec6fb 100644
--- a/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs
@@ -30,10 +30,6 @@ namespace System
 {
     internal partial class SR
     {
-#if GENERATE_RESOURCES_CODE_AS_CONSTANTS
-        private static ResourceManager ResourceManager => SRID.ResourceManager;
-#endif
-
         // This method is used to decide if we need to append the exception message parameters to the message when calling SR.Format.
         // by default it returns false.
         [MethodImpl(MethodImplOptions.NoInlining)]
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj
index a727e9bbb3a..fefa5242322 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj
@@ -7,6 +7,9 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.resx"/>
+    <Compile Include="$(WpfCommonDir)src\System\SR.cs">
+        <Link>Common\System\SR.cs</Link>
+    </Compile>
     <Compile Include="System\Windows\Input\Manipulations\DoubleUtil.cs" />
     <Compile Include="System\Windows\Input\Manipulations\Exceptions.cs" />
     <Compile Include="System\Windows\Input\Manipulations\GlobalSuppressions.cs" />
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj
index 2352762c376..f6fc49fef02 100644
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj
@@ -15,6 +15,9 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Resources\Strings.resx" />
+    <Compile Include="$(WpfCommonDir)src\System\SR.cs">
+        <Link>Common\System\SR.cs</Link>
+    </Compile>
     <Compile Include="$(WpfSharedDir)\RefAssemblyAttrs.cs" />
     <Compile Include="$(WpfSharedDir)\System\Windows\Interop\OperatingSystemVersion.cs" />
     <Compile Include="$(WpfSharedDir)\System\Windows\Interop\OSVersionHelper.cs" />