Skip to content
This repository was archived by the owner on Apr 6, 2024. It is now read-only.

Commit 3b44558

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/4.0.0'
2 parents cca90c3 + 7f5e4d8 commit 3b44558

File tree

75 files changed

+453
-366
lines changed

Some content is hidden

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

75 files changed

+453
-366
lines changed

‎.appveyor.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ install:
1414
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
1515
- ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
1616
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
17-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
18-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.302 -InstallDir $env:DOTNET_INSTALL_DIR'
17+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.417 -InstallDir $env:DOTNET_INSTALL_DIR'
18+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.404 -InstallDir $env:DOTNET_INSTALL_DIR'
19+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
1920
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
2021
- ps: dotnet --info
2122

‎.github/renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"github>cake-contrib/renovate-presets:cake-issues"
4+
"github>cake-contrib/renovate-presets:cake-issues",
5+
"github>cake-contrib/renovate-presets:frosting-addin"
56
]
67
}

‎azure-pipelines.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ jobs:
2828
inputs:
2929
version: '7.x'
3030
displayName: 'Install .NET 7'
31+
- task: UseDotNet@2
32+
inputs:
33+
version: '8.x'
34+
displayName: 'Install .NET 8'
3135
- powershell: ./build.ps1
3236
displayName: 'Build'
3337
- publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet

‎demos/frosting/build/Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Cake.Frosting" Version="3.0.0" />
8+
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
99
<PackageReference Include="Cake.Frosting.Issues.Reporting.Generic" Version="*-*" />
1010
</ItemGroup>
1111
</Project>

‎demos/frosting/global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"allowPrerelease": true,
4+
"version": "6.0.417",
5+
"rollForward": "latestFeature"
6+
}
7+
}

‎demos/frosting/src/ClassLibrary1/ClassLibrary1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
99
<PrivateAssets>all</PrivateAssets>
10-
<Version>3.0.0</Version>
10+
<Version>3.3.2</Version>
1111
</PackageReference>
1212
<PackageReference Include="StyleCop.Analyzers">
1313
<PrivateAssets>all</PrivateAssets>

‎demos/script-runner/.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": "3.0.0",
6+
"version": "4.0.0",
77
"commands": [
88
"dotnet-cake"
99
]

‎demos/script-runner/global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"allowPrerelease": true,
4+
"version": "6.0.417",
5+
"rollForward": "latestFeature"
6+
}
7+
}

‎demos/script-runner/src/ClassLibrary1/ClassLibrary1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
99
<PrivateAssets>all</PrivateAssets>
10-
<Version>3.0.0</Version>
10+
<Version>3.3.2</Version>
1111
</PackageReference>
1212
<PackageReference Include="StyleCop.Analyzers">
1313
<PrivateAssets>all</PrivateAssets>

