.gitignore

* macosx build
* update to .net8 and newest nugets
* added context menu to file list
* update version number

.gitignore

@@ -5,3 +5,4 @@ riderModule.iml
 /_ReSharper.Caches/
 .idea/
 *.user
+.nuke/temp

.nuke/build.schema.json

@@ -1,19 +1,48 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "$ref": "#/definitions/build",
-  "title": "Build Schema",
   "definitions": {
-    "build": {
+    "Host": {
-      "type": "object",
+      "type": "string",
+      "enum": [
+        "AppVeyor",
+        "AzurePipelines",
+        "Bamboo",
+        "Bitbucket",
+        "Bitrise",
+        "GitHubActions",
+        "GitLab",
+        "Jenkins",
+        "Rider",
+        "SpaceAutomation",
+        "TeamCity",
+        "Terminal",
+        "TravisCI",
+        "VisualStudio",
+        "VSCode"
+      ]
+    },
+    "ExecutableTarget": {
+      "type": "string",
+      "enum": [
+        "Clean",
+        "Publish",
+        "PublishLinux",
+        "PublishOsx",
+        "PublishWin"
+      ]
+    },
+    "Verbosity": {
+      "type": "string",
+      "description": "",
+      "enum": [
+        "Verbose",
+        "Normal",
+        "Minimal",
+        "Quiet"
+      ]
+    },
+    "NukeBuild": {
       "properties": {
-        "Configuration": {
-          "type": "string",
-          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
-          "enum": [
-            "Debug",
-            "Release"
-          ]
-        },
         "Continue": {
           "type": "boolean",
           "description": "Indicates to continue a previously failed build attempt"
@@ -23,25 +52,8 @@
           "description": "Shows the help text for this build assembly"
         },
         "Host": {
-          "type": "string",
           "description": "Host for execution. Default is 'automatic'",
-          "enum": [
+          "$ref": "#/definitions/Host"
-            "AppVeyor",
-            "AzurePipelines",
-            "Bamboo",
-            "Bitbucket",
-            "Bitrise",
-            "GitHubActions",
-            "GitLab",
-            "Jenkins",
-            "Rider",
-            "SpaceAutomation",
-            "TeamCity",
-            "Terminal",
-            "TravisCI",
-            "VisualStudio",
-            "VSCode"
-          ]
         },
         "NoLogo": {
           "type": "boolean",
@@ -70,42 +82,41 @@
           "type": "array",
           "description": "List of targets to be skipped. Empty list skips all dependencies",
           "items": {
-            "type": "string",
+            "$ref": "#/definitions/ExecutableTarget"
-            "enum": [
-              "Clean",
-              "Publish",
-              "PublishLinux",
-              "PublishWin"
-            ]
           }
         },
         "Target": {
           "type": "array",
           "description": "List of targets to be invoked. Default is '{default_target}'",
           "items": {
-            "type": "string",
+            "$ref": "#/definitions/ExecutableTarget"
-            "enum": [
-              "Clean",
-              "Publish",
-              "PublishLinux",
-              "PublishWin"
-            ]
           }
         },
         "Verbosity": {
-          "type": "string",
           "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "$ref": "#/definitions/Verbosity"
+        }
+      }
+    }
+  },
+  "allOf": [
+    {
+      "properties": {
+        "Configuration": {
+          "type": "string",
+          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
           "enum": [
-            "Minimal",
+            "Debug",
-            "Normal",
+            "Release"
-            "Quiet",
-            "Verbose"
           ]
         },
         "Version": {
           "type": "string"
         }
       }
+    },
+    {
+      "$ref": "#/definitions/NukeBuild"
     }
-  }
+  ]
 }

