Skip to content

Commit

Permalink
Merge branch 'develop/Habu' into release/Habu
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveGilham committed Mar 9, 2022
2 parents bbf2e04 + 8de8300 commit 89ed261
Show file tree
Hide file tree
Showing 290 changed files with 17,390 additions and 16,200 deletions.
10 changes: 5 additions & 5 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
"isRoot": true,
"tools": {
"dotnet-reportgenerator-globaltool": {
"version": "5.0.0",
"version": "5.0.4",
"commands": [
"reportgenerator"
]
},
"fake-cli": {
"version": "5.21.0",
"version": "5.22.0",
"commands": [
"fake"
]
},
"xmldocmd": {
"version": "2.7.0",
"version": "2.8.0",
"commands": [
"xmldocmd"
]
},
"altcode.gendarme-tool": {
"version": "2022.1.25.12143-pre-release",
"version": "2022.2.17.8350",
"commands": [
"gendarme"
]
},
"dotnet-fsharplint": {
"version": "0.21.0",
"version": "0.21.1",
"commands": [
"dotnet-fsharplint"
]
Expand Down
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions" # search for actions - there are other options available
directory: "/" # search in .github/workflows under root `/`
schedule:
interval: "weekly" # check for action update every week
- package-ecosystem: "nuget" # Enable version updates for nuget
directory: "/Build"
schedule:
interval: "daily" # Check the nuget registry for updates every day (weekdays) schedule:
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: actions/setup-dotnet@v1
- uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.101'
dotnet-version: '6.0.200'
- name: Tools
run: dotnet tool restore
- name: Setup
Expand All @@ -44,10 +44,10 @@ jobs:
linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-dotnet@v1
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.101'
dotnet-version: '6.0.200'
- name: Tools
run: dotnet tool restore
- name: Setup
Expand Down
8 changes: 4 additions & 4 deletions AltCover.Api.Tests/AltCover.Api.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
<Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
<HintPath>..\ThirdParty\Unquote.dll</HintPath>
</Reference>
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.12.13" Condition="'$(TargetFramework)' != 'net472'" />
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="1.0.0" Condition="'$(TargetFramework)' != 'net472'" />
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
</ItemGroup>

Expand All @@ -87,7 +87,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.1">
<PackageReference Update="FSharp.Core" Version="6.0.3">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
Loading

0 comments on commit 89ed261

Please sign in to comment.