Skip to content

Commit cac5877

Browse files
authored
Merge pull request #383 from bUnit-dev/release/v1.1
Release of new minor version v1.1
2 parents 7577dfd + 427c15d commit cac5877

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+151
-98
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
-->
66

77
### PR meta checklist
8-
- [ ] Pull request is targeted at `DEV` branch for code
9-
or targeted at `main` branch for documentation that is live on bunit.egilhansen.com.
8+
- [ ] Pull request is targeted at `main` branch for code
9+
or targeted at `stable` branch for documentation that is live on bunit.dev.
1010
- [ ] Pull request is linked to all related issues, if any.
1111
- [ ] I have read the _CONTRIBUTING.md_ document.
1212

.github/workflows/docs-deploy.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ jobs:
6363
with:
6464
dotnet-version: '5.0.x'
6565

66+
- name: ⚙️ Setup dotnet 6.0.x
67+
uses: actions/setup-dotnet@v1
68+
with:
69+
dotnet-version: '6.0.100-preview.3.21202.5'
70+
6671
- name: 🛠️ Building bUnit
6772
run: dotnet build /p:PublicRelease=true
6873

.github/workflows/release-preview.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ jobs:
2727
uses: actions/setup-dotnet@v1
2828
with:
2929
dotnet-version: '5.0.x'
30+
31+
- name: ⚙️ Setup dotnet 6.0.x
32+
uses: actions/setup-dotnet@v1
33+
with:
34+
dotnet-version: '6.0.100-preview.3.21202.5'
3035

3136
- name: 🛠️ Update tokens in project files
3237
uses: cschleiden/replace-tokens@v1

.github/workflows/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ jobs:
6464
with:
6565
dotnet-version: '5.0.x'
6666

67+
- name: ⚙️ Setup dotnet 6.0.x
68+
uses: actions/setup-dotnet@v1
69+
with:
70+
dotnet-version: '6.0.100-preview.3.21202.5'
71+
6772
- name: 🛠️ Update changelog
6873
uses: thomaseizinger/[email protected]
6974
with:

.github/workflows/verification.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ jobs:
4242
with:
4343
dotnet-version: '5.0.x'
4444

45+
- name: ⚙️ Setup dotnet 6.0.x
46+
uses: actions/setup-dotnet@v1
47+
with:
48+
dotnet-version: '6.0.100-preview.3.21202.5'
49+
4550
- name: ⚙️ Setup GIT versioning
4651
uses: dotnet/[email protected]
4752
with:
@@ -57,14 +62,14 @@ jobs:
5762
run: dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org --configfile $env:APPDATA\NuGet\NuGet.Config
5863
continue-on-error: true
5964

60-
- name: 🛠️ Building library in release mode
65+
- name: 🛠️ Build library in release mode
6166
run: dotnet build -c release -p:ContinuousIntegrationBuild=true
6267

6368
- name: 🧪 Run unit tests
6469
run: |
65-
dotnet test ./tests/bunit.core.tests/bunit.core.tests.csproj -c release --no-build --logger GitHubActions
66-
dotnet test ./tests/bunit.web.tests/bunit.web.tests.csproj -c release --no-build --logger GitHubActions
67-
dotnet test ./tests/bunit.web.testcomponents.tests/bunit.web.testcomponents.tests.csproj -c release --no-build --logger GitHubActions
70+
dotnet test ./tests/bunit.core.tests/bunit.core.tests.csproj -c release --logger GitHubActions
71+
dotnet test ./tests/bunit.web.tests/bunit.web.tests.csproj -c release --logger GitHubActions
72+
dotnet test ./tests/bunit.web.testcomponents.tests/bunit.web.testcomponents.tests.csproj -c release --logger GitHubActions
6873
6974
- name: 🗳️ Create library packages
7075
run: |
@@ -78,6 +83,7 @@ jobs:
7883
run: |
7984
dotnet new --install bunit.template::${NBGV_NuGetPackageVersion} --nuget-source ${GITHUB_WORKSPACE}/packages
8085
dotnet new bunit --no-restore -o ${GITHUB_WORKSPACE}/TemplateTest
86+
echo '<?xml version="1.0" encoding="utf-8"?><Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"></Project>' >> ${GITHUB_WORKSPACE}/TemplateTest/Directory.Build.props
8187
dotnet restore ${GITHUB_WORKSPACE}/TemplateTest --source ${GITHUB_WORKSPACE}/packages --source https://api.nuget.org/v3/index.json
8288
dotnet test ${GITHUB_WORKSPACE}/TemplateTest
8389

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ All notable changes to **bUnit** will be documented in this file. The project ad
99
### Added
1010

