Make StronglyTypedResourceGenerator work on .NET Core

build/Packages.props

@@ -30,6 +30,7 @@
     <PackageReference Update="System.Collections.Concurrent" Version="4.3.0" />
     <!-- Update binding redirect in app.config and app.amd64.config when changing this -->
     <PackageReference Update="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Update="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Update="System.Diagnostics.TraceSource" Version="4.0.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.FileSystem.Primitives" Version="4.3.0" />
@@ -42,7 +43,7 @@
     <PackageReference Update="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Update="System.Runtime.Loader" Version="4.0.0" />
     <PackageReference Update="System.Runtime.Serialization.Primitives" Version="4.1.1" />
-    <PackageReference Update="System.Security.Principal.Windows" Version="4.3.0" />
+    <PackageReference Update="System.Security.Principal.Windows" Version="4.5.0" />
     <PackageReference Update="System.Text.Encoding.CodePages" Version="4.0.1" />
 
     <!-- Update binding redirect in app.config and app.amd64.config when changing this -->

src/Directory.BeforeCommon.targets

@@ -105,6 +105,7 @@
     <DefineConstants>$(DefineConstants);FEATURE_WORKINGSET</DefineConstants>
     <DefineConstants Condition="'$(MonoBuild)' != 'true' and '$(MachineIndependentBuild)' != 'true'">$(DefineConstants);FEATURE_VISUALSTUDIOSETUP</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_MSCOREE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_WINFORMS_RESX</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>

src/Tasks.UnitTests/GenerateResource_Tests.cs

@@ -846,7 +846,9 @@ public void StronglyTypedResources()
                 Assert.Equal(Path.GetExtension(resourcesFile), ".resources");
                 resourcesFile = t.FilesWritten[0].ItemSpec;
                 Assert.Equal(Path.GetExtension(resourcesFile), ".resources");
+#if FEATURE_RESGENCACHE
                 Utilities.AssertStateFileWasWritten(t);
+#endif
                 // Files written should contain STR class file
                 string stronglyTypedFileName = Path.ChangeExtension(t.Sources[0].ItemSpec, ".cs");
                 Assert.Equal(t.FilesWritten[2].ItemSpec, stronglyTypedFileName);
@@ -910,7 +912,9 @@ public void StronglyTypedResourcesUpToDate()
                 resourcesFile = t.FilesWritten[0].ItemSpec;
                 Assert.Equal(Path.GetExtension(resourcesFile), ".resources");
 
+#if FEATURE_RESGENCACHE
                 Utilities.AssertStateFileWasWritten(t);
+#endif
                 // Files written should contain STR class file
                 string stronglyTypedFileName = Path.ChangeExtension(t.Sources[0].ItemSpec, ".cs");
                 Assert.Equal(t.FilesWritten[2].ItemSpec, stronglyTypedFileName);
@@ -940,7 +944,9 @@ public void StronglyTypedResourcesUpToDate()
                 Assert.Equal(t2.OutputResources[0].ItemSpec, resourcesFile);
                 Assert.Equal(t2.FilesWritten[0].ItemSpec, resourcesFile);
 
+#if FEATURE_RESGENCACHE
                 Utilities.AssertStateFileWasWritten(t2);
+#endif
                 Assert.Equal(t2.FilesWritten[2].ItemSpec, Path.ChangeExtension(t2.Sources[0].ItemSpec, ".cs"));
             }
             finally
@@ -1144,7 +1150,9 @@ public void StronglyTypedResourcesVB()
                 resourcesFile = t.FilesWritten[0].ItemSpec;
                 Assert.Equal(Path.GetExtension(resourcesFile), ".resources");
 
+#if FEATURE_RESGENCACHE
                 Utilities.AssertStateFileWasWritten(t);
+#endif
                 Assert.True(File.Exists(stronglyTypedFileName));
 
                 Utilities.AssertLogContainsResource(t, "GenerateResource.ProcessingFile", textFile, resourcesFile);
