Skip to content

Commit c61055e

Browse files
ignatandreiignatandrei
committed
try blockly 10
1 parent 811d88a commit c61055e

31 files changed

+143
-148
lines changed

‎.github/workflows/dotnetTools.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/setup-dotnet@v3
1919
with:
2020
dotnet-version: |
21-
7.0.200
21+
8.0.x
2222
2323
- name: Install dependencies
2424
run: |

‎src/NetCore2Blockly/DeploySampleSiteAzure/DeploySampleSiteAzure.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
11-
<PackageReference Include="NetCore2Blockly" Version="5.2022.730.2029" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
11+
<PackageReference Include="NetCore2Blockly" Version="7.2023.427.2025" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1313
</ItemGroup>
1414

1515
</Project>

‎src/NetCore2Blockly/NetCore2Blockly/NetCore2Blockly.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66
<PropertyGroup>
77
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
@@ -35,15 +35,15 @@
3535
</EmbeddedResource>
3636
</ItemGroup>
3737
<ItemGroup>
38-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
39-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.3" />
40-
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.4" />
41-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
42-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
43-
<PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
44-
<PackageReference Include="AMSWebAPI" Version="2021.7.6.628" />
45-
<PackageReference Include="AMS_Base" Version="2021.7.6.628" />
46-
<PackageReference Include="RSCG_AMS" Version="2021.7.6.628" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
38+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
39+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
40+
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.14" />
41+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
42+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
43+
<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
44+
<PackageReference Include="AMSWebAPI" Version="2023.5.21.1551" />
45+
<PackageReference Include="AMS_Base" Version="2023.5.21.1551" />
46+
<PackageReference Include="RSCG_AMS" Version="2023.5.21.1551" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
4747

4848

4949
</ItemGroup>

‎src/NetCore2Blockly/NetCore2Blockly/NetCore2Blockly.xml‎

Lines changed: 0 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/NetCore2Blockly/NetCore2BlocklyNew/NetCore2BlocklyNew.csproj‎

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

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

77
<PropertyGroup>
@@ -50,8 +50,8 @@
5050
<!--<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />-->
5151
<!--<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />-->
5252
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
53-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0" />
54-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
53+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
54+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
5555
<PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
5656
<!--<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />-->
5757
<!--<PackageReference Include="System.IO.Pipelines" Version="4.7.2" />-->

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

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
66
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
77
<Copyright>MIT</Copyright>
@@ -17,15 +17,15 @@
1717

1818
</PropertyGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
21-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.3" />
22-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.3" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.3">
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
21+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
22+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
28-
<PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
28+
<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
2929
</ItemGroup>
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
3131
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/NetCore2Blockly/NetCore2BlocklyUnitTests/NetCore2BlocklyUnitTests.csproj‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
11-
<PackageReference Include="Moq" Version="4.13.1" />
12-
<PackageReference Include="xunit" Version="2.4.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
14-
<PackageReference Include="coverlet.collector" Version="1.0.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11+
<PackageReference Include="Moq" Version="4.20.70" />
12+
<PackageReference Include="xunit" Version="2.8.0" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="coverlet.collector" Version="6.0.2">
18+
<PrivateAssets>all</PrivateAssets>
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
</PackageReference>
1521
</ItemGroup>
1622

1723
<ItemGroup>

‎src/NetCore2Blockly/TestBlocklyHtml/Controllers/EmployeesController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.AspNetCore.Mvc;
66
using efcore=Microsoft.EntityFrameworkCore;
77
using TestBlocklyHtml.DB;
8+
using Microsoft.EntityFrameworkCore;
89

910
namespace TestBlocklyHtml.Controllers
1011
{

‎src/NetCore2Blockly/TestBlocklyHtml/GraphQL/DepartmentSchema.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
using GraphQL;
22
using GraphQL.Types;
3+
using System;
34
using static TestBlocklyHtml.GraphQL.DepartmentOGT;
45

56
namespace TestBlocklyHtml.GraphQL
67
{
78
public class DepartmentSchema : Schema
89
{
9-
public DepartmentSchema(IDependencyResolver resolver) : base(resolver)
10+
public DepartmentSchema(IServiceProvider resolver) : base(resolver)
1011
{
11-
Query = resolver.Resolve<GetAllQuery>();
12-
Mutation = resolver.Resolve<Mutations>();
12+
//TODO : graphql
13+
14+
//Query = resolver.GetService< IDependencyResolver>.Resolve<GetAllQuery>();
15+
//Mutation = resolver.Resolve<Mutations>();
1316
}
1417
}
1518
}

‎src/NetCore2Blockly/TestBlocklyHtml/GraphQL/GetAllQuery.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using GraphQL.Types;
1+
using GraphQL;
2+
using GraphQL.Types;
23

34
namespace TestBlocklyHtml.GraphQL
45
{
@@ -8,6 +9,8 @@ public class GetAllQuery : ObjectGraphType
89
{
910
public GetAllQuery(DepartmentRepository departmentRepository)
1011
{
12+
//TODO : graphql
13+
1114
Field<ListGraphType<DepartmentOGT>>(
1215
"departmentQuery",
1316
resolve: context => departmentRepository.GetDepartment()

0 commit comments

Comments
 (0)