Skip to content

Commit 1daaddc

Browse files
manandremanandre
authored
Merge branch 'master' into dotnet-sdk
2 parents ff2c1fc + 78026d8 commit 1daaddc

File tree

343 files changed

+16355
-4901
lines changed

Some content is hidden

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

343 files changed

+16355
-4901
lines changed

‎.build/.build.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="JetBrains.ReSharper.CommandLineTools" ExcludeAssets="All" />
1514
<PackageReference Include="GitVersion.Tool" ExcludeAssets="All" />
1615
<PackageReference Include="ReportGenerator" ExcludeAssets="All" />
1716
<PackageReference Include="Rocket.Surgery.Nuke" />

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
]
1616
},
1717
"dotnet-reportgenerator-globaltool": {
18-
"version": "5.1.24",
18+
"version": "5.1.25",
1919
"commands": [
2020
"reportgenerator"
2121
]
2222
},
2323
"nuke.globaltool": {
24-
"version": "6.2.1",
24+
"version": "7.0.5",
2525
"commands": [
2626
"nuke"
2727
]

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: ${{ matrix.os }}
8080
steps:
8181
- name: Checkout
82-
uses: actions/checkout@v3.6.0
82+
uses: actions/checkout@v4.0.0
8383
with:
8484
clean: 'false'
8585
fetch-depth: '0'
@@ -117,7 +117,7 @@ jobs:
117117
run: |
118118
dotnet nuke Pack --skip
119119
- name: 🐿 Publish Coverage
120-
uses: codecov/codecov-action@v3
120+
uses: codecov/codecov-action@v4.0.0-beta.2
121121
with:
122122
name: 'actions-${{ matrix.os }}'
123123
- name: 🏺 Publish logs

‎.github/workflows/close-milestone.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3.6.0
13+
uses: actions/checkout@v4.0.0
1414
with:
1515
fetch-depth: 0
1616

17+
- uses: actions/setup-dotnet@v3
18+
1719
- name: Install GitVersion
1820
uses: gittools/actions/gitversion/[email protected]
1921
with:
@@ -22,7 +24,7 @@ jobs:
2224
- name: Install GitReleaseManager
2325
uses: gittools/actions/gitreleasemanager/[email protected]
2426
with:
25-
versionSpec: '0.11.x'
27+
versionSpec: '0.15.x'
2628

2729
- name: Use GitVersion
2830
id: gitversion

‎.github/workflows/draft-release.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@ on:
1111

1212
jobs:
1313
create_milestone_and_draft_release:
14+
permissions:
15+
# write permission is required to create a github release
16+
contents: write
1417
runs-on: ubuntu-latest
1518
steps:
1619
- name: Checkout
17-
uses: actions/checkout@v3.6.0
20+
uses: actions/checkout@v4.0.0
1821
with:
1922
fetch-depth: 0
2023

24+
- uses: actions/setup-dotnet@v3
25+
2126
- name: Fetch all history for all tags and branches
2227
run: git fetch --prune
2328

@@ -52,5 +57,5 @@ jobs:
5257
omitNameDuringUpdate: true
5358
name: 'v${{ steps.gitversion.outputs.majorMinorPatch }}'
5459
tag: 'v${{ steps.gitversion.outputs.majorMinorPatch }}'
55-
token: ${{ secrets.OMNISHARP_BOT_TOKEN }}
60+
token: ${{ secrets.GITHUB_TOKEN }}
5661
commit: ${{ github.base_ref }}

‎.github/workflows/sync-labels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3.6.0
19+
uses: actions/checkout@v4.0.0
2020

2121
- name: Run Labeler
2222
if: success()
23-
uses: crazy-max/ghaction-github-labeler@v4.2.0
23+
uses: crazy-max/ghaction-github-labeler@v5.0.0
2424
with:
2525
yaml-file: .github/labels.yml
2626
skip-delete: false

‎.github/workflows/update-milestone.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3.6.0
16+
uses: actions/checkout@v4.0.0
1717
with:
1818
ref: ${{ github.sha }}
1919
fetch-depth: 0
2020

21+
- uses: actions/setup-dotnet@v3
22+
2123
- name: Fetch all history for all tags and branches
2224
run: git fetch --prune
2325

@@ -31,7 +33,7 @@ jobs:
3133
if: ${{ github.event.action == 'opened' }}
3234
uses: gittools/actions/gitreleasemanager/[email protected]
3335
with:
34-
versionSpec: '0.11.x'
36+
versionSpec: '0.15.x'
3537

3638
- name: Use GitVersion
3739
if: ${{ github.event.action == 'opened' }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ coverage.info
4646
/codealike.json
4747
.tmp/
4848
.nuke/temp/
49+
**/*.received.cs

‎.nuke/build.schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"AppVeyor",
3838
"AzurePipelines",
3939
"Bamboo",
40+
"Bitbucket",
4041
"Bitrise",
4142
"GitHubActions",
4243
"GitLab",

‎Directory.Packages.props

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<Project>
33
<PropertyGroup>
44
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
@@ -23,28 +23,30 @@
2323
<ItemGroup>
2424
<PackageVersion Include="GitVersion.Tool" Version="5.12.0" />
2525
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2023.2.1" />
26-
<PackageVersion Include="ReportGenerator" Version="5.1.24" />
26+
<PackageVersion Include="ReportGenerator" Version="5.1.25" />
2727
<PackageVersion Include="Rocket.Surgery.Nuke" Version="0.19.1" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<!-- backwards compat is maintained in Directory.Packages.supports.props -->
3131
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
3232
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
33-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
3434
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
3535
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
3636
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
37-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
38-
<PackageVersion Include="Newtonsoft.Json" Version="11.0.2" />
39-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
40-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
41-
<PackageVersion Include="xunit" Version="2.4.2" />
37+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
38+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
39+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
40+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" />
41+
<PackageVersion Include="xunit" Version="2.5.1" />
4242
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
43-
<PackageVersion Include="NSubstitute" Version="5.0.0" />
43+
<PackageVersion Include="Verify.Xunit" Version="16.9.0" />
44+
<PackageVersion Include="Verify.SourceGenerators" Version="1.5.0" />
45+
<PackageVersion Include="NSubstitute" Version="5.1.0" />
4446
<PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
4547
<PackageVersion Include="Serilog.Sinks.Observable" Version="2.0.2" />
4648
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
47-
<PackageVersion Include="XunitXml.TestLogger" Version="3.0.78" />
49+
<PackageVersion Include="XunitXml.TestLogger" Version="3.1.17" />
4850
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
4951
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
5052
<PackageVersion Include="System.Reactive" Version="6.0.0" />
@@ -53,9 +55,9 @@
5355
<PackageVersion Include="Microsoft.Reactive.Testing" Version="5.0.0" />
5456
<PackageVersion Include="MediatR" Version="8.1.0" />
5557
<PackageVersion Include="Bogus" Version="34.0.2" />
56-
<PackageVersion Include="Snapper" Version="2.3.2" />
58+
<PackageVersion Include="Snapper" Version="2.4.0" />
5759
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
58-
<PackageVersion Include="Nerdbank.Streams" Version="2.8.57" />
60+
<PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
5961
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
6062
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
6163
<PackageVersion Include="DryIoc.Internal" Version="5.0.1" />

0 commit comments

Comments
 (0)