Skip to content

Commit 249aad0

Browse files
authored
Update to .NET 6.0 SDK and react to analyzer changes (dotnet#1065)
1 parent dd336c3 commit 249aad0

File tree

172 files changed

+9905
-10080
lines changed

Some content is hidden

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

172 files changed

+9905
-10080
lines changed

.editorconfig

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
[*.cs]
2+
3+
# SA1101: Prefix local calls with this
4+
dotnet_diagnostic.SA1101.severity = none
5+
6+
# SA1629: Documentation text should end with a period
7+
dotnet_diagnostic.SA1629.severity = none
8+
9+
# SA1405: Debug.Assert should provide message text
10+
dotnet_diagnostic.SA1405.severity = none
11+
12+
# SA1124: Do not use regions
13+
dotnet_diagnostic.SA1124.severity = none
14+
15+
# SA1201: Elements should appear in the correct order
16+
dotnet_diagnostic.SA1201.severity = none
17+
18+
# SA1625: Element documentation should not be copied and pasted
19+
dotnet_diagnostic.SA1625.severity = none
20+
21+
# SA1309: Field names should not begin with underscore
22+
dotnet_diagnostic.SA1309.severity = none
23+
24+
# SA1117: Parameters should be on same line or separate lines
25+
dotnet_diagnostic.SA1117.severity = suggestion
26+
27+
# SA1202: Elements should be ordered by access
28+
dotnet_diagnostic.SA1202.severity = none
29+
30+
# SA1204: Static elements should appear before instance elements
31+
dotnet_diagnostic.SA1204.severity = none
32+
33+
# SA1308: Variable names should not be prefixed
34+
dotnet_diagnostic.SA1308.severity = none
35+
36+
# SA1614: Element parameter documentation should have text
37+
dotnet_diagnostic.SA1614.severity = none
38+
39+
# SA1616: Element return value documentation should have text
40+
dotnet_diagnostic.SA1616.severity = none
41+
42+
# SA1642: Constructor summary documentation should begin with standard text
43+
dotnet_diagnostic.SA1642.severity = none
44+
45+
# SA1600: Elements should be documented
46+
dotnet_diagnostic.SA1600.severity = none
47+
48+
# SA1622: Generic type parameter documentation should have text
49+
dotnet_diagnostic.SA1622.severity = none

Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<IsShipped>false</IsShipped>
5+
<NoWarn>$(NoWarn);SA0001</NoWarn>
56
<SystemIOPackagingVersion>4.7.0</SystemIOPackagingVersion>
67
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
78

@@ -143,8 +144,7 @@
143144
</PropertyGroup>
144145

145146
<PropertyGroup>
146-
<LangVersion>9.0</LangVersion>
147-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\rules.ruleset</CodeAnalysisRuleSet>
147+
<LangVersion>10.0</LangVersion>
148148
</PropertyGroup>
149149

150150
<PropertyGroup>

Open-XML-SDK.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ VisualStudioVersion = 17.0.31612.314
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0B53C729-D408-450D-B755-7A57184CDE93}"
77
ProjectSection(SolutionItems) = preProject
8+
.editorconfig = .editorconfig
89
.vsconfig = .vsconfig
910
CHANGELOG.md = CHANGELOG.md
1011
Directory.Build.props = Directory.Build.props
@@ -15,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1516
LICENSE = LICENSE
1617
NuGet.Config = NuGet.Config
1718
README.md = README.md
18-
rules.ruleset = rules.ruleset
1919
stylecop.json = stylecop.json
2020
Tests.targets = Tests.targets
2121
EndProjectSection

build/build.yml

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ jobs:
2424
packageType: 'sdk'
2525
useGlobalJson: true
2626

27+
- task: UseDotNet@2
28+
displayName: 'Install .NET 5 SDK'
29+
inputs:
30+
packageType: 'sdk'
31+
version: 5.x
32+
2733
- ${{ each runtime in buildTarget.runtimes }}:
2834
- task: UseDotNet@2
2935
displayName: 'Install .NET Runtime ${{ runtime }}'

build/package.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@ jobs:
77
vmImage: 'windows-2019' # Needed for PEVerify
88
steps:
99
- task: UseDotNet@2
10-
displayName: 'Install SDK'
10+
displayName: 'Install global.json SDK'
1111
inputs:
1212
packageType: 'sdk'
1313
useGlobalJson: true
1414

15+
- task: UseDotNet@2
16+
displayName: 'Install .NET 5 SDK'
17+
inputs:
18+
packageType: 'sdk'
19+
version: 5.x
20+
1521
- task: PowerShell@2
1622
displayName: 'Update version'
1723
name: updateVersion

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "5.0.400",
3+
"version": "6.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

rules.ruleset

-225
This file was deleted.

0 commit comments

Comments
 (0)