Skip to content

Commit 7701fe4

Browse files
FlorianRapplFlorianRappl
authored
Merge branch 'devel' into devel
2 parents 33d8bc7 + 196db0d commit 7701fe4

File tree

9 files changed

+47
-16
lines changed

9 files changed

+47
-16
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 0.14.0
2+
3+
Released on Tuesday, March 31 2020.
4+
5+
- Fixed deadlock with some versions of jQuery (#63)
6+
- Enabled the instance creator factory (#11)
7+
18
# 0.13.0
29

310
Released on Friday, September 6 2019.

‎CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AngleSharp.Js contains code written by (in order of first pull request / commit)
77
* [Florian Rappl](https://github.com/FlorianRappl)
88
* [Georgios Diamantopoulos](https://github.com/georgiosd)
99
* [miroslav22](https://github.com/miroslav22)
10+
* [doominator42](https://github.com/doominator42)
1011

1112
Without these awesome people AngleSharp.Js could not exist. Thanks to everyone for your contributions! :beers:
1213

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 - 2019 AngleSharp
3+
Copyright (c) 2013 - 2020 AngleSharp
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ This project is supported by the [.NET Foundation](https://dotnetfoundation.org)
8383

8484
The MIT License (MIT)
8585

86-
Copyright (c) 2015 - 2019 AngleSharp
86+
Copyright (c) 2015 - 2020 AngleSharp
8787

8888
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
8989

‎build.cake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ var solutionName = "AngleSharp.Js";
44
var frameworks = new Dictionary<String, String>
55
{
66
{ "net46", "net46" },
7+
{ "net461", "net461" },
8+
{ "net472", "net472" },
79
{ "netstandard1.3", "netstandard1.3" },
810
{ "netstandard2.0", "netstandard2.0" },
911
};

‎src/AngleSharp.Js.Tests/AngleSharp.Js.Tests.csproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="AngleSharp.Css" Version="0.13.0" />
19-
<PackageReference Include="AngleSharp.Xml" Version="0.14.0-alpha-41" />
20-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
21-
<PackageReference Include="NUnit" Version="3.11.0" />
22-
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
18+
<PackageReference Include="AngleSharp.Css" Version="0.14.0-alpha-139" />
19+
<PackageReference Include="AngleSharp.Xml" Version="0.14.0" />
20+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
21+
<PackageReference Include="NUnit" Version="3.12.0" />
22+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
2326
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
2427
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
2528
</ItemGroup>

‎src/AngleSharp.Js.nuspec

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,28 @@
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>Integrates a JavaScript engine to AngleSharp.</description>
1313
<releaseNotes>https://github.com/AngleSharp/AngleSharp.Js/blob/master/CHANGELOG.md</releaseNotes>
14-
<copyright>Copyright 2017-2019, AngleSharp</copyright>
14+
<copyright>Copyright 2017-2020, AngleSharp</copyright>
1515
<tags>html html5 css css3 dom javascript scripting library js scripts runtime jint anglesharp angle</tags>
1616
<dependencies>
1717
<group targetFramework="netstandard1.3">
18-
<dependency id="AngleSharp" version="0.13.0" />
18+
<dependency id="AngleSharp" version="0.14.0" />
1919
<dependency id="Jint" version="2.10.4" />
20-
<dependency id="System.Threading.Thread" version="4.0.0" />
20+
<dependency id="System.Threading.Thread" version="4.3.0" />
2121
</group>
2222
<group targetFramework="netstandard2.0">
23-
<dependency id="AngleSharp" version="0.13.0" />
23+
<dependency id="AngleSharp" version="0.14.0" />
2424
<dependency id="Jint" version="2.10.4" />
2525
</group>
2626
<group targetFramework="net46">
27-
<dependency id="AngleSharp" version="0.13.0" />
27+
<dependency id="AngleSharp" version="0.14.0" />
28+
<dependency id="Jint" version="2.10.4" />
29+
</group>
30+
<group targetFramework="net461">
31+
<dependency id="AngleSharp" version="0.14.0" />
32+
<dependency id="Jint" version="2.10.4" />
33+
</group>
34+
<group targetFramework="net472">
35+
<dependency id="AngleSharp" version="0.14.0" />
2836
<dependency id="Jint" version="2.10.4" />
2937
</group>
3038
</dependencies>

‎src/AngleSharp.Js/AngleSharp.Js.csproj

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,30 @@
33
<AssemblyName>AngleSharp.Js</AssemblyName>
44
<RootNamespace>AngleSharp.Js</RootNamespace>
55
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.3;netstandard2.0</TargetFrameworks>
6-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard1.3;netstandard2.0;net46</TargetFrameworks>
6+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard1.3;netstandard2.0;net46;net461;net472</TargetFrameworks>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<LangVersion>7.1</LangVersion>
11+
<RepositoryUrl>https://github.com/AngleSharp/AngleSharp.Js</RepositoryUrl>
12+
<RepositoryType>git</RepositoryType>
13+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
14+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
15+
<IncludeSymbols>true</IncludeSymbols>
16+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1117
</PropertyGroup>
1218

1319
<ItemGroup>
14-
<PackageReference Include="AngleSharp" Version="0.14.0-alpha-798" />
20+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="AngleSharp" Version="0.14.0" />
1525
<PackageReference Include="Jint" Version="2.10.4" />
1626
</ItemGroup>
1727

1828
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
19-
<PackageReference Include="System.Threading.Thread" Version="4.0.0" />
29+
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
2030
</ItemGroup>
2131

2232
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">

‎src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<PropertyGroup>
33
<Description>Integrates a JavaScript engine to AngleSharp.</Description>
44
<Product>AngleSharp.Js</Product>
5-
<Version>0.13.0</Version>
5+
<Version>0.14.0</Version>
66
</PropertyGroup>
77
</Project>

0 commit comments

Comments
 (0)