From 9f7c401227619649af096e789d0cf6c9db1fdce0 Mon Sep 17 00:00:00 2001 From: Howard Kapustein Date: Wed, 11 May 2022 10:09:07 -0700 Subject: [PATCH] Add localpackages + Cleanup git logwarnings (#207) * Add support for localpackages/ for local testing using private/physically-local nugets * Cleanup some warnings (some of Aggregator build's 101 warnings) * Fixed more warnings --- .gitignore | 1 + .../MainWindow.xaml.cpp | 2 +- .../MainWindow.xaml.cpp | 4 +- .../CppWinUiDesktopState/MainWindow.xaml.cpp | 6 +-- .../cpp-console-unpackaged.vcxproj | 2 +- .../cpp-console-unpackaged/packages.config | 2 +- .../Package.appxmanifest.bak | 47 ------------------- .../cpp-console-unpackaged/Unpackaged.cpp | 6 ++- .../cpp-winui/SampleApp/DemoPage.xaml.cpp | 6 +-- .../cpp-winui/SampleApp/MainWindow.xaml.cpp | 12 ++--- .../SampleApp/PresenterPage.xaml.cpp | 6 +-- .../cpp-winui/SampleApp/TitlebarPage.xaml.cpp | 12 ++--- Samples/localpackages/readme.md | 3 +- Samples/nuget.config | 4 +- 14 files changed, 34 insertions(+), 79 deletions(-) delete mode 100644 Samples/SelfContainedDeployment/cpp-winui-unpackaged/Package.appxmanifest.bak diff --git a/.gitignore b/.gitignore index b17db9792..d964e10d0 100644 --- a/.gitignore +++ b/.gitignore @@ -91,6 +91,7 @@ StyleCopReport.xml *.tmp *.tmp_proj *_wpftmp.csproj +*.binlog *.log *.vspscc *.vssscc diff --git a/Samples/AppLifecycle/Activation/cpp-winui-packaged/CppWinUiDesktopActivation/CppWinUiDesktopActivation/MainWindow.xaml.cpp b/Samples/AppLifecycle/Activation/cpp-winui-packaged/CppWinUiDesktopActivation/CppWinUiDesktopActivation/MainWindow.xaml.cpp index 6985b24c4..8bad01ebe 100644 --- a/Samples/AppLifecycle/Activation/cpp-winui-packaged/CppWinUiDesktopActivation/CppWinUiDesktopActivation/MainWindow.xaml.cpp +++ b/Samples/AppLifecycle/Activation/cpp-winui-packaged/CppWinUiDesktopActivation/CppWinUiDesktopActivation/MainWindow.xaml.cpp @@ -29,7 +29,7 @@ namespace winrt::CppWinUiDesktopActivation::implementation } void winrt::CppWinUiDesktopActivation::implementation::MainWindow::ActivationInfoButton_Click( - winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e) + winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/) { GetActivationInfo(); } diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp index e46165261..60265969f 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp @@ -22,8 +22,8 @@ namespace winrt::CppWinUiDesktopInstancing::implementation } void winrt::CppWinUiDesktopInstancing::implementation::MainWindow::ActivationInfoButton_Click( - winrt::Windows::Foundation::IInspectable const& sender, - winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e) + winrt::Windows::Foundation::IInspectable const& /*sender*/, + winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/) { GetActivationInfo(); } diff --git a/Samples/AppLifecycle/StateNotifications/cpp-winui-packaged/CppWinUiDesktopState/CppWinUiDesktopState/MainWindow.xaml.cpp b/Samples/AppLifecycle/StateNotifications/cpp-winui-packaged/CppWinUiDesktopState/CppWinUiDesktopState/MainWindow.xaml.cpp index e98dfad31..3bf1687da 100644 --- a/Samples/AppLifecycle/StateNotifications/cpp-winui-packaged/CppWinUiDesktopState/CppWinUiDesktopState/MainWindow.xaml.cpp +++ b/Samples/AppLifecycle/StateNotifications/cpp-winui-packaged/CppWinUiDesktopState/CppWinUiDesktopState/MainWindow.xaml.cpp @@ -28,13 +28,13 @@ namespace winrt::CppWinUiDesktopState::implementation } void winrt::CppWinUiDesktopState::implementation::MainWindow::RegisterButton_Click( - winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e) + winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/) { RegisterPowerManagerCallbacks(); } void winrt::CppWinUiDesktopState::implementation::MainWindow::UnregisterButton_Click( - winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e) + winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/) { UnregisterPowerManagerCallbacks(); } @@ -268,7 +268,7 @@ void winrt::CppWinUiDesktopState::implementation::MainWindow::DetermineWorkloads || (powerSource == PowerSourceKind::AC && powerStatus == PowerSupplyStatus::Inadequate)) { - // The device is not in a good battery/power state, + // The device is not in a good battery/power state, // so we should pause any non-critical work. PauseNonCriticalWork(); } diff --git a/Samples/Notifications/Push/cpp-console-unpackaged/cpp-console-unpackaged.vcxproj b/Samples/Notifications/Push/cpp-console-unpackaged/cpp-console-unpackaged.vcxproj index 1e19a7d06..138b31a9d 100644 --- a/Samples/Notifications/Push/cpp-console-unpackaged/cpp-console-unpackaged.vcxproj +++ b/Samples/Notifications/Push/cpp-console-unpackaged/cpp-console-unpackaged.vcxproj @@ -224,4 +224,4 @@ - \ No newline at end of file + diff --git a/Samples/Notifications/Push/cpp-console-unpackaged/packages.config b/Samples/Notifications/Push/cpp-console-unpackaged/packages.config index 1e6a2eac0..daecb16a9 100644 --- a/Samples/Notifications/Push/cpp-console-unpackaged/packages.config +++ b/Samples/Notifications/Push/cpp-console-unpackaged/packages.config @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/Samples/SelfContainedDeployment/cpp-winui-unpackaged/Package.appxmanifest.bak b/Samples/SelfContainedDeployment/cpp-winui-unpackaged/Package.appxmanifest.bak deleted file mode 100644 index 76c9ac11a..000000000 --- a/Samples/SelfContainedDeployment/cpp-winui-unpackaged/Package.appxmanifest.bak +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - SelfContainedDeployment - Microsoft Corporation - Assets\logo.png - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp b/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp index ec3f5d591..b171cab45 100644 --- a/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp +++ b/Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp @@ -1,7 +1,7 @@ // Copyright(c) Microsoft Corporation. // Licensed under the MIT License. // -// DynamicDependenciesBasic.cpp : +// DynamicDependenciesBasic.cpp : // This file shows the headers and usings required to call apis in the Windows App SDK. // To run with auto-initialization of the Windows App Runtime, run as-is // To explicitly control initialization: @@ -22,7 +22,7 @@ namespace winrt { using namespace winrt::Microsoft::Windows::System::Power; } - + int main() { // WINAPPSDK-INITIALIZE: uncomment code below to have explicit control of initialization @@ -59,6 +59,8 @@ HRESULT ExplicitlyInitializeWinAppRuntime() hr, majorMinorVersion, versionTag, minVersion.Major, minVersion.Minor, minVersion.Build, minVersion.Revision); return hr; } + + return S_OK; } // Method to handle any clean up required for explicity initialization of Windows App Runtime diff --git a/Samples/Windowing/cpp-winui/SampleApp/DemoPage.xaml.cpp b/Samples/Windowing/cpp-winui/SampleApp/DemoPage.xaml.cpp index f57eca8a0..ef4e5604f 100644 --- a/Samples/Windowing/cpp-winui/SampleApp/DemoPage.xaml.cpp +++ b/Samples/Windowing/cpp-winui/SampleApp/DemoPage.xaml.cpp @@ -26,12 +26,12 @@ namespace winrt::SampleApp::implementation m_mainAppWindow = appWindow; } - void DemoPage::TitleBtn_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e) + void DemoPage::TitleBtn_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/) { m_mainAppWindow.Title(TitleTextBox().Text()); } - void DemoPage::SizeBtn_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e) + void DemoPage::SizeBtn_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/) { int windowWidth = 0; int windowHeight = 0; @@ -47,5 +47,5 @@ namespace winrt::SampleApp::implementation m_mainAppWindow.Resize(windowSize); } } - + } diff --git a/Samples/Windowing/cpp-winui/SampleApp/MainWindow.xaml.cpp b/Samples/Windowing/cpp-winui/SampleApp/MainWindow.xaml.cpp index 73eba0202..fcc7fb0ed 100644 --- a/Samples/Windowing/cpp-winui/SampleApp/MainWindow.xaml.cpp +++ b/Samples/Windowing/cpp-winui/SampleApp/MainWindow.xaml.cpp @@ -12,7 +12,7 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; using namespace Microsoft::UI::Xaml::Controls; - + namespace winrt::SampleApp::implementation { @@ -31,13 +31,13 @@ namespace winrt::SampleApp::implementation } - void MainWindow::NavigationView_Loaded(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args) + void MainWindow::NavigationView_Loaded(winrt::IInspectable const& /*sender*/, winrt::RoutedEventArgs const& /*args*/) { ContentFrame().Navigate(xaml_typename(), *this); } - void MainWindow::NavigationView_ItemInvoked(winrt::IInspectable const& sender, winrt::NavigationViewItemInvokedEventArgs const& args) + void MainWindow::NavigationView_ItemInvoked(winrt::IInspectable const& /*sender*/, winrt::NavigationViewItemInvokedEventArgs const& args) { if (args.InvokedItemContainer() != nullptr) { @@ -64,7 +64,7 @@ namespace winrt::SampleApp::implementation } - void MainWindow::NavigationView_BackRequested(winrt::NavigationView const& sender, winrt::NavigationViewBackRequestedEventArgs const& args) + void MainWindow::NavigationView_BackRequested(winrt::NavigationView const& /*sender*/, winrt::NavigationViewBackRequestedEventArgs const& /*args*/) { if (ContentFrame().CanGoBack()) { @@ -72,7 +72,7 @@ namespace winrt::SampleApp::implementation } } - void MainWindow::MyWindowIcon_DoubleTapped(winrt::IInspectable const& sender, winrt::Microsoft::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& e) + void MainWindow::MyWindowIcon_DoubleTapped(winrt::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& /*e*/) { this->AppWindow().Destroy(); } @@ -93,7 +93,7 @@ namespace winrt::SampleApp::implementation // Get the AppWindow for the WindowId Microsoft::UI::Windowing::AppWindow appWindow = Microsoft::UI::Windowing::AppWindow::GetFromWindowId(windowId); - + return appWindow; } } diff --git a/Samples/Windowing/cpp-winui/SampleApp/PresenterPage.xaml.cpp b/Samples/Windowing/cpp-winui/SampleApp/PresenterPage.xaml.cpp index 141d029ab..a5b4bbfaf 100644 --- a/Samples/Windowing/cpp-winui/SampleApp/PresenterPage.xaml.cpp +++ b/Samples/Windowing/cpp-winui/SampleApp/PresenterPage.xaml.cpp @@ -26,7 +26,7 @@ namespace winrt::SampleApp::implementation m_mainAppWindow = mainWindow.AppWindow(); } - void PresenterPage::SwitchPresenter(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e) + void PresenterPage::SwitchPresenter(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/) { std::string buttonName = to_string(sender.as