housekeeping: Update copyright year, apply more refactorings (#415)

* Update copyright year * More file scoped namespaces
reactiveui · Jan 8, 2022 · 9146f19 · 9146f19
1 parent d69202d
commit 9146f19
Show file tree

Hide file tree

Showing 45 changed files with 277 additions and 280 deletions.
diff --git a/samples/LoginApp.Avalonia/App.xaml.cs b/samples/LoginApp.Avalonia/App.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Avalonia/Program.cs b/samples/LoginApp.Avalonia/Program.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Avalonia/Services/AvaloniaUserDialogs.cs b/samples/LoginApp.Avalonia/Services/AvaloniaUserDialogs.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Avalonia/Views/SignUpView.xaml.cs b/samples/LoginApp.Avalonia/Views/SignUpView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Uwp/App.xaml.cs b/samples/LoginApp.Uwp/App.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
@@ -8,40 +8,39 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace LoginApp.Uwp
+namespace LoginApp.Uwp;
+
+/// <summary>
+/// Defines the main Universal Windows Application class.
+/// </summary>
+/// <inheritdoc />
+public sealed partial class App : Application
 {
     /// <summary>
-    /// Defines the main Universal Windows Application class.
+    /// Initializes a new instance of the <see cref="App"/> class.
     /// </summary>
+    public App() => InitializeComponent();
+
     /// <inheritdoc />
-    public sealed partial class App : Application
+    protected override void OnLaunched(LaunchActivatedEventArgs e)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="App"/> class.
-        /// </summary>
-        public App() => InitializeComponent();
-
-        /// <inheritdoc />
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        Frame rootFrame = Window.Current.Content as Frame;
+        if (rootFrame == null)
         {
-            Frame rootFrame = Window.Current.Content as Frame;
-            if (rootFrame == null)
-            {
-                rootFrame = new Frame();
-                Window.Current.Content = rootFrame;
-            }
-
-            if (e?.PrelaunchActivated == true)
-            {
-                return;
-            }
+            rootFrame = new Frame();
+            Window.Current.Content = rootFrame;
+        }
 
-            if (rootFrame.Content == null)
-            {
-                rootFrame.Navigate(typeof(SignUpView), e?.Arguments);
-            }
+        if (e?.PrelaunchActivated == true)
+        {
+            return;
+        }
 
-            Window.Current.Activate();
+        if (rootFrame.Content == null)
+        {
+            rootFrame.Navigate(typeof(SignUpView), e?.Arguments);
         }
+
+        Window.Current.Activate();
     }
 }
diff --git a/samples/LoginApp.Uwp/LoginApp.Uwp.csproj b/samples/LoginApp.Uwp/LoginApp.Uwp.csproj
@@ -18,6 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/samples/LoginApp.Uwp/Properties/AssemblyInfo.cs b/samples/LoginApp.Uwp/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Uwp/Services/UwpUserDialogs.cs b/samples/LoginApp.Uwp/Services/UwpUserDialogs.cs
@@ -1,19 +1,18 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
 using LoginApp.Services;
 using Windows.UI.Popups;
 
-namespace LoginApp.Uwp.Services
+namespace LoginApp.Uwp.Services;
+
+/// <summary>
+/// This class defines user dialogs for the Universal Windows Platform app.
+/// </summary>
+public class UwpUserDialogs : IUserDialogs
 {
-    /// <summary>
-    /// This class defines user dialogs for the Universal Windows Platform app.
-    /// </summary>
-    public class UwpUserDialogs : IUserDialogs
-    {
-        /// <inheritdoc />
-        public void ShowDialog(string message) => new MessageDialog(message).ShowAsync();
-    }
+    /// <inheritdoc />
+    public void ShowDialog(string message) => new MessageDialog(message).ShowAsync();
 }
