From 3c433ec0be5a611ce9c290b6e3a3632bc45160db Mon Sep 17 00:00:00 2001 From: Simon-IT Date: Tue, 3 Sep 2019 10:50:30 +0200 Subject: [PATCH 1/3] Modified transform combining mode for hit testing with geometry --- .../Windows/Media/HitTestWithGeometryDrawingContextWalker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestWithGeometryDrawingContextWalker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestWithGeometryDrawingContextWalker.cs index 931ccf17aa9..0097ebc845a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestWithGeometryDrawingContextWalker.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HitTestWithGeometryDrawingContextWalker.cs @@ -276,7 +276,7 @@ public override void PushTransform( else if ((_currentTransform != null) && !_currentTransform.IsIdentity) { // Both the current transform and the new one are nontrivial, combine them - Matrix combined = _currentTransform.Value * transform.Value; + Matrix combined = transform.Value * _currentTransform.Value; transform = new MatrixTransform(combined); } From f56c007b39f54e7d2fa2604cc1506d13d2cb22ca Mon Sep 17 00:00:00 2001 From: Simon-IT Date: Fri, 13 Sep 2019 11:51:01 +0200 Subject: [PATCH 2/3] Updated WPF files copy macro from netcoreapp3.0 to netcoreapp5.0 --- eng/copy-wpf.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1 index b309166a8c6..cfbb035e777 100644 --- a/eng/copy-wpf.ps1 +++ b/eng/copy-wpf.ps1 @@ -51,11 +51,11 @@ function CopyNativeBinariesToLocation($location, $localBinLocation) function CopyManagedBinariesToLocation($location, $localBinLocation) { # Layout of where the managed binaries looks something like this: - # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\netcoreapp3.0 - # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\netcoreapp3.0 + # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\netcoreapp5.0 + # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\netcoreapp5.0 $PackageName = "Microsoft.DotNet.Wpf.GitHub" - $BinaryLocationInPackage = "netcoreapp3.0" + $BinaryLocationInPackage = "netcoreapp5.0" CopyPackagedBinaries $location $localBinLocation $PackageName $BinaryLocationInPackage } @@ -140,7 +140,7 @@ else $runtimeIdentifer = "win-$arch" $location = [System.IO.Path]::Combine($destination, "bin\Debug\netcoreapp3.0", $runtimeIdentifer, "publish") if(![System.IO.Directory]::Exists($location)) - { + { Write-Host "Location unavailable: " $location -ForegroundColor Red return } From 8b07b43e9bbafda94392e5f2a041f2619e936713 Mon Sep 17 00:00:00 2001 From: Simon-IT Date: Fri, 13 Sep 2019 14:45:39 +0200 Subject: [PATCH 3/3] Revert "Updated WPF files copy macro from netcoreapp3.0 to netcoreapp5.0" This reverts commit f56c007b39f54e7d2fa2604cc1506d13d2cb22ca. --- eng/copy-wpf.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1 index cfbb035e777..b309166a8c6 100644 --- a/eng/copy-wpf.ps1 +++ b/eng/copy-wpf.ps1 @@ -51,11 +51,11 @@ function CopyNativeBinariesToLocation($location, $localBinLocation) function CopyManagedBinariesToLocation($location, $localBinLocation) { # Layout of where the managed binaries looks something like this: - # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\netcoreapp5.0 - # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\netcoreapp5.0 + # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\netcoreapp3.0 + # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\netcoreapp3.0 $PackageName = "Microsoft.DotNet.Wpf.GitHub" - $BinaryLocationInPackage = "netcoreapp5.0" + $BinaryLocationInPackage = "netcoreapp3.0" CopyPackagedBinaries $location $localBinLocation $PackageName $BinaryLocationInPackage } @@ -140,7 +140,7 @@ else $runtimeIdentifer = "win-$arch" $location = [System.IO.Path]::Combine($destination, "bin\Debug\netcoreapp3.0", $runtimeIdentifer, "publish") if(![System.IO.Directory]::Exists($location)) - { + { Write-Host "Location unavailable: " $location -ForegroundColor Red return }