Assets/favicon_io/about.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Genos
+- Font Author: Copyright 2011 The Genos Project Authors (https://github.com/googlefonts/genos)
+- Font Source: http://fonts.gstatic.com/s/genos/v12/SlGNmQqPqpUOYTYjacb0Hc91fTwVA0_orUK6K7ZsAg.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

Assets/favicon_io/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

K8sFileBrowser.sln

@@ -12,6 +12,7 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{637A753B-3168-4C9C-8098-7A16024E1957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{637A753B-3168-4C9C-8098-7A16024E1957}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{637A753B-3168-4C9C-8098-7A16024E1957}.Release|Any CPU.ActiveCfg = Release|Any CPU

K8sFileBrowser/App.axaml

@@ -10,7 +10,7 @@
     </Application.DataTemplates>
 
     <Application.Styles>
-        <FluentTheme>
+        <FluentTheme DensityStyle="Compact">
             <FluentTheme.Palettes>
                 <!-- Palette for Light theme variant -->
                 <ColorPaletteResources x:Key="Light" Accent="Green" RegionColor="White" ErrorText="Red" />
@@ -29,6 +29,7 @@
                                        ChromeMediumLow="#21252b"
 
                                        />
+                
                 <!-- AltHigh is used for the color of header in the DataGrid -->
                 <!-- BaseHigh is used for the text color -->
                 <!-- ListLow is used for the mouse over in lists and DataGrid -->

K8sFileBrowser/K8sFileBrowser.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -9,8 +9,8 @@
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
         <ApplicationIcon>Assets/app.ico</ApplicationIcon>
-        <Version>0.1.2</Version>
+        <Version>0.1.4</Version>
-        <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <DefineConstants>TRACE</DefineConstants>
@@ -22,21 +22,21 @@
 
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.2" />
+        <PackageReference Include="Avalonia" Version="11.2.5" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.5" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.5" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.5" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.2" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.5" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.2" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.5" />
-        <PackageReference Include="Avalonia.Xaml.Interactions" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Xaml.Interactions" Version="11.2.0.14" />
-        <PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.0.2" />
+        <PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.2.0.14" />
-        <PackageReference Include="KubernetesClient" Version="11.0.44" />
+        <PackageReference Include="KubernetesClient" Version="16.0.2" />
-        <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
+        <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
-        <PackageReference Include="Serilog" Version="3.0.1" />
+        <PackageReference Include="Serilog" Version="4.2.0" />
-        <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
+        <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+        <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
         <PackageReference Include="SharpZipLib" Version="1.4.2" />
     </ItemGroup>
 </Project>

K8sFileBrowser/Program.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
 using System;
+using Avalonia.Logging;
 using Serilog;
 
 namespace K8sFileBrowser;
@@ -18,6 +19,7 @@ class Program
                 //.Filter.ByIncludingOnly(Matching.WithProperty("Area", LogArea.Control))
                 .MinimumLevel.Information()
                 .WriteTo.Async(a => a.File("app.log"))
+                //.WriteTo.Console()
                 .CreateLogger();
 
             BuildAvaloniaApp()
@@ -42,5 +44,6 @@ class Program
             .UsePlatformDetect()
             .WithInterFont()
             .LogToTrace()
+            //.LogToTrace(LogEventLevel.Verbose)
             .UseReactiveUI();
 }

K8sFileBrowser/ViewModels/MainWindowViewModel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Concurrency;
@@ -67,8 +68,12 @@ public class MainWindowViewModel : ViewModelBase
 
   public ReactiveCommand<Unit, Unit> DownloadCommand { get; private set; } = null!;
   public ReactiveCommand<Unit, Unit> DownloadLogCommand { get; private set; } = null!;
+  public ReactiveCommand<Unit, Unit> RefreshCommand { get; private set; } = null!;
   public ReactiveCommand<Unit, Unit> ParentCommand { get; private set; } = null!;
   public ReactiveCommand<Unit, Unit> OpenCommand { get; private set; } = null!;
+  public ReactiveCommand<FileInformation, Unit> OpenContextCommand { get; private set; } = null!;
+  
+  public ReactiveCommand<FileInformation, Unit> DownloadContextCommand { get; private set; } = null!;
   private ReactiveCommand<Namespace, IEnumerable<Pod>> GetPodsForNamespace { get; set; } = null!;
 
   #endregion Commands
@@ -81,7 +86,10 @@ public class MainWindowViewModel : ViewModelBase
 
     // commands
     ConfigureOpenDirectoryCommand();
+    ConfigureOpenDirectoryContextCommand();
     ConfigureDownloadFileCommand(kubernetesService);
+    ConfigureDownloadFileContextCommand(kubernetesService);
+    ConfigureRefreshCommand(kubernetesService);
     ConfigureDownloadLogCommand(kubernetesService);
     ConfigureParentDirectoryCommand();
     ConfigureGetPodsForNamespaceCommand(kubernetesService);
@@ -110,7 +118,7 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(x =>
       {
         ResetNamespaces();
-        ClusterContexts = x;
+        ClusterContexts = x.OrderBy(c => c.Name);
 
         // select the current cluster context
         SelectedClusterContext = ClusterContexts
@@ -129,7 +137,7 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(ns =>
       {
         ResetPods();
-        Namespaces = ns;
+        Namespaces = ns.OrderBy(n => n.Name);
       });
   }
 
@@ -145,7 +153,7 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(x =>
       {
         ResetContainers();
-        Pods = x;
+        Pods = x.OrderBy(p => p.Name);
       });
   }
 
@@ -166,7 +174,7 @@ public class MainWindowViewModel : ViewModelBase
 
     this.WhenAnyValue(x => x.Containers)
       .Throttle(new TimeSpan(10))
-      .Where(x => !x.IsNullOrEmpty())
+      .Where(x => x != null && x.Any())
       .ObserveOn(RxApp.MainThreadScheduler)
       .Subscribe(x => SelectedContainer = x?.FirstOrDefault());
   }
