diff options
| -rwxr-xr-x | Xwt.XamMac/AssemblyInfo.cs | 28 | ||||
| -rw-r--r-- | Xwt.XamMac/Xwt.Mac/ImageHandler.cs | 15 | ||||
| -rw-r--r-- | Xwt.XamMac/Xwt.XamMac.csproj | 9 |
3 files changed, 14 insertions, 38 deletions
diff --git a/Xwt.XamMac/AssemblyInfo.cs b/Xwt.XamMac/AssemblyInfo.cs deleted file mode 100755 index ea440b81..00000000 --- a/Xwt.XamMac/AssemblyInfo.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Xwt.XamMac")] -[assembly: AssemblyDescription("Xamarin Mac Toolkit for the Xwt UI Framework")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Xwt UI Framework")] -[assembly: AssemblyCopyright("Xamarin, Inc (http://www.xamarin.com)")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyInformationalVersion("0.1.0.0-prerelease")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/Xwt.XamMac/Xwt.Mac/ImageHandler.cs b/Xwt.XamMac/Xwt.Mac/ImageHandler.cs index a11f86d3..8ba931ac 100644 --- a/Xwt.XamMac/Xwt.Mac/ImageHandler.cs +++ b/Xwt.XamMac/Xwt.Mac/ImageHandler.cs @@ -51,9 +51,7 @@ namespace Xwt.Mac public override object LoadFromStream (Stream stream) { - using (NSData data = NSData.FromStream (stream)) { - return new NSImage (data); - } + return NSImage.FromStream (stream); } public override object LoadFromFile (string file) @@ -71,8 +69,9 @@ namespace Xwt.Mac public override object CreateMultiSizeIcon (IEnumerable<object> images) { - if (images.Count () == 1) - return images.First (); + var singleImage = images.SingleOrDefault (); + if (singleImage != null) + return singleImage; NSImage res = new NSImage (); foreach (NSImage img in images) @@ -251,10 +250,8 @@ namespace Xwt.Mac static NSImage FromResource (string res) { - var stream = typeof(ImageHandler).Assembly.GetManifestResourceStream (res); - using (stream) - using (NSData data = NSData.FromStream (stream)) { - return new NSImage (data); + using (var stream = typeof(ImageHandler).Assembly.GetManifestResourceStream (res)) { + return NSImage.FromStream (stream); } } diff --git a/Xwt.XamMac/Xwt.XamMac.csproj b/Xwt.XamMac/Xwt.XamMac.csproj index 5da321c0..c170efe0 100644 --- a/Xwt.XamMac/Xwt.XamMac.csproj +++ b/Xwt.XamMac/Xwt.XamMac.csproj @@ -9,9 +9,16 @@ <SignAssembly>True</SignAssembly> <AssemblyOriginatorKeyFile>..\xwt.snk</AssemblyOriginatorKeyFile> <TargetFramework>$(MacTargetFramework)</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports> + <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion> + + <AssemblyTitle>Xwt.XamMac</AssemblyTitle> + <AssemblyDescription>Xamarin Mac Toolkit for the Xwt UI Framework</AssemblyDescription> + <Product>Xwt UI Framework</Product> + <Copyright>Microsoft, Inc (https://www.microsoft.com/)</Copyright> + <AssemblyVersion>0.1.0.0</AssemblyVersion> + <InformationalVersion>0.1.0.0-prerelease</InformationalVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> |