Skip to content

Commit 9046808

Browse files
jaybarden1jbarden
andauthored
Change to use SLNX, delete SLN and cleanup (#35)
Co-authored-by: Jason Barden <[email protected]>
1 parent a9bce3a commit 9046808

File tree

22 files changed

+163
-178
lines changed

22 files changed

+163
-178
lines changed

.github/workflows/dotnet.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
name: Build and analyse with SonarQube
1+
name: .NET
22

33
on:
4+
workflow_dispatch:
45
push:
5-
branches:
6-
- main
6+
branches: [ "main" ]
77
pull_request:
8-
types: [ opened, synchronize, reopened ]
9-
env:
10-
SONAR_PROJECT: astar-dev-functional-extensions
8+
branches: [ "main" ]
119

1210
jobs:
1311
build:
1412
name: Build and analyze
1513
runs-on: windows-latest
16-
14+
1715
steps:
18-
- name: Set up JDK 17
19-
uses: actions/setup-java@v4
16+
- name: Set up JDK
17+
uses: actions/setup-java@v4.4.0
2018
with:
2119
java-version: 17
2220
distribution: 'zulu'
2321

24-
- uses: actions/checkout@v4
22+
- name: Checkout
23+
uses: actions/[email protected]
2524
with:
26-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
25+
fetch-depth: 0
2726

28-
- name: Cache SonarQube Cloud packages
29-
uses: actions/cache@v4
27+
- name: 🛠 Cache SonarQube Cloud packages
28+
uses: actions/cache@v4.2.3
3029
with:
3130
path: ~\sonar\cache
3231
key: ${{ runner.os }}-sonar
3332
restore-keys: ${{ runner.os }}-sonar
3433

35-
- name: Cache SonarQube Cloud scanner
34+
- name: 🛠 Cache SonarQube Cloud scanner
3635
id: cache-sonar-scanner
37-
uses: actions/cache@v4
36+
uses: actions/cache@v4.2.3
3837
with:
3938
path: .\.sonar\scanner
4039
key: ${{ runner.os }}-sonar-scanner
4140
restore-keys: ${{ runner.os }}-sonar-scanner
4241

43-
- name: Install SonarQube Cloud scanner
42+
- name: 🛠 Install SonarQube Cloud scanner
4443
if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
4544
shell: powershell
4645
run: |
4746
New-Item -Path .\.sonar\scanner -ItemType Directory
4847
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
4948
50-
- name: Build and analyze
49+
- name: 🔍 Restore, 🛠 Build and 🧪 Test with ☁️ SonarCloud / Qube project - ${{ vars.SONAR_PROJECT_NAME }}
5150
env:
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
5353
shell: powershell
5454
run: |
5555
dotnet tool install --global dotnet-coverage
56-
.\.sonar\scanner\dotnet-sonarscanner begin /k:"astar-development_${{ env.SONAR_PROJECT }}" /o:"astar-development" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml /d:sonar.scanner.scanAll=false /d:sonar.scanner.skipJreProvisioning=true
57-
dotnet build
56+
.\.sonar\scanner\dotnet-sonarscanner begin /k:"astar-development_${{ github.event.repository.name }}" /o:"astar-development" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml /d:sonar.scanner.scanAll=false /d:sonar.scanner.skipJreProvisioning=true
57+
dotnet build --configuration Release
5858
dotnet-coverage collect 'dotnet test --filter "FullyQualifiedName!~Tests.EndToEnd"' -f xml -o 'coverage.xml'
5959
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

.github/workflows/publish.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ jobs:
88
runs-on: ubuntu-latest
99
permissions:
1010
contents: read
11-
env:
12-
ProjectName: 'AStar.Dev.Functional.Extensions'
1311

1412
steps:
1513
- name: 🧾 Checkout code
@@ -26,8 +24,8 @@ jobs:
2624
- name: 🛠 Build solution
2725
run: dotnet build --configuration Release
2826

29-
- name: 📦 Pack NuGet package
30-
run: dotnet pack ./src/${{ env.ProjectName }}/${{ env.ProjectName }}.csproj --configuration Release --output ./nupkg
27+
- name: 📦 Pack NuGet package for ${{ github.event.repository.name }}
28+
run: dotnet pack ./src/**/*.csproj --configuration Release --output ./nupkg
3129

3230
- name: 🚀 Publish to NuGet.org
3331
run: dotnet nuget push ./nupkg/*.nupkg --skip-duplicate --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NuGet_API_Key }} #

AStar.Dev.Functional.Extensions.sln

Lines changed: 0 additions & 59 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Solution>
2+
<Folder Name="/.github/"/>
3+
<Folder Name="/.github/workflows/">
4+
<File Path=".github/workflows/dotnet.yml"/>
5+
<File Path=".github/workflows/publish.yml"/>
6+
</Folder>
7+
<Folder Name="/Solution Items/">
8+
<File Path="blog-post.md"/>
9+
<File Path="Readme-option.md"/>
10+
<File Path="Readme-result.md"/>
11+
<File Path="Readme.md"/>
12+
</Folder>
13+
<Folder Name="/Solution Items/Docs/">
14+
<File Path="docs/advanced-usage-option.md"/>
15+
<File Path="docs/advanced-usage.md"/>
16+
<File Path="docs/basic-usage.md"/>
17+
<File Path="docs/core-concepts.md"/>
18+
<File Path="docs/error-handling-patterns.md"/>
19+
<File Path="docs/method-reference.md"/>
20+
<File Path="docs/testing.md"/>
21+
</Folder>
22+
<Folder Name="/src/">
23+
<Project Path="src/AStar.Dev.Functional.Extensions/AStar.Dev.Functional.Extensions.csproj"/>
24+
</Folder>
25+
<Folder Name="/test/">
26+
<Project Path="test/AStar.Dev.Functional.Extensions.Tests.Unit/AStar.Dev.Functional.Extensions.Tests.Unit.csproj"/>
27+
</Folder>
28+
</Solution>

src/AStar.Dev.Functional.Extensions/.idea/.idea.AStar.Dev.Functional.dir/.idea/.gitignore

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AStar.Dev.Functional.Extensions/.idea/.idea.AStar.Dev.Functional.dir/.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AStar.Dev.Functional.Extensions/.idea/.idea.AStar.Dev.Functional.dir/.idea/encodings.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AStar.Dev.Functional.Extensions/.idea/.idea.AStar.Dev.Functional.dir/.idea/indexLayout.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AStar.Dev.Functional.Extensions/.idea/.idea.AStar.Dev.Functional.dir/.idea/inspectionProfiles/Project_Default.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AStar.Dev.Functional.Extensions/.idea/.idea.AStar.Dev.Functional.dir/.idea/misc.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)