Skip to content

Commit b2d3a7b

Browse files
gep13gep13
committed
Merge branch 'release/3.0.0'
* release/3.0.0: (maint) Update action version numbers (maint) Update GitHub Actions (maint) Update nuget packages (maint): Bump gittools/actions from 0.9.9 to 0.10.2 (build) .NET 5.0 is still required (build) Update to required versions for build (build) Switch to latest build images (#129) Update to target Cake 3.0.0 (build) Start building 3.0.0 of addin (maint) Re-enable posting of Tweets (maint) Reformatted files (#104) Update Cake and Cake.Recipe for build
2 parents 9470229 + c8fd6a5 commit b2d3a7b

File tree

13 files changed

+187
-163
lines changed

13 files changed

+187
-163
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "0.38.5",
6+
"version": "1.3.0",
77
"commands": [
88
"dotnet-cake"
99
]

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
1313
strategy:
1414
matrix:
15-
os: [ windows-2022, ubuntu-18.04, macos-10.15 ]
15+
os: [ windows-2022, ubuntu-latest, macos-latest ]
1616

1717
env:
1818
AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
@@ -35,48 +35,48 @@ jobs:
3535
WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
3636
steps:
3737
- name: Checkout the repository
38-
uses: actions/checkout@v2
38+
uses: actions/checkout@v3.5.3
3939

4040
- name: Fetch all tags and branches
4141
run: git fetch --prune --unshallow
4242

4343
- name: Cache Tools
44-
uses: actions/cache@v2
44+
uses: actions/cache@v3.3.1
4545
with:
4646
path: tools
4747
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
4848

49-
- name: Install .NET Core SDK 3.1.x
50-
uses: actions/setup-dotnet@v1
51-
with:
52-
dotnet-version: '3.1.x'
53-
5449
- name: Install .NET Core SDK 5.0.x
55-
uses: actions/setup-dotnet@v1
50+
uses: actions/setup-dotnet@v3.2.0
5651
with:
5752
dotnet-version: '5.0.x'
5853

54+
- name: Install .NET Core SDK 6.0.x
55+
uses: actions/setup-dotnet@v3.2.0
56+
with:
57+
dotnet-version: '6.0.x'
58+
5959
- name: Install .NET Core SDK (global.json)
60-
uses: actions/setup-dotnet@v1
60+
uses: actions/setup-dotnet@v3.2.0
6161

6262
- name: Build project
63-
uses: cake-build/cake-action@v1
63+
uses: cake-build/cake-action@v1.4.1
6464
with:
6565
script-path: recipe.cake
6666
target: CI
6767
verbosity: Normal
68-
cake-version: 0.38.5
68+
cake-version: 1.3.0
6969
cake-bootstrap: true
7070

7171
- name: Upload Issues-Report
72-
uses: actions/upload-artifact@v2
72+
uses: actions/upload-artifact@v3.1.2
7373
with:
7474
if-no-files-found: warn
7575
name: issues
7676
path: BuildArtifacts/report.html
7777

7878
- name: Upload Packages
79-
uses: actions/upload-artifact@v2
79+
uses: actions/upload-artifact@v3.1.2
8080
with:
8181
if-no-files-found: warn
8282
name: package

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v2.3.4
33+
uses: actions/checkout@v3.5.3
3434
with:
3535
fetch-depth: 0
3636

‎.github/workflows/dependabot-cake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
runs-on: ubuntu-latest # linux, because this is a docker-action
1111
steps:
1212
- name: check/update cake dependencies
13-
uses: nils-org/dependabot-cake-action@v1
13+
uses: nils-org/dependabot-cake-action@v1.1.0

‎.github/workflows/publishDocs.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ jobs:
1515

1616
steps:
1717
- name: checkout
18-
uses: actions/checkout@v2.3.4 #https://github.com/actions/checkout
18+
uses: actions/checkout@v3.5.3 #https://github.com/actions/checkout
1919
with:
2020
fetch-depth: 0 # GitVersion is somewhat irritated when fetch-depth is "1"....
2121
ref: ${{ github.event.ref }}
2222

2323
- name: Cache Tools
24-
uses: actions/cache@v2
24+
uses: actions/cache@v3.3.1
2525
with:
2626
path: tools
2727
key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}
2828

