chore: update project structure

.github/workflows/CI.yaml

@@ -1,5 +1,5 @@
 name: CI
-on: 
+on:
   - push
   - pull_request
 env:
@@ -9,20 +9,17 @@ env:
 
 jobs:
   check_format:
+    name: Check format
     runs-on: ubuntu-latest
     steps:
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.x
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Run dotnet format check
-        run: dotnet format -v diag --verify-no-changes
+      - run: dotnet format -v diag --verify-no-changes
 
   test:
+    name: Run tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -32,54 +29,45 @@ jobs:
           - macos-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.x
-
-      - name: Run tests
-        working-directory: UnitTest
-        run: dotnet test -c Release
+      - run: dotnet test -c Release
 
   build:
     needs: [test, check_format]
     runs-on: windows-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.x
 
       - name: Build
         shell: pwsh
         run: |
-          .\build.ps1
-          .\build.WinUI.ps1 x64
-          .\build.WinUI.ps1 arm64
+          .\scripts\build.ps1
+          .\scripts\build.WinUI.ps1 x64
+          .\scripts\build.WinUI.ps1 arm64
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ProjectName }}
-          path: ${{ env.ProjectName }}\bin\${{ env.Configuration }}\${{ env.NET_TFM }}\generic\publish\
+          path: src\${{ env.ProjectName }}\bin\${{ env.Configuration }}\${{ env.NET_TFM }}\generic\publish\
 
       - name: Upload WinUI x64
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ProjectName }}.WinUI.x64
-          path: ${{ env.ProjectName }}.WinUI\bin\x64\${{ env.Configuration }}\${{ env.NET_TFM }}\win-x64\publish\
+          path: src\${{ env.ProjectName }}.WinUI\bin\x64\${{ env.Configuration }}\${{ env.NET_TFM }}\win-x64\publish\
 
       - name: Upload WinUI arm64
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ProjectName }}.WinUI.arm64
-          path: ${{ env.ProjectName }}.WinUI\bin\arm64\${{ env.Configuration }}\${{ env.NET_TFM }}\win-arm64\publish\
+          path: src\${{ env.ProjectName }}.WinUI\bin\arm64\${{ env.Configuration }}\${{ env.NET_TFM }}\win-arm64\publish\
 
   nuget:
     needs: [test, check_format]
@@ -93,20 +81,17 @@ jobs:
           - STUN
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0.x
 
       - name: Build
-        working-directory: ${{ matrix.PackageName }}
-        run: dotnet build -c Release
+        working-directory: src/${{ matrix.PackageName }}
+        run: dotnet pack
 
       - name: Push nuget packages
-        working-directory: ${{ matrix.PackageName }}/bin/Release
+        working-directory: src/${{ matrix.PackageName }}/bin/Release
         run: |
           dotnet nuget push *.nupkg -s https://nuget.pkg.github.com/HMBSbige -k ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
           dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NuGetAPIKey }} --skip-duplicate

NatTypeTester.slnx

@@ -7,50 +7,48 @@
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />
     <File Path=".gitignore" />
-    <File Path="build.ps1" />
-    <File Path="build.WinUI.ps1" />
-    <File Path="Build\DotNetDllPathPatcher.ps1" />
     <File Path="LICENSE" />
     <File Path="NuGet.Config" />
     <File Path="README.md" />
     <File Path="Directory.Packages.props" />
+    <File Path="Directory.Build.props" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src\NatTypeTester.Models\NatTypeTester.Models.csproj" Type="Classic C#">
+      <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
+      <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
+      <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
+      <Configuration Solution="Release|x64" Project="Release|Any CPU" />
+    </Project>
+    <Project Path="src\NatTypeTester.ViewModels\NatTypeTester.ViewModels.csproj" Type="Classic C#">
+      <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
+      <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
+      <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
+      <Configuration Solution="Release|x64" Project="Release|Any CPU" />
+    </Project>
+    <Project Path="src\NatTypeTester.WinUI\NatTypeTester.WinUI.csproj">
+      <Configuration Solution="Debug|Any CPU" Project="Debug|x64" />
+      <Configuration Solution="Release|Any CPU" Project="Release|x64" />
+    </Project>
+    <Project Path="src\NatTypeTester\NatTypeTester.csproj" Type="Classic C#">
+      <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
+      <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
+      <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
+      <Configuration Solution="Release|x64" Project="Release|Any CPU" />
+    </Project>
+    <Project Path="src\STUN\STUN.csproj" Type="Classic C#">
+      <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
+      <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
+      <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
+      <Configuration Solution="Release|x64" Project="Release|Any CPU" />
+    </Project>
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="src\tests\UnitTest\UnitTest.csproj" Type="Classic C#">
+      <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
+      <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
+      <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
+      <Configuration Solution="Release|x64" Project="Release|Any CPU" />
+    </Project>
   </Folder>
