Skip to content

Commit b64a893

Browse files
committed
going to .net 7
1 parent c45fdaf commit b64a893

File tree

7 files changed

+9
-11
lines changed

7 files changed

+9
-11
lines changed

.github/workflows/dotnetTools.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ jobs:
1818
uses: actions/setup-dotnet@v3
1919
with:
2020
dotnet-version: |
21-
3.1.101
22-
5.0.404
23-
7.0.x
21+
7.0.200
2422
2523
- name: Install dependencies
2624
run: |

src/NetCore2Blockly/NetCore2Blockly/NetCore2Blockly.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66
<PropertyGroup>
77
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>

src/NetCore2Blockly/NetCore2BlocklyStorage.Sqlite/NetCore2BlocklyStorage.Sqlite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
66
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
77
<Copyright>MIT</Copyright>

src/NetCore2Blockly/NetCore2BlocklyUnitTests/NetCore2BlocklyUnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

src/NetCore2Blockly/TestBlocklyHtml/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
using OdataToEntity.AspNetCore;
2626
using Microsoft.AspNet.OData.Formatter;
2727
using Microsoft.Net.Http.Headers;
28-
using Hellang.Middleware.ProblemDetails;
28+
//using Hellang.Middleware.ProblemDetails;
2929
using System.Security.Claims;
3030
using Microsoft.AspNetCore.Mvc.Infrastructure;
3131
using TestBlocklyHtml.resolveAtRuntime;
@@ -217,7 +217,7 @@ public void ConfigureServices(IServiceCollection services)
217217
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
218218
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
219219
{
220-
app.UseProblemDetails();
220+
//app.UseProblemDetails();
221221
#region odata
222222
IEdmModel edmModel = ModelDB();
223223
#endregion

src/NetCore2Blockly/TestBlocklyHtml/TestBlocklyHtml.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
66
<UserSecretsId>007a2c57-025c-457d-a28c-b78300869b18</UserSecretsId>
77
</PropertyGroup>
@@ -16,7 +16,7 @@
1616
<PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="3.4.0" />
1717
<PackageReference Include="GraphQL.Server.Ui.Playground" Version="3.4.0" />
1818
<PackageReference Include="HealthCheckVersion" Version="3.1.2020.16776727" />
19-
<PackageReference Include="Hellang.Middleware.ProblemDetails" Version="5.1.0" />
19+
<!--<PackageReference Include="Hellang.Middleware.ProblemDetails" Version="5.1.0" />-->
2020
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.4" />
2121
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.4.0" />
2222
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.8.0" />

src/NetCore2Blockly/TestNetCorePackage/TestNetCorePackage.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)