@@ -1200,7 +1208,9 @@ public void StronglyTypedResourcesWithoutNamespaceOrClassOrFilename()
                 resourcesFile = t.FilesWritten[0].ItemSpec;
                 Assert.Equal(Path.GetExtension(resourcesFile), ".resources");
 
+#if FEATURE_RESGENCACHE
                 Utilities.AssertStateFileWasWritten(t);
+#endif
 
                 // Should have defaulted the STR filename to the bare output resource name + ".cs"
                 string STRfile = Path.ChangeExtension(t.Sources[0].ItemSpec, ".cs");
@@ -1922,7 +1932,9 @@ public void StronglyTypedClassName()
                 // Verify class was public, as we specified
                 Assert.True(File.ReadAllText(t.StronglyTypedFileName).Contains("public class " + t.StronglyTypedClassName));
 
+#if FEATURE_RESGENCACHE
                 Utilities.AssertStateFileWasWritten(t);
+#endif
             }
             finally
             {
@@ -1970,7 +1982,9 @@ public void StronglyTypedFileName()
                 Assert.Equal(t.StronglyTypedFileName, Path.ChangeExtension(t.Sources[0].ItemSpec, ".cs"));
                 Assert.True(File.Exists(t.StronglyTypedFileName));
 
+#if FEATURE_RESGENCACHE
                 Utilities.AssertStateFileWasWritten(t);
+#endif
 
                 // Verify class was internal, since we didn't specify a preference
                 Assert.True(File.ReadAllText(t.StronglyTypedFileName).Contains("internal class " + t.StronglyTypedClassName));
@@ -3628,7 +3642,9 @@ public static void STRNamespaceTestHelper(string strLanguage, string resourcesNa
                 resourcesFile = t.FilesWritten[0].ItemSpec;
                 Assert.Equal(Path.GetExtension(resourcesFile), ".resources");
 
+#if FEATURE_RESGENCACHE
                 Utilities.AssertStateFileWasWritten(t);
+#endif
 
                 // Files written should contain STR class file
                 Assert.Equal(Path.ChangeExtension(t.Sources[0].ItemSpec, codeFileExtension), t.StronglyTypedFileName);

src/Tasks.UnitTests/Microsoft.Build.Tasks.UnitTests.csproj

@@ -8,7 +8,7 @@
 
     <AssemblyName>Microsoft.Build.Tasks.UnitTests</AssemblyName>
     <IsTestProject>true</IsTestProject>
-    <DefineConstants>$(DefineConstants);MICROSOFT_BUILD_TASKS_UNITTESTS</DefineConstants>
+    <DefineConstants>$(DefineConstants);MICROSOFT_BUILD_TASKS_UNITTESTS;FEATURE_CODEDOM</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

src/Tasks.UnitTests/WriteCodeFragment_Tests.cs

@@ -464,13 +464,9 @@ public void MultilineAttributeCSharp()
         private static readonly string WindowsNewLine = $"{VBCarriageReturn}&{VBLineFeed}";
 
         public static readonly string VBLineSeparator =
-#if FEATURE_CODEDOM
-            WindowsNewLine;
-#else
             NativeMethodsShared.IsWindows
                 ? WindowsNewLine
                 : VBLineFeed;
-#endif
 
         /// <summary>
         /// Multi line argument values should cause a verbatim string to be used

src/Tasks/GenerateResource.cs

@@ -25,9 +25,7 @@
 using System.CodeDom.Compiler;
 using System.Xml;
 using System.Runtime.InteropServices;
-#if FEATURE_SYSTEM_CONFIGURATION
 using System.Configuration;
-#endif
 using System.Security;
 #if FEATURE_RESX_RESOURCE_READER
 using System.ComponentModel.Design;
@@ -3054,8 +3052,26 @@ private void ReadResources(String filename, bool shouldUseSourcePath, String out
                             foreach (XElement dataElem in doc.Element("root").Elements("data"))
                             {
                                 string name = dataElem.Attribute("name").Value;
+                                string typeName = dataElem.Attribute("type")?.Value;
                                 string value = dataElem.Element("value").Value;
-                                AddResource(reader, name, value, filename);
+
+                                if (typeName != null)
+                                {
+                                    int pos = typeName.IndexOf(',');
+                                    if (pos > 0) typeName = typeName.Substring(0, pos); // strip off the assembly name or alias, if any
+                                }
+
+                                if (typeName == "System.Resources.ResXFileRef")
+                                {
+                                    // The "real" type of a ResXFileRef is embedded in the value.
+                                    var pos = value.IndexOf(';');
+                                    if (pos > 0) typeName = value.Substring(pos + 1);
+
+                                    pos = typeName.IndexOf(',');
+                                    if (pos > 0) typeName = typeName.Substring(0, pos);
+                                }
+
+                                AddResource(reader, name, value, filename, typeName);
                             }
                         }
                         break;
@@ -3444,18 +3460,23 @@ public static bool TryCreateCodeDomProvider(TaskLoggingHelper logger, string str
             {
                 provider = CodeDomProvider.CreateProvider(stronglyTypedLanguage);
             }
-#if FEATURE_SYSTEM_CONFIGURATION
             catch (ConfigurationException e)
             {
                 logger.LogErrorWithCodeFromResources("GenerateResource.STRCodeDomProviderFailed", stronglyTypedLanguage, e.Message);
                 return false;
             }
-#endif
             catch (SecurityException e)
             {
                 logger.LogErrorWithCodeFromResources("GenerateResource.STRCodeDomProviderFailed", stronglyTypedLanguage, e.Message);
                 return false;
             }
+            catch (SystemException e)
+            {
+                // The actual exception type thrown (System.CodeDom.Compiler.CodeDomProvider.ConfigurationErrorsException)
+                // is private to the CodeDomProvider class, but it inherits from SystemException.
+                logger.LogErrorWithCodeFromResources("GenerateResource.STRCodeDomProviderFailed", stronglyTypedLanguage, e.Message);
+                return false;
+            }
 
             return provider != null;
         }
@@ -3739,7 +3760,8 @@ private void WriteTextResources(ReaderInfo reader, String fileName)
         /// <param name="inputFileName">Input file for messages</param>
         /// <param name="lineNumber">Line number for messages</param>
         /// <param name="linePosition">Column number for messages</param>
-        private void AddResource(ReaderInfo reader, string name, object value, String inputFileName, int lineNumber, int linePosition)
+        /// <param name="customTypeName">Type name for custom object type</param>
+        private void AddResource(ReaderInfo reader, string name, object value, String inputFileName, int lineNumber, int linePosition, string customTypeName = null)
         {
             Entry entry = new Entry(name, value);
 
@@ -3750,7 +3772,16 @@ private void AddResource(ReaderInfo reader, string name, object value, String in
             }
 
             reader.resources.Add(entry);
-            reader.resourcesHashTable.Add(name, value);
+            if (customTypeName != null)
+            {
+                reader.resourcesHashTable.Add(name, new StronglyTypedResourceBuilder.ResourceData(customTypeName, value));
+            }
+            else
+            {
+                Type valueType = typeof(object);
+                if (value != null) valueType = value.GetType();
+                reader.resourcesHashTable.Add(name, new StronglyTypedResourceBuilder.ResourceData(valueType, value));
+            }
         }
 
         /// <summary>
@@ -3759,9 +3790,9 @@ private void AddResource(ReaderInfo reader, string name, object value, String in
         /// <param name="name">Resource name</param>
         /// <param name="value">Resource value</param>
         /// <param name="inputFileName">Input file for messages</param>
-        private void AddResource(ReaderInfo reader, string name, object value, String inputFileName)
+        private void AddResource(ReaderInfo reader, string name, object value, String inputFileName, string customTypeName = null)
         {
-            AddResource(reader, name, value, inputFileName, 0, 0);
+            AddResource(reader, name, value, inputFileName, 0, 0, customTypeName);
         }
 
         internal sealed class ReaderInfo

src/Tasks/Microsoft.Build.Tasks.csproj

@@ -9,7 +9,7 @@
     <GenerateReferenceAssemblySources>true</GenerateReferenceAssemblySources>
     <AssemblyName>Microsoft.Build.Tasks.Core</AssemblyName>
     <RootNamespace>Microsoft.Build.Tasks</RootNamespace>
-    <DefineConstants>$(DefineConstants);MICROSOFT_BUILD_TASKS</DefineConstants>
+    <DefineConstants>$(DefineConstants);MICROSOFT_BUILD_TASKS;FEATURE_CODEDOM</DefineConstants>
     <CreateTlb>true</CreateTlb>
     <IsPackable>true</IsPackable>
     <Description>This package contains the $(MSBuildProjectName) assembly which implements the commonly used tasks of MSBuild.</Description>
@@ -482,6 +482,7 @@
     <Compile Include="RoslynCodeTaskFactory\RoslynCodeTaskFactoryCodeType.cs" />
     <Compile Include="RoslynCodeTaskFactory\RoslynCodeTaskFactoryCompilers.cs" />
     <Compile Include="RoslynCodeTaskFactory\RoslynCodeTaskFactoryTaskInfo.cs" />
+    <Compile Include="System.Design.cs" />
     <Compile Include="TaskExtension.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
     </Compile>
@@ -512,6 +513,9 @@
     <Compile Include="SystemState.cs" />
     <Compile Include="DependencyFile.cs" />
     <Compile Include="ZipDirectory.cs" />
+    <Compile Include="system.design\stronglytypedresourcebuilder.cs">
+      <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
+    </Compile>
   </ItemGroup>
   <ItemGroup Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
     <Compile Include="Al.cs">
@@ -633,16 +637,12 @@
     <Compile Include="SignFile.cs" Condition="'$(MonoBuild)' != 'true'">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
     </Compile>
-    <Compile Include="system.design\stronglytypedresourcebuilder.cs">
-      <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
-    </Compile>
     <Compile Include="StrongNameException.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
     </Compile>
     <Compile Include="StrongNameUtils.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
     </Compile>
-    <Compile Include="System.Design.cs" />
     <Compile Include="TlbImp.cs" />
     <Compile Include="TlbReference.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
@@ -981,6 +981,7 @@
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
     <PackageReference Include="System.CodeDom" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Linq.Parallel" />
     <PackageReference Include="System.Net.Http" />
     <PackageReference Include="System.Reflection.Metadata" />
@@ -991,6 +992,7 @@
     <!-- Need Win32 API on .NET Core to ping registry to determine long path support -->
     <PackageReference Include="Microsoft.Win32.Registry" />
 
+
     <Content Include="$(NuGetPackageRoot)microsoft.netcore.compilers\$(MicrosoftNetCoreCompilersVersion)\tools\**\*" CopyToOutputDirectory="PreserveNewest" LinkBase="Roslyn" />
   </ItemGroup>
 

src/Tasks/WriteCodeFragment.cs

@@ -139,16 +139,23 @@ private string GenerateCode(out string extension)
             {
                 provider = CodeDomProvider.CreateProvider(Language);
             }
+#if FEATURE_WINFORMS_RESX
             catch (System.Configuration.ConfigurationException ex)
             {
                 Log.LogErrorWithCodeFromResources("WriteCodeFragment.CouldNotCreateProvider", Language, ex.Message);
                 return null;
             }
+#endif
             catch (SecurityException ex)
             {
                 Log.LogErrorWithCodeFromResources("WriteCodeFragment.CouldNotCreateProvider", Language, ex.Message);
                 return null;
             }
+            catch (SystemException ex)
+            {
+                Log.LogErrorWithCodeFromResources("WriteCodeFragment.CouldNotCreateProvider", Language, ex.Message);
+                return null;
+            }
 
             extension = provider.FileExtension;