Enabled Nullable reference type feature of C# 8.

vkradio · vkradio · commit 9579e47738ef · 2020-04-02T16:31:59.000+05:00
diff --git a/src/ApplicationCore/ApplicationCore.csproj b/src/ApplicationCore/ApplicationCore.csproj
@@ -1,8 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ApplicationCore/Entities/Store.cs b/src/ApplicationCore/Entities/Store.cs
@@ -8,7 +8,7 @@ public class Store
     {
         public int Id { get; set; }
 
-        public string Name { get; set; }
+        public string Name { get; set; } = string.Empty;
 
         public int OrdinalNumber { get; set; }
 
diff --git a/src/FashionStoreWinForms/FashionStoreWinForms.csproj b/src/FashionStoreWinForms/FashionStoreWinForms.csproj
@@ -12,6 +12,7 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+	<LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/src/FashionStoreWinForms/Forms/FRM_Main.cs b/src/FashionStoreWinForms/Forms/FRM_Main.cs
@@ -22,6 +22,7 @@ namespace FashionStoreWinForms.Forms
 {
     public partial class FRM_Main : Form, ILegacyWorkspaceContext, ILocalizationService
     {
+#nullable enable
         readonly WorkspaceViewModel workspaceViewModel;
         readonly IStoreManagementService storeManagementService;
 
@@ -43,6 +44,7 @@ public void SetCurrentStore(Store store)
         #region ILocalizationService
         public string AskProceedAndAbandonFormData => Resources.ASK_PROCEED_AND_ABANDON_FORM_DATA;
         #endregion
+#nullable restore
 
         bool AskForSaveIfNeeded()
         {
@@ -85,32 +87,32 @@ async void FRM_Main_Load(object sender, EventArgs e)
         }
         void MI_Card_PointOfSale_Click(object sender, EventArgs e)
         {
-            using (FRM_Card_PointOfSale frm = new FRM_Card_PointOfSale())
-                frm.ShowDialog(this);
+            using FRM_Card_PointOfSale frm = new FRM_Card_PointOfSale();
+            frm.ShowDialog(this);
         }
         void MI_DressMatrix_Click(object sender, EventArgs e)
         {
-            using (FRM_DressMatrix frm = new FRM_DressMatrix())
-                frm.ShowDialog(this);
+            using FRM_DressMatrix frm = new FRM_DressMatrix();
+            frm.ShowDialog(this);
         }
         void MI_Sql_Click(object sender, EventArgs e)
         {
-            using (FRM_Sql frm = new FRM_Sql())
-                frm.ShowDialog(this);
+            using FRM_Sql frm = new FRM_Sql();
+            frm.ShowDialog(this);
         }
         void MI_UserSettings_Click(object sender, EventArgs e)
         {
-            using (FRM_UserSettings frm = new FRM_UserSettings())
-                frm.ShowDialog(this);
+            using FRM_UserSettings frm = new FRM_UserSettings();
+            frm.ShowDialog(this);
         }
         void MI_AddSku_Click(object sender, EventArgs e) { AddSku(); }
         void MI_SearchSku_Click(object sender, EventArgs e) { SearchSku(); }
         void MI_SalesJournal_Click(object sender, EventArgs e)
         {
             PAN_Workplace.Controls.Clear();
 
-            using (FRM_SalesJournal frmSalesJournal = new FRM_SalesJournal())
-                frmSalesJournal.ShowDialog(this);
+            using FRM_SalesJournal frmSalesJournal = new FRM_SalesJournal();
+            frmSalesJournal.ShowDialog(this);
         }
         void MI_Backup_Click(object sender, EventArgs e)
         {
@@ -159,6 +161,7 @@ void MI_Backup_Click(object sender, EventArgs e)
             MessageBox.Show(this, Resources.BACKUP_COMPLETED, Resources.MESSAGE, MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
+#nullable enable
         #region Temporary mock StoreService
         class MockStoreService: IStoreManagementService
         {
@@ -195,13 +198,14 @@ public FRM_Main()
                 if (a.PropertyName == nameof(StoreSelectorViewModel.SelectedStore))
                 {
                     var storeVM = (StoreSelectorViewModel)s;
-                    var store = await storeManagementService.GetStore(storeVM.SelectedStore.StoreId);
+                    var store = await storeManagementService.GetStore(storeVM.SelectedStore!.StoreId);
                     SetCurrentStore(store);
                 }
             };
 
             warehouseSelector1.DataContext = workspaceViewModel.StoreSelector;
         }
+#nullable restore
 
         public void AddSku()
         {
@@ -250,17 +254,15 @@ void MakeReport(PointOfSale in_pos = null)
 
             if (in_pos != null)
             {
-                using (FRM_ReportParams frmParams = new FRM_ReportParams())
-                {
-                    frmParams.ShowDialog(this);
-                    if (!frmParams.MakeReport)
-                        return;
-                    articlePrefix = frmParams.ArticlePrefix != string.Empty ? frmParams.ArticlePrefix : null;
-                    showPriceOfPurchase = Settings.Default.LastRepShowPriceOfPurchase;
-                    showPriceOfSale = Settings.Default.LastRepShowPriceOfSale;
-                    showPriceOfStock = Settings.Default.LastRepShowPriceOfStock;
-                    showSizes = Settings.Default.LastRepShowSizes;
-                }
+                using FRM_ReportParams frmParams = new FRM_ReportParams();
+                frmParams.ShowDialog(this);
+                if (!frmParams.MakeReport)
+                    return;
+                articlePrefix = frmParams.ArticlePrefix != string.Empty ? frmParams.ArticlePrefix : null;
+                showPriceOfPurchase = Settings.Default.LastRepShowPriceOfPurchase;
+                showPriceOfSale = Settings.Default.LastRepShowPriceOfSale;
+                showPriceOfStock = Settings.Default.LastRepShowPriceOfStock;
+                showSizes = Settings.Default.LastRepShowSizes;
             }
 
             List<string> textLines = new List<string>();
diff --git a/src/MvvmInfrastructure/MvvmInfrastructure.csproj b/src/MvvmInfrastructure/MvvmInfrastructure.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/MvvmInfrastructure/PropertyChangeNotifier.cs b/src/MvvmInfrastructure/PropertyChangeNotifier.cs
@@ -5,7 +5,7 @@ namespace MvvmInfrastructure
 {
     public class PropertyChangeNotifier : INotifyPropertyChanged
     {
-        readonly PropertyChangeNotifier parent;
+        readonly PropertyChangeNotifier? parent;
 
         bool busy;
 
@@ -26,8 +26,8 @@ public virtual bool Busy
             }
         }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        protected void OnPropertyChanged([CallerMemberName] string? propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 }
diff --git a/src/Utilities/DictionaryUtilities.cs b/src/Utilities/DictionaryUtilities.cs
@@ -14,6 +14,7 @@ public static class DictionaryUtilities
         /// <param name="dictionary">Dictionary</param>
         /// <param name="key">Key</param>
         public static void Inc<T>(this Dictionary<T, int> dictionary, T key)
+            where T : notnull
         {
             Guard.Against.Null(dictionary, nameof(dictionary));
 
diff --git a/src/Utilities/EnumUtilities.cs b/src/Utilities/EnumUtilities.cs
@@ -1,15 +1,21 @@
-﻿using System;
+﻿using Ardalis.GuardClauses;
+using System;
 using System.Linq;
 
 namespace Utilities
 {
     public static class EnumUtilities
     {
         public static TMapTo MapTo<T, TMapTo>(this T thisValue)
+            where T : notnull
+            where TMapTo : notnull
         {
-            var optionsName = Enum.GetName(typeof(T), thisValue).ToUpperInvariant();
-            var button = ((TMapTo[])Enum.GetValues(typeof(TMapTo)))
-                .Where(v => Enum.GetName(typeof(TMapTo), v).ToUpperInvariant() == optionsName)
+            Guard.Against.Null(thisValue, nameof(thisValue));
+
+            var optionsName = Enum.GetName(typeof(T), thisValue)!.ToUpperInvariant();
+            var button = ((TMapTo[])Enum
+                .GetValues(typeof(TMapTo)))
+                .Where(val => Enum.GetName(typeof(TMapTo), val!)!.ToUpperInvariant() == optionsName)
                 .Single();
             return button;
         }
diff --git a/src/Utilities/Utilities.csproj b/src/Utilities/Utilities.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ViewModels/StoreButtonViewModel.cs b/src/ViewModels/StoreButtonViewModel.cs
@@ -45,7 +45,9 @@ public StoreButtonViewModel(Store store)
         {
             Guard.Against.Null(store, nameof(store));
 
-            StoreName = store.Name;
+            storeName = store.Name;
+            OnPropertyChanged(nameof(StoreName));
+
             StoreId = store.Id;
         }
     }
diff --git a/src/ViewModels/StoreSelectorViewModel.cs b/src/ViewModels/StoreSelectorViewModel.cs
@@ -13,14 +13,13 @@ public class StoreSelectorViewModel : PropertyChangeNotifier
         readonly IStoreManagementService storeManagementService;
 
         #region Private underlying fields
-        ObservableCollection<StoreButtonViewModel> selectorButtons;
-        StoreButtonViewModel selectedStore;
+        StoreButtonViewModel? selectedStore;
         #endregion
 
         #region Public properties and actions
-        public ObservableCollection<StoreButtonViewModel> SelectorButtons => selectorButtons;
+        public ObservableCollection<StoreButtonViewModel>? SelectorButtons { get; private set; }
 
-        public StoreButtonViewModel SelectedStore
+        public StoreButtonViewModel? SelectedStore
         {
             get => selectedStore;
 
@@ -51,7 +50,7 @@ public async Task Initialize()
             var storeButtons = stores
                 .Select(store => new StoreButtonViewModel(store));
 
-            selectorButtons = new ObservableCollection<StoreButtonViewModel>(storeButtons);
+            SelectorButtons = new ObservableCollection<StoreButtonViewModel>(storeButtons);
             OnPropertyChanged(nameof(SelectorButtons));
 
             SelectedStore = SelectorButtons.FirstOrDefault();
diff --git a/src/ViewModels/ViewModels.csproj b/src/ViewModels/ViewModels.csproj
@@ -1,8 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ViewModels/WorkspaceViewModel.cs b/src/ViewModels/WorkspaceViewModel.cs
@@ -70,7 +70,8 @@ ILegacyWorkspaceContext legacyWorkspaceContext
             this.storeManagementService = storeManagementService;
             this.legacyWorkspaceContext = legacyWorkspaceContext;
 
-            StoreSelector = new StoreSelectorViewModel(this, this.storeManagementService);
+            storeSelector = new StoreSelectorViewModel(this, this.storeManagementService);
+            OnPropertyChanged(nameof(StoreSelector));
         }
 
         public async Task Initialize()
diff --git a/src/WinFormsInfrastructure/DialogService.cs b/src/WinFormsInfrastructure/DialogService.cs
@@ -1,4 +1,7 @@
-﻿using MvvmInfrastructure;
+﻿#nullable enable
+
+using Ardalis.GuardClauses;
+using MvvmInfrastructure;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,9 +16,10 @@ public class DialogService : IDialogService
     {
         public DialogResultEnum PresentDialog(string question, DialogOptionsEnum options)
         {
+            Guard.Against.NullOrEmpty(question, nameof(question));
+
             var button = options.MapTo<DialogOptionsEnum, MessageBoxButtons>();
-            var nonNullQuestion = question ?? string.Empty;
-            var dlgResult = MessageBox.Show(nonNullQuestion, nonNullQuestion.Length > 30 ? (question.Substring(0, 28) + "...") : nonNullQuestion, button);
+            var dlgResult = MessageBox.Show(question, question.Length > 30 ? (question.Substring(0, 28) + "...") : question, button);
             return dlgResult.MapTo<DialogResult, DialogResultEnum>();
         }
 
@@ -36,3 +40,5 @@ public string SelectDirectoryPath()
         }
     }
 }
+
+#nullable restore
diff --git a/src/WinFormsInfrastructure/WinFormsInfrastructure.csproj b/src/WinFormsInfrastructure/WinFormsInfrastructure.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,6 +57,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Ardalis.GuardClauses">
+      <Version>1.4.2</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
       <Version>2.9.8</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/tests/ViewModelsTests/StoreButtonViewModelUT.cs b/tests/tests/ViewModelsTests/StoreButtonViewModelUT.cs
@@ -13,10 +13,10 @@ public class StoreButtonViewModelUT
         public void WillThrowExceptionIfConstructorPassNullStore()
         {
             // Arrange
-            Store nullStore = null;
+            Store? nullStore = null;
 
             // Act
-            var ex = Assert.Throws<ArgumentNullException>(() => new StoreButtonViewModel(nullStore));
+            var ex = Assert.Throws<ArgumentNullException>(() => new StoreButtonViewModel(nullStore!));
 
             // Assert
             Assert.NotNull(ex);
diff --git a/tests/tests/ViewModelsTests/StoreSelectorViewModel/SelectedStoreAndNotificationsUT.cs b/tests/tests/ViewModelsTests/StoreSelectorViewModel/SelectedStoreAndNotificationsUT.cs
@@ -15,8 +15,8 @@ namespace ViewModelsTests.StoreSelectorViewModel
     public class SelectedStoreAndNotificationsUT
     {
         (Mock<IStoreManagementService>, vm.WorkspaceViewModel) CreateBaseMocks(
-            Mock<vm.ILegacyWorkspaceContext> mockOverrideLegacyWorkspaceContext = null,
-            Mock<IDialogService> mockOverrideDialogService = null
+            Mock<vm.ILegacyWorkspaceContext>? mockOverrideLegacyWorkspaceContext = null,
+            Mock<IDialogService>? mockOverrideDialogService = null
         )
         {
             var mockDialogService = mockOverrideDialogService ?? new Mock<IDialogService>();
@@ -72,7 +72,7 @@ public async void DifferentSelectionConditions(bool selectDifferentStore, bool n
 
             const int nextStoreIndex = 1;
             var oldStore = workspace.StoreSelector.SelectedStore;
-            var nextStore = workspace.StoreSelector.SelectorButtons[nextStoreIndex];
+            var nextStore = workspace.StoreSelector.SelectorButtons![nextStoreIndex];
             Assert.NotEqual(oldStore, nextStore);
 
             // Act
diff --git a/tests/tests/ViewModelsTests/StoreSelectorViewModelUT.cs b/tests/tests/ViewModelsTests/StoreSelectorViewModelUT.cs
diff --git a/tests/tests/ViewModelsTests/ViewModelsTests.csproj b/tests/tests/ViewModelsTests/ViewModelsTests.csproj
diff --git a/tests/tests/ViewModelsTests/WorkspaceViewModelUT.cs b/tests/tests/ViewModelsTests/WorkspaceViewModelUT.cs

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class Store`
`8`	`8`	`{`
`9`	`9`	`public int Id { get; set; }`
`10`	`10`
`11`		`- public string Name { get; set; }`
	`11`	`+ public string Name { get; set; } = string.Empty;`
`12`	`12`
`13`	`13`	`public int OrdinalNumber { get; set; }`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ namespace FashionStoreWinForms.Forms`
`22`	`22`	`{`
`23`	`23`	`public partial class FRM_Main : Form, ILegacyWorkspaceContext, ILocalizationService`
`24`	`24`	`{`
	`25`	`+#nullable enable`
`25`	`26`	`readonly WorkspaceViewModel workspaceViewModel;`
`26`	`27`	`readonly IStoreManagementService storeManagementService;`
`27`	`28`
`@@ -43,6 +44,7 @@ public void SetCurrentStore(Store store)`
`43`	`44`	`#region ILocalizationService`
`44`	`45`	`public string AskProceedAndAbandonFormData => Resources.ASK_PROCEED_AND_ABANDON_FORM_DATA;`
`45`	`46`	`#endregion`
	`47`	`+#nullable restore`
`46`	`48`
`47`	`49`	`bool AskForSaveIfNeeded()`
`48`	`50`	`{`
`@@ -85,32 +87,32 @@ async void FRM_Main_Load(object sender, EventArgs e)`
`85`	`87`	`}`
`86`	`88`	`void MI_Card_PointOfSale_Click(object sender, EventArgs e)`
`87`	`89`	`{`
`88`		`- using (FRM_Card_PointOfSale frm = new FRM_Card_PointOfSale())`
`89`		`- frm.ShowDialog(this);`
	`90`	`+ using FRM_Card_PointOfSale frm = new FRM_Card_PointOfSale();`
	`91`	`+ frm.ShowDialog(this);`
`90`	`92`	`}`
`91`	`93`	`void MI_DressMatrix_Click(object sender, EventArgs e)`
`92`	`94`	`{`
`93`		`- using (FRM_DressMatrix frm = new FRM_DressMatrix())`
`94`		`- frm.ShowDialog(this);`
	`95`	`+ using FRM_DressMatrix frm = new FRM_DressMatrix();`
	`96`	`+ frm.ShowDialog(this);`
`95`	`97`	`}`
`96`	`98`	`void MI_Sql_Click(object sender, EventArgs e)`
`97`	`99`	`{`
`98`		`- using (FRM_Sql frm = new FRM_Sql())`
`99`		`- frm.ShowDialog(this);`
	`100`	`+ using FRM_Sql frm = new FRM_Sql();`
	`101`	`+ frm.ShowDialog(this);`
`100`	`102`	`}`
`101`	`103`	`void MI_UserSettings_Click(object sender, EventArgs e)`
`102`	`104`	`{`
`103`		`- using (FRM_UserSettings frm = new FRM_UserSettings())`
`104`		`- frm.ShowDialog(this);`
	`105`	`+ using FRM_UserSettings frm = new FRM_UserSettings();`
	`106`	`+ frm.ShowDialog(this);`
`105`	`107`	`}`
`106`	`108`	`void MI_AddSku_Click(object sender, EventArgs e) { AddSku(); }`
`107`	`109`	`void MI_SearchSku_Click(object sender, EventArgs e) { SearchSku(); }`
`108`	`110`	`void MI_SalesJournal_Click(object sender, EventArgs e)`
`109`	`111`	`{`
`110`	`112`	`PAN_Workplace.Controls.Clear();`
`111`	`113`
`112`		`- using (FRM_SalesJournal frmSalesJournal = new FRM_SalesJournal())`
`113`		`- frmSalesJournal.ShowDialog(this);`
	`114`	`+ using FRM_SalesJournal frmSalesJournal = new FRM_SalesJournal();`
	`115`	`+ frmSalesJournal.ShowDialog(this);`
`114`	`116`	`}`
`115`	`117`	`void MI_Backup_Click(object sender, EventArgs e)`
`116`	`118`	`{`
`@@ -159,6 +161,7 @@ void MI_Backup_Click(object sender, EventArgs e)`
`159`	`161`	`MessageBox.Show(this, Resources.BACKUP_COMPLETED, Resources.MESSAGE, MessageBoxButtons.OK, MessageBoxIcon.Information);`
`160`	`162`	`}`
`161`	`163`
	`164`	`+#nullable enable`
`162`	`165`	`#region Temporary mock StoreService`
`163`	`166`	`class MockStoreService: IStoreManagementService`
`164`	`167`	`{`
`@@ -195,13 +198,14 @@ public FRM_Main()`
`195`	`198`	`if (a.PropertyName == nameof(StoreSelectorViewModel.SelectedStore))`
`196`	`199`	`{`
`197`	`200`	`var storeVM = (StoreSelectorViewModel)s;`
`198`		`- var store = await storeManagementService.GetStore(storeVM.SelectedStore.StoreId);`
	`201`	`+ var store = await storeManagementService.GetStore(storeVM.SelectedStore!.StoreId);`
`199`	`202`	`SetCurrentStore(store);`
`200`	`203`	`}`
`201`	`204`	`};`
`202`	`205`
`203`	`206`	`warehouseSelector1.DataContext = workspaceViewModel.StoreSelector;`
`204`	`207`	`}`
	`208`	`+#nullable restore`
`205`	`209`
`206`	`210`	`public void AddSku()`
`207`	`211`	`{`
`@@ -250,17 +254,15 @@ void MakeReport(PointOfSale in_pos = null)`
`250`	`254`
`251`	`255`	`if (in_pos != null)`
`252`	`256`	`{`
`253`		`- using (FRM_ReportParams frmParams = new FRM_ReportParams())`
`254`		`- {`
`255`		`- frmParams.ShowDialog(this);`
`256`		`- if (!frmParams.MakeReport)`
`257`		`- return;`
`258`		`- articlePrefix = frmParams.ArticlePrefix != string.Empty ? frmParams.ArticlePrefix : null;`
`259`		`- showPriceOfPurchase = Settings.Default.LastRepShowPriceOfPurchase;`
`260`		`- showPriceOfSale = Settings.Default.LastRepShowPriceOfSale;`
`261`		`- showPriceOfStock = Settings.Default.LastRepShowPriceOfStock;`
`262`		`- showSizes = Settings.Default.LastRepShowSizes;`
`263`		`- }`
	`257`	`+ using FRM_ReportParams frmParams = new FRM_ReportParams();`
	`258`	`+ frmParams.ShowDialog(this);`
	`259`	`+ if (!frmParams.MakeReport)`
	`260`	`+ return;`
	`261`	`+ articlePrefix = frmParams.ArticlePrefix != string.Empty ? frmParams.ArticlePrefix : null;`
	`262`	`+ showPriceOfPurchase = Settings.Default.LastRepShowPriceOfPurchase;`
	`263`	`+ showPriceOfSale = Settings.Default.LastRepShowPriceOfSale;`
	`264`	`+ showPriceOfStock = Settings.Default.LastRepShowPriceOfStock;`
	`265`	`+ showSizes = Settings.Default.LastRepShowSizes;`
`264`	`266`	`}`
`265`	`267`
`266`	`268`	`List<string> textLines = new List<string>();`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace MvvmInfrastructure`
`5`	`5`	`{`
`6`	`6`	`public class PropertyChangeNotifier : INotifyPropertyChanged`
`7`	`7`	`{`
`8`		`- readonly PropertyChangeNotifier parent;`
	`8`	`+ readonly PropertyChangeNotifier? parent;`
`9`	`9`
`10`	`10`	`bool busy;`
`11`	`11`
`@@ -26,8 +26,8 @@ public virtual bool Busy`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`29`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`30`	`30`
`31`		`- protected void OnPropertyChanged([CallerMemberName] string propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
	`31`	`+ protected void OnPropertyChanged([CallerMemberName] string? propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public static class DictionaryUtilities`
`14`	`14`	`/// <param name="dictionary">Dictionary</param>`
`15`	`15`	`/// <param name="key">Key</param>`
`16`	`16`	`public static void Inc<T>(this Dictionary<T, int> dictionary, T key)`
	`17`	`+ where T : notnull`
`17`	`18`	`{`
`18`	`19`	`Guard.Against.Null(dictionary, nameof(dictionary));`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,9 @@ public StoreButtonViewModel(Store store)`
`45`	`45`	`{`
`46`	`46`	`Guard.Against.Null(store, nameof(store));`
`47`	`47`
`48`		`- StoreName = store.Name;`
	`48`	`+ storeName = store.Name;`
	`49`	`+ OnPropertyChanged(nameof(StoreName));`
	`50`	`+`
`49`	`51`	`StoreId = store.Id;`
`50`	`52`	`}`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ ILegacyWorkspaceContext legacyWorkspaceContext`
`70`	`70`	`this.storeManagementService = storeManagementService;`
`71`	`71`	`this.legacyWorkspaceContext = legacyWorkspaceContext;`
`72`	`72`
`73`		`- StoreSelector = new StoreSelectorViewModel(this, this.storeManagementService);`
	`73`	`+ storeSelector = new StoreSelectorViewModel(this, this.storeManagementService);`
	`74`	`+ OnPropertyChanged(nameof(StoreSelector));`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`public async Task Initialize()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`		`-using MvvmInfrastructure;`
	`1`	`+#nullable enable`
	`2`	`+`
	`3`	`+using Ardalis.GuardClauses;`
	`4`	`+using MvvmInfrastructure;`
`2`	`5`	`using System;`
`3`	`6`	`using System.Collections.Generic;`
`4`	`7`	`using System.Linq;`
`@@ -13,9 +16,10 @@ public class DialogService : IDialogService`
`13`	`16`	`{`
`14`	`17`	`public DialogResultEnum PresentDialog(string question, DialogOptionsEnum options)`
`15`	`18`	`{`
	`19`	`+ Guard.Against.NullOrEmpty(question, nameof(question));`
	`20`	`+`
`16`	`21`	`var button = options.MapTo<DialogOptionsEnum, MessageBoxButtons>();`
`17`		`- var nonNullQuestion = question ?? string.Empty;`
`18`		`- var dlgResult = MessageBox.Show(nonNullQuestion, nonNullQuestion.Length > 30 ? (question.Substring(0, 28) + "...") : nonNullQuestion, button);`
	`22`	`+ var dlgResult = MessageBox.Show(question, question.Length > 30 ? (question.Substring(0, 28) + "...") : question, button);`
`19`	`23`	`return dlgResult.MapTo<DialogResult, DialogResultEnum>();`
`20`	`24`	`}`
`21`	`25`
`@@ -36,3 +40,5 @@ public string SelectDirectoryPath()`
`36`	`40`	`}`
`37`	`41`	`}`
`38`	`42`	`}`
	`43`	`+`
	`44`	`+#nullable restore`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ namespace ViewModelsTests.StoreSelectorViewModel`
`15`	`15`	`public class SelectedStoreAndNotificationsUT`
`16`	`16`	`{`
`17`	`17`	`(Mock<IStoreManagementService>, vm.WorkspaceViewModel) CreateBaseMocks(`
`18`		`- Mock<vm.ILegacyWorkspaceContext> mockOverrideLegacyWorkspaceContext = null,`
`19`		`- Mock<IDialogService> mockOverrideDialogService = null`
	`18`	`+ Mock<vm.ILegacyWorkspaceContext>? mockOverrideLegacyWorkspaceContext = null,`
	`19`	`+ Mock<IDialogService>? mockOverrideDialogService = null`
`20`	`20`	`)`
`21`	`21`	`{`
`22`	`22`	`var mockDialogService = mockOverrideDialogService ?? new Mock<IDialogService>();`
`@@ -72,7 +72,7 @@ public async void DifferentSelectionConditions(bool selectDifferentStore, bool n`
`72`	`72`
`73`	`73`	`const int nextStoreIndex = 1;`
`74`	`74`	`var oldStore = workspace.StoreSelector.SelectedStore;`
`75`		`- var nextStore = workspace.StoreSelector.SelectorButtons[nextStoreIndex];`
	`75`	`+ var nextStore = workspace.StoreSelector.SelectorButtons![nextStoreIndex];`
`76`	`76`	`Assert.NotEqual(oldStore, nextStore);`
`77`	`77`
`78`	`78`	`// Act`