@@ -249,6 +257,24 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(ShowErrorMessage);
   }
   
+  private void ConfigureRefreshCommand(IKubernetesService kubernetesService)
+  {
+    var isSelectedContainer = this
+      .WhenAnyValue(x => x.SelectedContainer)
+      .Select(x => x != null);
+
+    RefreshCommand = ReactiveCommand.CreateFromTask(async () =>
+    {
+      await Observable.Start(() =>
+      {
+        FileInformation = GetFileInformation(kubernetesService, SelectedPath!, SelectedPod!, SelectedNamespace!, SelectedContainer!);
+      }, RxApp.TaskpoolScheduler);
+    }, isSelectedContainer, RxApp.MainThreadScheduler);
+
+    RefreshCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
+      .Subscribe(ShowErrorMessage);
+  }
+
   private void ConfigureDownloadFileCommand(IKubernetesService kubernetesService)
   {
     var isFile = this
@@ -276,9 +302,33 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(ShowErrorMessage);
   }
   
+  private void ConfigureDownloadFileContextCommand(IKubernetesService kubernetesService)
+  {
+
+    DownloadContextCommand = ReactiveCommand.CreateFromTask<FileInformation>(async (file) =>
+    {
+      await Observable.StartAsync(async () =>
+      {
+        var fileName = file.Name.Substring(SelectedFile!.Name.LastIndexOf('/') + 1,
+          file.Name.Length - file.Name.LastIndexOf('/') - 1);
+        var saveFileName = await ApplicationHelper.SaveFile(_lastDirectory, fileName);
+        if (saveFileName != null)
+        {
+          SetLastDirectory(saveFileName);
+          ShowWorkingMessage("Downloading File...");
+          await kubernetesService.DownloadFile(SelectedNamespace, SelectedPod, SelectedContainer, file, saveFileName);
+          HideWorkingMessage();
+        }
+      }, RxApp.TaskpoolScheduler);
+    }, outputScheduler: RxApp.MainThreadScheduler);
+
+    DownloadCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
+      .Subscribe(ShowErrorMessage);
+  }
+
   private void SetLastDirectory(string saveFileName)
   {
-    _lastDirectory = saveFileName.Substring(0, saveFileName.LastIndexOf('\\'));
+    _lastDirectory = saveFileName.Substring(0, saveFileName.LastIndexOf(Path.DirectorySeparatorChar));
   }
 
   private void ConfigureOpenDirectoryCommand()
@@ -300,6 +350,17 @@ public class MainWindowViewModel : ViewModelBase
       .Subscribe(ShowErrorMessage);
   }
   
+  private void ConfigureOpenDirectoryContextCommand()
+  {
+    OpenContextCommand = ReactiveCommand.Create<FileInformation>((file) =>
+    {
+      SelectedPath = ".." == file.Name ? file.Parent : file.Name;
+    }, outputScheduler: RxApp.MainThreadScheduler);
+
+    OpenCommand.ThrownExceptions.ObserveOn(RxApp.MainThreadScheduler)
+      .Subscribe(ShowErrorMessage);
+  }
+
   #endregion Configure Commands
 
   #region Get Data

K8sFileBrowser/Views/MainWindow.axaml

@@ -94,6 +94,9 @@
                         <Button Command="{Binding DownloadLogCommand}" VerticalAlignment="Center" ToolTip.Tip="Download Container Log" Margin="0 0 48 0 ">
                             <PathIcon Data="{StaticResource document_one_page_regular}"></PathIcon>
                         </Button>
+                        <Button Command="{Binding RefreshCommand}" VerticalAlignment="Center" ToolTip.Tip="Refresh Directory">
+                            <PathIcon Data="{StaticResource arrow_sync_circle_regular}"></PathIcon>
+                        </Button>
                         <Button Command="{Binding ParentCommand}" VerticalAlignment="Center" ToolTip.Tip="Go To Parent Directory">
                             <PathIcon Data="{StaticResource arrow_curve_up_left_regular}"></PathIcon>
                         </Button>
@@ -148,7 +151,19 @@
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate DataType="models:FileInformation">
                                 <Border Background="Transparent">
-                                    <TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center"/>
+                                    <Border.ContextFlyout>
+                                        <MenuFlyout>
+                                            <MenuItem Header="Open" 
+                                                      Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).OpenContextCommand}"
+                                                      CommandParameter="{Binding}"
+                                                      IsEnabled="{Binding IsDirectory}"/>
+                                            <MenuItem Header="Download" 
+                                                      Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).DownloadContextCommand}"
+                                                      CommandParameter="{Binding}"
+                                                      IsEnabled="{Binding IsFile}"/>      
+                                        </MenuFlyout>
+                                    </Border.ContextFlyout>
+                                    <TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" />
                                     <Interaction.Behaviors>
                                         <EventTriggerBehavior EventName="DoubleTapped">
                                             <InvokeCommandAction Command="{Binding ((vm:MainWindowViewModel)DataContext).OpenCommand, RelativeSource={RelativeSource AncestorType=Window }}" />

