Skip to content

Commit 746b917

Browse files
authored
Merge pull request #229 from nils-a/feature/cake-3.0.0
Update Cake to 3.0.0
2 parents 8ca76ba + 6ae0dac commit 746b917

File tree

6 files changed

+20
-23
lines changed

6 files changed

+20
-23
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
3.1.x
5555
5.0.x
5656
6.0.x
57+
7.0.x
5758
- name: Cache Tools
5859
uses: actions/cache@v3
5960
with:

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ jobs:
3636
fetch-depth: 0
3737
- uses: actions/[email protected]
3838
with:
39-
dotnet-version: |
40-
2.1.818
41-
3.1.x
42-
5.0.x
43-
6.0.x
39+
dotnet-version: 7.0.x
4440

4541
- name: Cache Tools
4642
uses: actions/cache@v3
@@ -54,7 +50,7 @@ jobs:
5450
with:
5551
languages: ${{ matrix.language }}
5652
# If you wish to specify custom queries, you can do so here or in a config file.
57-
# By default, queries listed here will override any specified in a config file.
53+
# By default, queries listed here will override any specified in a config file.
5854
# Prefix the list here with "+" to use these queries and those in the config file.
5955
# queries: ./path/to/local/query, your-org/your-repo/queries@main
6056

@@ -78,4 +74,4 @@ jobs:
7874
with:
7975
if-no-files-found: warn
8076
name: CoreDump
81-
path: BuildArtifacts/coredump.dmp
77+
path: BuildArtifacts/coredump.dmp

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"sarif-viewer.connectToGithubCodeScanning": "on"
3+
}

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.402",
3+
"version": "7.0.100",
44
"rollForward": "latestFeature"
55
}
6-
}
6+
}

src/Cake.7zip.Tests/Cake.7zip.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<!--
5+
Fool Cake.Incubator into thinking we're building agains netcoreapp3.1.
6+
This is done to make Cake.Recipe avoid using OpenCover. Remove this hack if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0
7+
-->
8+
<TargetFrameworks Condition="false">netcoreapp3.1</TargetFrameworks>
9+
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
510
<CodeAnalysisRuleSet>..\cake.7zip.ruleset</CodeAnalysisRuleSet>
611

712
<IsPackable>false</IsPackable>
@@ -10,16 +15,12 @@
1015
</PropertyGroup>
1116

1217
<ItemGroup>
13-
<PackageReference Include="Cake.Testing" Version="2.3.0" />
18+
<PackageReference Include="Cake.Testing" Version="3.0.0" />
1419
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
1520
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1621
<PrivateAssets>all</PrivateAssets>
1722
</PackageReference>
18-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
2324
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2425
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2526
<PrivateAssets>all</PrivateAssets>

src/Cake.7zip/Cake.7zip.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
44
<GenerateDocumentationFile>true</GenerateDocumentationFile>
55
<PublishRepositoryUrl>true</PublishRepositoryUrl>
66
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -39,16 +39,12 @@
3939
<PrivateAssets>all</PrivateAssets>
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
</PackageReference>
42-
<PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
43-
<PackageReference Include="CakeContrib.Guidelines" Version="1.3.0" PrivateAssets="All" />
42+
<PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
43+
<PackageReference Include="CakeContrib.Guidelines" Version="1.4.0" PrivateAssets="All" />
4444
<PackageReference Include="IDisposableAnalyzers" Version="4.0.2">
4545
<PrivateAssets>all</PrivateAssets>
4646
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4747
</PackageReference>
48-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
49-
<PrivateAssets>all</PrivateAssets>
50-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
51-
</PackageReference>
5248
<PackageReference Include="stylecop.analyzers" Version="1.1.118">
5349
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
5450
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)