Skip to content

Commit 91bf023

Browse files
unitycoderunitycoder
committed
8.0 upgrade test, fails on loading settings data?
1 parent e75f68e commit 91bf023

File tree

7 files changed

+329
-189
lines changed

7 files changed

+329
-189
lines changed

‎UnityLauncherPro/App.config‎

Lines changed: 145 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,151 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3+
<!-- MUST be first -->
4+
<configSections>
5+
<sectionGroup name="userSettings"
6+
type="System.Configuration.UserSettingsGroup, System.Configuration.ConfigurationManager">
7+
<section name="UnityLauncherPro.Properties.Settings"
8+
type="System.Configuration.ClientSettingsSection, System.Configuration.ConfigurationManager"
9+
allowExeDefinition="MachineToLocalUser"
10+
requirePermission="false" />
11+
</sectionGroup>
12+
</configSections>
13+
14+
<!-- Optional runtime switches go AFTER configSections -->
315
<runtime>
416
<AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false" />
517
</runtime>
6-
<configSections>
7-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
8-
<section name="UnityLauncherPro.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
9-
</sectionGroup>
10-
</configSections>
11-
<startup>
12-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
13-
</startup>
14-
<userSettings>
15-
<UnityLauncherPro.Properties.Settings>
16-
<setting name="windowWidth" serializeAs="String">
17-
<value>600</value>
18-
</setting>
19-
<setting name="windowHeight" serializeAs="String">
20-
<value>650</value>
21-
</setting>
22-
<setting name="minimizeToTaskbar" serializeAs="String">
23-
<value>True</value>
24-
</setting>
25-
<setting name="registerExplorerMenu" serializeAs="String">
26-
<value>False</value>
27-
</setting>
28-
<setting name="closeAfterProject" serializeAs="String">
29-
<value>False</value>
30-
</setting>
31-
<setting name="closeAfterExplorer" serializeAs="String">
32-
<value>True</value>
33-
</setting>
34-
<setting name="showArgumentsColumn" serializeAs="String">
35-
<value>False</value>
36-
</setting>
37-
<setting name="showGitBranchColumn" serializeAs="String">
38-
<value>False</value>
39-
</setting>
40-
<setting name="showProjectsMissingFolder" serializeAs="String">
41-
<value>False</value>
42-
</setting>
43-
<setting name="AllowSingleInstanceOnly" serializeAs="String">
44-
<value>False</value>
45-
</setting>
46-
<setting name="preferredVersion" serializeAs="String">
47-
<value />
48-
</setting>
49-
<setting name="newProjectsRoot" serializeAs="String">
50-
<value />
51-
</setting>
52-
<setting name="askNameForQuickProject" serializeAs="String">
53-
<value>True</value>
54-
</setting>
55-
<setting name="enableProjectRename" serializeAs="String">
56-
<value>False</value>
57-
</setting>
58-
<setting name="streamerMode" serializeAs="String">
59-
<value>False</value>
60-
</setting>
61-
<setting name="showTargetPlatform" serializeAs="String">
62-
<value>False</value>
63-
</setting>
64-
<setting name="webglBuildPath" serializeAs="String">
65-
<value />
66-
</setting>
67-
<setting name="useCustomTheme" serializeAs="String">
68-
<value>False</value>
69-
</setting>
70-
<setting name="themeFile" serializeAs="String">
71-
<value>theme.ini</value>
72-
</setting>
73-
<setting name="enablePlatformSelection" serializeAs="String">
74-
<value>False</value>
75-
</setting>
76-
<setting name="runAutomatically" serializeAs="String">
77-
<value>False</value>
78-
</setting>
79-
<setting name="useCustomLastModified" serializeAs="String">
80-
<value>False</value>
81-
</setting>
82-
<setting name="customDateFormat" serializeAs="String">
83-
<value>dd/MM/yyyy HH:mm:ss</value>
84-
</setting>
85-
<setting name="useHumandFriendlyLastModified" serializeAs="String">
86-
<value>False</value>
87-
</setting>
88-
<setting name="runAutomaticallyMinimized" serializeAs="String">
89-
<value>False</value>
90-
</setting>
91-
<setting name="adbLogCatArgs" serializeAs="String">
92-
<value>-s Unity ActivityManager PackageManager dalvikvm DEBUG -v color</value>
93-
</setting>
94-
<setting name="projectName" serializeAs="String">
95-
<value>0</value>
96-
</setting>
97-
<setting name="templatePackagesFolder" serializeAs="String">
98-
<value />
99-
</setting>
100-
<setting name="newProjectPlatform" serializeAs="String">
101-
<value />
102-
</setting>
103-
<setting name="searchProjectPathAlso" serializeAs="String">
104-
<value>False</value>
105-
</setting>
106-
<setting name="checkPlasticBranch" serializeAs="String">
107-
<value>False</value>
108-
</setting>
109-
<setting name="shortcutBatchFileFolder" serializeAs="String">
110-
<value />
111-
</setting>
112-
<setting name="rootFolders" serializeAs="Xml">
113-
<value>
114-
<ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
115-
<string>C:\Program Files\</string>
116-
</ArrayOfString>
117-
</value>
118-
</setting>
119-
<setting name="customInitFile" serializeAs="String">
120-
<value>InitializeProject.cs</value>
121-
</setting>
122-
<setting name="useInitScript" serializeAs="String">
123-
<value>False</value>
124-
</setting>
125-
<setting name="webglPort" serializeAs="String">
126-
<value>50000</value>
127-
</setting>
128-
<setting name="projectPaths" serializeAs="Xml">
129-
<value>
130-
<ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
131-
</value>
132-
</setting>
133-
<setting name="override40ProjectCount" serializeAs="String">
134-
<value>False</value>
135-
</setting>
136-
<setting name="maxProjectCount" serializeAs="String">
137-
<value>40</value>
138-
</setting>
139-
</UnityLauncherPro.Properties.Settings>
140-
</userSettings>
18+
19+
<userSettings>
20+
<UnityLauncherPro.Properties.Settings>
21+
<setting name="windowWidth" serializeAs="String">
22+
<value>600</value>
23+
</setting>
24+
<setting name="windowHeight" serializeAs="String">
25+
<value>650</value>
26+
</setting>
27+
<setting name="minimizeToTaskbar" serializeAs="String">
28+
<value>True</value>
29+
</setting>
30+
<setting name="registerExplorerMenu" serializeAs="String">
31+
<value>False</value>
32+
</setting>
33+
<setting name="closeAfterProject" serializeAs="String">
34+
<value>False</value>
35+
</setting>
36+
<setting name="closeAfterExplorer" serializeAs="String">
37+
<value>True</value>
38+
</setting>
39+
<setting name="showArgumentsColumn" serializeAs="String">
40+
<value>False</value>
41+
</setting>
42+
<setting name="showGitBranchColumn" serializeAs="String">
43+
<value>False</value>
44+
</setting>
45+
<setting name="showProjectsMissingFolder" serializeAs="String">
46+
<value>False</value>
47+
</setting>
48+
<setting name="AllowSingleInstanceOnly" serializeAs="String">
49+
<value>False</value>
50+
</setting>
51+
<setting name="preferredVersion" serializeAs="String">
52+
<value />
53+
</setting>
54+
<setting name="newProjectsRoot" serializeAs="String">
55+
<value />
56+
</setting>
57+
<setting name="askNameForQuickProject" serializeAs="String">
58+
<value>True</value>
59+
</setting>
60+
<setting name="enableProjectRename" serializeAs="String">
61+
<value>False</value>
62+
</setting>
63+
<setting name="streamerMode" serializeAs="String">
64+
<value>False</value>
65+
</setting>
66+
<setting name="showTargetPlatform" serializeAs="String">
67+
<value>False</value>
68+
</setting>
69+
<setting name="webglBuildPath" serializeAs="String">
70+
<value />
71+
</setting>
72+
<setting name="useCustomTheme" serializeAs="String">
73+
<value>False</value>
74+
</setting>
75+
<setting name="themeFile" serializeAs="String">
76+
<value>theme.ini</value>
77+
</setting>
78+
<setting name="enablePlatformSelection" serializeAs="String">
79+
<value>False</value>
80+
</setting>
81+
<setting name="runAutomatically" serializeAs="String">
82+
<value>False</value>
83+
</setting>
84+
<setting name="useCustomLastModified" serializeAs="String">
85+
<value>False</value>
86+
</setting>
87+
<setting name="customDateFormat" serializeAs="String">
88+
<value>dd/MM/yyyy HH:mm:ss</value>
89+
</setting>
90+
<setting name="useHumandFriendlyLastModified" serializeAs="String">
91+
<value>False</value>
92+
</setting>
93+
<setting name="runAutomaticallyMinimized" serializeAs="String">
94+
<value>False</value>
95+
</setting>
96+
<setting name="adbLogCatArgs" serializeAs="String">
97+
<value>-s Unity ActivityManager PackageManager dalvikvm DEBUG -v color</value>
98+
</setting>
99+
<setting name="projectName" serializeAs="String">
100+
<value>0</value>
101+
</setting>
102+
<setting name="templatePackagesFolder" serializeAs="String">
103+
<value />
104+
</setting>
105+
<setting name="newProjectPlatform" serializeAs="String">
106+
<value />
107+
</setting>
108+
<setting name="searchProjectPathAlso" serializeAs="String">
109+
<value>False</value>
110+
</setting>
111+
<setting name="checkPlasticBranch" serializeAs="String">
112+
<value>False</value>
113+
</setting>
114+
<setting name="shortcutBatchFileFolder" serializeAs="String">
115+
<value />
116+
</setting>
117+
118+
<!-- XML-serialized collections are OK on .NET 8 -->
119+
<setting name="rootFolders" serializeAs="Xml">
120+
<value>
121+
<ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema"
122+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
123+
<string>C:\Program Files\</string>
124+
</ArrayOfString>
125+
</value>
126+
</setting>
127+
128+
<setting name="customInitFile" serializeAs="String">
129+
<value>InitializeProject.cs</value>
130+
</setting>
131+
<setting name="useInitScript" serializeAs="String">
132+
<value>False</value>
133+
</setting>
134+
<setting name="webglPort" serializeAs="String">
135+
<value>50000</value>
136+
</setting>
137+
<setting name="projectPaths" serializeAs="Xml">
138+
<value>
139+
<ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema"
140+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
141+
</value>
142+
</setting>
143+
<setting name="override40ProjectCount" serializeAs="String">
144+
<value>False</value>
145+
</setting>
146+
<setting name="maxProjectCount" serializeAs="String">
147+
<value>40</value>
148+
</setting>
149+
</UnityLauncherPro.Properties.Settings>
150+
</userSettings>
141151
</configuration>

