add CoreCRL module download for 6.7 and later, fix open persistant data path for special characters in company/product name

Author: unitycoder

UnityLauncherPro/Data/UnityVersionResponse.cs

@@ -291,7 +291,7 @@
 
                     <Button Style="{StaticResource CustomButton}" ToolTip="Refresh installations (F5)" x:Name="btnRefreshUnityList" Content="⟳" Height="22" Width="26" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16"  Margin="0,4,3,0" Padding="1,-2,1,1"  Click="BtnRefreshUnityList_Click"/>
 
-                    <DataGrid x:Name="dataGridUnitys"  SelectionMode="Single" Margin="4,30,2,42" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" CanUserAddRows="False" AutoGenerateColumns="False" PreviewKeyDown="DataGridUnitys_PreviewKeyDown" PreviewMouseDoubleClick="DataGridUnitys_PreviewMouseDoubleClick">
+                    <DataGrid x:Name="dataGridUnitys"  SelectionMode="Single" Margin="4,30,2,42" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="{DynamicResource ThemeGridForeground}" HorizontalGridLinesBrush="{DynamicResource ThemeDatagridLines}" VerticalGridLinesBrush="{DynamicResource ThemeGridVerticalGridLines}" CanUserAddRows="False" AutoGenerateColumns="False" PreviewKeyDown="DataGridUnitys_PreviewKeyDown" PreviewMouseDoubleClick="DataGridUnitys_PreviewMouseDoubleClick" ContextMenuOpening="GridUnitys_ContextMenuOpening">
                         <DataGrid.CommandBindings>
                             <CommandBinding Command="ApplicationCommands.Copy" Executed="CopyRowFolderToClipBoard" CanExecute="CanExecute_Copy"/>
                         </DataGrid.CommandBindings>
@@ -346,6 +346,7 @@
                                     <MenuItem x:Name="menuItemDownloadWebGLModule" Header="Download WebGL module" Click="MenuItemDownloadWebGLModule_Click" />
                                     <MenuItem x:Name="menuItemDownloadLinuxModule" Header="Download Linux modules" Click="MenuItemDownloadLinuxModule_Click"/>
                                     <MenuItem x:Name="menuItemDownloadIL2CPPModule" Header="Download IL2CPP module" Click="menuItemDownloadIL2CPPModule_Click"/>
+                                    <MenuItem x:Name="menuItemDownloadCoreCRLModule" Header="Download CoreCLR module" Click="menuItemDownloadCoreCRLModule_Click"/>
                                     <MenuItem x:Name="menuItemDownloadWinDedicatedServerModule" Header="Download Windows Dedicated module" Click="menuItemDownloadWinDedicatedServerModule_Click"/>
                                     <MenuItem x:Name="menuItemDownloadLinuxDedicatedServerModule" Header="Download Linux Dedicated module" Click="menuItemDownloadLinuxDedicatedServerModule_Click"/>
                                 </MenuItem>

UnityLauncherPro/MainWindow.xaml

@@ -2360,8 +2360,6 @@ void KillSelectedProcess(object sender, ExecutedRoutedEventArgs e)
 
         private void GridRecent_ContextMenuOpening(object sender, ContextMenuEventArgs e)
         {
-            if (tabControl.SelectedIndex == 0)
-            {
                 var proj = GetSelectedProject();
                 if (proj != null)
                 {
@@ -2372,9 +2370,25 @@ private void GridRecent_ContextMenuOpening(object sender, ContextMenuEventArgs e
                 {
                     menuItemKillProcess.IsEnabled = false;
                 }
+        }
+
+        private void GridUnitys_ContextMenuOpening(object sender, ContextMenuEventArgs e)
+        {
+            var unity = GetSelectedUnity();
+            var isNewerThan6000_7 = Tools.IsVersionAtLeast(unity?.Version, "6000.7");
+
+            if (unity != null && isNewerThan6000_7)
+            {
+                menuItemDownloadCoreCRLModule.IsEnabled = true;
             }
+            else
+            {
+                menuItemDownloadCoreCRLModule.IsEnabled = false;
+            }
+
         }
 
+
         // add alt+Q shortcut for killing process
         // https://stackoverflow.com/a/29817712/5452781
         public static readonly RoutedCommand KillProcessCommand = new RoutedUICommand("None", "KillProcessCommand", typeof(MainWindow), new InputGestureCollection(new InputGesture[]
@@ -2781,6 +2795,10 @@ private void MenuItemBrowsePersistentDataPath_Click(object sender, RoutedEventAr
                 var companyName = rows[i].Split(new[] { "companyName: " }, StringSplitOptions.None)[1];
                 var productName = rows[i + 1].Split(new[] { "productName: " }, StringSplitOptions.None)[1];
 
+                // replace special characters with _, but not space
+                companyName = Regex.Replace(companyName, @"[^\w\s]", "_");
+                productName = Regex.Replace(productName, @"[^\w\s]", "_");
+
                 // open folder from %userprofile%\AppData\LocalLow\<companyname>\<productname>
                 var dataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "/../LocalLow");
                 var psFullPath = Path.Combine(dataFolder, companyName, productName);
@@ -3833,6 +3851,13 @@ private void menuItemDownloadIL2CPPModule_Click(object sender, RoutedEventArgs e
             Tools.DownloadAdditionalModules(unity.Path, unity.Version, "Windows-IL2CPP");
         }
 
+        private void menuItemDownloadCoreCRLModule_Click(object sender, RoutedEventArgs e)
+        {
+            var unity = GetSelectedUnity();
+            if (unity == null) return;
+            Tools.DownloadAdditionalModules(unity.Path, unity.Version, "Windows-CoreCLR");
+        }
+
         private void menuItemDownloadWinDedicatedServerModule_Click(object sender, RoutedEventArgs e)
         {
             var unity = GetSelectedUnity();

UnityLauncherPro/MainWindow.xaml.cs

@@ -101,7 +101,6 @@
     <Compile Include="Data\TemplateGraphQLResponse.cs" />
     <Compile Include="Data\ThemeColor.cs" />
     <Compile Include="Data\UnityVersion.cs" />
-    <Compile Include="Data\UnityVersionResponse.cs" />
     <Compile Include="Data\UnityVersionStream.cs" />
     <Compile Include="DownloadProgressWindow.xaml.cs">
       <DependentUpon>DownloadProgressWindow.xaml</DependentUpon>