K8sFileBrowser/app.manifest

@@ -3,7 +3,7 @@
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embeded controls.
        For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
-  <assemblyIdentity version="1.0.0.0" name="K8sFileBrowser.Desktop"/>
+  <assemblyIdentity version="1.4.0.0" name="K8sFileBrowser.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>

build/Build.cs

@@ -12,15 +12,17 @@ class Build : NukeBuild
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
     readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
-    [Parameter] readonly string Version = "1.0.0";
+    [Parameter] readonly string Version = "1.4.0";
 
     AbsolutePath SourceDirectory => RootDirectory / "K8sFileBrowser";
     AbsolutePath OutputDirectory => RootDirectory / "output";
     AbsolutePath WinOutputDirectory => OutputDirectory / "win";
     AbsolutePath LinuxOutputDirectory => OutputDirectory / "linux";
+    AbsolutePath OsxOutputDirectory => OutputDirectory / "osx";
 
     AbsolutePath WinZip => OutputDirectory / $"K8sFileBrowser_{Version}.zip";
     AbsolutePath LinuxGz => OutputDirectory / $"K8sFileBrowser_{Version}.tgz";
+    AbsolutePath OsxGz => OutputDirectory / $"K8sFileBrowser_OSX_{Version}.tgz";
 
     AbsolutePath ProjectFile => SourceDirectory / "K8sFileBrowser.csproj";
 
@@ -44,11 +46,11 @@ class Build : NukeBuild
                 .SetProject(ProjectFile)
                 .SetConfiguration(Configuration)
                 .SetOutput(WinOutputDirectory)
-                .SetSelfContained(true)
+                .EnableSelfContained()
-                .SetFramework("net7.0")
+                .SetFramework("net8.0")
                 .SetRuntime("win-x64")
-                .SetPublishSingleFile(true)
+                .EnablePublishSingleFile()
-                .SetPublishReadyToRun(true)
+                .EnablePublishReadyToRun()
                 .SetAuthors("Andreas Billmann")
                 .SetCopyright("Copyright (c) 2023")
                 .SetVersion(Version)
@@ -70,11 +72,11 @@ class Build : NukeBuild
                 .SetProject(ProjectFile)
                 .SetConfiguration(Configuration)
                 .SetOutput(LinuxOutputDirectory)
-                .SetSelfContained(true)
+                .EnableSelfContained()
-                .SetFramework("net7.0")
+                .SetFramework("net8.0")
                 .SetRuntime("linux-x64")
-                .SetPublishSingleFile(true)
+                .EnablePublishSingleFile()
-                .SetPublishReadyToRun(true)
+                .EnablePublishReadyToRun()
                 .SetAuthors("Andreas Billmann")
                 .SetCopyright("Copyright (c) 2023")
                 .SetVersion(Version)
@@ -87,8 +89,33 @@ class Build : NukeBuild
                 fileMode: FileMode.CreateNew);
         });
     
+    Target PublishOsx => _ => _
+        .DependsOn(Clean)
+        .Executes(() =>
+        {
+            DotNetPublish(s => s
+                .SetProject(ProjectFile)
+                .SetConfiguration(Configuration)
+                .SetOutput(OsxOutputDirectory)
+                .EnableSelfContained()
+                .SetFramework("net8.0")
+                .SetRuntime("osx-arm64")
+                .EnablePublishSingleFile()
+                .EnablePublishReadyToRun()
+                .SetAuthors("Andreas Billmann")
+                .SetCopyright("Copyright (c) 2023")
+                .SetVersion(Version)
+                .SetProcessArgumentConfigurator(_ => _
+                    .Add("-p:IncludeNativeLibrariesForSelfExtract=true")));
+
+            OsxOutputDirectory.TarGZipTo(
+                OsxGz,
+                filter: x => !x.HasExtension(ExcludedExtensions),
+                fileMode: FileMode.CreateNew);
+        });
+
     Target Publish => _ => _
-        .DependsOn(PublishWin, PublishLinux)
+        .DependsOn(PublishWin, PublishLinux, PublishOsx)
         .Executes(() =>
         {
         });

build/_build.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="7.0.2" />
+    <PackageReference Include="Nuke.Common" Version="8.1.4" />
   </ItemGroup>
 
 </Project>

build/_build.csproj.DotSettings

@@ -17,6 +17,8 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -25,4 +27,5 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "8.0.0",
+    "rollForward": "latestFeature",
+    "allowPrerelease": false
+  }
+}