whatever

Author: Cisien

CSDiscordService.Tests/CSDiscordService.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>CSDiscordService.Tests</RootNamespace>
   </PropertyGroup>
 
@@ -12,13 +12,8 @@
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
   <ItemGroup>
-<<<<<<< Updated upstream
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0-preview.1.20124.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0-preview-20200310-03" />
-=======
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0-preview.7.20365.19" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200812-03" />
->>>>>>> Stashed changes
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.reporters" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

CSDiscordService.Tests/EvalTests.cs

@@ -102,21 +102,21 @@ public async Task Eval_WellFormedCodeExecutes_ComputedExpected()
 
             foreach (var (code, expected) in tests)
             {
-                var (result, statusCode) = await Execute(code);
+                var (result, _) = await Execute(code);
                 var res = result.ReturnValue as JsonElement?;
-                object convertedValue;
+
                 if (expected is string || expected is null)
                 {
-                    convertedValue = res?.GetString();
+                    _ = res?.GetString();
                 }
                 else if (res.Value.ValueKind == JsonValueKind.Object)
                 {
-                    convertedValue = res.HasValue;
+                    _ = res.HasValue;
                 }
                 else
                 {
                     var value = res.Value.GetRawText();
-                    convertedValue = Convert.ChangeType(value, expected.GetType());
+                    _ = Convert.ChangeType(value, expected.GetType());
                 }
             }
         }

CSDiscordService/CSDiscordService.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp5.0</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <OutputType>Exe</OutputType>
         <UserSecretsId>03629088-8bb9-4faf-8162-debf93066bc4</UserSecretsId>
         <ApplicationInsightsResourceId>/subscriptions/a46288ed-15a1-40ee-8fb2-d8867d876013/resourcegroups/CSharpDiscord/providers/microsoft.insights/components/CSDiscordService</ApplicationInsightsResourceId>
@@ -10,19 +10,16 @@
 
     <ItemGroup>
         <PackageReference Include="ICSharpCode.Decompiler" Version="3.2.0.3856" />
-<<<<<<< Updated upstream
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.6.0-2.20166.4" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.1.20120.4" />
+
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.1.20120.5" />
-=======
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.7.0" />
+
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.7.0-6.20418.4" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.7.20364.11" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.7.20364.11" />
->>>>>>> Stashed changes
+
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="System.Memory" Version="4.5.3" />
+        <PackageReference Include="System.Memory" Version="4.5.4" />
     </ItemGroup>
     <ItemGroup>
       <None Update="start.sh">

Dockerfile

@@ -1,11 +1,12 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:5.0 as dotnet-build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 as dotnet-build
 WORKDIR /src
 COPY . .
 RUN dotnet --info
 RUN dotnet restore CSDiscord.sln --configfile .nuget/nuget.config
 RUN dotnet test CSDiscordService.Tests/CSDiscordService.Tests.csproj
 RUN dotnet publish CSDiscordService/CSDiscordService.csproj -o /app
-FROM mcr.microsoft.com/dotnet/core/aspnet:5.0
+FROM mcr.microsoft.com/dotnet/aspnet:5.0
+RUN apt-get update && apt-get install -y ca-certificates
 WORKDIR /app
 COPY --from=dotnet-build /app .
 ENTRYPOINT ["bash", "start.sh"]