WUX/MUX prototype

build/AzurePipelineTemplates/CsWinRT-BuildAndTest-Stage.yml

@@ -111,6 +111,18 @@ stages:
         script: |
           dir _build\$(BuildPlatform)\$(BuildConfiguration)\AuthoringConsumptionTest\bin
           _build\$(BuildPlatform)\$(BuildConfiguration)\AuthoringConsumptionTest\bin\AuthoringConsumptionTest.exe --gtest_output=xml:AUTHORINGTEST-$(Build.BuildNumber).xml 
+          exit /b 0
+
+# Run WUX Tests
+    - task: CmdLine@2
+      displayName: Run WUX Tests
+      condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64')))
+      continueOnError: True
+      inputs:
+        workingDirectory: $(Build.SourcesDirectory)\src
+        script: |
+          dir _build\$(BuildPlatform)\$(BuildConfiguration)\AuthoringWuxConsumptionTest\bin
+          _build\$(BuildPlatform)\$(BuildConfiguration)\AuthoringWuxConsumptionTest\bin\AuthoringWuxConsumptionTest.exe --gtest_output=xml:AUTHORINGWUXTEST-$(Build.BuildNumber).xml 
           exit /b 0 
 
 # Run Functional Tests  

nuget/Microsoft.Windows.CsWinRT.Authoring.targets

@@ -31,6 +31,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <CompilerVisibleProperty Include="CsWinRTWindowsMetadata" />
     <CompilerVisibleProperty Include="CsWinRTGenerateProjection" />
     <CompilerVisibleProperty Include="CsWinRTAuthoringInputs" />
+    <CompilerVisibleProperty Include="CsWinRTUiXamlMode" />
   </ItemGroup>
 
   <!-- Note this runs before the msbuild editor config file is generated because that is what is used to pass properties to the source generator. -->

nuget/Microsoft.Windows.CsWinRT.targets

@@ -230,6 +230,13 @@ $(CsWinRTInternalProjection)
     </ItemGroup>
   </Target>
 
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="CsWinRT.UiXamlMode" Condition="'$(CsWinRTUiXamlMode)' != ''">
+      <Value>$(CsWinRTUiXamlMode)</Value>
+      <Trim>true</Trim>
+    </RuntimeHostConfigurationOption>
+  </ItemGroup>
+
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Prerelease.targets" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Prerelease.targets')"/>
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Authoring.targets" Condition="'$(CsWinRTComponent)' == 'true'"/>
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.IIDOptimizer.targets" Condition="'$(CsWinRTIIDOptimizerOptOut)' != 'true'"/>

src/Authoring/WinRT.SourceGenerator/DiagnosticUtils.cs

@@ -16,11 +16,13 @@ public WinRTComponentScanner(GeneratorExecutionContext context, string assemblyN
             _assemblyName = assemblyName;
             _context = context;
             _flag = false;
+            _typeMapper = new TypeMapper(context.AnalyzerConfigOptions.GlobalOptions.GetUiXamlMode());
         }
 
         private readonly string _assemblyName;
         private readonly GeneratorExecutionContext _context;
         private bool _flag;
+        private readonly TypeMapper _typeMapper;
 
         public bool Found() { return _flag; }
 
@@ -105,7 +107,7 @@ private void CheckDeclarations()
                     var props = @class.DescendantNodes().OfType<PropertyDeclarationSyntax>().Where(IsPublic);
 
                     // filter out methods and properties that will be replaced with our custom type mappings
-                    IgnoreCustomTypeMappings(classSymbol, ref publicMethods, ref props);
+                    IgnoreCustomTypeMappings(classSymbol, _typeMapper, ref publicMethods, ref props);
 
                     if (!classSymbol.IsSealed && !classSymbol.IsStatic)
                     {
@@ -137,7 +139,7 @@ private void CheckDeclarations()
                     var props = @interface.DescendantNodes().OfType<PropertyDeclarationSyntax>().Where(IsPublic);
 
                     // filter out methods and properties that will be replaced with our custom type mappings
-                    IgnoreCustomTypeMappings(interfaceSym, ref methods, ref props);
+                    IgnoreCustomTypeMappings(interfaceSym, _typeMapper, ref methods, ref props);
 
                     if (interfaceSym.IsGenericType)
                     {
@@ -206,6 +208,7 @@ private bool IsMethodImpl(IMethodSymbol m, IMethodSymbol interfaceMethod)
         }
 
         private void IgnoreCustomTypeMappings(INamedTypeSymbol typeSymbol,
+            TypeMapper typeMapper,
             ref IEnumerable<MethodDeclarationSyntax> methods,
             ref IEnumerable<PropertyDeclarationSyntax> properties)
         {
@@ -217,7 +220,7 @@ string QualifiedName(INamedTypeSymbol sym)
             HashSet<ISymbol> classMethods = new();
 
             foreach (var @interface in typeSymbol.AllInterfaces.
-                        Where(symbol => GeneratorHelper.MappedCSharpTypes.ContainsKey(QualifiedName(symbol)) ||
+                        Where(symbol => typeMapper.HasMappingForType(QualifiedName(symbol)) ||
                                         WinRTTypeWriter.ImplementedInterfacesWithoutMapping.Contains(QualifiedName(symbol))))
             {
                 foreach (var interfaceMember in @interface.GetMembers())

src/Authoring/WinRT.SourceGenerator/Generator.cs

@@ -1,4 +1,4 @@
-using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
@@ -20,11 +20,14 @@ public class ComponentGenerator
         private Logger Logger { get; }
         private readonly GeneratorExecutionContext context;
         private string tempFolder;
+        private readonly TypeMapper mapper;
 
         public ComponentGenerator(GeneratorExecutionContext context)
         {
             this.context = context;
             Logger = new Logger(context);
+            mapper = new(context.AnalyzerConfigOptions.GlobalOptions.GetUiXamlMode());
+            // TODO-WuxMux: output a module initializer that validates the MUX/WUX projection mode to ensure that things don't get out of sync.
         }
 
         private string GetTempFolder(bool clearSourceFilesFromFolder = false)
@@ -152,7 +155,8 @@ public void Generate()
                     assembly,
                     version,
                     metadataBuilder,
-                    Logger);
+                    Logger,
+                    mapper);
 
                 WinRTSyntaxReceiver syntaxReceiver = (WinRTSyntaxReceiver)context.SyntaxReceiver;
                 Logger.Log("Found " + syntaxReceiver.Declarations.Count + " types");