.NET Core resx support

eng/Packages.props

@@ -31,6 +31,7 @@
     <PackageReference Update="System.Net.Http" Version="4.3.0" />
     <PackageReference Update="System.Reflection.Metadata" Version="1.6.0" />
     <PackageReference Update="System.Reflection.TypeExtensions" Version="4.1.0" />
+    <PackageReference Update="System.Resources.Extensions" Version="$(SystemResourcesExtensionsVersion)" />
     <PackageReference Update="System.Resources.Writer" Version="4.0.0" />
     <PackageReference Update="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Update="System.Runtime.Loader" Version="4.0.0" />

eng/Version.Details.xml

@@ -6,4 +6,10 @@
       <Sha>b5016f5688dc8ca9f3e4811ee7e2e86ad8907a40</Sha>
     </Dependency>
   </ToolsetDependencies>
+  <ProductDependencies>
+    <Dependency Name="System.Resources.Extensions" Version="4.6.0-preview7.19311.1">
+      <Uri>https://github.com/dotnet/corefx</Uri>
+      <Sha>a78bd7308555926f88aad3d0ecaaebae0f9204cc</Sha>
+    </Dependency>
+  </ProductDependencies>
 </Dependencies>

eng/Versions.props

@@ -6,6 +6,7 @@
     <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
         $(RestoreSources);
+        https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
         https://dotnet.myget.org/F/roslyn/api/v3/index.json;
         https://dotnet.myget.org/F/nuget-build/api/v3/index.json;
         https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
@@ -32,4 +33,8 @@
   <PropertyGroup>
     <DotNetCliVersion>3.0.100-preview5-011568</DotNetCliVersion>
   </PropertyGroup>
+  <!-- Product Dependencies -->
+  <PropertyGroup>
+    <SystemResourcesExtensionsVersion>4.6.0-preview7.19311.1</SystemResourcesExtensionsVersion>
+  </PropertyGroup>
 </Project>

ref/Microsoft.Build.Tasks.Core/net/Microsoft.Build.Tasks.Core.cs

@@ -547,6 +547,7 @@ public GenerateResource() { }
         public string TrackerLogDirectory { get { throw null; } set { } }
         public string TrackerSdkPath { get { throw null; } set { } }
         public bool TrackFileAccess { get { throw null; } set { } }
+        public bool UsePreserializedResources { get { throw null; } set { } }
         public bool UseSourcePath { get { throw null; } set { } }
         public override bool Execute() { throw null; }
     }

ref/Microsoft.Build.Tasks.Core/netstandard/Microsoft.Build.Tasks.Core.cs

@@ -354,6 +354,7 @@ public GenerateResource() { }
         public string TrackerLogDirectory { get { throw null; } set { } }
         public string TrackerSdkPath { get { throw null; } set { } }
         public bool TrackFileAccess { get { throw null; } set { } }
+        public bool UsePreserializedResources { get { throw null; } set { } }
         public bool UseSourcePath { get { throw null; } set { } }
         public override bool Execute() { throw null; }
     }

src/Directory.BeforeCommon.targets

@@ -55,7 +55,6 @@
     <DefineConstants>$(DefineConstants);FEATURE_LEGACY_GETCURRENTDIRECTORY</DefineConstants>
     <!-- Path.GetFullPath The pre .Net 4.6.2 implementation of Path.GetFullPath is slow and creates strings in its work. -->
     <DefineConstants>$(DefineConstants);FEATURE_LEGACY_GETFULLPATH</DefineConstants>
-    <DefineConstants>$(DefineConstants);FEATURE_LINKED_RESOURCES</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_NAMED_PIPE_SECURITY_CONSTRUCTOR</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_OSVERSION</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_PERFORMANCE_COUNTERS</DefineConstants>

src/Shared/Traits.cs

@@ -164,6 +164,14 @@ internal class EscapeHatches
         /// </summary>
         public readonly bool EnsureStdOutForChildNodesIsPrimaryStdout = Environment.GetEnvironmentVariable("MSBUILDENSURESTDOUTFORTASKPROCESSES") == "1";
 
