Merge pull request #9904 from unoplatform/dev/jela/revert-wpf-fix

fix: Remove WPF issue #6792 workaround
unoplatform · Sep 21, 2022 · d018d7d · d018d7d
2 parents 735ec7a + f747e84
commit d018d7d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build/ci/templates/dotnet6-install-mac.yml b/build/ci/templates/dotnet6-install-mac.yml
@@ -1,5 +1,5 @@
 parameters:
-  DotNetVersion: '6.0.400'
+  DotNetVersion: '6.0.401'
   UnoCheck_Version: '1.5.4'
   UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json'
   Dotnet_Root: '/usr/local/share/dotnet/'

diff --git a/build/ci/templates/dotnet6-install-windows.yml b/build/ci/templates/dotnet6-install-windows.yml
@@ -1,5 +1,5 @@
 parameters:
-  DotNetVersion: '6.0.400'
+  DotNetVersion: '6.0.401'
   UnoCheck_Version: '1.5.4'
   UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json'
 

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props b/src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
@@ -467,7 +467,7 @@
 		</ItemGroup>
 	</Target>
 
-	<Target Name="_WPFIssue6792_RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+	<Target Name="_WPFIssue6792_RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile" Condition="'$(UnoUseWPFIssue6792Workaround)'=='true'">
 		<!-- Work around https://github.com/dotnet/wpf/issues/6792, remove for .NET 6.0.500 or later -->
 
 		<ItemGroup>