Projetc move to "src"

zimbres · Dec 7, 2024 · 3a20799 · 3a20799
1 parent 34c6e39
commit 3a20799
Show file tree

Hide file tree

Showing 31 changed files with 10 additions and 17 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -42,7 +42,7 @@ jobs:
           tag=$(git describe --tags --abbrev=0)
           release_name="UptimeKumaRemoteProbe-$tag-${{ matrix.target }}"
 
-          dotnet publish UptimeKumaRemoteProbe/UptimeKumaRemoteProbe.csproj --framework net8.0 --runtime "${{ matrix.target }}" --no-self-contained -p:PublishSingleFile=true -c Release -o "$release_name"
+          dotnet publish src/UptimeKumaRemoteProbe/UptimeKumaRemoteProbe.csproj --framework net8.0 --runtime "${{ matrix.target }}" --no-self-contained -p:PublishSingleFile=true -c Release -o "$release_name"
 
           if [ "${{ matrix.target }}" == "win-x64" ]; then
             7z a -tzip "${release_name}.zip" "./${release_name}/*"
@@ -94,8 +94,8 @@ jobs:
       - name: Build and Push Image
         uses: docker/build-push-action@v5
         with:
-          context: UptimeKumaRemoteProbe
-          file: UptimeKumaRemoteProbe/Dockerfile.multiarch
+          context: src/UptimeKumaRemoteProbe
+          file: src/UptimeKumaRemoteProbe/Dockerfile.multiarch
           tags: ${{ steps.meta.outputs.tags }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
diff --git a/UptimeKumaRemoteProbe.sln b/UptimeKumaRemoteProbe.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34309.116
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UptimeKumaRemoteProbe", "UptimeKumaRemoteProbe\UptimeKumaRemoteProbe.csproj", "{29A3E819-13D5-4FE4-84E3-84497054267D}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4A42D506-96D1-4492-92DB-35B8013122A8}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
@@ -15,16 +13,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		SECURITY.md = SECURITY.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UptimeKumaRemoteProbe", "src\UptimeKumaRemoteProbe\UptimeKumaRemoteProbe.csproj", "{291D4A53-0E98-4E7B-861D-C43973C0B5D1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{29A3E819-13D5-4FE4-84E3-84497054267D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29A3E819-13D5-4FE4-84E3-84497054267D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29A3E819-13D5-4FE4-84E3-84497054267D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29A3E819-13D5-4FE4-84E3-84497054267D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{291D4A53-0E98-4E7B-861D-C43973C0B5D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{291D4A53-0E98-4E7B-861D-C43973C0B5D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{291D4A53-0E98-4E7B-861D-C43973C0B5D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{291D4A53-0E98-4E7B-861D-C43973C0B5D1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,5 +3,5 @@ version: '3.9'
 services:
   worker:
     build:
-      context: ./UptimeKumaRemoteProbe
+      context: ./src/UptimeKumaRemoteProbe
       dockerfile: Dockerfile
diff --git a/...aRemoteProbe/Data/ApplicationDbContext.cs → ...aRemoteProbe/Data/ApplicationDbContext.cs b/...aRemoteProbe/Data/ApplicationDbContext.cs → ...aRemoteProbe/Data/ApplicationDbContext.cs
diff --git a/UptimeKumaRemoteProbe/Dockerfile → src/UptimeKumaRemoteProbe/Dockerfile b/UptimeKumaRemoteProbe/Dockerfile → src/UptimeKumaRemoteProbe/Dockerfile
diff --git a/UptimeKumaRemoteProbe/Dockerfile.multiarch → ...ptimeKumaRemoteProbe/Dockerfile.multiarch b/UptimeKumaRemoteProbe/Dockerfile.multiarch → ...ptimeKumaRemoteProbe/Dockerfile.multiarch
diff --git a/UptimeKumaRemoteProbe/GlobalSuppressions.cs → ...timeKumaRemoteProbe/GlobalSuppressions.cs b/UptimeKumaRemoteProbe/GlobalSuppressions.cs → ...timeKumaRemoteProbe/GlobalSuppressions.cs
diff --git a/UptimeKumaRemoteProbe/GlobalUsings.cs → src/UptimeKumaRemoteProbe/GlobalUsings.cs b/UptimeKumaRemoteProbe/GlobalUsings.cs → src/UptimeKumaRemoteProbe/GlobalUsings.cs
diff --git a/UptimeKumaRemoteProbe/Models/AppSettings.cs → ...timeKumaRemoteProbe/Models/AppSettings.cs b/UptimeKumaRemoteProbe/Models/AppSettings.cs → ...timeKumaRemoteProbe/Models/AppSettings.cs
diff --git a/...eKumaRemoteProbe/Models/Configurations.cs → ...eKumaRemoteProbe/Models/Configurations.cs b/...eKumaRemoteProbe/Models/Configurations.cs → ...eKumaRemoteProbe/Models/Configurations.cs
diff --git a/UptimeKumaRemoteProbe/Models/DbVersion.cs → ...UptimeKumaRemoteProbe/Models/DbVersion.cs b/UptimeKumaRemoteProbe/Models/DbVersion.cs → ...UptimeKumaRemoteProbe/Models/DbVersion.cs
diff --git a/UptimeKumaRemoteProbe/Models/Domain.cs → src/UptimeKumaRemoteProbe/Models/Domain.cs b/UptimeKumaRemoteProbe/Models/Domain.cs → src/UptimeKumaRemoteProbe/Models/Domain.cs
diff --git a/UptimeKumaRemoteProbe/Models/Monitors.cs → src/UptimeKumaRemoteProbe/Models/Monitors.cs b/UptimeKumaRemoteProbe/Models/Monitors.cs → src/UptimeKumaRemoteProbe/Models/Monitors.cs
diff --git a/UptimeKumaRemoteProbe/Program.cs → src/UptimeKumaRemoteProbe/Program.cs b/UptimeKumaRemoteProbe/Program.cs → src/UptimeKumaRemoteProbe/Program.cs
diff --git a/...emoteProbe/Properties/launchSettings.json → ...emoteProbe/Properties/launchSettings.json b/...emoteProbe/Properties/launchSettings.json → ...emoteProbe/Properties/launchSettings.json
diff --git a/...emoteProbe/Services/CertificateService.cs → ...emoteProbe/Services/CertificateService.cs b/...emoteProbe/Services/CertificateService.cs → ...emoteProbe/Services/CertificateService.cs
diff --git a/UptimeKumaRemoteProbe/Services/DbService.cs → ...timeKumaRemoteProbe/Services/DbService.cs b/UptimeKumaRemoteProbe/Services/DbService.cs → ...timeKumaRemoteProbe/Services/DbService.cs
diff --git a/...KumaRemoteProbe/Services/DomainService.cs → ...KumaRemoteProbe/Services/DomainService.cs b/...KumaRemoteProbe/Services/DomainService.cs → ...KumaRemoteProbe/Services/DomainService.cs
diff --git a/...oteProbe/Services/HealthCheckPublisher.cs → ...oteProbe/Services/HealthCheckPublisher.cs b/...oteProbe/Services/HealthCheckPublisher.cs → ...oteProbe/Services/HealthCheckPublisher.cs
diff --git a/...meKumaRemoteProbe/Services/HttpService.cs → ...meKumaRemoteProbe/Services/HttpService.cs b/...meKumaRemoteProbe/Services/HttpService.cs → ...meKumaRemoteProbe/Services/HttpService.cs
diff --git a/...maRemoteProbe/Services/MonitorsService.cs → ...maRemoteProbe/Services/MonitorsService.cs b/...maRemoteProbe/Services/MonitorsService.cs → ...maRemoteProbe/Services/MonitorsService.cs
diff --git a/...meKumaRemoteProbe/Services/PingService.cs → ...meKumaRemoteProbe/Services/PingService.cs b/...meKumaRemoteProbe/Services/PingService.cs → ...meKumaRemoteProbe/Services/PingService.cs
diff --git a/...meKumaRemoteProbe/Services/PushService.cs → ...meKumaRemoteProbe/Services/PushService.cs b/...meKumaRemoteProbe/Services/PushService.cs → ...meKumaRemoteProbe/Services/PushService.cs
diff --git a/UptimeKumaRemoteProbe/Services/TcpService.cs → ...imeKumaRemoteProbe/Services/TcpService.cs b/UptimeKumaRemoteProbe/Services/TcpService.cs → ...imeKumaRemoteProbe/Services/TcpService.cs
diff --git a/...umaRemoteProbe/Services/VersionService.cs → ...umaRemoteProbe/Services/VersionService.cs b/...umaRemoteProbe/Services/VersionService.cs → ...umaRemoteProbe/Services/VersionService.cs
diff --git a/...aRemoteProbe/UptimeKumaRemoteProbe.csproj → ...aRemoteProbe/UptimeKumaRemoteProbe.csproj b/...aRemoteProbe/UptimeKumaRemoteProbe.csproj → ...aRemoteProbe/UptimeKumaRemoteProbe.csproj
@@ -25,13 +25,6 @@
     <Content Include="uptime-kuma.ico" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.13.1" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />

diff --git a/UptimeKumaRemoteProbe/Worker.cs → src/UptimeKumaRemoteProbe/Worker.cs b/UptimeKumaRemoteProbe/Worker.cs → src/UptimeKumaRemoteProbe/Worker.cs
diff --git a/...aRemoteProbe/appsettings.Development.json → ...aRemoteProbe/appsettings.Development.json b/...aRemoteProbe/appsettings.Development.json → ...aRemoteProbe/appsettings.Development.json
diff --git a/UptimeKumaRemoteProbe/appsettings.json → src/UptimeKumaRemoteProbe/appsettings.json b/UptimeKumaRemoteProbe/appsettings.json → src/UptimeKumaRemoteProbe/appsettings.json
diff --git a/UptimeKumaRemoteProbe/health → src/UptimeKumaRemoteProbe/health b/UptimeKumaRemoteProbe/health → src/UptimeKumaRemoteProbe/health
diff --git a/UptimeKumaRemoteProbe/uptime-kuma.ico → src/UptimeKumaRemoteProbe/uptime-kuma.ico b/UptimeKumaRemoteProbe/uptime-kuma.ico → src/UptimeKumaRemoteProbe/uptime-kuma.ico