Skip to content

Commit

Permalink
Updated AW version
Browse files Browse the repository at this point in the history
  • Loading branch information
@falleretic
falleretic committed May 6, 2020
1 parent 09fe920 commit a62a9a3
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 133 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Temp/
obj/
classes/
generated/
.idea
*.suo
*.ide
applicationhost.config
Expand Down
16 changes: 8 additions & 8 deletions ...mples/CSharp/ApiExamples.Xamarin/Mac/TestRunner.Xamarin.Mac/TestRunner.Xamarin.Mac.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,9 @@
<AOTMode>None</AOTMode>
</PropertyGroup>
<ItemGroup>
<Reference Include="Aspose.Words, Version=20.5.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Aspose.Words.20.5.0\lib\net40\Aspose.Words.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<Reference Include="GuiUnit">
<HintPath>..\..\..\packages\MonoDevelop.Addins.GuiUnit.0.1.1\lib\net45\GuiUnit.exe</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
Expand All @@ -87,7 +80,6 @@
<ItemGroup>
<None Include="Info.plist" />
<None Include="Entitlements.plist" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
Expand All @@ -99,5 +91,13 @@
<Name>Xamarin.Mac.Tests</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspose.Words">
<Version>20.5.0</Version>
</PackageReference>
<PackageReference Include="MonoDevelop.Addins.GuiUnit">
<Version>0.1.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
</Project>
5 changes: 0 additions & 5 deletions ApiExamples/CSharp/ApiExamples.Xamarin/Mac/TestRunner.Xamarin.Mac/packages.config
View file

This file was deleted.

40 changes: 9 additions & 31 deletions ApiExamples/CSharp/ApiExamples.Xamarin/Mac/Xamarin.Mac.Tests/Xamarin.Mac.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,34 +49,11 @@
</XamMacArch>
</PropertyGroup>
<ItemGroup>
<Reference Include="Aspose.Words, Version=20.5.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Aspose.Words.20.5.0\lib\net40\Aspose.Words.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\SkiaSharp.1.68.1.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Mac" />
<Reference Include="System.Drawing" />
<Reference Include="System.Data" />
<Reference Include="GuiUnit">
<HintPath>..\..\..\packages\MonoDevelop.Addins.GuiUnit.0.1.1\lib\net45\GuiUnit.exe</HintPath>
</Reference>
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -330,14 +307,15 @@
<Compile Include="ApiExampleBase.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="Aspose.Words">
<Version>20.5.0</Version>
</PackageReference>
<PackageReference Include="MonoDevelop.Addins.GuiUnit">
<Version>0.1.1</Version>
</PackageReference>
<PackageReference Include="SkiaSharp">
<Version>1.68.1.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\..\packages\SkiaSharp.1.68.1.1\build\net45\SkiaSharp.targets" Condition="Exists('..\..\..\packages\SkiaSharp.1.68.1.1\build\net45\SkiaSharp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\SkiaSharp.1.68.1.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SkiaSharp.1.68.1.1\build\net45\SkiaSharp.targets'))" />
</Target>
</Project>
9 changes: 0 additions & 9 deletions ApiExamples/CSharp/ApiExamples.Xamarin/Mac/Xamarin.Mac.Tests/packages.config
View file

This file was deleted.

36 changes: 11 additions & 25 deletions ...mples/CSharp/ApiExamples.Xamarin/iOS/TestRunner.Xamarin.iOS/TestRunner.Xamarin.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,42 +94,17 @@
<None Include="Info.plist" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="Entitlements.plist" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Default.png" />
<BundleResource Include="Resources\[email protected]" />
<BundleResource Include="Resources\[email protected]" />
</ItemGroup>
<ItemGroup>
<Reference Include="Aspose.Words, Version=20.5.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Aspose.Words.20.5.0\lib\netstandard2.0\Aspose.Words.dll</HintPath>
</Reference>
<Reference Include="Aspose.Words.Pdf2Word, Version=20.4.0.0, Culture=neutral, PublicKeyToken=b2012bcb6a4c6805, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Aspose.Words.20.5.0\lib\netstandard2.0\Aspose.Words.Pdf2Word.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Win32.Registry, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Win32.Registry.4.7.0\lib\netstandard2.0\Microsoft.Win32.Registry.dll</HintPath>
</Reference>
<Reference Include="MonoTouch.NUnitLite" />
<Reference Include="Aspose.BarCode">
<HintPath>..\..\..\packages\Aspose.BarCode.19.2.0\lib\netstandard2.0\Aspose.BarCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\SkiaSharp.1.68.1.1\lib\Xamarin.iOS\SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.AccessControl.4.7.0\lib\netstandard2.0\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.Principal.Windows.4.7.0\lib\netstandard2.0\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
Expand All @@ -142,5 +117,16 @@
<IsWatchApp>false</IsWatchApp>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspose.BarCode">
<Version>19.2.0</Version>
</PackageReference>
<PackageReference Include="Aspose.Words">
<Version>20.5.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit" Version="4.3.0">
<ExcludeAssets>all</ExcludeAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
13 changes: 0 additions & 13 deletions ApiExamples/CSharp/ApiExamples.Xamarin/iOS/TestRunner.Xamarin.iOS/packages.config
View file

This file was deleted.

36 changes: 11 additions & 25 deletions ApiExamples/CSharp/ApiExamples.Xamarin/iOS/Xamarin.iOS.Tests/Xamarin.iOS.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,34 +46,10 @@
</MtouchVerbosity>
</PropertyGroup>
<ItemGroup>
<Reference Include="Aspose.Words, Version=20.5.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Aspose.Words.20.5.0\lib\netstandard2.0\Aspose.Words.dll</HintPath>
</Reference>
<Reference Include="Aspose.Words.Pdf2Word, Version=20.4.0.0, Culture=neutral, PublicKeyToken=b2012bcb6a4c6805, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Aspose.Words.20.5.0\lib\netstandard2.0\Aspose.Words.Pdf2Word.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Win32.Registry, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Win32.Registry.4.7.0\lib\netstandard2.0\Microsoft.Win32.Registry.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\SkiaSharp.1.68.1.1\lib\Xamarin.iOS\SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.AccessControl.4.7.0\lib\netstandard2.0\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.Principal.Windows.4.7.0\lib\netstandard2.0\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<Reference Include="Aspose.BarCode">
<HintPath>..\..\..\packages\Aspose.BarCode.19.2.0\lib\netstandard2.0\Aspose.BarCode.dll</HintPath>
</Reference>
<Reference Include="MonoTouch.NUnitLite" />
<Reference Include="OpenTK-1.0" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -336,7 +312,17 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aspose.BarCode">
<Version>19.2.0</Version>
</PackageReference>
<PackageReference Include="Aspose.Words">
<Version>20.5.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit" Version="4.3.0">
<ExcludeAssets>all</ExcludeAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
13 changes: 0 additions & 13 deletions ApiExamples/CSharp/ApiExamples.Xamarin/iOS/Xamarin.iOS.Tests/packages.config
View file

This file was deleted.

3 changes: 2 additions & 1 deletion ApiExamples/CSharp/ApiExamples/ApiExampleBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
using Aspose.Words;
using NUnit.Framework;

Expand Down Expand Up @@ -40,7 +41,7 @@ public void OneTimeSetUp()
[SetUp]
public void SetUp()
{
Console.WriteLine($"Clr: {System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription}\n");
Console.WriteLine($"Clr: {RuntimeInformation.FrameworkDescription}\n");
}

[OneTimeTearDown]
Expand Down
6 changes: 5 additions & 1 deletion ApiExamples/CSharp/ApiExamples/ApiExamples.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
Expand Down Expand Up @@ -38,11 +38,15 @@
<Reference Include="Interop.ADODB">
<HintPath>..\..\Data\Dlls\Interop.ADODB.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation">
<HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.1.0\ref\netcoreapp2.1\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<PackageReference Include="BouncyCastle" Version="1.8.6.1" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>

Expand Down
5 changes: 3 additions & 2 deletions ApiExamples/CSharp/ApiExamples/ExReportingEngine.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,9 @@ public void RemoveEmptyParagraphs()
GoldsDir + "ReportingEngine.RemoveEmptyParagraphs Gold.docx"));
}

[TestCase("Hello", "Hello", "ReportingEngine.MergingTableCellsDynamically.Merged", Description = "Cells in the first two tables must be merged")]
[TestCase("Hello", "Name", "ReportingEngine.MergingTableCellsDynamically.NotMerged", Description = "Only last table cells must be merge")]
[Test]
[TestCase("Hello", "Hello", "ReportingEngine.MergingTableCellsDynamically.Merged", TestName = "Cells in the first two tables must be merged")]
[TestCase("Hello", "Name", "ReportingEngine.MergingTableCellsDynamically.NotMerged", TestName = "Only last table cells must be merge")]
public void MergingTableCellsDynamically(string value1, string value2, string resultDocumentName)
{
string artifactPath = ArtifactsDir + resultDocumentName +
Expand Down

0 comments on commit a62a9a3

Please sign in to comment.