‎UnityLauncherPro/GetProjects.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ public static class GetProjects
1717

1818
public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranch = false, bool getArguments = false, bool showMissingFolders = false, bool showTargetPlatform = false, StringCollection AllProjectPaths = null, bool searchGitbranchRecursively = false, bool showSRP = false)
1919
{
20+
// TODO FIXME
21+
Console.WriteLine("TODO fixme 8.0");
22+
return null;
23+
2024
List<Project> projectsFound = new List<Project>();
2125

2226
var hklm = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64);

‎UnityLauncherPro/GetUnityInstallations.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Collections.Specialized;
34
using System.IO;
45

56
namespace UnityLauncherPro
@@ -14,8 +15,13 @@ public static class GetUnityInstallations
1415
// returns unity installations
1516
public static List<UnityInstallation> Scan()
1617
{
18+
// TODO fixme 8.0
19+
Console.WriteLine("TODO fixme 8.0");
20+
return null;
21+
22+
1723
// get list from settings
18-
var rootFolders = Properties.Settings.Default.rootFolders;
24+
StringCollection rootFolders = Properties.Settings.Default.rootFolders;
1925

2026
// unityversion, exe_path
2127
List<UnityInstallation> results = new List<UnityInstallation>();

0 commit comments

Comments
 (0)