+        /// <summary>
+        /// Use the original, string-only resx parsing in .NET Core scenarios.
+        /// </summary>
+        /// <remarks>
+        /// Escape hatch for problems arising from https://github.com/microsoft/msbuild/pull/4420.
+        /// </remarks>
+        public readonly bool UseMinimalResxParsingInCoreScenarios = Environment.GetEnvironmentVariable("MSBUILDUSEMINIMALRESX") == "1";
+
         private static bool? ParseNullableBoolFromEnvironmentVariable(string environmentVariable)
         {
             var value = Environment.GetEnvironmentVariable(environmentVariable);

src/Shared/UnitTests/TestEnvironment.cs

@@ -612,12 +612,11 @@ public override void Revert()
         {
             // Basic checks to make sure we're not deleting something very obviously wrong (e.g.
             // the entire temp drive).
-            Assert.NotNull(Path);
-            Assert.NotEqual(string.Empty, Path);
-            Assert.NotEqual(@"\", Path);
-            Assert.NotEqual(@"/", Path);
-            Assert.NotEqual(System.IO.Path.GetFullPath(System.IO.Path.GetTempPath()), System.IO.Path.GetFullPath(Path));
-            Assert.True(System.IO.Path.IsPathRooted(Path));
+            Path.ShouldNotBeNullOrEmpty();
+            Path.ShouldNotBe(@"\");
+            Path.ShouldNotBe(@"/");
+            System.IO.Path.GetFullPath(Path).ShouldNotBe(System.IO.Path.GetFullPath(System.IO.Path.GetTempPath()));
+            System.IO.Path.IsPathRooted(Path).ShouldBeTrue(() => $"{Path} is not rooted");
 
             FileUtilities.DeleteDirectoryNoThrow(Path, true);
         }

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

@@ -99,14 +99,14 @@
     <Compile Remove="DependentAssembly_Tests.cs" />
     <Compile Remove="ErrorWarningMessage_Tests.cs" />
     <Compile Remove="FindInvalidProjectReferences_Tests.cs" />
-    <Compile Remove="GenerateResourceOutOfProc_Tests.cs" />
+    <Compile Remove="ResourceHandling\GenerateResourceOutOfProc_Tests.cs" />
+    <Compile Remove="ResourceHandling\ResGen_Tests.cs" />
+    <Compile Remove="ResourceHandling\ResGenDependencies_Tests.cs" />
     <Compile Remove="GetInstalledSDKLocations_Tests.cs" />
     <Compile Remove="GetSDKReference_Tests.cs" />
     <Compile Remove="LC_Tests.cs" />
     <Compile Remove="MockTypeInfo.cs" />
     <Compile Remove="MockTypeLib.cs" />
-    <Compile Remove="ResGen_Tests.cs" />
-    <Compile Remove="ResGenDependencies_Tests.cs" />
     <Compile Remove="AssemblyDependency\AssemblyFoldersFromConfig_Tests.cs" />
     <Compile Remove="AssemblyDependency\FilePrimary.cs" />
     <Compile Remove="AssemblyDependency\GlobalAssemblyCacheTests.cs" />
@@ -140,6 +140,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="ResourceHandling\*.txt" CopyToOutputDirectory="PreserveNewest" />
     <None Update="TestResources\lorem.bin">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/Tasks.UnitTests/GenerateResource_Tests.cs → src/Tasks.UnitTests/ResourceHandling/GenerateResource_Tests.cs

@@ -20,7 +20,7 @@ namespace Microsoft.Build.UnitTests.GenerateResource_Tests.InProc
 {
     [Trait("Category", "mono-osx-failing")]
     [Trait("Category", "mono-windows-failing")]
-    public sealed class RequiredTransformations
+    public sealed class RequiredTransformations : IDisposable
     {
         private readonly TestEnvironment _env;
         private readonly ITestOutputHelper _output;
@@ -31,6 +31,11 @@ public RequiredTransformations(ITestOutputHelper output)
             _output = output;
         }
 
+        public void Dispose()
+        {
+            _env.Dispose();
+        }
+
         /// <summary>
         ///  ResX to Resources, no references
         /// </summary>
@@ -363,17 +368,14 @@ public void ForceOutOfDateByDeletion()
         /// <summary>
         ///  Force out-of-date with ShouldRebuildResgenOutputFile on the linked file
         /// </summary>
-#if FEATURE_LINKED_RESOURCES
-        [Fact]
-#else
-        [Fact(Skip = "https://github.com/Microsoft/msbuild/issues/1247")]
-#endif
-        public void ForceOutOfDateLinked()
+        [Theory]
+        [MemberData(nameof(Utilities.UsePreserializedResourceStates), MemberType = typeof(Utilities))]
+        public void ForceOutOfDateLinked(bool usePreserialized)
         {
             string bitmap = Utilities.CreateWorldsSmallestBitmap();
             string resxFile = Utilities.WriteTestResX(false, bitmap, null, false);
 
-            GenerateResource t = Utilities.CreateTask(_output);
+            GenerateResource t = Utilities.CreateTask(_output, usePreserialized, _env);
             t.StateFile = new TaskItem(Utilities.GetTempFileName(".cache"));
 
             try
@@ -382,27 +384,29 @@ public void ForceOutOfDateLinked()
 
                 Utilities.ExecuteTask(t);
 
-                string resourcesFile = t.OutputResources[0].ItemSpec;
-                Assert.Equal(".resources", Path.GetExtension(resourcesFile));
-                resourcesFile = t.FilesWritten[0].ItemSpec;
-                Assert.Equal(".resources", Path.GetExtension(resourcesFile));
-
+                Path.GetExtension(t.OutputResources[0].ItemSpec).ShouldBe(".resources");
+                Path.GetExtension(t.FilesWritten[0].ItemSpec).ShouldBe(".resources");
+
                 Utilities.AssertStateFileWasWritten(t);
 
-                GenerateResource t2 = Utilities.CreateTask(_output);
+                GenerateResource t2 = Utilities.CreateTask(_output, usePreserialized, _env);
                 t2.StateFile = new TaskItem(t.StateFile);
                 t2.Sources = new ITaskItem[] { new TaskItem(resxFile) };
 
-                DateTime time = File.GetLastWriteTime(t.OutputResources[0].ItemSpec);
+                DateTime firstWriteTime = File.GetLastWriteTime(t.OutputResources[0].ItemSpec);
                 System.Threading.Thread.Sleep(200);
-                File.SetLastWriteTime(bitmap, DateTime.Now);
+                File.SetLastWriteTime(bitmap, DateTime.Now + TimeSpan.FromSeconds(2));
 
                 Utilities.ExecuteTask(t2);
 
-                Assert.True(DateTime.Compare(File.GetLastWriteTime(t2.OutputResources[0].ItemSpec), time) > 0);
+                File.GetLastWriteTime(t2.OutputResources[0].ItemSpec).ShouldBeGreaterThan(firstWriteTime);
 
-                // ToUpper because WriteTestResX uppercases links
-                Utilities.AssertLogContainsResource(t2, "GenerateResource.LinkedInputNewer", bitmap.ToUpper(), t2.OutputResources[0].ItemSpec);
+                Utilities.AssertLogContainsResource(
+                    t2,
+                    "GenerateResource.LinkedInputNewer",
+                    // ToUpper because WriteTestResX uppercases links
+                    NativeMethodsShared.IsWindows ? bitmap.ToUpper() : bitmap,
+                    t2.OutputResources[0].ItemSpec);
             }
             finally
             {
@@ -419,42 +423,44 @@ public void ForceOutOfDateLinked()
             }
         }
 
-#if FEATURE_LINKED_RESOURCES
-        [Fact]
-#else
-        [Fact(Skip = "https://github.com/Microsoft/msbuild/issues/1247")]
-#endif
-        public void ForceOutOfDateLinkedByDeletion()
+        [Theory]
+        [MemberData(nameof(Utilities.UsePreserializedResourceStates), MemberType = typeof(Utilities))]
+        public void ForceOutOfDateLinkedByDeletion(bool usePreserialized)
         {
             string bitmap = Utilities.CreateWorldsSmallestBitmap();
             string resxFile = Utilities.WriteTestResX(false, bitmap, null, false);
 
-            GenerateResource t = Utilities.CreateTask(_output);
+            GenerateResource t = Utilities.CreateTask(_output, usePreserialized, _env);
             t.StateFile = new TaskItem(Utilities.GetTempFileName(".cache"));
 
+            t.UsePreserializedResources = usePreserialized;
+
             try
             {
                 t.Sources = new ITaskItem[] { new TaskItem(resxFile) };
 
                 Utilities.ExecuteTask(t);
 
-                string resourcesFile = t.OutputResources[0].ItemSpec;
-                Path.GetExtension(resourcesFile).ShouldBe(".resources");
-                resourcesFile = t.FilesWritten[0].ItemSpec;
-                Path.GetExtension(resourcesFile).ShouldBe(".resources");
-
+                Path.GetExtension(t.OutputResources[0].ItemSpec).ShouldBe(".resources");
+                Path.GetExtension(t.FilesWritten[0].ItemSpec).ShouldBe(".resources");
+
                 Utilities.AssertStateFileWasWritten(t);
 
-                GenerateResource t2 = Utilities.CreateTask(_output);
+                GenerateResource t2 = Utilities.CreateTask(_output, usePreserialized, _env);
                 t2.StateFile = new TaskItem(t.StateFile);
                 t2.Sources = new ITaskItem[] { new TaskItem(resxFile) };
+                t2.UsePreserializedResources = usePreserialized;
 
                 File.Delete(bitmap);
 
                 t2.Execute().ShouldBeFalse();
 
                 // ToUpper because WriteTestResX uppercases links
-                Utilities.AssertLogContainsResource(t2, "GenerateResource.LinkedInputDoesntExist", bitmap.ToUpper());
+                Utilities.AssertLogContainsResource(
+                    t2,
+                    "GenerateResource.LinkedInputDoesntExist",
+                    // ToUpper because WriteTestResX uppercases links
+                    NativeMethodsShared.IsWindows ? bitmap.ToUpper() : bitmap);
             }
             finally
             {
@@ -531,19 +537,18 @@ public void ForceSomeOutOfDate()
         /// <summary>
         ///  Allow ShouldRebuildResgenOutputFile to return "false" since nothing's out of date, including linked file
         /// </summary>
-#if FEATURE_RESX_RESOURCE_READER
-        [Fact]
-#else
-        [Fact(Skip = "https://github.com/Microsoft/msbuild/issues/1247")]
-#endif
-        public void AllowLinkedNoGenerate()
+        [Theory]
+        [MemberData(nameof(Utilities.UsePreserializedResourceStates), MemberType = typeof(Utilities))]
+        public void AllowLinkedNoGenerate(bool usePreserialized)
         {
             string bitmap = Utilities.CreateWorldsSmallestBitmap();
             string resxFile = Utilities.WriteTestResX(false, bitmap, null, false);
 
-            GenerateResource t = Utilities.CreateTask(_output);
+            GenerateResource t = Utilities.CreateTask(_output, usePreserialized, _env);
             t.StateFile = new TaskItem(Utilities.GetTempFileName(".cache"));
 
+            t.UsePreserializedResources = usePreserialized;
+
             try
             {
                 t.Sources = new ITaskItem[] { new TaskItem(resxFile) };
@@ -559,7 +564,7 @@ public void AllowLinkedNoGenerate()
 
                 DateTime time = File.GetLastWriteTime(t.OutputResources[0].ItemSpec);
 
-                GenerateResource t2 = Utilities.CreateTask(_output);
+                GenerateResource t2 = Utilities.CreateTask(_output, usePreserialized, _env);
                 t2.StateFile = new TaskItem(t.StateFile);
                 t2.Sources = new ITaskItem[] { new TaskItem(resxFile) };
 
@@ -2591,9 +2596,8 @@ public References(ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait("Category", "netcore-osx-failing")]
-        [Trait("Category", "netcore-linux-failing")] // https://github.com/Microsoft/msbuild/issues/309
-        [Trait("Category", "mono-osx-failing")] // https://github.com/Microsoft/msbuild/issues/677
+        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp, "Linked resources not supported on Core: https://github.com/microsoft/msbuild/issues/4094")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "https://github.com/Microsoft/msbuild/issues/677")]
         public void DontLockP2PReferenceWhenResolvingSystemTypes()
         {
             // This WriteLine is a hack.  On a slow machine, the Tasks unittest fails because remoting
@@ -2769,9 +2773,8 @@ public class Class1
         /// Assembly.LoadFrom instead.
         /// </summary>
         [Fact]
-        [Trait("Category", "netcore-osx-failing")]
-        [Trait("Category", "netcore-linux-failing")] // https://github.com/Microsoft/msbuild/issues/309
-        [Trait("Category", "mono-osx-failing")] // https://github.com/Microsoft/msbuild/issues/677
+        [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp, "Linked resources not supported on Core: https://github.com/microsoft/msbuild/issues/4094")]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "https://github.com/Microsoft/msbuild/issues/677")]
         public void ReferencedAssemblySpecifiedUsingRelativePath()
         {
             // This WriteLine is a hack.  On a slow machine, the Tasks unittest fails because remoting
@@ -3379,7 +3382,7 @@ public static void ExecuteTask(GenerateResource t)
         /// This method creates a GenerateResource task and performs basic setup on it, e.g. BuildEngine
         /// </summary>
         /// <param name="output"></param>
-        public static GenerateResource CreateTask(ITestOutputHelper output)
+        public static GenerateResource CreateTask(ITestOutputHelper output, bool usePreserialized = false, TestEnvironment env = null)
         {
             // always use the internal ctor that says don't perform separate app domain check
             GenerateResource t = new GenerateResource();
@@ -3388,6 +3391,27 @@ public static GenerateResource CreateTask(ITestOutputHelper output)
             // Make the task execute in-proc
             t.ExecuteAsTool = false;
 
+            if (usePreserialized)
+            {
+                t.UsePreserializedResources = usePreserialized;
+
+                // Synthesize a reference that looks close enough to System.Resources.Extensions
+                // to pass the "is it ok to use preserialized resources?" check
+
+                var folder = env.CreateFolder(true);
+                var dll = folder.CreateFile("System.Resource.Extensions.dll");
+
+                // Make sure the reference looks old relative to all the other inputs
+                File.SetLastWriteTime(dll.Path, DateTime.Now - TimeSpan.FromDays(30));
+
+                var referenceItem = new TaskItem(dll.Path);
+                referenceItem.SetMetadata(Tasks.ItemMetadataNames.fusionName, "System.Resources.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51");
+
+                t.References = new ITaskItem[] {
+                    referenceItem
+                };
+            }
+
             return t;
         }
 
@@ -3752,6 +3776,17 @@ public static void STRNamespaceTestHelper(string strLanguage, string resourcesNa
                 }
             }
         }
+
+        public static IEnumerable<object[]> UsePreserializedResourceStates()
+        {
+            // All MSBuilds should be able to use the new resource codepaths
+            yield return new object[] { true };
+
+#if FEATURE_RESX_RESOURCE_READER
+            // But the old get-live-objects codepath is supported only on full framework.
+            yield return new object[] { false };
+#endif
+        }
     }
 
     /// <summary>