Merge pull request #781 from lepoco/development

Development
lepoco · Oct 9, 2023 · bb3933b · bb3933b
2 parents 5a67397 + f465d5f
commit bb3933b
Show file tree

Hide file tree

Showing 238 changed files with 3,666 additions and 4,120 deletions.
diff --git a/.clabot b/.clabot
diff --git a/.csharpierrc b/.csharpierrc
@@ -0,0 +1,10 @@
+{
+    "printWidth": 130,
+    "useTabs": false,
+    "tabWidth": 4,
+    "preprocessorSymbolSets": [
+        "",
+        "DEBUG",
+        "DEBUG,CODE_STYLE"
+    ]
+}
diff --git a/.github/policies/cla.yml b/.github/policies/cla.yml
@@ -0,0 +1,25 @@
+name: Contributor License Agreement Policy
+description: CLA policy file
+
+resource: repository
+
+configuration: 
+   cla:
+      content: https://raw.githubusercontent.com/lepoco/.github/main/CLA/lepoco.yml
+      minimalChangeRequired: 
+         files: 1
+         codeLines: 1
+      bypassUsers:
+         - azclibot
+         - azure-pipelines[bot]
+         - azure-pipelines-bot
+         - azure-powershell-bot
+         - azuresdkciprbot
+         - dependabot[bot]
+         - dependabot-preview[bot]
+         - dotnet-bot
+         - dotnet-corert-bot
+         - dotnet-docker-bot
+         - dotnet-maestro[bot]
+         - dotnet-maestro-bot
+         - dotnet-winget-bot
diff --git a/.github/policies/platformcontext.yml b/.github/policies/platformcontext.yml
@@ -0,0 +1,10 @@
+name: platform_context
+description: The context for GitOps platform, this will drive GitOps specific policies
+owner:
+resource: repository
+where:
+configuration:
+  platformContext:
+    active: true
+onFailure:
+onSuccess:
diff --git a/.github/workflows/wpf-ui-cd-docs.yaml b/.github/workflows/wpf-ui-cd-docs.yaml
@@ -26,7 +26,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Use Node.js 18.x

diff --git a/.github/workflows/wpf-ui-cd-extension.yaml b/.github/workflows/wpf-ui-cd-extension.yaml
@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: microsoft/setup-msbuild@v1.3
         with:
           msbuild-architecture: x64

diff --git a/.github/workflows/wpf-ui-cd-nuget.yaml b/.github/workflows/wpf-ui-cd-nuget.yaml
@@ -10,7 +10,7 @@ jobs:
   deploy:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: microsoft/setup-msbuild@v1.3
         with:
           msbuild-architecture: x64

diff --git a/.github/workflows/wpf-ui-pr-validator.yaml b/.github/workflows/wpf-ui-pr-validator.yaml
@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: microsoft/setup-msbuild@v1.3
         with:
           msbuild-architecture: x64

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.0-preview.6</Version>
+    <Version>3.0.0-preview.7</Version>
     <LangVersion>11.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -11,14 +11,14 @@
     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.4.2118" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.1462.37" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
-    <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="NativeMethods" Version="0.0.3" />
+    <PackageVersion Include="NSubstitute" Version="5.0.0" />
     <PackageVersion Include="PolySharp" Version="1.13.2" />
-    <PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
+    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
     <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
-    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
+    <PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageVersion Include="xunit" Version="2.4.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Settings.XamlStyler b/Settings.XamlStyler
@@ -7,7 +7,7 @@
     "SeparateByGroups": false,
     "AttributeIndentation": 0,
     "AttributeIndentationStyle": 1,
-    "RemoveDesignTimeReferences":  false,
+    "RemoveDesignTimeReferences": false,
     "IgnoreDesignTimeReferencePrefix": false,
     "EnableAttributeReordering": true,
     "AttributeOrderingRuleGroups": [
@@ -38,5 +38,7 @@
     "ThicknessSeparator": 2,
     "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
     "FormatOnSave": true,
-    "CommentPadding": 2
+    "CommentPadding": 2,
+    "IndentSize": 4,
+    "IndentWithTabs": false
 }
