Skip to content

fix Xcode11.2.1 plist key missed case #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dourgulf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix Xcode11.2.1 plist key missed case #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80cbaaa
fix Xcode11.2.1 plist key misssed case
Dec 14, 2019
d255f70
fix incorrect assignment
Dec 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions OpenSimulator.app/Contents/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>18A391</string>
<string>18G1012</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand Down Expand Up @@ -31,17 +31,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>10A255</string>
<string>11B500</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>18A384</string>
<string>19B89</string>
<key>DTSDKName</key>
<string>macosx10.14</string>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1000</string>
<string>1120</string>
<key>DTXcodeBuild</key>
<string>10A255</string>
<string>11B500</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
<key>LSUIElement</key>
Expand Down
Binary file modified OpenSimulator.app/Contents/MacOS/OpenSimulator
View file
Open in desktop
Binary file not shown.
Binary file modified OpenSimulator.app/Contents/Resources/Assets.car
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions OpenSimulator.app/Contents/_CodeSignature/CodeResources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</data>
<key>Resources/Assets.car</key>
<data>
TI3/tmZ3tw9/fwmn4oSLdJ1aqqI=
JnbGBBKbPObW3Zu1nhcMiAROz6c=
</data>
<key>Resources/Base.lproj/MainMenu.nib</key>
<data>
Expand All @@ -30,7 +30,7 @@
<dict>
<key>hash2</key>
<data>
VHjOLtjdzQQ+rBHp+sR4xpR5ZETM0gSdtWSb2WdheYA=
LGX9WVSv2uDbBhSjMkQWkhfZiIYVvscMH0Cx2HZknfw=
</data>
</dict>
<key>Resources/Base.lproj/MainMenu.nib</key>
Expand Down
Binary file added ...xcodeproj/project.xcworkspace/xcuserdata/lizhi.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions OpenSimulator.xcodeproj/xcuserdata/lizhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "53577366-7FB5-4C90-A90F-A8191F3A2FFA"
type = "1"
version = "2.0">
</Bucket>
14 changes: 14 additions & 0 deletions OpenSimulator.xcodeproj/xcuserdata/lizhi.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>OpenSimulator.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
17 changes: 17 additions & 0 deletions OpenSimulator/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,23 @@ -(NSArray *)installedAppsOnSimulatorWithWindowName:(NSString *)windowName{
NSString * platform = [[NSString stringWithFormat:@"%@.%@",system,[windowName componentsSeparatedByString:@" "].lastObject] stringByReplacingOccurrencesOfString:@"." withString:@"-"];
NSString * versionKey = [NSString stringWithFormat:@"com.apple.CoreSimulator.SimRuntime.%@",platform];
NSDictionary * simDictionary = DefaultDevices[versionKey];
if (simDictionary == nil) {
NSLog(@"Can't find %@", versionKey);
// 修正一下最小的子版本号有时候不在配置中的情况
NSArray *platformParts = [platform componentsSeparatedByString:@"-"];
NSMutableString *platform2 = [[NSMutableString alloc] initWithCapacity:platform.length];
if (platformParts.count > 0) {
for (NSUInteger i=0; i<platformParts.count-1; i++) {
[platform2 appendString:platformParts[i]];
if (i != platformParts.count-2) {
[platform2 appendString:@"-"];
}
}
platform = platform2;
}
versionKey = [NSString stringWithFormat:@"com.apple.CoreSimulator.SimRuntime.%@",platform];
simDictionary = DefaultDevices[versionKey];
}
//?
NSString *deviceName;
if ([windowName containsString:@" — "]) {
Expand Down