Skip to content

Commit ca697ae

Browse files
authored
Merge pull request #1133 from ita-social-projects/develop
Minor release 1.1.0
2 parents 62e7711 + 2028841 commit ca697ae

File tree

454 files changed

+10998
-8252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

454 files changed

+10998
-8252
lines changed

.github/assign/auto_assign.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addReviewers: true
22
addAssignees: author
33
reviewers:
4-
- andriy-korchynskyy
4+
- h4wk13
55
- DmyMi
66
numberOfReviewers: 0

.github/workflows/dotnetcore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Setup .NET
6666
uses: actions/setup-dotnet@v1
6767
with:
68-
dotnet-version: 6.0.102
68+
dotnet-version: 6.0.406
6969

7070
- name: Clean
7171
run: dotnet clean ./OutOfSchool/OutOfSchool.sln --configuration Release && dotnet nuget locals all --clear

Config/export_users.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/mysqlsh --file
2+
from mysqlsh import mysql
3+
import os
4+
5+
# Export test database users using MySQL Shell
6+
7+
# Using classic session, so running only pure SQL
8+
s = mysql.get_session('mysql://root@mysql:3306', os.getenv('ROOT_PASSWORD'))
9+
users = s.run_sql("""SELECT User FROM mysql.user WHERE Host != 'localhost' AND User != 'root' AND User != ''""").fetch_all()
10+
create_user_commands = []
11+
grants = []
12+
for user in users:
13+
for cmd in s.run_sql("""SHOW CREATE USER ?""", [user[0]]).fetch_all():
14+
create_user_commands.append(cmd[0])
15+
for cmd in s.run_sql("""SHOW GRANTS FOR ?""", [user[0]]).fetch_all():
16+
grants.append(cmd[0])
17+
18+
result = create_user_commands + grants + ['']
19+
print(";\n".join(result))

Config/initDbServer.bat

Lines changed: 0 additions & 2 deletions
This file was deleted.

Config/initDbServer.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

Config/sql-edge.bat

Lines changed: 0 additions & 2 deletions
This file was deleted.

Nginx/nginx.conf

Lines changed: 0 additions & 58 deletions
This file was deleted.

OutOfSchool/.editorconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,9 @@ dotnet_style_qualification_for_field = false:silent
108108
dotnet_style_qualification_for_property = false:silent
109109
dotnet_style_qualification_for_method = true:silent
110110
dotnet_style_qualification_for_event = false:silent
111+
112+
[*.props]
113+
tab_width = 4
114+
indent_size = 4
115+
end_of_line = crlf
116+
indent_style = space

OutOfSchool/.globalconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dotnet_diagnostic.SA1101.severity = none

OutOfSchool/Directory.Build.props

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
<Target Name="PostClean" AfterTargets="Clean">
7+
<RemoveDir Directories="$(BaseIntermediateOutputPath)"/><!-- obj -->
8+
<RemoveDir Directories="$(BaseOutputPath)"/><!-- bin -->
9+
</Target>
10+
</Project>

0 commit comments

Comments
 (0)