Skip to content

Commit

Permalink
Merge pull request #1604 from bUnit-dev/release/v1.35
Browse files Browse the repository at this point in the history
  • Loading branch information
egil authored Nov 12, 2024
2 parents a0cfdc8 + b4879d2 commit 59c5196
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
"rollForward": false
},
"docfx": {
"version": "2.76.0",
"version": "2.77.0",
"commands": [
"docfx"
],
"rollForward": false
},
"dotnet-dump": {
"version": "8.0.547301",
"version": "9.0.553101",
"commands": [
"dotnet-dump"
],
"rollForward": false
}
}
}
}
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,11 @@ jobs:
with:
fetch-depth: 0 # Get all history to allow automatic versioning using MinVer

- name: Setup .NET
- name: ⚙️ Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
9.0.x
- uses: actions/download-artifact@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ jobs:
dotnet pack src/bunit/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.core/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.web/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.template/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.generators/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.web.query/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
- name: 🛠️ Upload library to NuGet.org repository
run: |
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ All notable changes to **bUnit** will be documented in this file. The project ad

## [Unreleased]

### Added
- Extension packages (`bunit.generators` and `bunit.web.query`) are flagged as stable.

## [1.34.0] - 2024-11-01

### Fixed
Expand Down
1 change: 0 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
</ItemGroup>

<ItemGroup Label="Package Versioning">
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.146" />
</ItemGroup>

Expand Down
4 changes: 0 additions & 4 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ See the full changelog at https://github.com/bUnit-dev/bUnit/releases
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Nerdbank.GitVersioning">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
7 changes: 6 additions & 1 deletion src/bunit.template/template/.template.config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"description": "The target framework sdk for the project.",
"displayName": "Target framework sdk",
"datatype": "choice",
"defaultValue": "net7.0",
"defaultValue": "net9.0",
"replaces": "targetSdk",
"choices": [
{
Expand All @@ -99,6 +99,11 @@
"choice": "net8.0",
"description": ".net 8.0",
"displayName": ".net 8.0"
},
{
"choice": "net9.0",
"description": ".net 9.0",
"displayName": ".net 9.0"
}
]
}
Expand Down
12 changes: 6 additions & 6 deletions src/bunit.template/template/Company.BlazorTests1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
</ItemGroup>

<ItemGroup Condition="'$(testFramework_xunit)' == 'true'">
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(testFramework_nunit)' == 'true'">
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
</ItemGroup>

<ItemGroup Condition="'$(testFramework_mstest)' == 'true'">
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.34",
"version": "1.35",
"assemblyVersion": {
"precision": "revision"
},
Expand Down

0 comments on commit 59c5196

Please sign in to comment.