Switched Downloader from sourcecode to the nuget package.

rogerfar · Jan 25, 2021 · 8bd26b7 · 8bd26b7
1 parent 2652895
commit 8bd26b7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/client/src/app/navbar/settings/settings.component.html b/client/src/app/navbar/settings/settings.component.html
@@ -43,7 +43,6 @@
           <select [(ngModel)]="settingDownloadClient">
             <option value="Simple">Simple Downloader</option>
             <option value="MultiPart">Multi Part Downloader</option>
-            <!--<option value="Aria2c">Aria2c Downloader</option>-->
           </select>
         </div>
         <p class="help">

diff --git a/docker-publish.bat b/docker-publish.bat
@@ -1,9 +1,2 @@
-docker build --tag rogerfar/rdtclient:amd64 --build-arg ARCH=amd64 .
-docker push rogerfar/rdtclient:amd64
-
-docker build -t rogerfar/rdtclient:arm64v8 --build-arg ARCH=arm64v8 .
-docker push rogerfar/rdtclient:arm64v8
-
-docker manifest create rogerfar/rdtclient:latest --amend rogerfar/rdtclient:amd64 --amend rogerfar/rdtclient:arm64v8
-
-docker manifest push rogerfar/rdtclient:latest
+docker build --tag rogerfar/rdtclient:latest --build-arg ARCH=amd64 .
+docker push rogerfar/rdtclient:latest
diff --git a/server/RdtClient.Service/RdtClient.Service.csproj b/server/RdtClient.Service/RdtClient.Service.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Downloader" Version="2.0.7" />
     <PackageReference Include="MonoTorrent" Version="1.0.28" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="RD.NET" Version="1.0.0" />
@@ -16,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Downloader\Downloader.csproj" />
     <ProjectReference Include="..\RdtClient.Data\RdtClient.Data.csproj" />
   </ItemGroup>
 

diff --git a/server/RdtClient.sln b/server/RdtClient.sln
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RdtClient.Service", "RdtCli
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RdtClient.Data", "RdtClient.Data\RdtClient.Data.csproj", "{92EF8817-AD73-4301-93BD-745D7D61DD74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Downloader", "Downloader\Downloader.csproj", "{48FF995D-AD14-4E41-BC69-7A144C84E3B6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,10 +27,6 @@ Global
 		{92EF8817-AD73-4301-93BD-745D7D61DD74}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92EF8817-AD73-4301-93BD-745D7D61DD74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92EF8817-AD73-4301-93BD-745D7D61DD74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48FF995D-AD14-4E41-BC69-7A144C84E3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48FF995D-AD14-4E41-BC69-7A144C84E3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48FF995D-AD14-4E41-BC69-7A144C84E3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48FF995D-AD14-4E41-BC69-7A144C84E3B6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE