Skip to content

Commit

Permalink
Upgraded .net from 3 to 8 (#344)
Browse files Browse the repository at this point in the history
  • Loading branch information
PeteRoyston committed Dec 27, 2023
1 parent 504a405 commit e8ef1fc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 23 deletions.
20 changes: 8 additions & 12 deletions src/Backend/Backend.csproj
Original file line number Diff line number Diff line change
@@ -1,34 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<ProjectDir>bin\$(Configuration)\$(TargetFramework)\</ProjectDir>
<IsPackable>false</IsPackable>
<LangVersion>8.0</LangVersion>
<ApplicationInsightsResourceId>/subscriptions/7704f82a-fc3d-4692-a493-61ac7588aab8/resourcegroups/Default-ApplicationInsights-EastUS/providers/microsoft.insights/components/RoystonGame</ApplicationInsightsResourceId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="JonSkeet.MiscUtil" Version="0.2.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.4" />
<PackageReference Include="Microsoft.Identity.Web" Version="0.2.1-preview" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Common\Code\Common.Code.csproj" />
<ProjectReference Include="..\Common\DataModels\Common.DataModels.csproj" />
</ItemGroup>

<ItemGroup>
<WCFMetadata Include="Connected Services" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions src/Backend/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void ConfigureServices(IServiceCollection services)
#if DEBUG
IdentityModelEventSource.ShowPII = true;
#endif

/*
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
.AddMicrosoftWebApi(options =>
{
Expand All @@ -52,7 +52,7 @@ public void ConfigureServices(IServiceCollection services)
options.AddPolicy("LobbyManagement",
policy => policy.Requirements.Add(new ScopesRequirement("LobbyManagement")));
});

*/
// The following line enables Application Insights telemetry collection.
services.AddApplicationInsightsTelemetry();
services.AddSingleton(typeof(GameManager));
Expand Down
13 changes: 4 additions & 9 deletions src/BackendTests/BackendTests.csproj
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>

<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="JonSkeet.MiscUtil" Version="0.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Backend\Backend.csproj" />
</ItemGroup>

</Project>
</Project>

0 comments on commit e8ef1fc

Please sign in to comment.