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
microsoft · May 11, 2022 · 9f7c401 · 9f7c401
1 parent 7f9c212
commit 9f7c401
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 79 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,6 +91,7 @@ StyleCopReport.xml
 *.tmp
 *.tmp_proj
 *_wpftmp.csproj
+*.binlog
 *.log
 *.vspscc
 *.vssscc

diff --git a/...pp-winui-packaged/CppWinUiDesktopActivation/CppWinUiDesktopActivation/MainWindow.xaml.cpp b/...pp-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/...pp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp b/...pp-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/...ications/cpp-winui-packaged/CppWinUiDesktopState/CppWinUiDesktopState/MainWindow.xaml.cpp b/...ications/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
@@ -224,4 +224,4 @@
     <Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.1.0-preview3\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.1.0-preview3\build\native\Microsoft.WindowsAppSDK.props'))" />
     <Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.1.0-preview3\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.1.0-preview3\build\native\Microsoft.WindowsAppSDK.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/Samples/Notifications/Push/cpp-console-unpackaged/packages.config b/Samples/Notifications/Push/cpp-console-unpackaged/packages.config
@@ -4,4 +4,4 @@
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.210204.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22000.194" targetFramework="native" />
   <package id="Microsoft.WindowsAppSDK" version="1.1.0-preview3" targetFramework="native" />
-</packages>
+</packages>
diff --git a/Samples/SelfContainedDeployment/cpp-winui-unpackaged/Package.appxmanifest.bak b/Samples/SelfContainedDeployment/cpp-winui-unpackaged/Package.appxmanifest.bak
diff --git 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
@@ -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
@@ -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<winrt::SampleApp::DemoPage>(), *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,15 +64,15 @@ 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())
         {
             ContentFrame().GoBack();
         }
     }
 
-    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
@@ -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<Button>().Name());
         AppWindowPresenterKind newPresenterKind = AppWindowPresenterKind::Default;
@@ -44,8 +44,8 @@ namespace winrt::SampleApp::implementation
             newPresenterKind = AppWindowPresenterKind::Default;
         }
 
-        if(newPresenterKind == m_mainAppWindow.Presenter().Kind())
-        { 
+        if (newPresenterKind == m_mainAppWindow.Presenter().Kind())
+        {
             m_mainAppWindow.SetPresenter(AppWindowPresenterKind::Default);
         }
         else

diff --git a/Samples/Windowing/cpp-winui/SampleApp/TitlebarPage.xaml.cpp b/Samples/Windowing/cpp-winui/SampleApp/TitlebarPage.xaml.cpp
@@ -38,7 +38,7 @@ namespace winrt::SampleApp::implementation
         }
     }
 
-    void TitlebarPage::TitlebarBrandingBtn_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
+    void TitlebarPage::TitlebarBrandingBtn_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
     {
         m_appWindow.TitleBar().ResetToDefault();
         m_mainWindow.MyTitleBar().Visibility(winrt::Microsoft::UI::Xaml::Visibility::Collapsed);
@@ -70,14 +70,14 @@ namespace winrt::SampleApp::implementation
         }
     }
 
-    void TitlebarPage::TitlebarCustomBtn_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
+    void TitlebarPage::TitlebarCustomBtn_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
     {
         // Check to see if customization is supported. Currently only supported on Windows 11.
         if (AppWindowTitleBar::IsCustomizationSupported() && !m_customTitleBar) {
             m_customTitleBar = true;
             m_appWindow.TitleBar().ExtendsContentIntoTitleBar(true);
 
-            // Show the custom titlebar           
+            // Show the custom titlebar
             m_mainWindow.MyTitleBar().Visibility(winrt::Microsoft::UI::Xaml::Visibility::Visible);
 
             // Set Button colors to match the custom titlebar
@@ -102,7 +102,7 @@ namespace winrt::SampleApp::implementation
         }
     }
 
-    void TitlebarPage::ResetTitlebarBtn_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
+    void TitlebarPage::ResetTitlebarBtn_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
     {
         m_mainWindow.MyTitleBar().Visibility(winrt::Microsoft::UI::Xaml::Visibility::Collapsed);
         m_appWindow.TitleBar().ResetToDefault();
@@ -120,8 +120,8 @@ namespace winrt::SampleApp::implementation
         double CaptionButtonOcclusionWidth = m_appWindow.TitleBar().RightInset();
 
         // Define your drag Regions
-        int windowIconWidthAndPadding = (int)m_mainWindow.MyWindowIcon().ActualWidth() + (int)m_mainWindow.MyWindowIcon().Margin().Right;
-        int dragRegionWidth = m_appWindow.Size().Width - (CaptionButtonOcclusionWidth + windowIconWidthAndPadding);
+        int windowIconWidthAndPadding = static_cast<int>(m_mainWindow.MyWindowIcon().ActualWidth() + static_cast<int>(m_mainWindow.MyWindowIcon().Margin().Right));
+        int dragRegionWidth = static_cast<int>(m_appWindow.Size().Width - (CaptionButtonOcclusionWidth + windowIconWidthAndPadding));
 
         std::vector<Windows::Graphics::RectInt32> dragRects;
         Windows::Graphics::RectInt32 dragRect;

diff --git a/Samples/localpackages/readme.md b/Samples/localpackages/readme.md
@@ -1,2 +1 @@
-Local source for packages.
-This is used by the the nightly pipelines for build compat testing.
+Local source for packages. Places nupkg files in this directory to test them out before uploading.
diff --git a/Samples/nuget.config b/Samples/nuget.config
@@ -8,11 +8,11 @@
         <add key="automatic" value="True" />
     </packageRestore>
     <packageSources>
-    <clear />
+        <clear />
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 
         <!-- a local directory to allow testing nupkg files without pushing to a remote feed -->
         <add key="localpackages" value="localpackages" />
     </packageSources>
     <disabledPackageSources />
-</configuration>  
+</configuration>