diff --git a/docs/codesnippet/Rtf/Hyperlink/RtfDocumentProcessor.cs b/docs/codesnippet/Rtf/Hyperlink/RtfDocumentProcessor.cs
@@ -87,11 +87,7 @@ private static HashSet<string> CollectLinksAndFixDocument(FileModel model)
         #endregion
 
         #region FixLink
-        private static void FixLink(
-            XAttribute link,
-            RelativePath filePath,
-            HashSet<string> linkToFiles
-        )
+        private static void FixLink(XAttribute link, RelativePath filePath, HashSet<string> linkToFiles)
         {
             string linkFile;
             string anchor = null;

diff --git a/docs/codesnippet/Rtf/RtfBuildStep.cs b/docs/codesnippet/Rtf/RtfBuildStep.cs
@@ -22,9 +22,7 @@ public class RtfBuildStep : IDocumentBuildStep
         public void Build(FileModel model, IHostService host)
         {
             string content = (string)((Dictionary<string, object>)model.Content)["conceptual"];
-            content = _taskFactory
-                .StartNew(() => RtfToHtmlConverter.ConvertRtfToHtml(content))
-                .Result;
+            content = _taskFactory.StartNew(() => RtfToHtmlConverter.ConvertRtfToHtml(content)).Result;
             ((Dictionary<string, object>)model.Content)["conceptual"] = content;
         }
         #endregion

diff --git a/docs/codesnippet/Rtf/RtfDocumentProcessor.cs b/docs/codesnippet/Rtf/RtfDocumentProcessor.cs
@@ -59,11 +59,7 @@ public FileModel Load(FileAndType file, ImmutableDictionary<string, object> meta
         #region Save
         public SaveResult Save(FileModel model)
         {
-            return new SaveResult
-            {
-                DocumentType = "Conceptual",
-                FileWithoutExtension = Path.ChangeExtension(model.File, null),
-            };
+            return new SaveResult { DocumentType = "Conceptual", FileWithoutExtension = Path.ChangeExtension(model.File, null), };
         }
         #endregion
 

diff --git a/docs/templates/wpfui/src/nav.ts b/docs/templates/wpfui/src/nav.ts
@@ -56,7 +56,7 @@ export async function renderNavbar(): Promise<NavItem[]> {
       <form class="icons">
         ${window.docfx.iconLinks?.map(i => html`<a href="${i.href}" title="${i.title}" class="btn border-0"><i class="bi bi-${i.icon}"></i></a>`)}
         ${themePicker(renderCore)}
-        <a class="btn btn-border-0 btn-sponsor mr-05" rel="noopener noreferrer" href="https://github.com/sponsors/lepoco">Sponsor</a>
+        <a class="btn btn-border-0 btn-colorful mr-05" rel="noopener noreferrer" href="https://github.com/sponsors/lepoco">Sponsor</a>
       </form>`
 
     render(html`${menu} ${icons}`, navbar)

diff --git a/docs/templates/wpfui/src/wpfui.scss b/docs/templates/wpfui/src/wpfui.scss
@@ -38,6 +38,13 @@ h5 {
         rgb(19, 104, 145) 50%,
         rgb(32, 135, 135) 75%
     );
+    transition: background-position 0.5s ease-in-out;
+    background-size: 200% 200%;
+    background-position: 0% 0%;
+
+    &:hover {
+        background-position: 100% 100%;
+    }
 }
 
 .btn-colorful {
@@ -48,16 +55,14 @@ h5 {
         rgb(19, 104, 145) 50%,
         rgb(32, 135, 135) 75%
     );
-}
+    transition: background-position 0.5s ease-in-out;
+    background-size: 200% 200%;
+    background-position: 0% 0%;
+    color: white;
 
-.btn-sponsor {
-    background-color: rgb(15, 163, 180);
-    background-image: linear-gradient(
-        140deg,
-        rgb(0, 128, 154),
-        rgb(19, 104, 145) 50%,
-        rgb(32, 135, 135) 75%
-    );
+    &:hover {
+        background-position: 100% 100%;
+    }
 }
 
 img {

diff --git a/src/Wpf.Ui.Demo.Mvvm/App.xaml.cs b/src/Wpf.Ui.Demo.Mvvm/App.xaml.cs
@@ -95,10 +95,7 @@ private async void OnExit(object sender, ExitEventArgs e)
     /// <summary>
     /// Occurs when an exception is thrown by an application but not handled.
     /// </summary>
-    private void OnDispatcherUnhandledException(
-        object sender,
-        DispatcherUnhandledExceptionEventArgs e
-    )
+    private void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
     {
         // For more info see https://docs.microsoft.com/en-us/dotnet/api/system.windows.application.dispatcherunhandledexception?view=windowsdesktop-6.0
     }

diff --git a/src/Wpf.Ui.Demo.Mvvm/Services/ApplicationHostService.cs b/src/Wpf.Ui.Demo.Mvvm/Services/ApplicationHostService.cs
@@ -48,9 +48,7 @@ private async Task HandleActivationAsync()
 
         if (!Application.Current.Windows.OfType<MainWindow>().Any())
         {
-            _navigationWindow = (
-                _serviceProvider.GetService(typeof(INavigationWindow)) as INavigationWindow
-            )!;
+            _navigationWindow = (_serviceProvider.GetService(typeof(INavigationWindow)) as INavigationWindow)!;
             _navigationWindow!.ShowWindow();
 
             _navigationWindow.Navigate(typeof(Views.Pages.DashboardPage));

diff --git a/src/Wpf.Ui.Demo.Mvvm/ViewModels/DataViewModel.cs b/src/Wpf.Ui.Demo.Mvvm/ViewModels/DataViewModel.cs
@@ -34,12 +34,7 @@ private void InitializeViewModel()
                 new DataColor
                 {
                     Color = new SolidColorBrush(
-                        Color.FromArgb(
-                            (byte)200,
-                            (byte)random.Next(0, 250),
-                            (byte)random.Next(0, 250),
-                            (byte)random.Next(0, 250)
-                        )
+                        Color.FromArgb((byte)200, (byte)random.Next(0, 250), (byte)random.Next(0, 250), (byte)random.Next(0, 250))
                     )
                 }
             );

diff --git a/src/Wpf.Ui.Demo.Mvvm/ViewModels/SettingsViewModel.cs b/src/Wpf.Ui.Demo.Mvvm/ViewModels/SettingsViewModel.cs
@@ -15,10 +15,7 @@ public partial class SettingsViewModel : ObservableObject, INavigationAware
     private string _appVersion = String.Empty;
 
     [ObservableProperty]
-    private Wpf.Ui.Appearance.ApplicationTheme _currentApplicationTheme = Wpf.Ui
-        .Appearance
-        .ApplicationTheme
-        .Unknown;
+    private Wpf.Ui.Appearance.ApplicationTheme _currentApplicationTheme = Wpf.Ui.Appearance.ApplicationTheme.Unknown;
 
     public void OnNavigatedTo()
     {
@@ -38,8 +35,7 @@ private void InitializeViewModel()
 
     private string GetAssemblyVersion()
     {
-        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString()
-            ?? String.Empty;
+        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? String.Empty;
     }
 
     [RelayCommand]
@@ -51,9 +47,7 @@ private void OnChangeTheme(string parameter)
                 if (CurrentApplicationTheme == Wpf.Ui.Appearance.ApplicationTheme.Light)
                     break;
 
-                Wpf.Ui.Appearance.ApplicationThemeManager.Apply(
-                    Wpf.Ui.Appearance.ApplicationTheme.Light
-                );
+                Wpf.Ui.Appearance.ApplicationThemeManager.Apply(Wpf.Ui.Appearance.ApplicationTheme.Light);
                 CurrentApplicationTheme = Wpf.Ui.Appearance.ApplicationTheme.Light;
 
                 break;
@@ -62,9 +56,7 @@ private void OnChangeTheme(string parameter)
                 if (CurrentApplicationTheme == Wpf.Ui.Appearance.ApplicationTheme.Dark)
                     break;
 
-                Wpf.Ui.Appearance.ApplicationThemeManager.Apply(
-                    Wpf.Ui.Appearance.ApplicationTheme.Dark
-                );
+                Wpf.Ui.Appearance.ApplicationThemeManager.Apply(Wpf.Ui.Appearance.ApplicationTheme.Dark);
                 CurrentApplicationTheme = Wpf.Ui.Appearance.ApplicationTheme.Dark;
 
                 break;

diff --git a/src/Wpf.Ui.Demo.Mvvm/Views/MainWindow.xaml.cs b/src/Wpf.Ui.Demo.Mvvm/Views/MainWindow.xaml.cs
@@ -14,11 +14,7 @@ public partial class MainWindow : INavigationWindow
 {
     public ViewModels.MainWindowViewModel ViewModel { get; }
 
-    public MainWindow(
-        ViewModels.MainWindowViewModel viewModel,
-        IPageService pageService,
-        INavigationService navigationService
-    )
+    public MainWindow(ViewModels.MainWindowViewModel viewModel, IPageService pageService, INavigationService navigationService)
     {
         ViewModel = viewModel;
         DataContext = this;
@@ -37,8 +33,7 @@ INavigationService navigationService
 
     public bool Navigate(Type pageType) => RootNavigation.Navigate(pageType);
 
-    public void SetPageService(IPageService pageService) =>
-        RootNavigation.SetPageService(pageService);
+    public void SetPageService(IPageService pageService) => RootNavigation.SetPageService(pageService);
 
     public void ShowWindow() => Show();
 

diff --git a/src/Wpf.Ui.Demo.Simple/Views/Pages/DashboardPage.xaml.cs b/src/Wpf.Ui.Demo.Simple/Views/Pages/DashboardPage.xaml.cs
@@ -19,17 +19,11 @@ public DashboardPage()
         DataContext = this;
         InitializeComponent();
 
-        CounterTextBlock.SetCurrentValue(
-            System.Windows.Controls.TextBlock.TextProperty,
-            _counter.ToString()
-        );
+        CounterTextBlock.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, _counter.ToString());
     }
 
     private void OnBaseButtonClick(object sender, RoutedEventArgs e)
     {
-        CounterTextBlock.SetCurrentValue(
-            System.Windows.Controls.TextBlock.TextProperty,
-            (++_counter).ToString()
-        );
+        CounterTextBlock.SetCurrentValue(System.Windows.Controls.TextBlock.TextProperty, (++_counter).ToString());
     }
 }
diff --git a/src/Wpf.Ui.Demo.Simple/Views/Pages/DataPage.xaml.cs b/src/Wpf.Ui.Demo.Simple/Views/Pages/DataPage.xaml.cs
@@ -34,12 +34,7 @@ private void InitializeData()
                 new DataColor
                 {
                     Color = new SolidColorBrush(
-                        Color.FromArgb(
-                            (byte)200,
-                            (byte)random.Next(0, 250),
-                            (byte)random.Next(0, 250),
-                            (byte)random.Next(0, 250)
-                        )
+                        Color.FromArgb((byte)200, (byte)random.Next(0, 250), (byte)random.Next(0, 250), (byte)random.Next(0, 250))
                     )
                 }
             );

diff --git a/src/Wpf.Ui.Demo.Simple/Views/Pages/SettingsPage.xaml.cs b/src/Wpf.Ui.Demo.Simple/Views/Pages/SettingsPage.xaml.cs
@@ -42,7 +42,6 @@ private void OnDarkThemeRadioButtonChecked(object sender, RoutedEventArgs e)
 
     private string GetAssemblyVersion()
     {
-        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString()
-            ?? String.Empty;
+        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? String.Empty;
     }
 }