Skip to content

Commit 77c6a48

Browse files
FlorianRapplFlorianRappl
authored
Merge pull request #37 from georgiosd/master
Update packages to latest AngleSharp
2 parents 7c39886 + 142eeb4 commit 77c6a48

File tree

13 files changed

+37
-38
lines changed

13 files changed

+37
-38
lines changed

‎src/AngleSharp.Scripting.CSharp.Tests/AngleSharp.Scripting.CSharp.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
39-
<HintPath>..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
38+
<Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
39+
<HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="Microsoft.CSharp" />
43-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
44-
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
43+
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
44+
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="System" />

‎src/AngleSharp.Scripting.CSharp.Tests/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
4-
<package id="NUnit" version="3.4.1" targetFramework="net45" />
3+
<package id="AngleSharp" version="0.9.9" targetFramework="net45" />
4+
<package id="NUnit" version="3.6.1" targetFramework="net45" />
55
</packages>

‎src/AngleSharp.Scripting.CSharp/AngleSharp.Scripting.CSharp.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<Compile Include="WindowContext.cs" />
4343
</ItemGroup>
4444
<ItemGroup>
45-
<Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
46-
<HintPath>..\packages\AngleSharp.0.9.8.1\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll</HintPath>
45+
<Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
46+
<HintPath>..\packages\AngleSharp.0.9.9\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
4949
</ItemGroup>

‎src/AngleSharp.Scripting.CSharp/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.8.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
3+
<package id="AngleSharp" version="0.9.9" targetFramework="portable45-net45+win8+wp8+wpa81" />
44
</packages>

‎src/AngleSharp.Scripting.JavaScript.Generator.Tests/AngleSharp.Scripting.JavaScript.Generator.Tests.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
39-
<HintPath>..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
38+
<Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
39+
<HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="Microsoft.CSharp" />
43-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
44-
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
43+
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
44+
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="System" />
@@ -50,15 +50,15 @@
5050
<Compile Include="GeneratorTests.cs" />
5151
<Compile Include="Properties\AssemblyInfo.cs" />
5252
</ItemGroup>
53-
<ItemGroup>
54-
<None Include="packages.config" />
55-
</ItemGroup>
5653
<ItemGroup>
5754
<ProjectReference Include="..\AngleSharp.Scripting.JavaScript.Generator\AngleSharp.Scripting.JavaScript.Generator.csproj">
5855
<Project>{2bebf4ad-1660-43a6-b452-109716f42fa6}</Project>
5956
<Name>AngleSharp.Scripting.JavaScript.Generator</Name>
6057
</ProjectReference>
6158
</ItemGroup>
59+
<ItemGroup>
60+
<None Include="packages.config" />
61+
</ItemGroup>
6262
<Choose>
6363
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
6464
<ItemGroup>

‎src/AngleSharp.Scripting.JavaScript.Generator.Tests/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
4-
<package id="NUnit" version="3.4.1" targetFramework="net46" />
3+
<package id="AngleSharp" version="0.9.9" targetFramework="net45" />
4+
<package id="NUnit" version="3.6.1" targetFramework="net45" />
55
</packages>

‎src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
35-
<HintPath>..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
34+
<Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
35+
<HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
3838
<Reference Include="System" />

‎src/AngleSharp.Scripting.JavaScript.Generator/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
3+
<package id="AngleSharp" version="0.9.9" targetFramework="net45" />
44
</packages>

‎src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
39-
<HintPath>..\packages\AngleSharp.0.9.8.1\lib\net45\AngleSharp.dll</HintPath>
38+
<Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
39+
<HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
42-
<Reference Include="Jint, Version=2.9.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Jint.2.9.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
42+
<Reference Include="jint, Version=2.10.4.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
43+
<HintPath>..\packages\jint.2.10.4\lib\net45\jint.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
48-
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
47+
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
48+
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="System" />

‎src/AngleSharp.Scripting.JavaScript.Tests/packages.config

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.8.1" targetFramework="net45" />
4-
<package id="Jint" version="2.9.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
5-
<package id="NUnit" version="3.4.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
3+
<package id="AngleSharp" version="0.9.9" targetFramework="net45" />
4+
<package id="NUnit" version="3.6.1" targetFramework="net45" />
65
</packages>

‎src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
<DocumentationFile>bin\Release\AngleSharp.Scripting.JavaScript.xml</DocumentationFile>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="AngleSharp, Version=0.9.8.1, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
38-
<HintPath>..\packages\AngleSharp.0.9.8.1\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll</HintPath>
37+
<Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
38+
<HintPath>..\packages\AngleSharp.0.9.9\lib\portable-windows8+net45+windowsphone8+wpa+monoandroid+monotouch\AngleSharp.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="Jint, Version=2.9.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Jint.2.9.1\lib\portable-net40+sl50+win+WindowsPhoneApp81+wp80\Jint.dll</HintPath>
41+
<Reference Include="jint, Version=2.10.4.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
42+
<HintPath>..\packages\jint.2.10.4\lib\portable40-net40+sl5+win8+wp8+wpa81\jint.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="System" />

‎src/AngleSharp.Scripting.JavaScript/SystemTypeConverter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public static Object ToObject(JsValue arg)
4848
return arg.ToObject();
4949
}
5050

51-
static Object Clr(this JsValue? arg)
51+
static Object Clr(this JsValue arg)
5252
{
53-
return arg.HasValue ? arg.Value.ToObject() : null;
53+
return arg?.ToObject();
5454
}
5555
}
5656
}

‎src/AngleSharp.Scripting.JavaScript/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.8.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
4-
<package id="Jint" version="2.9.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
3+
<package id="AngleSharp" version="0.9.9" targetFramework="portable45-net45+win8+wp8+wpa81" />
4+
<package id="jint" version="2.10.4" targetFramework="portable45-net45+win8+wp8+wpa81" />
55
</packages>

0 commit comments

Comments
 (0)