‎docs/templates/htmldatatable-demo-default.html

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,56 @@ <h2>MSBuild</h2>
5050
</tr>
5151
</thead>
5252
<tbody>
53+
<tr>
54+
<td>Warning</td>
55+
<td>ClassLibrary1</td>
56+
<td>src/ClassLibrary1</td>
57+
<td>CSC</td>
58+
<td></td>
59+
<td>
60+
<a href="https://www.google.com/search?q="CA9998:"+site:learn.microsoft.com" target="_blank">CA9998</a>
61+
</td>
62+
<td>FxCopAnalyzers package has been deprecated in favor of &#x27;Microsoft.CodeAnalysis.NetAnalyzers&#x27;, that ships with the .NET SDK. Please refer to https://docs.microsoft.com/visualstudio/code-quality/migrate-from-fxcop-analyzers-to-net-analyzers to migrate to .NET analyzers.</td>
63+
</tr>
64+
<tr>
65+
<td>Warning</td>
66+
<td>ClassLibrary1</td>
67+
<td>src/ClassLibrary1</td>
68+
<td>CSC</td>
69+
<td></td>
70+
<td>
71+
<a href="https://www.google.com/search?q="CA9998:"+site:learn.microsoft.com" target="_blank">CA9998</a>
72+
</td>
73+
<td>FxCopAnalyzers package has been deprecated in favor of &#x27;Microsoft.CodeAnalysis.NetAnalyzers&#x27;, that ships with the .NET SDK. Please refer to https://docs.microsoft.com/visualstudio/code-quality/migrate-from-fxcop-analyzers-to-net-analyzers to migrate to .NET analyzers.</td>
74+
</tr>
5375
<tr>
5476
<td>Warning</td>
5577
<td>ClassLibrary1</td>
5678
<td>src/ClassLibrary1</td>
5779
<td>Class1.cs</td>
5880
<td>1:1</td>
5981
<td>
60-
<a href="https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md" target="_blank">SA1200</a>
82+
<a href="https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1633.md" target="_blank">SA1633</a>
6183
</td>
62-
<td>Using directive should appear within a namespace declaration</td>
84+
<td>The file header is missing or not located at the top of the file.</td>
85+
</tr>
86+
<tr>
87+
<td>Warning</td>
88+
<td>ClassLibrary1</td>
89+
<td>src/ClassLibrary1</td>
90+
<td>CSC</td>
91+
<td></td>
92+
<td>
93+
<a href="https://www.google.com/search?q="CA9998:"+site:learn.microsoft.com" target="_blank">CA9998</a>
94+
</td>
95+
<td>FxCopAnalyzers package has been deprecated in favor of &#x27;Microsoft.CodeAnalysis.NetAnalyzers&#x27;, that ships with the .NET SDK. Please refer to https://docs.microsoft.com/visualstudio/code-quality/migrate-from-fxcop-analyzers-to-net-analyzers to migrate to .NET analyzers.</td>
6396
</tr>
6497
<tr>
6598
<td>Warning</td>
6699
<td>ClassLibrary1</td>
67100
<td>src/ClassLibrary1</td>
68101
<td>Class1.cs</td>
69-
<td>2:1</td>
102+
<td>1:1</td>
70103
<td>
71104
<a href="https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md" target="_blank">SA1200</a>
72105
</td>
@@ -77,7 +110,7 @@ <h2>MSBuild</h2>
77110
<td>ClassLibrary1</td>
78111
<td>src/ClassLibrary1</td>
79112
<td>Class1.cs</td>
80-
<td>3:1</td>
113+
<td>2:1</td>
81114
<td>
82115
<a href="https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md" target="_blank">SA1200</a>
83116
</td>
@@ -88,7 +121,7 @@ <h2>MSBuild</h2>
88121
<td>ClassLibrary1</td>
89122
<td>src/ClassLibrary1</td>
90123
<td>Class1.cs</td>
91-
<td>4:1</td>
124+
<td>3:1</td>
92125
<td>
93126
<a href="https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md" target="_blank">SA1200</a>
94127
</td>
@@ -99,7 +132,7 @@ <h2>MSBuild</h2>
99132
<td>ClassLibrary1</td>
100133
<td>src/ClassLibrary1</td>
101134
<td>Class1.cs</td>
102-
<td>5:1</td>
135+
<td>4:1</td>
103136
<td>
104137
<a href="https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md" target="_blank">SA1200</a>
105138
</td>
@@ -110,11 +143,11 @@ <h2>MSBuild</h2>
110143
<td>ClassLibrary1</td>
111144
<td>src/ClassLibrary1</td>
112145
<td>Class1.cs</td>
113-
<td>1:1</td>
146+
<td>5:1</td>
114147
<td>
115-
<a href="https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1633.md" target="_blank">SA1633</a>
148+
<a href="https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md" target="_blank">SA1200</a>
116149
</td>
117-
<td>The file header is missing or not located at the top of the file.</td>
150+
<td>Using directive should appear within a namespace declaration</td>
118151
</tr>
119152
<tr>
120153
<td>Warning</td>

0 commit comments

Comments
 (0)