1111
- All bUnit assemblies is now strong named signed.
12+
- Added .NET 6 (preview 3) as a target framework for bUnit, bUnit.core and bUnit.web.
1213

1314
### Changed
1415

Directory.Build.props

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup Label="Configuration variables">
55
<DotNet3Version>3.1.1</DotNet3Version>
66
<DotNet5Version>5.0.0</DotNet5Version>
7+
<DotNet6Version>6.0.0-preview.3.*</DotNet6Version>
78
</PropertyGroup>
89

910
<!-- Solution wide properties -->
@@ -45,7 +46,7 @@
4546
<!-- Shared code analyzers used for all projects in the solution -->
4647
<ItemGroup Label="Code Analyzers">
4748
<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
48-
<PackageReference Include="Meziantou.Analyzer" Version="1.0.658" PrivateAssets="All" />
49+
<PackageReference Include="Meziantou.Analyzer" Version="1.0.660" PrivateAssets="All" />
4950
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
5051
<AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" Visible="false" />
5152
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.21.0.30542" PrivateAssets="All" />
@@ -67,4 +68,12 @@
6768
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet5Version)" />
6869
</ItemGroup>
6970

71+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' AND $(MSBuildProjectName) != 'bunit.template' AND $(MSBuildProjectName) != 'bunit'">
72+
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(DotNet6Version)" />
73+
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(DotNet6Version)" />
74+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNet6Version)" />
75+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="$(DotNet6Version)" />
76+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet6Version)" />
77+
</ItemGroup>
78+
7079
</Project>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# bUnit - a testing library for Blazor components
77

8-
<a href="https://www.telerik.com/campaigns/blazor/free-trial-1?utm_source=egilhansen&utm_medium=cpm&utm_campaign=blazor-trial-readme-sponsored-message"><img align="right" width="200" src="https://raw.githubusercontent.com/bUnit-dev/bUnit/main/docs/site/sponsors/telerik-ad-github.svg" /></a>
8+
<a href="https://www.telerik.com/campaigns/blazor/free-trial-1?utm_source=egilhansen&utm_medium=cpm&utm_campaign=blazor-trial-readme-sponsored-message"><img align="right" width="200" src="https://raw.githubusercontent.com/bUnit-dev/bUnit/main/docs/site/sponsors/telerik-ad-github.svg" /></a>
99

1010
**bUnit** is a testing library for Blazor Components. Its goal is to make it easy to write _comprehensive, stable_ unit tests. With bUnit, you can:
1111

bunit.sln

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.testcomponents.te
5353
EndProject
5454
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".workflows", ".workflows", "{3B2F3419-5336-4147-A212-E19091195203}"
5555
ProjectSection(SolutionItems) = preProject
56+
.github\workflows\docs-deploy.yml = .github\workflows\docs-deploy.yml
57+
.github\workflows\prepare-release.yml = .github\workflows\prepare-release.yml
58+
.github\workflows\release-preview.yml = .github\workflows\release-preview.yml
59+
.github\workflows\release.yml = .github\workflows\release.yml
5660
.github\workflows\verification.yml = .github\workflows\verification.yml
5761
EndProjectSection
5862
EndProject

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"rollForward": "latestMajor",
4-
"allowPrerelease": false
4+
"allowPrerelease": true
55
}
6-
}
6+
}

0 commit comments

Comments
 (0)