2929
- name: Publishing documentation
30-
uses: cake-build/cake-action@v1
30+
uses: cake-build/cake-action@v1.4.1
3131
with:
3232
script-path: recipe.cake
3333
target: Force-Publish-Documentation
3434
verbosity: Diagnostic
35-
cake-version: 0.38.5
35+
cake-version: 1.3.0
3636
cake-bootstrap: true

‎.github/workflows/release-notes.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ jobs:
1111

1212
steps:
1313
- name: Checkout the requested branch
14-
uses: actions/checkout@v2.3.4
14+
uses: actions/checkout@v3.5.3
1515
- name: Fetch all tags and branches
1616
run: git fetch --prune --unshallow
1717
- name: Cache Tools
18-
uses: actions/cache@v2.1.4
18+
uses: actions/cache@v3.3.1
1919
with:
2020
path: tools
2121
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
2222
- name: Set up git version
2323
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
24-
uses: gittools/actions/gitversion/setup@v0.9.9
24+
uses: gittools/actions/gitversion/setup@v0.10.2
2525
with:
2626
versionSpec: "5.x"
2727
- name: Run git version
2828
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
2929
id: gitversion
30-
uses: gittools/actions/gitversion/execute@v0.9.9
30+
uses: gittools/actions/gitversion/execute@v0.10.2
3131
- name: Create release branch ${{ github.event.inputs.version }}
3232
if: ${{ steps.gitversion.outputs.majorMinorPatch }}
3333
run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}
@@ -38,10 +38,10 @@ jobs:
3838
branch: "release/${{ steps.gitversion.outputs.majorMinorPatch }}"
3939
github_token: ${{ secrets.GH_TOKEN }}
4040
- name: Drafting Release Notes
41-
uses: cake-build/cake-action@v1
41+
uses: cake-build/cake-action@v1.4.1
4242
with:
4343
script-path: recipe.cake
4444
target: releasenotes
4545
verbosity: Diagnostic
46-
cake-version: 0.38.5
46+
cake-version: 1.3.0
4747
cake-bootstrap: true

‎GitVersion.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
next-version: 3.0.0

‎Source/Cake.Twitter.Tests/Cake.Twitter.Tests.csproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55
<DebugType>full</DebugType>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Cake.Core" Version="2.0.0">
10+
<PackageReference Include="Cake.Core" Version="3.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
</PackageReference>
13-
<PackageReference Include="Cake.Testing" Version="2.0.0">
13+
<PackageReference Include="Cake.Testing" Version="3.0.0">
1414
<PrivateAssets>all</PrivateAssets>
1515
</PackageReference>
16-
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
16+
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
21-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
21+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>
25-
<PackageReference Include="xunit" Version="2.4.1" />
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
25+
<PackageReference Include="xunit" Version="2.5.0" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29+
</PackageReference>
2730
</ItemGroup>
2831

2932
<ItemGroup>

‎Source/Cake.Twitter/Cake.Twitter.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
44
<GenerateDocumentationFile>true</GenerateDocumentationFile>
55
<IncludeSymbols>true</IncludeSymbols>
66
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -33,16 +33,17 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
36+
<PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
3737
<PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
3838
<PrivateAssets>all</PrivateAssets>
3939
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4040
</PackageReference>
41-
<PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
41+
<PackageReference Include="Cake.Testing" Version="3.0.0" />
42+
<PackageReference Include="CakeContrib.Guidelines" Version="1.4.0">
4243
<PrivateAssets>all</PrivateAssets>
4344
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4445
</PackageReference>
45-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
46+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
4647
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4748
<PrivateAssets>all</PrivateAssets>
4849
</PackageReference>

0 commit comments

Comments
 (0)