Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/VladimirKhil/SI
Browse files Browse the repository at this point in the history
  • Loading branch information
@VladimirKhil
VladimirKhil committed Mar 10, 2024
2 parents e5c97a2 + ec4e6ff commit fc570f5
Show file tree
Hide file tree
Showing 79 changed files with 1,514 additions and 1,223 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<Authors>Vladimir Khil</Authors>
<Company>Khil-soft</Company>
<SIGameVersion>7.11.3</SIGameVersion>
<SIQuesterVersion>6.0.0</SIQuesterVersion>
<SIGameVersion>7.11.11</SIGameVersion>
<SIQuesterVersion>6.0.2</SIQuesterVersion>
<SImulatorVersion>2.15.0</SImulatorVersion>
</PropertyGroup>

Expand Down
23 changes: 0 additions & 23 deletions SIGame.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SI.GameServer.Client", "src
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "src\Common\Utils\Utils.csproj", "{49D06BD3-C088-4E5A-888E-697D78417ABF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppService.Client", "src\Common\AppService.Client\AppService.Client.csproj", "{26C59ADA-8AE7-467B-8D03-404725CCFC53}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.ViewModel", "src\Common\SIStorageService.ViewModel\SIStorageService.ViewModel.csproj", "{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{0D6E84B6-C90C-4FA8-A932-1DA7179E9F1D}"
Expand Down Expand Up @@ -530,26 +528,6 @@ Global
{49D06BD3-C088-4E5A-888E-697D78417ABF}.Release|x64.Build.0 = Release|Any CPU
{49D06BD3-C088-4E5A-888E-697D78417ABF}.Release|x86.ActiveCfg = Release|Any CPU
{49D06BD3-C088-4E5A-888E-697D78417ABF}.Release|x86.Build.0 = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|ARM.ActiveCfg = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|ARM.Build.0 = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|ARM64.Build.0 = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|x64.ActiveCfg = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|x64.Build.0 = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|x86.ActiveCfg = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Debug|x86.Build.0 = Debug|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|Any CPU.Build.0 = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|ARM.ActiveCfg = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|ARM.Build.0 = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|ARM64.ActiveCfg = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|ARM64.Build.0 = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|x64.ActiveCfg = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|x64.Build.0 = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|x86.ActiveCfg = Release|Any CPU
{26C59ADA-8AE7-467B-8D03-404725CCFC53}.Release|x86.Build.0 = Release|Any CPU
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -700,7 +678,6 @@ Global
{8D528C21-F673-4CE0-A430-3F23F5B6A346} = {3E07412F-2F9C-458E-B897-E07E86BF682A}
{35AD14FA-7BDC-42CB-8501-1EC446805C99} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
{49D06BD3-C088-4E5A-888E-697D78417ABF} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
{26C59ADA-8AE7-467B-8D03-404725CCFC53} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
{9D7B6E42-82F0-491E-9E7C-F36086715D50} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
{8C805CF1-39A5-461D-BB30-09E520FF3C78} = {3E07412F-2F9C-458E-B897-E07E86BF682A}
Expand Down
16 changes: 5 additions & 11 deletions SIQuester.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{29A5EB8A-6B8
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "src\Common\Utils\Utils.csproj", "{DB37734A-E865-4E1E-8CB9-3A9EB3D6BDF4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppService.Client", "src\Common\AppService.Client\AppService.Client.csproj", "{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIPackages.Tests", "test\Common\SIPackages.Tests\SIPackages.Tests.csproj", "{3B650F1B-FA32-4C3C-A79E-6C386DF9977E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.ViewModel", "src\Common\SIStorageService.ViewModel\SIStorageService.ViewModel.csproj", "{C3B297B7-6782-473B-B908-42458A636100}"
Expand All @@ -43,6 +41,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIEngine.Core", "src\Common
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils.Wpf", "src\Common\Utils.Wpf\Utils.Wpf.csproj", "{F7AF5912-E7B2-43A2-8E3E-DE5CC75243A6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{1293FEFC-100A-4F00-8B73-1660DBF26F3F}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -119,14 +122,6 @@ Global
{DB37734A-E865-4E1E-8CB9-3A9EB3D6BDF4}.Release|Any CPU.Build.0 = Release|Any CPU
{DB37734A-E865-4E1E-8CB9-3A9EB3D6BDF4}.Release|x86.ActiveCfg = Release|Any CPU
{DB37734A-E865-4E1E-8CB9-3A9EB3D6BDF4}.Release|x86.Build.0 = Release|Any CPU
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}.Debug|x86.ActiveCfg = Debug|Any CPU
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}.Debug|x86.Build.0 = Debug|Any CPU
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}.Release|Any CPU.Build.0 = Release|Any CPU
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}.Release|x86.ActiveCfg = Release|Any CPU
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484}.Release|x86.Build.0 = Release|Any CPU
{3B650F1B-FA32-4C3C-A79E-6C386DF9977E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B650F1B-FA32-4C3C-A79E-6C386DF9977E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B650F1B-FA32-4C3C-A79E-6C386DF9977E}.Debug|x86.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -183,7 +178,6 @@ Global
{191BE083-3920-4C18-8130-4D6B2BF0AB59} = {9BD30589-9C99-4E58-8447-2DDB33A7F0FC}
{80E6576A-4906-4D07-B473-A994EDDD13AC} = {9BD30589-9C99-4E58-8447-2DDB33A7F0FC}
{DB37734A-E865-4E1E-8CB9-3A9EB3D6BDF4} = {D8DC2EF3-36A3-475B-A88F-861AB1E112F6}
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484} = {D8DC2EF3-36A3-475B-A88F-861AB1E112F6}
{3B650F1B-FA32-4C3C-A79E-6C386DF9977E} = {03BB87B1-7EA0-49F8-B8A5-46A64E7A6E0C}
{C3B297B7-6782-473B-B908-42458A636100} = {D8DC2EF3-36A3-475B-A88F-861AB1E112F6}
{64E4E20D-318F-404F-B7D4-1039FD67F84B} = {03BB87B1-7EA0-49F8-B8A5-46A64E7A6E0C}
Expand Down
28 changes: 5 additions & 23 deletions SImulator.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SImulator", "src\SImulator\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "src\Common\Utils\Utils.csproj", "{349CBBC7-36F8-4ED6-B45B-7B34D5B970DD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppService.Client", "src\Common\AppService.Client\AppService.Client.csproj", "{56112D6B-FD5A-4918-982D-4D3724375CF9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EDF0B6AF-1972-47A9-B812-533BD079C701}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.ViewModel", "src\Common\SIStorageService.ViewModel\SIStorageService.ViewModel.csproj", "{9CE7BB4E-0C76-4B89-9249-49369580C25B}"
Expand All @@ -41,6 +39,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIEngine.Tests", "test\Comm
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils.Wpf", "src\Common\Utils.Wpf\Utils.Wpf.csproj", "{4C678CED-354B-432E-BB67-700E669EE0E7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{B368E16F-622F-4C82-97CE-DFF0F750A473}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -235,26 +238,6 @@ Global
{349CBBC7-36F8-4ED6-B45B-7B34D5B970DD}.Release|x64.Build.0 = Release|Any CPU
{349CBBC7-36F8-4ED6-B45B-7B34D5B970DD}.Release|x86.ActiveCfg = Release|Any CPU
{349CBBC7-36F8-4ED6-B45B-7B34D5B970DD}.Release|x86.Build.0 = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|ARM.ActiveCfg = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|ARM.Build.0 = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|ARM64.Build.0 = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|x64.ActiveCfg = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|x64.Build.0 = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|x86.ActiveCfg = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Debug|x86.Build.0 = Debug|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|Any CPU.Build.0 = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|ARM.ActiveCfg = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|ARM.Build.0 = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|ARM64.ActiveCfg = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|ARM64.Build.0 = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|x64.ActiveCfg = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|x64.Build.0 = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|x86.ActiveCfg = Release|Any CPU
{56112D6B-FD5A-4918-982D-4D3724375CF9}.Release|x86.Build.0 = Release|Any CPU
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -371,7 +354,6 @@ Global
{CB2B8CE7-876C-4D16-BFA4-E1F67F949280} = {F7CE4B38-4286-47BA-B5BA-0E4FA77E594E}
{7BF7F1CE-2187-4372-9A31-CC0048031E09} = {117739F8-28CD-4CC4-950C-E3513265A87D}
{349CBBC7-36F8-4ED6-B45B-7B34D5B970DD} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
{56112D6B-FD5A-4918-982D-4D3724375CF9} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
{9CE7BB4E-0C76-4B89-9249-49369580C25B} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
{D960F7D2-7575-46DA-A2E4-A315A50B9863} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
{72F8EAE3-CBAD-45A5-A1BC-0FDA0C363DD2} = {F7CE4B38-4286-47BA-B5BA-0E4FA77E594E}
Expand Down
6 changes: 0 additions & 6 deletions deploy/SIGame.Setup/Product.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@
<Component Guid="{9E128CD4-80CB-4268-832B-C2D07E36E03D}">
<File KeyPath="yes" Source="$(var.PublishFolder)appsettings.json" />
</Component>
<Component Guid="{84D30ED4-930D-436F-8287-A8FDB01860FA}">
<File KeyPath="yes" Source="$(var.PublishFolder)appsettings.Production.json" />
</Component>
<Component Guid="{10301C79-C85C-4FD5-94D8-A23533BE7D79}">
<File KeyPath="yes" Source="$(var.PublishFolder)Help_ru.pdf" />
</Component>
Expand Down Expand Up @@ -345,9 +342,6 @@
<ComponentGroup Id="licenses" Directory="LicensesFolder">
<Component Guid="{214E3004-1EFF-4FC5-881A-4832D0FD7980}">
<File KeyPath="yes" Source="$(var.SIGame.ProjectDir)licenses\Ben.Demystifier.LICENSE.txt" />
</Component>
<Component Guid="{417121A7-629F-4FB1-BAD0-EBB15B8535A9}">
<File KeyPath="yes" Source="$(var.SIGame.ProjectDir)licenses\Newtonsoft.Json.LICENSE.md" />
</Component>
<Component Guid="{FCD1B58A-5BA3-4258-8A72-A1423D9A79EF}">
<File KeyPath="yes" Source="$(var.SIGame.ProjectDir)licenses\Polly.LICENSE.txt" />
Expand Down
3 changes: 0 additions & 3 deletions deploy/SIQuester.Setup/Product.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@
<Component Guid="{6874C052-7D52-4E31-9BF3-D6563FE7F8AB}">
<File KeyPath="yes" Source="$(var.PublishFolder)licenses\MahApps.Metro.LICENSE+" />
</Component>
<Component Guid="{E05E068D-CD01-4F91-90D2-B110E3A31DCA}">
<File KeyPath="yes" Source="$(var.PublishFolder)licenses\Newtonsoft.Json.LICENSE.md" />
</Component>
<Component Guid="{930943B4-D03E-40C3-8196-B966C21EB6C1}">
<File KeyPath="yes" Source="$(var.PublishFolder)licenses\Modern UI Icons.license.txt" />
</Component>
Expand Down
23 changes: 0 additions & 23 deletions src/Common/AppService.Client/AppService.Client.csproj
View file

This file was deleted.

81 changes: 0 additions & 81 deletions src/Common/AppService.Client/AppServiceClient.cs
View file

This file was deleted.

15 changes: 0 additions & 15 deletions src/Common/AppService.Client/AppServiceClientOptions.cs
View file

This file was deleted.

34 changes: 0 additions & 34 deletions src/Common/AppService.Client/IAppServiceClient.cs
View file

This file was deleted.

18 changes: 0 additions & 18 deletions src/Common/AppService.Client/Models/AppInfo.cs
View file

This file was deleted.

33 changes: 0 additions & 33 deletions src/Common/AppService.Client/Models/ErrorInfo.cs
View file

This file was deleted.

Loading

0 comments on commit fc570f5

Please sign in to comment.