Skip to content

Commit 9f7c401

Browse files
authored
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
1 parent 7f9c212 commit 9f7c401

File tree

14 files changed

+34
-79
lines changed

14 files changed

+34
-79
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ StyleCopReport.xml
9191
*.tmp
9292
*.tmp_proj
9393
*_wpftmp.csproj
94+
*.binlog
9495
*.log
9596
*.vspscc
9697
*.vssscc

Samples/AppLifecycle/Activation/cpp-winui-packaged/CppWinUiDesktopActivation/CppWinUiDesktopActivation/MainWindow.xaml.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace winrt::CppWinUiDesktopActivation::implementation
2929
}
3030

3131
void winrt::CppWinUiDesktopActivation::implementation::MainWindow::ActivationInfoButton_Click(
32-
winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
32+
winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
3333
{
3434
GetActivationInfo();
3535
}

Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ namespace winrt::CppWinUiDesktopInstancing::implementation
2222
}
2323

2424
void winrt::CppWinUiDesktopInstancing::implementation::MainWindow::ActivationInfoButton_Click(
25-
winrt::Windows::Foundation::IInspectable const& sender,
26-
winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
25+
winrt::Windows::Foundation::IInspectable const& /*sender*/,
26+
winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
2727
{
2828
GetActivationInfo();
2929
}

Samples/AppLifecycle/StateNotifications/cpp-winui-packaged/CppWinUiDesktopState/CppWinUiDesktopState/MainWindow.xaml.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ namespace winrt::CppWinUiDesktopState::implementation
2828
}
2929

3030
void winrt::CppWinUiDesktopState::implementation::MainWindow::RegisterButton_Click(
31-
winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
31+
winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
3232
{
3333
RegisterPowerManagerCallbacks();
3434
}
3535

3636
void winrt::CppWinUiDesktopState::implementation::MainWindow::UnregisterButton_Click(
37-
winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
37+
winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
3838
{
3939
UnregisterPowerManagerCallbacks();
4040
}
@@ -268,7 +268,7 @@ void winrt::CppWinUiDesktopState::implementation::MainWindow::DetermineWorkloads
268268
|| (powerSource == PowerSourceKind::AC
269269
&& powerStatus == PowerSupplyStatus::Inadequate))
270270
{
271-
// The device is not in a good battery/power state,
271+
// The device is not in a good battery/power state,
272272
// so we should pause any non-critical work.
273273
PauseNonCriticalWork();
274274
}

Samples/Notifications/Push/cpp-console-unpackaged/cpp-console-unpackaged.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,4 +224,4 @@
224224
<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'))" />
225225
<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'))" />
226226
</Target>
227-
</Project>
227+
</Project>

Samples/Notifications/Push/cpp-console-unpackaged/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.210204.1" targetFramework="native" />
55
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22000.194" targetFramework="native" />
66
<package id="Microsoft.WindowsAppSDK" version="1.1.0-preview3" targetFramework="native" />
7-
</packages>
7+
</packages>

Samples/SelfContainedDeployment/cpp-winui-unpackaged/Package.appxmanifest.bak

Lines changed: 0 additions & 47 deletions
This file was deleted.

Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright(c) Microsoft Corporation.
22
// Licensed under the MIT License.
33
//
4-
// DynamicDependenciesBasic.cpp :
4+
// DynamicDependenciesBasic.cpp :
55
// This file shows the headers and usings required to call apis in the Windows App SDK.
66
// To run with auto-initialization of the Windows App Runtime, run as-is
77
// To explicitly control initialization:
@@ -22,7 +22,7 @@ namespace winrt
2222
{
2323
using namespace winrt::Microsoft::Windows::System::Power;
2424
}
25-
25+
2626
int main()
2727
{
2828
// WINAPPSDK-INITIALIZE: uncomment code below to have explicit control of initialization
@@ -59,6 +59,8 @@ HRESULT ExplicitlyInitializeWinAppRuntime()
5959
hr, majorMinorVersion, versionTag, minVersion.Major, minVersion.Minor, minVersion.Build, minVersion.Revision);
6060
return hr;
6161
}
62+
63+
return S_OK;
6264
}
6365

6466
// Method to handle any clean up required for explicity initialization of Windows App Runtime

Samples/Windowing/cpp-winui/SampleApp/DemoPage.xaml.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ namespace winrt::SampleApp::implementation
2626
m_mainAppWindow = appWindow;
2727
}
2828

29-
void DemoPage::TitleBtn_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
29+
void DemoPage::TitleBtn_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
3030
{
3131
m_mainAppWindow.Title(TitleTextBox().Text());
3232
}
3333

34-
void DemoPage::SizeBtn_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e)
34+
void DemoPage::SizeBtn_Click(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/)
3535
{
3636
int windowWidth = 0;
3737
int windowHeight = 0;
@@ -47,5 +47,5 @@ namespace winrt::SampleApp::implementation
4747
m_mainAppWindow.Resize(windowSize);
4848
}
4949
}
50-
50+
5151
}

Samples/Windowing/cpp-winui/SampleApp/MainWindow.xaml.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using namespace winrt;
1212
using namespace Microsoft::UI::Xaml;
1313
using namespace Microsoft::UI::Xaml::Controls;
1414

15-
15+
1616
namespace winrt::SampleApp::implementation
1717
{
1818

@@ -31,13 +31,13 @@ namespace winrt::SampleApp::implementation
3131
}
3232

3333

34-
void MainWindow::NavigationView_Loaded(winrt::IInspectable const& sender, winrt::RoutedEventArgs const& args)
34+
void MainWindow::NavigationView_Loaded(winrt::IInspectable const& /*sender*/, winrt::RoutedEventArgs const& /*args*/)
3535
{
3636
ContentFrame().Navigate(xaml_typename<winrt::SampleApp::DemoPage>(), *this);
3737
}
3838

3939

40-
void MainWindow::NavigationView_ItemInvoked(winrt::IInspectable const& sender, winrt::NavigationViewItemInvokedEventArgs const& args)
40+
void MainWindow::NavigationView_ItemInvoked(winrt::IInspectable const& /*sender*/, winrt::NavigationViewItemInvokedEventArgs const& args)
4141
{
4242
if (args.InvokedItemContainer() != nullptr)
4343
{
@@ -64,15 +64,15 @@ namespace winrt::SampleApp::implementation
6464
}
6565

6666

67-
void MainWindow::NavigationView_BackRequested(winrt::NavigationView const& sender, winrt::NavigationViewBackRequestedEventArgs const& args)
67+
void MainWindow::NavigationView_BackRequested(winrt::NavigationView const& /*sender*/, winrt::NavigationViewBackRequestedEventArgs const& /*args*/)
6868
{
6969
if (ContentFrame().CanGoBack())
7070
{
7171
ContentFrame().GoBack();
7272
}
7373
}
7474

75-
void MainWindow::MyWindowIcon_DoubleTapped(winrt::IInspectable const& sender, winrt::Microsoft::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& e)
75+
void MainWindow::MyWindowIcon_DoubleTapped(winrt::IInspectable const& /*sender*/, winrt::Microsoft::UI::Xaml::Input::DoubleTappedRoutedEventArgs const& /*e*/)
7676
{
7777
this->AppWindow().Destroy();
7878
}
@@ -93,7 +93,7 @@ namespace winrt::SampleApp::implementation
9393

9494
// Get the AppWindow for the WindowId
9595
Microsoft::UI::Windowing::AppWindow appWindow = Microsoft::UI::Windowing::AppWindow::GetFromWindowId(windowId);
96-
96+
9797
return appWindow;
9898
}
9999
}

0 commit comments

Comments
 (0)