From c9fa2df5dfd1816c3ae1a417115b75c62a7c6159 Mon Sep 17 00:00:00 2001 From: shisan Date: Fri, 3 Apr 2026 10:12:44 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Fix=20build=20issues=20and=20update?= =?UTF-8?q?=20core=20package=20versions=20in=20Directory.Packag=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0fab336143a911b6434bc7765bc75e171bc10f19. --- Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs | 2 +- Samples/AppContentSearch/cs-winui/Notes.csproj | 1 - Samples/AppContentSearch/cs-winui/NotesApp.sln | 8 -------- .../AppContentSearch/cs-winui/Pages/NotesPage.xaml.cs | 2 +- .../cpp-winui/BackgroundTaskBuilder/BackgroundTask.cpp | 2 +- Samples/Directory.Packages.props | 10 +++++----- .../DynamicDependencies/DirectX/D3D9ExSample.cpp | 6 +++--- .../DynamicDependencies/DirectX/D3D9ExSample.vcxproj | 2 -- .../WindowsAISampleForWPF/WindowsAISampleForWPF.csproj | 3 +-- 9 files changed, 12 insertions(+), 24 deletions(-) diff --git a/Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs b/Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs index b71f5465f..14dce1859 100644 --- a/Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs +++ b/Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs @@ -254,7 +254,7 @@ private async void DeleteIndexButton_Click(object sender, RoutedEventArgs e) } } - internal partial class MenuItemTemplateSelector : DataTemplateSelector + internal class MenuItemTemplateSelector : DataTemplateSelector { public DataTemplate? NoteTemplate { get; set; } public DataTemplate? DefaultTemplate { get; set; } diff --git a/Samples/AppContentSearch/cs-winui/Notes.csproj b/Samples/AppContentSearch/cs-winui/Notes.csproj index e681ced14..d43c76f47 100644 --- a/Samples/AppContentSearch/cs-winui/Notes.csproj +++ b/Samples/AppContentSearch/cs-winui/Notes.csproj @@ -75,7 +75,6 @@ - diff --git a/Samples/AppContentSearch/cs-winui/NotesApp.sln b/Samples/AppContentSearch/cs-winui/NotesApp.sln index 09f6076db..4886822de 100644 --- a/Samples/AppContentSearch/cs-winui/NotesApp.sln +++ b/Samples/AppContentSearch/cs-winui/NotesApp.sln @@ -7,23 +7,15 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.ActiveCfg = Debug|ARM64 {DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.Build.0 = Debug|ARM64 {DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.ActiveCfg = Debug|x64 - {DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.Build.0 = Debug|x64 - {DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.Deploy.0 = Debug|x64 {DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.ActiveCfg = Release|ARM64 {DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.Build.0 = Release|ARM64 {DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.Deploy.0 = Release|ARM64 - {DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.ActiveCfg = Release|x64 - {DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.Build.0 = Release|x64 - {DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.Deploy.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/AppContentSearch/cs-winui/Pages/NotesPage.xaml.cs b/Samples/AppContentSearch/cs-winui/Pages/NotesPage.xaml.cs index 4fb488c6e..245430e68 100644 --- a/Samples/AppContentSearch/cs-winui/Pages/NotesPage.xaml.cs +++ b/Samples/AppContentSearch/cs-winui/Pages/NotesPage.xaml.cs @@ -15,7 +15,7 @@ namespace Notes.Pages { - public partial class RelativePathConverter : IValueConverter + public class RelativePathConverter : IValueConverter { public object? Convert(object value, Type targetType, object parameter, string language) { diff --git a/Samples/BackgroundTask/InProc BackgroundTask/cpp-winui/BackgroundTaskBuilder/BackgroundTask.cpp b/Samples/BackgroundTask/InProc BackgroundTask/cpp-winui/BackgroundTaskBuilder/BackgroundTask.cpp index dcc81bbf7..d66c3d753 100644 --- a/Samples/BackgroundTask/InProc BackgroundTask/cpp-winui/BackgroundTaskBuilder/BackgroundTask.cpp +++ b/Samples/BackgroundTask/InProc BackgroundTask/cpp-winui/BackgroundTaskBuilder/BackgroundTask.cpp @@ -30,7 +30,7 @@ namespace winrt::BackgroundTaskBuilder m_mainWindow = window.as(); Windows::Foundation::TimeSpan period{ std::chrono::seconds{2} }; - m_periodicTimer = Windows::System::Threading::ThreadPoolTimer::CreatePeriodicTimer([this, lifetime = get_strong()](Windows::System::Threading::ThreadPoolTimer /* timer */) + m_periodicTimer = Windows::System::Threading::ThreadPoolTimer::CreatePeriodicTimer([this, lifetime = get_strong()](Windows::System::Threading::ThreadPoolTimer timer) { if (!m_cancelRequested && m_progress < 100) { diff --git a/Samples/Directory.Packages.props b/Samples/Directory.Packages.props index 357f507fe..836833986 100644 --- a/Samples/Directory.Packages.props +++ b/Samples/Directory.Packages.props @@ -7,14 +7,14 @@ - - + + - + @@ -27,12 +27,12 @@ - + - + \ No newline at end of file diff --git a/Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.cpp b/Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.cpp index 3657a89a6..905909d73 100644 --- a/Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.cpp +++ b/Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.cpp @@ -103,8 +103,8 @@ const UINT32 majorMinorVersion{ 0x00010000 }; PCWSTR versionTag{ L"" }; int APIENTRY wWinMain( HINSTANCE hInstance, - HINSTANCE /* hPrevInstance */, - LPWSTR /* lpCmdLine */, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, int nCmdShow ) { // Use Dynamic Dependencies API to use DirectX framework package @@ -745,7 +745,7 @@ void Render( IDirect3DDevice9Ex* pDev ) g_liLastTimerUpdate.QuadPart = liCurrentTime.QuadPart; } -void RenderText( IDirect3DDevice9Ex* /* pDev */ ) +void RenderText( IDirect3DDevice9Ex* pDev ) { // The helper object simply helps keep track of text position, and color // and then it calls pFont->DrawText( m_pSprite, strMsg, -1, &rc, DT_NOCLIP, m_clr ); diff --git a/Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.vcxproj b/Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.vcxproj index ce18a52e4..3141b6d1b 100644 --- a/Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.vcxproj +++ b/Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.vcxproj @@ -151,7 +151,6 @@ MultiThreaded Level3 - stdcpp17 ProgramDatabase @@ -172,7 +171,6 @@ Level3 - stdcpp17 ProgramDatabase diff --git a/Samples/WindowsAIFoundry/cs-wpf-dotnet/WindowsAISampleForWPF/WindowsAISampleForWPF.csproj b/Samples/WindowsAIFoundry/cs-wpf-dotnet/WindowsAISampleForWPF/WindowsAISampleForWPF.csproj index bb7b20259..9c1e4ccc7 100644 --- a/Samples/WindowsAIFoundry/cs-wpf-dotnet/WindowsAISampleForWPF/WindowsAISampleForWPF.csproj +++ b/Samples/WindowsAIFoundry/cs-wpf-dotnet/WindowsAISampleForWPF/WindowsAISampleForWPF.csproj @@ -82,8 +82,7 @@ + SkipUnchangedFiles="true">