diff --git a/samples/LoginApp.Uwp/Views/SignUpView.xaml.cs b/samples/LoginApp.Uwp/Views/SignUpView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
@@ -11,74 +11,73 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
-namespace LoginApp.Uwp.Views
+namespace LoginApp.Uwp.Views;
+
+/// <summary>
+/// A page which contains controls for signing up.
+/// </summary>
+public sealed partial class SignUpView : Page, IViewFor<SignUpViewModel>
 {
     /// <summary>
-    /// A page which contains controls for signing up.
+    /// Defines the view model dependency property for the <see cref="SignUpView" /> class.
     /// </summary>
-    public sealed partial class SignUpView : Page, IViewFor<SignUpViewModel>
-    {
-        /// <summary>
-        /// Defines the view model dependency property for the <see cref="SignUpView" /> class.
-        /// </summary>
-        // ReSharper disable once MemberCanBePrivate.Global due to MSDN recommendations.
-        public static readonly DependencyProperty ViewModelProperty = DependencyProperty
-            .Register(nameof(ViewModel), typeof(SignUpViewModel), typeof(SignUpView), null);
+    // ReSharper disable once MemberCanBePrivate.Global due to MSDN recommendations.
+    public static readonly DependencyProperty ViewModelProperty = DependencyProperty
+        .Register(nameof(ViewModel), typeof(SignUpViewModel), typeof(SignUpView), null);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignUpView"/> class.
-        /// </summary>
-        public SignUpView()
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SignUpView"/> class.
+    /// </summary>
+    public SignUpView()
+    {
+        ViewModel = new SignUpViewModel(null, new UwpUserDialogs());
+        InitializeComponent();
+        this.WhenActivated(disposables =>
         {
-            ViewModel = new SignUpViewModel(null, new UwpUserDialogs());
-            InitializeComponent();
-            this.WhenActivated(disposables =>
-            {
-                this.Bind(ViewModel, x => x.UserName, x => x.UserNameTextBox.Text)
-                    .DisposeWith(disposables);
-                this.Bind(ViewModel, x => x.Password, x => x.PasswordTextBox.Text)
-                    .DisposeWith(disposables);
-                this.Bind(ViewModel, x => x.ConfirmPassword, x => x.ConfirmPasswordTextBox.Text)
-                    .DisposeWith(disposables);
+            this.Bind(ViewModel, x => x.UserName, x => x.UserNameTextBox.Text)
+                .DisposeWith(disposables);
+            this.Bind(ViewModel, x => x.Password, x => x.PasswordTextBox.Text)
+                .DisposeWith(disposables);
+            this.Bind(ViewModel, x => x.ConfirmPassword, x => x.ConfirmPasswordTextBox.Text)
+                .DisposeWith(disposables);
 
-                this.BindCommand(ViewModel, x => x.SignUp, x => x.SignUpButton)
-                    .DisposeWith(disposables);
+            this.BindCommand(ViewModel, x => x.SignUp, x => x.SignUpButton)
+                .DisposeWith(disposables);
 
-                this.BindValidation(ViewModel, x => x.UserName, x => x.UserNameErrorLabel.Text)
-                    .DisposeWith(disposables);
-                this.BindValidation(ViewModel, x => x.Password, x => x.PasswordErrorLabel.Text)
-                    .DisposeWith(disposables);
-                this.BindValidation(ViewModel, x => x.ConfirmPassword, x => x.ConfirmPasswordErrorLabel.Text)
-                    .DisposeWith(disposables);
-                this.BindValidation(ViewModel, x => x.ErrorLabel.Text)
-                    .DisposeWith(disposables);
+            this.BindValidation(ViewModel, x => x.UserName, x => x.UserNameErrorLabel.Text)
+                .DisposeWith(disposables);
+            this.BindValidation(ViewModel, x => x.Password, x => x.PasswordErrorLabel.Text)
+                .DisposeWith(disposables);
+            this.BindValidation(ViewModel, x => x.ConfirmPassword, x => x.ConfirmPasswordErrorLabel.Text)
+                .DisposeWith(disposables);
+            this.BindValidation(ViewModel, x => x.ErrorLabel.Text)
+                .DisposeWith(disposables);
 
-                this.WhenAnyValue(x => x.UserNameErrorLabel.Text, text => !string.IsNullOrWhiteSpace(text))
-                    .BindTo(this, x => x.UserNameErrorLabel.Visibility)
-                    .DisposeWith(disposables);
-                this.WhenAnyValue(x => x.PasswordErrorLabel.Text, text => !string.IsNullOrWhiteSpace(text))
-                    .BindTo(this, x => x.PasswordErrorLabel.Visibility)
-                    .DisposeWith(disposables);
-                this.WhenAnyValue(x => x.ConfirmPasswordErrorLabel.Text, text => !string.IsNullOrWhiteSpace(text))
-                    .BindTo(this, x => x.ConfirmPasswordErrorLabel.Visibility)
-                    .DisposeWith(disposables);
-            });
-        }
+            this.WhenAnyValue(x => x.UserNameErrorLabel.Text, text => !string.IsNullOrWhiteSpace(text))
+                .BindTo(this, x => x.UserNameErrorLabel.Visibility)
+                .DisposeWith(disposables);
+            this.WhenAnyValue(x => x.PasswordErrorLabel.Text, text => !string.IsNullOrWhiteSpace(text))
+                .BindTo(this, x => x.PasswordErrorLabel.Visibility)
+                .DisposeWith(disposables);
+            this.WhenAnyValue(x => x.ConfirmPasswordErrorLabel.Text, text => !string.IsNullOrWhiteSpace(text))
+                .BindTo(this, x => x.ConfirmPasswordErrorLabel.Visibility)
+                .DisposeWith(disposables);
+        });
+    }
 
-        /// <summary>
-        /// Gets or sets the view model.
-        /// </summary>
-        public SignUpViewModel ViewModel
-        {
-            get => (SignUpViewModel)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
+    /// <summary>
+    /// Gets or sets the view model.
+    /// </summary>
+    public SignUpViewModel ViewModel
+    {
+        get => (SignUpViewModel)GetValue(ViewModelProperty);
+        set => SetValue(ViewModelProperty, value);
+    }
 
-        /// <inheritdoc/>
-        object IViewFor.ViewModel
-        {
-            get => ViewModel;
-            set => ViewModel = (SignUpViewModel)value;
-        }
+    /// <inheritdoc/>
+    object IViewFor.ViewModel
+    {
+        get => ViewModel;
+        set => ViewModel = (SignUpViewModel)value;
     }
 }
diff --git a/samples/LoginApp.WinForms/Program.cs b/samples/LoginApp.WinForms/Program.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.WinForms/Services/WindowsUserDialogs.cs b/samples/LoginApp.WinForms/Services/WindowsUserDialogs.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.WinForms/Views/SignUpView.cs b/samples/LoginApp.WinForms/Views/SignUpView.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Wpf/App.xaml.cs b/samples/LoginApp.Wpf/App.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Wpf/AppBootstrapper.cs b/samples/LoginApp.Wpf/AppBootstrapper.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Wpf/Program.cs b/samples/LoginApp.Wpf/Program.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Wpf/Services/WindowsUserDialogs.cs b/samples/LoginApp.Wpf/Services/WindowsUserDialogs.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp.Wpf/Views/SignUpView.xaml.cs b/samples/LoginApp.Wpf/Views/SignUpView.xaml.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.

diff --git a/samples/LoginApp/LoginApp.csproj b/samples/LoginApp/LoginApp.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI" Version="17.*" />

diff --git a/samples/LoginApp/Services/IUserDialogs.cs b/samples/LoginApp/Services/IUserDialogs.cs
@@ -1,19 +1,18 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2022 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-namespace LoginApp.Services
+namespace LoginApp.Services;
+
+/// <summary>
+/// This interface defines a platform-specific notification manager.
+/// </summary>
+public interface IUserDialogs
 {
     /// <summary>
-    /// This interface defines a platform-specific notification manager.
+    /// Displays a platform-specific notification containing a message.
     /// </summary>
-    public interface IUserDialogs
-    {
-        /// <summary>
-        /// Displays a platform-specific notification containing a message.
-        /// </summary>
-        /// <param name="message">The message to show.</param>
-        void ShowDialog(string message);
-    }
+    /// <param name="message">The message to show.</param>
+    void ShowDialog(string message);
 }