From 95f0db5ee3769fee2367c1c765401aab8c9868ee Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Wed, 19 Jun 2024 13:30:17 -0700 Subject: [PATCH 1/4] Move common files to props file --- .../src/sfx/Directory.Build.props | 44 +++++++++++++++++ .../Microsoft.WindowsDesktop.App.Ref.sfxproj | 48 ------------------- ...crosoft.WindowsDesktop.App.Runtime.sfxproj | 44 +---------------- 3 files changed, 46 insertions(+), 90 deletions(-) diff --git a/src/windowsdesktop/src/sfx/Directory.Build.props b/src/windowsdesktop/src/sfx/Directory.Build.props index 2b9507bf6..c1bc91fb8 100644 --- a/src/windowsdesktop/src/sfx/Directory.Build.props +++ b/src/windowsdesktop/src/sfx/Directory.Build.props @@ -31,4 +31,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj index 2c7824173..e4a15f3df 100644 --- a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj +++ b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Ref.sfxproj @@ -10,30 +10,6 @@ false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj index f003f2533..ebe2ff683 100644 --- a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj +++ b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj @@ -10,29 +10,9 @@ LatestPatch - + - - - - - - - - - - - - - - - - - @@ -41,7 +21,7 @@ - + @@ -69,32 +49,12 @@ - - - - - - - - - - - - - - - - - - - - From ee9e33ec93d20b2bf0fa8d4ce2252b76a3cc846f Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Wed, 19 Jun 2024 13:37:55 -0700 Subject: [PATCH 2/4] Forgot to move the WPF specific file --- .../src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj index ebe2ff683..49cfeb8e4 100644 --- a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj +++ b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj @@ -21,7 +21,6 @@ - @@ -61,5 +60,6 @@ + From 7868bcc4cb556c720eb64fd54beccfece8c73ed1 Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Thu, 20 Jun 2024 10:14:00 -0700 Subject: [PATCH 3/4] fixing an issue with merging main --- src/windowsdesktop/src/sfx/Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/windowsdesktop/src/sfx/Directory.Build.props b/src/windowsdesktop/src/sfx/Directory.Build.props index c1bc91fb8..06710eaab 100644 --- a/src/windowsdesktop/src/sfx/Directory.Build.props +++ b/src/windowsdesktop/src/sfx/Directory.Build.props @@ -41,6 +41,8 @@ + + From 94285f655e975e5bb792f6f91db8bd599958690f Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Thu, 20 Jun 2024 10:34:00 -0700 Subject: [PATCH 4/4] Remove Hashing assembly --- src/windowsdesktop/src/sfx/Directory.Build.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/windowsdesktop/src/sfx/Directory.Build.props b/src/windowsdesktop/src/sfx/Directory.Build.props index 06710eaab..46e1d1b94 100644 --- a/src/windowsdesktop/src/sfx/Directory.Build.props +++ b/src/windowsdesktop/src/sfx/Directory.Build.props @@ -42,7 +42,6 @@ -