Skip to content

Commit c1aa338

Browse files
joeriddlesjoeriddles
authored
Merge branch 'main' into add-devcontainer
2 parents dc5b6cd + ab114e8 commit c1aa338

52 files changed

Lines changed: 524 additions & 484 deletions

File tree

Some content is hidden

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

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "nuget" # See documentation for possible values
4+
directory: "/" # Location of package manifests
5+
schedule:
6+
interval: "weekly"
7+
8+
- package-ecosystem: "github-actions" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

‎.github/workflows/ConvertGuidelinesXmlToMarkdown.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
push:
66
branches:
77
- 'main'
8+
workflow_dispatch:
89

910
jobs:
1011
build:
@@ -14,13 +15,13 @@ jobs:
1415
XmlFileName: "Guidelines(8th Edition).xml"
1516

1617
steps:
17-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1819
with:
1920
ref: ${{ github.ref }}
2021
token: ${{ secrets.CI_PAT }}
2122

2223
- name: Simple Diff
23-
uses: mudlabs/simple-diff@v1.0.2
24+
uses: mudlabs/simple-diff@v1.2.0
2425
id: diff
2526
with:
2627
# The path of the file or folder to find in the commits diff tree.
@@ -34,9 +35,11 @@ jobs:
3435
echo "${{ steps.diff.outputs.name }}"
3536
3637
- name: Setup .NET Core
37-
uses: actions/setup-dotnet@v1
38+
uses: actions/setup-dotnet@v3
3839
with:
39-
dotnet-version: 5.0.201
40+
dotnet-version: |
41+
5.0.x
42+
6.0.x
4043
if: ${{ steps.diff.outputs.modified == 'true' }}
4144

4245
- name: restore_compile_run_createMD
@@ -48,7 +51,7 @@ jobs:
4851
- name: Create commit and push to CodingGuideLinesMDUpdate
4952
run: |
5053
git config user.name '${{ github.actor }}'
51-
git config user.email '${{ github.actor }}@user.noreply.github.com'
54+
git config user.email '${{ github.actor }}@users.noreply.github.com'
5255
git add -A
5356
git commit -m "new coding guidelines MD File created"
5457
git push origin '${{ github.ref }}'

‎.github/workflows/copy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Copycat Action
1717
# You may pin to the exact commit or the version.
1818
# uses: andstor/copycat-action@10a8fce94cc066110cb394d6f06814b7f5f06a34
19-
uses: andstor/copycat-action@v3.2.3
19+
uses: andstor/copycat-action@v3.2.4
2020
with:
2121
# Personal access token
2222
personal_token: ${{ secrets.REPO_PAT }}

‎.github/workflows/dotnetBuild.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: CodingGuidelines Build
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
workflow_dispatch:
9+
env:
10+
version: 0.1.10
11+
jobs:
12+
build:
13+
runs-on: windows-latest
14+
steps:
15+
- uses: actions/checkout@v3
16+
- name: Setup dotnet SDK
17+
uses: actions/setup-dotnet@v3
18+
with:
19+
dotnet-version: |
20+
6.0.x
21+
7.0.x
22+
- name: Get Build Information
23+
run: |
24+
pwd
25+
dotnet --info
26+
dotnet --version
27+
- name: Install dependencies
28+
run: dotnet restore
29+
- name: Build
30+
run: dotnet build -p:Version="${{ env.version }}" --no-restore
31+
- name: Test
32+
run: dotnet test --no-build --verbosity normal
33+
- name: dotnet pack
34+
run: dotnet pack -p:Version="${{ env.version }}-ci-${{ github.run_number }}" -o ${{ github.workspace }}
35+
- uses: actions/upload-artifact@v3
36+
with:
37+
path: ${{ github.workspace }}/*.nupkg
38+
name: Intellitect.CodingGuidelines

‎.github/workflows/manuallyRunXmlToMD.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
XmlFileName: "Guidelines(8th Edition).xml"
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2323
with:
2424
ref: ${{ github.ref }}
2525
token: ${{ secrets.CI_PAT }}
2626

2727
- name: Setup .NET Core
28-
uses: actions/setup-dotnet@v1
28+
uses: actions/setup-dotnet@v3
2929
with:
3030
dotnet-version: 5.0.201
3131

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4-
<LangVersion>8.0</LangVersion>
4+
<LangVersion>11.0</LangVersion>
55
</PropertyGroup>
66
</Project>

‎IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/AnalyzerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static AnalyzerTests()
2323
[TestMethod]
2424
public async Task RunOnSelf()
2525
{
26-
await ProcessProject(new FileInfo(Path.Combine("..", "..", "..", "..", "IntelliTect.Analyzer","IntelliTect.Analyzer.csproj")))
26+
await ProcessProject(new FileInfo(Path.Combine("..", "..", "..", "..", "IntelliTect.Analyzer", "IntelliTect.Analyzer.csproj")))
2727
.ConfigureAwait(false);
2828
}
2929

‎IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
65
<IsPackable>false</IsPackable>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
12-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
13-
<PackageReference Include="coverlet.collector" Version="1.0.1" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
10+
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
11+
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
12+
<PackageReference Include="coverlet.collector" Version="3.2.0">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
1416

15-
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0-beta1-final" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.5.0-beta1-final" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.5.0-beta1-final" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.5.0-beta1-final" />
20-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.8">
17+
<PackageReference Include="Microsoft.Build.Locator" Version="1.5.5" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" />
20+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.4.0" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.4.0" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4-beta1.22559.1">
2123
<PrivateAssets>all</PrivateAssets>
2224
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2325
</PackageReference>

‎IntelliTect.Analyzer/IntelliTect.Analyzer.Test/AsyncVoidTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public async void Sample() { }
5353
var expected = new DiagnosticResult
5454
{
5555
Id = "INTL0201",
56-
Message = "Async methods should not return void.",
56+
Message = "Async methods should not return void",
5757
Severity = DiagnosticSeverity.Warning,
5858
Locations =
5959
new[] {

‎IntelliTect.Analyzer/IntelliTect.Analyzer.Test/AttributesOnSeparateLinesTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ static void Main()
390390
await VerifyCSharpFix(test, fixTest);
391391
}
392392

393-
private DiagnosticResult GetExpectedDiagnosticResult(int line, int col)
393+
private static DiagnosticResult GetExpectedDiagnosticResult(int line, int col)
394394
{
395395
return new DiagnosticResult
396396
{

0 commit comments

Comments
 (0)