Skip to content

Commit 885aa5b

Browse files
rickdotnetrickdotnet
authored
Standardize Repo / Solution with nats.net (#26)
Addresses #25 . There's a small deviation from [nats.net](https://github.com/nats-io/nats.net). The `.sln` and solution artifacts are in the `src` folder, instead of the repo root, as they are in `nats.net`. @mtmk can you take a look at the ci/cd bits?
1 parent d6934d7 commit 885aa5b

File tree

86 files changed

+87
-78
lines changed

Some content is hidden

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

86 files changed

+87
-78
lines changed

‎.github/workflows/format.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
dotnet-version: '8.x'
1818

1919
- name: Check formatting
20+
working-directory: ./src
2021
run: |
2122
if dotnet format --verify-no-changes; then
2223
echo "formatting passed"

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818

1919
- id: tag
2020
name: Determine tag
21+
working-directory: ./src
2122
run: |
2223
version="$(head -n 1 version.txt)"
2324
ref_name="v$version"
@@ -38,12 +39,14 @@ jobs:
3839

3940
- if: ${{ fromJSON(steps.tag.outputs.create) }}
4041
name: Pack
42+
working-directory: ./src
4143
# https://learn.microsoft.com/en-us/nuget/create-packages/symbol-packages-snupkg
4244
# https://devblogs.microsoft.com/dotnet/producing-packages-with-source-link/
4345
run: dotnet pack -c Release -o dist -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -p:ContinuousIntegrationBuild=true
4446

4547
- if: ${{ fromJSON(steps.tag.outputs.create) }}
4648
name: Push
49+
working-directory: ./src
4750
run: |
4851
cd dist
4952
ls -lh

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,15 @@ jobs:
5252
8.x
5353
5454
- name: Restore
55+
working-directory: ./src
5556
run: dotnet restore
5657

5758
- name: Build
59+
working-directory: ./src
5860
run: dotnet build --no-restore -p:ContinuousIntegrationBuild=true
5961

6062
- name: Test
63+
working-directory: ./src
6164
# Collect code coverage
6265
# https://github.com/MarcoRossignoli/coverlet/blob/master/Documentation/KnownIssues.md#tests-fail-if-assembly-is-strong-named
6366
run: dotnet test --no-build --logger:"console;verbosity=normal" --collect:"XPlat Code Coverage" --settings Default.runsettings -- RunConfiguration.DisableAppDomain=true
@@ -71,6 +74,7 @@ jobs:
7174
token: ${{ secrets.CODECOV_TOKEN }}
7275

7376
- name: Test Native AOT
77+
working-directory: ./tests
7478
shell: bash
7579
run: |
7680
echo ">> Set up for AOT compilation..."

.editorconfig renamed to src/.editorconfig

File renamed without changes.

Default.runsettings renamed to src/Default.runsettings

File renamed without changes.

Directory.Build.props renamed to src/Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
</PropertyGroup>
3232

3333
<ItemGroup>
34-
<None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath=""/>
35-
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath=""/>
36-
<None Include="$(MSBuildThisFileDirectory)Icon.png" Pack="true" PackagePath=""/>
34+
<None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath=""/>
35+
<None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath=""/>
36+
<None Include="$(MSBuildThisFileDirectory)..\Icon.png" Pack="true" PackagePath=""/>
3737
</ItemGroup>
3838

3939
</Project>

NATS.Jwt.sln renamed to src/NATS.Jwt.sln

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,43 @@ VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt", "NATS.Jwt\NATS.Jwt.csproj", "{9B613C47-922B-4AA8-82D7-1520A13E0F74}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt.Tests", "NATS.Jwt.Tests\NATS.Jwt.Tests.csproj", "{707139DF-D75B-40F8-9AA7-816C64E98572}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt.Tests", "..\tests\NATS.Jwt.Tests\NATS.Jwt.Tests.csproj", "{707139DF-D75B-40F8-9AA7-816C64E98572}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt.TestNativeAot", "..\tests\NATS.Jwt.TestNativeAot\NATS.Jwt.TestNativeAot.csproj", "{E144211D-3549-4E78-BFC4-B5BF7E70AEDA}"
11+
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3E7EFAD-B3EA-45F4-907B-F3C2338771CE}"
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{79B0CD3B-C106-44A2-9A2A-CFDA69A3016A}"
915
EndProject
1016
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".", ".", "{1F24478C-D5CB-4A58-A74E-6371F7F95C01}"
1117
ProjectSection(SolutionItems) = preProject
12-
README.md = README.md
13-
LICENSE = LICENSE
18+
README.md = ..\README.md
19+
LICENSE = ..\LICENSE
1420
Directory.Build.props = Directory.Build.props
15-
Icon.png = Icon.png
21+
Icon.png = ..\Icon.png
1622
version.txt = version.txt
1723
.editorconfig = .editorconfig
18-
.gitattributes = .gitattributes
19-
.gitignore = .gitignore
24+
.gitattributes = ..\.gitattributes
25+
.gitignore = ..\.gitignore
2026
Default.runsettings = Default.runsettings
2127
EndProjectSection
2228
EndProject
2329
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{03E5999C-5D20-4EA2-B8C8-53ACE65B221F}"
2430
EndProject
2531
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{1EB01F81-8857-4646-B8BF-16024F357506}"
2632
ProjectSection(SolutionItems) = preProject
27-
.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
28-
.github\ISSUE_TEMPLATE\defect.yml = .github\ISSUE_TEMPLATE\defect.yml
29-
.github\ISSUE_TEMPLATE\proposal.yml = .github\ISSUE_TEMPLATE\proposal.yml
33+
.github\ISSUE_TEMPLATE\config.yml = ..\.github\ISSUE_TEMPLATE\config.yml
34+
.github\ISSUE_TEMPLATE\defect.yml = ..\.github\ISSUE_TEMPLATE\defect.yml
35+
.github\ISSUE_TEMPLATE\proposal.yml = ..\.github\ISSUE_TEMPLATE\proposal.yml
3036
EndProjectSection
3137
EndProject
3238
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{9C98B59B-D0C0-4F2B-8333-2242ED1B5F70}"
3339
ProjectSection(SolutionItems) = preProject
34-
.github\workflows\format.yml = .github\workflows\format.yml
35-
.github\workflows\release.yml = .github\workflows\release.yml
36-
.github\workflows\test.yml = .github\workflows\test.yml
40+
.github\workflows\format.yml = ..\.github\workflows\format.yml
41+
.github\workflows\release.yml = ..\.github\workflows\release.yml
42+
.github\workflows\test.yml = ..\.github\workflows\test.yml
3743
EndProjectSection
3844
EndProject
39-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NATS.Jwt.TestNativeAot", "NATS.Jwt.TestNativeAot\NATS.Jwt.TestNativeAot.csproj", "{E144211D-3549-4E78-BFC4-B5BF7E70AEDA}"
40-
EndProject
4145
Global
4246
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4347
Debug|Any CPU = Debug|Any CPU
@@ -61,7 +65,11 @@ Global
6165
{E144211D-3549-4E78-BFC4-B5BF7E70AEDA}.Release|Any CPU.Build.0 = Release|Any CPU
6266
EndGlobalSection
6367
GlobalSection(NestedProjects) = preSolution
68+
{9B613C47-922B-4AA8-82D7-1520A13E0F74} = {F3E7EFAD-B3EA-45F4-907B-F3C2338771CE}
69+
{E144211D-3549-4E78-BFC4-B5BF7E70AEDA} = {79B0CD3B-C106-44A2-9A2A-CFDA69A3016A}
70+
{707139DF-D75B-40F8-9AA7-816C64E98572} = {79B0CD3B-C106-44A2-9A2A-CFDA69A3016A}
6471
{1EB01F81-8857-4646-B8BF-16024F357506} = {03E5999C-5D20-4EA2-B8C8-53ACE65B221F}
6572
{9C98B59B-D0C0-4F2B-8333-2242ED1B5F70} = {03E5999C-5D20-4EA2-B8C8-53ACE65B221F}
73+
{03E5999C-5D20-4EA2-B8C8-53ACE65B221F} = {1F24478C-D5CB-4A58-A74E-6371F7F95C01}
6674
EndGlobalSection
6775
EndGlobal

NATS.Jwt.sln.DotSettings renamed to src/NATS.Jwt.sln.DotSettings

File renamed without changes.

NATS.Jwt.snk renamed to src/NATS.Jwt.snk

File renamed without changes.

NATS.Jwt/EncodingUtils.cs renamed to src/NATS.Jwt/EncodingUtils.cs

File renamed without changes.

0 commit comments

Comments
 (0)