-  <Project Path="NatTypeTester.Models\NatTypeTester.Models.csproj">
-    <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
-    <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
-    <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
-    <Configuration Solution="Release|x64" Project="Release|Any CPU" />
-  </Project>
-  <Project Path="NatTypeTester.ViewModels\NatTypeTester.ViewModels.csproj">
-    <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
-    <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
-    <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
-    <Configuration Solution="Release|x64" Project="Release|Any CPU" />
-  </Project>
-  <Project Path="NatTypeTester.WinUI\NatTypeTester.WinUI.csproj">
-    <Configuration Solution="Debug|Any CPU" Project="Debug|x64|Deploy" />
-    <Configuration Solution="Debug|ARM64" Project="Debug|ARM64|Deploy" />
-    <Configuration Solution="Debug|x64" Project="Debug|x64|Deploy" />
-    <Configuration Solution="Release|Any CPU" Project="Release|x64|Deploy" />
-    <Configuration Solution="Release|ARM64" Project="Release|ARM64|Deploy" />
-    <Configuration Solution="Release|x64" Project="Release|x64|Deploy" />
-  </Project>
-  <Project Path="NatTypeTester\NatTypeTester.csproj">
-    <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
-    <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
-    <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
-    <Configuration Solution="Release|x64" Project="Release|Any CPU" />
-  </Project>
-  <Project Path="STUN\STUN.csproj">
-    <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
-    <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
-    <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
-    <Configuration Solution="Release|x64" Project="Release|Any CPU" />
-  </Project>
-  <Project Path="UnitTest\UnitTest.csproj">
-    <Configuration Solution="Debug|ARM64" Project="Debug|Any CPU" />
-    <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
-    <Configuration Solution="Release|ARM64" Project="Release|Any CPU" />
-    <Configuration Solution="Release|x64" Project="Release|Any CPU" />
-  </Project>
 </Solution>

README.md

@@ -25,7 +25,7 @@ Stun.Net | [![NuGet.org](https://img.shields.io/nuget/v/Stun.Net.svg?logo=nuget)
 ## RFC3489
 <details>
 
-![](pic/RFC3489.png)
+![](docs/img/RFC3489.png)
 </details>
 
 ## RFC5389
@@ -33,26 +33,26 @@ Stun.Net | [![NuGet.org](https://img.shields.io/nuget/v/Stun.Net.svg?logo=nuget)
 <details>
   <summary>Checking for UDP Connectivity with the STUN Server</summary>
 
-![](pic/RFC5780_4.2.png)
+![](docs/img/RFC5780_4.2.png)
 </details>
 
 ### Mapping Behavior
 <details>
   <summary>Determining NAT Mapping Behavior</summary>
 
-![](pic/RFC5780_4.3.png)
+![](docs/img/RFC5780_4.3.png)
 </details>
 
 ### Filtering Behavior
 <details>
   <summary>Determining NAT Filtering Behavior</summary>
 
-![](pic/RFC5780_4.4.png)
+![](docs/img/RFC5780_4.4.png)
 </details>
 
 ### Combining Tests
 <details>
 
-![](pic/RFC5780_4.5.png)
+![](docs/img/RFC5780_4.5.png)
 
 </details>

build.WinUI.ps1 → scripts/build.WinUI.ps1

@@ -6,12 +6,12 @@ dotnet --info
 $proj = 'NatTypeTester.WinUI'
 $net_tfm = 'net8.0-windows10.0.22621.0'
 $configuration = 'Release'
-$proj_path = "$PSScriptRoot\$proj\$proj.csproj"
+$proj_path = "src\$proj\$proj.csproj"
 
 $rid = "win-$platform"
 Write-Host "Building $rid"
 
-$publishDir = "$PSScriptRoot\$proj\bin\$platform\$configuration\$net_tfm\$rid\publish"
+$publishDir = "src\$proj\bin\$platform\$configuration\$net_tfm\$rid\publish"
 
 Remove-Item $publishDir -Recurse -Force -Confirm:$false -ErrorAction Ignore
 

build.ps1 → scripts/build.ps1

@@ -6,8 +6,8 @@ $proj = 'NatTypeTester'
 $exe = "$proj.exe"
 $net_tfm = 'net8.0-windows10.0.22621.0'
 $configuration = 'Release'
-$output_dir = "$PSScriptRoot\$proj\bin\$configuration"
-$proj_path = "$PSScriptRoot\$proj\$proj.csproj"
+$output_dir = "src\$proj\bin\$configuration"
+$proj_path = "src\$proj\$proj.csproj"
 $generic_outdir = "$output_dir\$net_tfm\generic"
 
 function Build-Generic {
@@ -21,7 +21,7 @@ function Build-Generic {
     dotnet publish -c $configuration -f $net_tfm $proj_path -o $publishDir
     if ($LASTEXITCODE) { exit $LASTEXITCODE }
 
-    & "$PSScriptRoot\Build\DotNetDllPathPatcher.ps1" "$publishDir\$exe" bin
+    & "$PSScriptRoot\DotNetDllPathPatcher.ps1" "$publishDir\$exe" bin
     if ($LASTEXITCODE) { exit $LASTEXITCODE }
 
     Remove-Item "$publishDir\$exe"
@@ -41,7 +41,7 @@ function Build {
     dotnet publish -c $configuration -f $net_tfm -r $rid --no-self-contained true $proj_path
     if ($LASTEXITCODE) { exit $LASTEXITCODE }
 
-    & "$PSScriptRoot\Build\DotNetDllPathPatcher.ps1" "$publishDir\$exe" bin
+    & "$PSScriptRoot\DotNetDllPathPatcher.ps1" "$publishDir\$exe" bin
     if ($LASTEXITCODE) { exit $LASTEXITCODE }
 
     Move-Item "$publishDir\$exe" "$generic_outdir\publish\$proj-$arch.exe"