Skip to content

Commit 6b7d4b1

Browse files
committed
Merge branch 'v2_develop' into v2_release
2 parents 4fb71e3 + 7c0a3be commit 6b7d4b1

File tree

209 files changed

+3306
-4829
lines changed

Some content is hidden

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

209 files changed

+3306
-4829
lines changed

.github/workflows/api-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: Setup Pages
3434
if: github.ref_name == 'main' || github.ref_name == 'develop'
35-
uses: actions/configure-pages@v4
35+
uses: actions/configure-pages@v5
3636

3737
- name: Upload artifact
3838
if: github.ref_name == 'main' || github.ref_name == 'develop'
@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: v2_develop Repository Dispatch ${{ github.ref_name }}
5151
if: github.ref_name == 'v2_develop'
52-
uses: peter-evans/repository-dispatch@v2
52+
uses: peter-evans/repository-dispatch@v3
5353
with:
5454
token: ${{ secrets.V2DOCS_TOKEN }}
5555
repository: gui-cs/Terminal.GuiV2Docs

.github/workflows/publish.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fetch-depth: 0 # fetch-depth is needed for GitVersion
2020

2121
- name: Install GitVersion
22-
uses: gittools/actions/gitversion/setup@v0
22+
uses: gittools/actions/gitversion/setup@v1
2323
with:
2424
versionSpec: '5.x'
2525
includePrerelease: true
@@ -43,7 +43,6 @@ jobs:
4343
- name: Build Release
4444
run: |
4545
dotnet-gitversion /updateprojectfiles
46-
dotnet build ./Analyzers/Terminal.Gui.Analyzers.Internal --no-incremental --nologo --force --configuration Release
4746
dotnet build --no-incremental --nologo --force --configuration Release
4847
4948
- name: Pack

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ UnitTests/TestResults
5050
TestResults
5151

5252
# git merge files
53-
.orig
54-
.theirs
55-
.ours
53+
*.orig
54+
*.theirs
55+
*.ours
5656

5757
demo.*
5858

Analyzers.slnf

Lines changed: 0 additions & 10 deletions
This file was deleted.

Analyzers/Directory.Build.props

Lines changed: 0 additions & 23 deletions
This file was deleted.

Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Program.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

Analyzers/Terminal.Gui.Analyzers.Internal.Debugging/Terminal.Gui.Analyzers.Internal.Debugging.csproj

Lines changed: 0 additions & 25 deletions
This file was deleted.

Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Generators/EnumExtensions/EnumDefinitions/EnumMemberValues.cs

Lines changed: 0 additions & 42 deletions
This file was deleted.

Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Generators/EnumExtensions/EnumDefinitions/WithGenerator/BetterEnum.cs

Lines changed: 0 additions & 51 deletions
This file was deleted.

Analyzers/Terminal.Gui.Analyzers.Internal.Tests/Generators/EnumExtensions/EnumDefinitions/WithGenerator/BetterEnum_ExplicitInt.cs

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)