Merge pull request #27 from picoe/curtis/htmlrenderer-xammac-net45

Make Eto.HtmlRenderer.XamMac2 build for net45
picoe · Oct 17, 2019 · e51cef5 · e51cef5
2 parents 02adddc + 5eb18f3
commit e51cef5
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 7 deletions.
diff --git a/src/Eto.CodeEditor.Wpf/Eto.CodeEditor.Wpf.csproj b/src/Eto.CodeEditor.Wpf/Eto.CodeEditor.Wpf.csproj
@@ -13,6 +13,8 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <TargetFrameworkProfile />
+    <Title>Eto.CodeEditor adapter for Eto.Wpf</Title>
+    <Description>This is the Wpf implementation of Eto.CodeEditor.</Description>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/Eto.CodeEditor.XamMac/Eto.CodeEditor.XamMac2.csproj b/src/Eto.CodeEditor.XamMac/Eto.CodeEditor.XamMac2.csproj
@@ -12,6 +12,9 @@
     <UseXamMacFullFramework>true</UseXamMacFullFramework>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
+    <Title>Eto.CodeEditor adapter for Eto.XamMac2</Title>
+    <Description>This is the Xamarin.Mac implementation of Eto.CodeEditor.</Description>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +71,7 @@
     <ProjectReference Include="..\Scintilla.XamMac2\Scintilla.XamMac2.csproj">
       <Project>{810B1BCD-8E09-4F69-8726-B6ED91E243E7}</Project>
       <Name>Scintilla.XamMac2</Name>
+      <Pack>True</Pack>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -80,6 +84,11 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
+    <ItemGroup>
+      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('Pack', 'True'))"/>
+    </ItemGroup>
+  </Target>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
 
 </Project>
diff --git a/src/Eto.CodeEditor/Eto.CodeEditor.csproj b/src/Eto.CodeEditor/Eto.CodeEditor.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard1.0</TargetFramework>
+    <Title>Code Editor control for Eto.Forms</Title>
+    <Description>This gives you a code editor control in Eto.Forms.  Currently only supports Eto.Wpf and Eto.XamMac2, please add the platform-specific nuget package to your project.</Description>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Eto.Forms" Version="2.4.1" />

diff --git a/src/Eto.HtmlRenderer.ImageSharp/Eto.HtmlRenderer.ImageSharp.csproj b/src/Eto.HtmlRenderer.ImageSharp/Eto.HtmlRenderer.ImageSharp.csproj
@@ -2,6 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <Title>Eto.HtmlRenderer adapter for ImageSharp</Title>
+    <Description>This can be optionally used to extract animated image frames using ImageSharp.
+
+To load the adapter, do this before creating the HtmlRenderer control:
+
+  Platform.Instance.LoadAssembly("Eto.HtmlRenderer.ImageSharp");
+
+</Description>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Eto.HtmlRenderer.Mac/Eto.HtmlRenderer.Mac64.csproj b/src/Eto.HtmlRenderer.Mac/Eto.HtmlRenderer.Mac64.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net45</TargetFramework>
     <MacBuildBundle>False</MacBuildBundle>
+    <Title>Eto.HtmlRenderer adapter for Eto.Mac64</Title>
+    <Description>This can be optionally used to extract animated image frames when using the Eto.Mac64 platform.</Description>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Eto.HtmlRenderer.Mac/Eto.HtmlRenderer.XamMac2.csproj b/src/Eto.HtmlRenderer.Mac/Eto.HtmlRenderer.XamMac2.csproj
@@ -10,8 +10,8 @@
     <AssemblyName>Eto.HtmlRenderer.XamMac2</AssemblyName>
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <UseXamMacFullFramework>true</UseXamMacFullFramework>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
+    <Title>Eto.HtmlRenderer adapter for Eto.XamMac2</Title>
+    <Description>This can be optionally used to extract animated image frames when using the Eto.XamMac2 platform.</Description>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,4 +72,4 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-</Project>
+</Project>
diff --git a/src/Eto.HtmlRenderer.Wpf/Eto.HtmlRenderer.Wpf.csproj b/src/Eto.HtmlRenderer.Wpf/Eto.HtmlRenderer.Wpf.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net45</TargetFramework>
+    <Title>Eto.HtmlRenderer adapter for Eto.Wpf</Title>
+    <Description>This can be optionally used to extract animated image frames when using the Eto.Wpf platform.</Description>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Scintilla.XamMac2/Scintilla.XamMac2.csproj b/src/Scintilla.XamMac2/Scintilla.XamMac2.csproj
@@ -12,6 +12,7 @@
     <UseXamMacFullFramework>true</UseXamMacFullFramework>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
+    <IsPackable>False</IsPackable>
   </PropertyGroup>
   <PropertyGroup>
     <!-- use these properties to compile an ObjectiveC binding project for XamMac Full.  Remove if/when UseXamMacFullFramework is supported. -->
@@ -63,8 +64,12 @@
       <SmartLink>False</SmartLink>
     </NativeReference>
   </ItemGroup>
-  <Target Name="Pack">
-    <!-- do nothing -->
-  </Target>
+  <ItemGroup>
+    <PackageReference Include="NuGet.Build.Tasks.Pack">
+      <Version>5.3.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.ObjcBinding.CSharp.targets" />
-</Project>
+</Project>