[sharpie] Bump version of sharpie and accommodate xtro to new output (#8759)

Make.config

@@ -139,9 +139,9 @@ MIN_CMAKE_URL=https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.dmg
 MIN_CMAKE_VERSION=2.8.8
 
 # ObjectiveSharpie min/max versions
-MIN_SHARPIE_VERSION=3.5.22
+MIN_SHARPIE_VERSION=3.5.37
 MAX_SHARPIE_VERSION=3.5.99
-MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/693cb4a2-5455-4841-904f-a2936d2781f4/3890cb5f74ea75ff4474152f1f2b8008/objectivesharpie-3.5.22.pkg
+MIN_SHARPIE_URL=https://bosstoragemirror.blob.core.windows.net/objective-sharpie/builds/626091405aca6fdee94b2d2beb8a667d810994b6/440/696076/ObjectiveSharpie-3.5.37.pkg
 
 # Minimum OSX versions for building XI/XM
 MIN_OSX_BUILD_VERSION=10.15.2

tests/xtro-sharpie/Makefile

@@ -48,7 +48,7 @@ XMAC_ARCH = x86_64
 XMAC_PCH = macosx$(OSX_SDK_VERSION)-$(XMAC_ARCH).pch
 
 $(XMAC_PCH): .stamp-check-sharpie
-	sharpie sdk-db --xcode $(XCODE) -s macosx$(OSX_SDK_VERSION) -a $(XMAC_ARCH) -exclude DriverKit -exclude IOUSBHost -exclude NetworkingDriverKit -exclude USBDriverKit -exclude USBSerialDriverKit -exclude HIDDriverKit -exclude PCIDriverKit -exclude PDFKit
+	sharpie sdk-db --xcode $(XCODE) -s macosx$(OSX_SDK_VERSION) -a $(XMAC_ARCH)
 
 
 

tests/xtro-sharpie/SimdCheck.cs

@@ -243,11 +243,17 @@ namespace Extrospection
 
 		string Undecorate (string native_name)
 		{
-			if (native_name.StartsWith ("const ", StringComparison.Ordinal))
-				return Undecorate (native_name.Substring ("const ".Length));
+			const string _const = "const ";
+			if (native_name.StartsWith (_const, StringComparison.Ordinal))
+				return Undecorate (native_name.Substring (_const.Length));
 
-			if (native_name.StartsWith ("struct ", StringComparison.Ordinal))
-				return Undecorate (native_name.Substring ("struct ".Length));
+			const string _struct = "struct ";
+			if (native_name.StartsWith (_struct, StringComparison.Ordinal))
+				return Undecorate (native_name.Substring (_struct.Length));
+
+			const string _nsrefinedforswift = "NS_REFINED_FOR_SWIFT ";
+			if (native_name.StartsWith (_nsrefinedforswift, StringComparison.Ordinal))
+				return Undecorate (native_name.Substring (_nsrefinedforswift.Length));
 
 			const string _Nonnull = " _Nonnull";
 			if (native_name.EndsWith (_Nonnull, StringComparison.Ordinal))

tests/xtro-sharpie/xtro-sharpie.csproj

@@ -48,7 +48,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'macOS' ">
     <StartAction>Project</StartAction>
-    <StartArguments>macosx10.14-x86_64.pch ../../_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/git/lib/x86_64/mobile/Xamarin.Mac.dll</StartArguments>
+    <StartArguments>macosx10.15-x86_64.pch ../../_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/git/lib/x86_64/mobile/Xamarin.Mac.dll</StartArguments>
     <StartWorkingDirectory>.</StartWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>