Merge pull request #3792 from unoplatform/mergify/bp/release/stable/3…

….0/pr-3790 fix(reg): [Wasm] Fix default styles not referenced (bp #3790)
unoplatform · Aug 12, 2020 · 0a2692c · 0a2692c
2 parents b5b40df + 17cebfe
commit 0a2692c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/PlatformHelper.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/PlatformHelper.cs
@@ -18,13 +18,5 @@ public static bool IsValidPlatform(SourceGeneratorContext context)
 
 			return !evaluatedValue.Equals("UAP", StringComparison.OrdinalIgnoreCase);
 		}
-
-		public static bool IsReferenceUnoRuntimeIdentifier(SourceGeneratorContext context)
-		{
-			return context
-				.GetProjectInstance()
-				.GetProperty("UnoRuntimeIdentifier")?.EvaluatedValue?.Equals("Reference", StringComparison.OrdinalIgnoreCase) ?? false;
-		}
-
 	}
 }
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlCodeGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlCodeGenerator.cs
@@ -17,8 +17,7 @@ public override void Execute(SourceGeneratorContext context)
 				context.Project
 			);
 
-			if (PlatformHelper.IsValidPlatform(context)
-				&& !PlatformHelper.IsReferenceUnoRuntimeIdentifier(context))
+			if (PlatformHelper.IsValidPlatform(context))
 			{
 				var genereratedTrees = gen.Generate();
 

diff --git a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.csproj b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.csproj
@@ -14,12 +14,20 @@
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<AssemblyName>Uno.UI.FluentTheme</AssemblyName>
 		<RootNamespace>Uno.UI.FluentTheme</RootNamespace>
-		
+
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
 		<Deterministic>true</Deterministic>
-		
+
 		<UnoRuntimeIdentifier Condition="'$(TargetFramework)'=='netstandard2.0'">Reference</UnoRuntimeIdentifier>
-
+
+		<!--
+		Disable source generation for Uno.UI.Fluent for netstandard2.0 so
+		that we don't generate the global static resources for the reference target.
+		This will allow for the Uno.UI.Fluent to be linked out if XamlControlsResources
+		is not referenced in the app.
+		-->
+		<BuildingInsideUnoSourceGenerator Condition="'$(UnoRuntimeIdentifier)'=='Reference'">true</BuildingInsideUnoSourceGenerator>
+
 		<UseCommonOverridePackage>true</UseCommonOverridePackage>
 		<CommonOverridePackageId>Uno.UI</CommonOverridePackageId>
 	</PropertyGroup>