Merge branch 'master' into feature/mvvmlight-migration

Author: Sergio0694

azure-pipelines.yml

@@ -8,7 +8,8 @@ pool:
   vmImage: 'windows-latest'
 
 variables:
-  solution: '**/*.sln'
+  solutionUwp: 'samples/MvvmSampleUwp.sln'
+  solutionXf: 'samples/MvvmSampleUwp.sln'
   buildPlatform: 'x86|x64|ARM|ARM64'
   buildConfiguration: 'Release'
   appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'
@@ -26,6 +27,12 @@ steps:
 - task: VSBuild@1
   inputs:
     platform: 'x86'
-    solution: '$(solution)'
+    solution: '$(solutionUwp)'
     configuration: '$(buildConfiguration)'
     msbuildArgs: '/p:AppxBundlePlatforms="$(buildPlatform)" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload'
+
+- task: VSBuild@1
+  inputs:
+    platform: 'Any CPU'
+    solution: '$(solutionXf)'
+    configuration: '$(buildConfiguration)'

…mpleUwp/Assets/docs/AsyncRelayCommand.md …vvmSample.Core/Docs/AsyncRelayCommand.mdsamples/MvvmSampleUwp/MvvmSampleUwp/Assets/docs/AsyncRelayCommand.md renamed to samples/MvvmSample.Core/Docs/AsyncRelayCommand.md samples/MvvmSampleUwp/MvvmSampleUwp/Assets/docs/AsyncRelayCommand.md renamed to samples/MvvmSample.Core/Docs/AsyncRelayCommand.md

@@ -7,9 +7,9 @@ dev_langs:
   - csharp
 ---
 
-# Ioc ([Inversion of control](https://en.wikipedia.org/wiki/Inversion_of_control))
+# Ioc (Inversion of control)
 
-Inversion of Control is a common pattern that can be used to increase modularity in the codebase of an application when using the MVVM pattern. A frequently used way to enable this is to use _dependency injection_ (DI), which consists of creating a number of services that are injected into backend classes (i.e. passed as parameters to the viewmodel constructors). Doing this allows code using these services not to rely on the implementation details of these services, and it also makes it easy to swap the concrete implementations of these services. This pattern also makes it easy to make platform-specific features available to backend code, by abstracting them through a service which is then injected where needed. Since services are then isolated from where they are used, they become more testable as well.
+[Inversion of Control](https://en.wikipedia.org/wiki/Inversion_of_control) is a common pattern that can be used to increase modularity in the codebase of an application when using the MVVM pattern. A frequently used way to enable this is to use _dependency injection_ (DI), which consists of creating a number of services that are injected into backend classes (i.e. passed as parameters to the viewmodel constructors). Doing this allows code using these services not to rely on the implementation details of these services, and it also makes it easy to swap the concrete implementations of these services. This pattern also makes it easy to make platform-specific features available to backend code, by abstracting them through a service which is then injected where needed. Since services are then isolated from where they are used, they become more testable as well.
 
 The MVVM Toolkit doesn't provide built-in APIs to facilitate the usage of this pattern, as dedicated libraries specifically exist for this, such as the `Microsoft.Extensions.DependencyInjection` package. It provides a fully featured and powerful set of dependency injection APIs already and can be easily setup to use the [`IServiceProvider`](https://docs.microsoft.com/dotnet/api/system.iserviceprovider) interface. The following guide will refer to this library and provide a series of examples of how to integrate it into applications using the MVVM pattern with the MVVM Toolkit.
 

…vvmSampleUwp/Assets/docs/Introduction.md …les/MvvmSample.Core/Docs/Introduction.mdsamples/MvvmSampleUwp/MvvmSampleUwp/Assets/docs/Introduction.md renamed to samples/MvvmSample.Core/Docs/Introduction.md samples/MvvmSampleUwp/MvvmSampleUwp/Assets/docs/Introduction.md renamed to samples/MvvmSample.Core/Docs/Introduction.md

@@ -7,7 +7,7 @@ dev_langs:
   - csharp
 ---
 
-# RelayCommand and RelayCommand<T>
+# RelayCommand
 
 The [`RelayCommand`](https://docs.microsoft.com/dotnet/api/microsoft.toolkit.mvvm.input.RelayCommand) and [`RelayCommand<T>`](https://docs.microsoft.com/dotnet/api/microsoft.toolkit.mvvm.input.RelayCommand-1) are `ICommand` implementations that can expose a method or delegate to the view. These types act as a way to bind commands between the viewmodel and UI elements.
 

…mpleUwp/MvvmSampleUwp/Assets/docs/Ioc.md samples/MvvmSample.Core/Docs/Ioc.mdsamples/MvvmSampleUwp/MvvmSampleUwp/Assets/docs/Ioc.md renamed to samples/MvvmSample.Core/Docs/Ioc.md samples/MvvmSampleUwp/MvvmSampleUwp/Assets/docs/Ioc.md renamed to samples/MvvmSample.Core/Docs/Ioc.md

@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace MvvmSampleUwp.Helpers
+namespace MvvmSample.Core.Helpers
 {
     /// <summary>
     /// A simple class to help with basic operations on markdown documents.
@@ -21,7 +21,8 @@ public static class MarkdownHelper
         public static IReadOnlyDictionary<string, string> GetParagraphs(string text)
         {
             return
-                Regex.Matches(text, @"(?<=\W)#+ ([^\n]+).+?(?=\W#|$)", RegexOptions.Singleline)
+               Regex.Matches(text, @"(?<=\W)#+ ([^\n]+).+?(?=\W#|$)", RegexOptions.Singleline)
+               .OfType<Match>()
                 .ToDictionary(
                     m => m.Groups[1].Value.Trim().Replace("&lt;", "<"),
                     m => m.Groups[0].Value.Trim().Replace("&lt;", "<").Replace("[!WARNING]", "**WARNING:**").Replace("[!NOTE]", "**NOTE:**"));