Merge pull request #15465 from sfoslund/OptIntoWPFFix

Opt into IncludePackageReferencesDuringMarkupCompilation

Author: William Li

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets

@@ -23,6 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <_IsExecutable Condition="'$(OutputType)' == 'Exe' or '$(OutputType)'=='WinExe'">true</_IsExecutable>
     <OutputType Condition="'$(DisableWinExeOutputInference)' != 'true' and '$(OutputType)' == 'Exe' and ('$(UseWindowsForms)' == 'true' or '$(UseWPF)' == 'true')">WinExe</OutputType>
+    <IncludePackageReferencesDuringMarkupCompilation Condition=" '$(IncludePackageReferencesDuringMarkupCompilation)' == '' ">true</IncludePackageReferencesDuringMarkupCompilation>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(HasRuntimeOutput)' == ''">

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs

@@ -237,5 +237,95 @@ public void It_fails_if_target_platform_identifier_and_version_are_invalid()
                 .And
                 .NotHaveStdOutContaining("NETSDK1140");
         }
+
+        [WindowsOnlyFact]
+        public void It_can_use_source_generators_with_wpf()
+        {
+            var sourceGenProject = new TestProject()
+            {
+                Name = "SourceGen",
+                TargetFrameworks = "netstandard2.0"
+            };
+            sourceGenProject.AdditionalProperties.Add("LangVersion", "preview");
+            sourceGenProject.PackageReferences.Add(new TestPackageReference("Microsoft.CodeAnalysis.CSharp", "3.8.0-3.final", privateAssets: "all"));
+            sourceGenProject.PackageReferences.Add(new TestPackageReference("Microsoft.CodeAnalysis.Analyzers", "3.0.0", privateAssets: "all"));
+            sourceGenProject.SourceFiles.Add("Program.cs", SourceGenSourceFile);
+            var sourceGenTestAsset = _testAssetsManager.CreateTestProject(sourceGenProject);
+
+            var testDir = sourceGenTestAsset.Path;
+            var newCommand = new DotnetCommand(Log, "new", "wpf", "-o", "wpfApp", "--no-restore");
+            newCommand.WorkingDirectory = testDir;
+            newCommand.Execute()
+                .Should()
+                .Pass();
+
+            // Reference generated code from a wpf app
+            var projFile = Path.Combine(testDir, "wpfApp", "wpfApp.csproj");
+            File.WriteAllText(projFile, $@"<Project Sdk=`Microsoft.NET.Sdk`>
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net5.0-windows</TargetFramework>
+        <UseWPF>true</UseWPF>
+        <LangVersion>preview</LangVersion>
+    </PropertyGroup>
+    <ItemGroup>
+	    <ProjectReference Include=`..\{sourceGenProject.Name}\{sourceGenProject.Name}.csproj` OutputItemType=`Analyzer` ReferenceOutputAssembly=`false` />
+    </ItemGroup>
+</Project>".Replace('`', '"'));
+            File.WriteAllText(Path.Combine(testDir, "wpfApp", "MainWindow.xaml.cs"), $@"using System.Windows;
+namespace wpfApp
+{{
+    public partial class MainWindow : Window
+    {{
+        public MainWindow()
+        {{
+            HelloWorldGenerated.HelloWorld.SayHello();
+        }}
+    }}
+}}");
+
+            var buildCommand = new BuildCommand(Log, Path.Combine(testDir, "wpfApp"));
+            buildCommand.Execute()
+                .Should()
+                .Pass();
+        }
+
+        private static readonly string SourceGenSourceFile = @"using System.Collections.Generic;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace SourceGeneratorSamples
+{
+    [Generator]
+    public class HelloWorldGenerator : ISourceGenerator
+    {
+        public void Execute(GeneratorExecutionContext context)
+        {
+            StringBuilder sourceBuilder = new StringBuilder(@`
+using System;
+namespace HelloWorldGenerated
+{
+    public static class HelloWorld
+    {
+        public static void SayHello() 
+        {
+            Console.WriteLine(``Hello from generated code!``);
+`);
+            IEnumerable<SyntaxTree> syntaxTrees = context.Compilation.SyntaxTrees;
+            foreach (SyntaxTree tree in syntaxTrees)
+            {
+                sourceBuilder.AppendLine($@`Console.WriteLine(@`` - {tree.FilePath}``);`);
+            }
+            sourceBuilder.Append(@`
+        }
+    }
+}`);
+            context.AddSource(`helloWorldGenerated`, SourceText.From(sourceBuilder.ToString(), Encoding.UTF8));
+        }
+
+        public void Initialize(GeneratorInitializationContext context) {}
+    }
+}".Replace('`', '"');
     }
 }