Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.NET 5 #36

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

.NET 5 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
45e43e3
Upgrade everything to .NET 5
asbjornu Apr 21, 2021
d48144e
Bump IKVM from 8.1.5717.0 to 8.2.1
asbjornu Sep 1, 2022
3cd2147
Bump NUnit from 3.13.2 to 3.13.3
asbjornu Jul 26, 2022
3596b47
Bump NUnit3TestAdapter from 4.1.0 to 4.2.1
asbjornu Jul 26, 2022
afe03e1
Ignore .idea directory
asbjornu Jul 26, 2022
6ab654f
Bump UpgradeAssistant from 0.2.220602 to 0.4.336902
asbjornu Jul 26, 2022
4c38179
Bump Microsoft.NET.Test.Sdk from 17.0.0 to 17.2.0
asbjornu Jul 26, 2022
684de40
Remove traces of .NET Framework
asbjornu Jul 26, 2022
a16f17d
Delete the tools folder
asbjornu Jul 26, 2022
3a22ce2
Bump everything to .NET 6
asbjornu Jul 26, 2022
6225623
Bump actions/checkout from 2 to 3
dependabot[bot] Mar 2, 2022
6a829fc
Bump actions/upload-artifact from 2 to 3
dependabot[bot] Apr 11, 2022
b25db45
Attempt to run NHtmlUnitGenerator
asbjornu Jul 26, 2022
95ae3c4
Change `newVersion` from `8.2.1.0` to `8.2.1`
asbjornu Jul 26, 2022
975f565
Output FusionLog on FileNotFoundExceptions
asbjornu Sep 1, 2022
93ae602
More logging
asbjornu Sep 1, 2022
a8e3595
Debug with AssemblyResolveEventHandler
asbjornu Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 35 additions & 33 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,51 @@
name: Build
name: build

on:
push:
tags: ['*']
branches: [ main ]
pull_request:
branches: [ main ]
on: [push, pull_request]

jobs:
build:
runs-on: windows-latest

runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: microsoft/setup-msbuild@v1
- uses: NuGet/[email protected]
- uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: '5.x'

- name: Restore NuGet packages
run: nuget restore NHtmlUnit.sln
- uses: gittools/actions/gitversion/[email protected]
id: gitversion
with:
updateAssemblyInfo: true

- uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: '5.x.x'
- uses: actions/cache@v2
with:
path: ${{ github.workspace }}/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: ${{ runner.os }}-nuget-

- uses: gittools/actions/gitversion/[email protected]
id: gitversion # step id used as reference for output values
with:
updateAssemblyInfo: true
- run: dotnet restore

- name: Build Solution
run: msbuild NHtmlUnit.sln /property:Configuration=Release
- run: dotnet run --configuration Release --no-restore --project app/NHtmlUnitGenerator/NHtmlUnit.Generator.csproj

- name: Test Solution
run: packages\NUnit.ConsoleRunner.3.12.0\tools\nunit3-console.exe tests\IntegrationTests\bin\Release\IntegrationTests.dll
- run: dotnet build --configuration Release --no-restore

- name: Create NuGet Package
run: nuget.exe pack NHtmlUnit.nuspec -Verbosity detailed -Symbols -Properties Configuration=Release -Version ${{ steps.gitversion.outputs.nuGetVersion }}
- run: dotnet test --project tests/IntegrationTests/IntegrationTests.csproj --configuration Release --no-build --no-restore -p:CollectCoverage=true -p:CoverletOutputFormat=opencover -p:Exclude="[NHtmlUnit.Test*]*"

- uses: actions/upload-artifact@v3
with:
name: NHtmlUnit.nupkg
path: '*.nupkg'
- uses: codecov/codecov-action@v2

- run: dotnet pack --include-source --configuration Release --no-build --no-restore -p:PackageVersion="${{ steps.gitversion.outputs.fullSemVer }}" app/NHtmlUnit/NHtmlUnit.csproj --output ${{ github.workspace }}/nugets/

- uses: actions/upload-artifact@v3
with:
name: NHtmlUnit.nupkg
path: ${{ github.workspace }}/nugets/*.nupkg

release:
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
/tools/.DS_Store
/*.tss
/TestResult.xml

# JetBrains Rider
.idea
10 changes: 5 additions & 5 deletions NHtmlUnit.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
<title>NHtmlUnit</title>
<authors>OKB AS</authors>
<owners>OKB AS</owners>
<license type="expression">Apache-2.0</license>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/HtmlUnit/NHtmlUnit</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>NHtmlUnit is a .NET wrapper of HtmlUnit; a "GUI-less browser for Java programs". It allows you to write code to test web applications with a headless, automated browser.</description>
<releaseNotes>Updated to HtmlUnit 2.50</releaseNotes>
<copyright>Copyright © OKB AS 2021</copyright>
<tags>testing htmlunit nhtmlunit headless browser</tags>
<dependencies>
<dependency id="IKVM" version="8.1.5717" />
<dependency id="IKVM" version="8.2.1" />
</dependencies>
<frameworkAssemblies />
<references />
</metadata>
<files>
<file src="app\NHtmlUnit\bin\Release\HtmlUnit.dll" target="lib/net45" />
<file src="app\NHtmlUnit\bin\Release\NHtmlUnit.dll" target="lib/net45" />
<file src="app\NHtmlUnit\bin\Release\HtmlUnit.dll" target="lib/net6.0" />
<file src="app\NHtmlUnit\bin\Release\NHtmlUnit.dll" target="lib/net6.0" />
</files>
</package>
</package>
2,179 changes: 8 additions & 2,171 deletions app/NHtmlUnit/NHtmlUnit.csproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/NHtmlUnit/NHtmlUnit.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<tags>testing htmlunit nhtmlunit headless browser</tags>
</metadata>
<files>
<file src="bin\Release\HtmlUnit.dll" target="lib/net45" />
<file src="bin\Release\HtmlUnit.dll" target="lib/net6.0" />
</files>
</package>
105 changes: 51 additions & 54 deletions app/NHtmlUnit/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Beans" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.XML.API" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.SwingAWT" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Media" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Security" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Jdbc" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Naming" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Beans" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.XML.API" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.SwingAWT" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Media" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Security" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Jdbc" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IKVM.OpenJDK.Naming" publicKeyToken="13235d27fcbfff58" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
4 changes: 0 additions & 4 deletions app/NHtmlUnit/packages.config
View file
Open in desktop

This file was deleted.

Loading