Skip to content

Commit c423e37

Browse files
VladimirKhilVladimirKhil
committed
SIQuester 5.8.0
- copy/paste and drag&drop media transfer (#96) - remove file link from recent files (#90) - table flat view (#84) - empty questions (#73) - tab warnings - optional warning when package size exceeds 100 MB (not useful for Game Server) (#89) - add child button for every item in tree view (you can add children without selecting parent first) - add question, remove question and switch to empty question buttons in flat view - bugfixing
1 parent 454576b commit c423e37

File tree

156 files changed

+4150
-1723
lines changed

Some content is hidden

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

156 files changed

+4150
-1723
lines changed

‎Directory.Build.props

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup>
3+
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)\obj\$(Platform).$(Configuration)\$(MSBuildProjectName)</BaseIntermediateOutputPath>
4+
<OutputPath>$(MSBuildThisFileDirectory)\bin\$(Platform).$(Configuration)\$(MSBuildProjectName)</OutputPath>
5+
</PropertyGroup>
6+
</Project>

‎SIGame.sln

+23-7
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIUI.Model", "src\Common\SI
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIUI.ViewModel", "src\Common\SIUI.ViewModel\SIUI.ViewModel.csproj", "{F25DB44A-CE4D-4E80-8688-55390FFA4C35}"
2121
EndProject
22-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SIService.ViewModel", "src\Common\SIService.ViewModel\SIService.ViewModel.shproj", "{D8A9ACD8-2C11-4CFB-B4E2-0BFA4F6F9500}"
23-
EndProject
2422
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "desktop", "desktop", "{15089A1F-44DF-4B42-83B3-313E024F07BE}"
2523
EndProject
2624
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIUI", "src\Common\SIUI\SIUI.csproj", "{78C96549-6EA8-4236-B026-6ECA55D9EC3A}"
@@ -67,6 +65,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SI.GameResultService.Client
6765
EndProject
6866
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.Client", "src\Common\SIStorageService.Client\SIStorageService.Client.csproj", "{D991588B-3F10-405B-B173-6363ED37BE72}"
6967
EndProject
68+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.ViewModel", "src\Common\SIStorageService.ViewModel\SIStorageService.ViewModel.csproj", "{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}"
69+
EndProject
7070
Global
7171
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7272
Debug|Any CPU = Debug|Any CPU
@@ -579,6 +579,26 @@ Global
579579
{D991588B-3F10-405B-B173-6363ED37BE72}.Release|x64.Build.0 = Release|Any CPU
580580
{D991588B-3F10-405B-B173-6363ED37BE72}.Release|x86.ActiveCfg = Release|Any CPU
581581
{D991588B-3F10-405B-B173-6363ED37BE72}.Release|x86.Build.0 = Release|Any CPU
582+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
583+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
584+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|ARM.ActiveCfg = Debug|Any CPU
585+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|ARM.Build.0 = Debug|Any CPU
586+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|ARM64.ActiveCfg = Debug|Any CPU
587+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|ARM64.Build.0 = Debug|Any CPU
588+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|x64.ActiveCfg = Debug|Any CPU
589+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|x64.Build.0 = Debug|Any CPU
590+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|x86.ActiveCfg = Debug|Any CPU
591+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Debug|x86.Build.0 = Debug|Any CPU
592+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
593+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|Any CPU.Build.0 = Release|Any CPU
594+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|ARM.ActiveCfg = Release|Any CPU
595+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|ARM.Build.0 = Release|Any CPU
596+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|ARM64.ActiveCfg = Release|Any CPU
597+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|ARM64.Build.0 = Release|Any CPU
598+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|x64.ActiveCfg = Release|Any CPU
599+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|x64.Build.0 = Release|Any CPU
600+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|x86.ActiveCfg = Release|Any CPU
601+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98}.Release|x86.Build.0 = Release|Any CPU
582602
EndGlobalSection
583603
GlobalSection(SolutionProperties) = preSolution
584604
HideSolutionNode = FALSE
@@ -591,7 +611,6 @@ Global
591611
{099E79AD-4A07-464E-BC5E-FE2B25B6B398} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
592612
{7A59B7D8-AA61-4DE8-BC29-41C16A22F2E9} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
593613
{F25DB44A-CE4D-4E80-8688-55390FFA4C35} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
594-
{D8A9ACD8-2C11-4CFB-B4E2-0BFA4F6F9500} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
595614
{15089A1F-44DF-4B42-83B3-313E024F07BE} = {F806503B-43D4-473F-AAF7-4297E54EBE66}
596615
{78C96549-6EA8-4236-B026-6ECA55D9EC3A} = {15089A1F-44DF-4B42-83B3-313E024F07BE}
597616
{C4457E87-27E4-45E3-ADF9-01BA5E9D5771} = {F806503B-43D4-473F-AAF7-4297E54EBE66}
@@ -613,12 +632,9 @@ Global
613632
{26C59ADA-8AE7-467B-8D03-404725CCFC53} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
614633
{1E610AA5-EAF3-4F24-AFFA-8CBCD8E18AEC} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
615634
{D991588B-3F10-405B-B173-6363ED37BE72} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
635+
{AFF2B73A-0BA3-4152-82D0-9573C05FDC98} = {98AD9562-11D8-4547-B71E-56BDAC94A39C}
616636
EndGlobalSection
617637
GlobalSection(ExtensibilityGlobals) = postSolution
618638
SolutionGuid = {BD7AA90B-4EDB-45F7-A42F-7DE847C4386A}
619639
EndGlobalSection
620-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
621-
src\Common\SIService.ViewModel\SIService.ViewModel.projitems*{b992988a-31c6-44fd-8719-47144ae78bb8}*SharedItemsImports = 5
622-
src\Common\SIService.ViewModel\SIService.ViewModel.projitems*{d8a9acd8-2c11-4cfb-b4e2-0bfa4f6f9500}*SharedItemsImports = 13
623-
EndGlobalSection
624640
EndGlobal

‎SIQuester.sln

+22-7
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{D8DC2E
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Desktop", "Desktop", "{B812C629-7DBF-4094-AA34-059C9094A226}"
99
EndProject
10-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SIService.ViewModel", "src\Common\SIService.ViewModel\SIService.ViewModel.shproj", "{D8A9ACD8-2C11-4CFB-B4E2-0BFA4F6F9500}"
11-
EndProject
1210
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIQuester.ViewModel", "src\SIQuester\SIQuester.ViewModel\SIQuester.ViewModel.csproj", "{8B3640F3-9547-4B76-874D-7FA2E75AD679}"
1311
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIQuester", "src\SIQuester\SIQuester\SIQuester.csproj", "{D689345A-26EB-432D-8442-67E1DE287FE9}"
@@ -39,6 +37,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIPackages.Tests", "test\Co
3937
EndProject
4038
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.Client", "src\Common\SIStorageService.Client\SIStorageService.Client.csproj", "{A7A22A0A-6409-490B-86DA-3F3DE2C307B7}"
4139
EndProject
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.ViewModel", "src\Common\SIStorageService.ViewModel\SIStorageService.ViewModel.csproj", "{C3B297B7-6782-473B-B908-42458A636100}"
41+
EndProject
42+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIQuester.ViewModel.Tests", "test\SIQuester\SIQuester.ViewModel.Tests\SIQuester.ViewModel.Tests.csproj", "{64E4E20D-318F-404F-B7D4-1039FD67F84B}"
43+
EndProject
4244
Global
4345
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4446
Debug|Any CPU = Debug|Any CPU
@@ -139,14 +141,29 @@ Global
139141
{A7A22A0A-6409-490B-86DA-3F3DE2C307B7}.Release|Any CPU.Build.0 = Release|Any CPU
140142
{A7A22A0A-6409-490B-86DA-3F3DE2C307B7}.Release|x86.ActiveCfg = Release|Any CPU
141143
{A7A22A0A-6409-490B-86DA-3F3DE2C307B7}.Release|x86.Build.0 = Release|Any CPU
144+
{C3B297B7-6782-473B-B908-42458A636100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145+
{C3B297B7-6782-473B-B908-42458A636100}.Debug|Any CPU.Build.0 = Debug|Any CPU
146+
{C3B297B7-6782-473B-B908-42458A636100}.Debug|x86.ActiveCfg = Debug|Any CPU
147+
{C3B297B7-6782-473B-B908-42458A636100}.Debug|x86.Build.0 = Debug|Any CPU
148+
{C3B297B7-6782-473B-B908-42458A636100}.Release|Any CPU.ActiveCfg = Release|Any CPU
149+
{C3B297B7-6782-473B-B908-42458A636100}.Release|Any CPU.Build.0 = Release|Any CPU
150+
{C3B297B7-6782-473B-B908-42458A636100}.Release|x86.ActiveCfg = Release|Any CPU
151+
{C3B297B7-6782-473B-B908-42458A636100}.Release|x86.Build.0 = Release|Any CPU
152+
{64E4E20D-318F-404F-B7D4-1039FD67F84B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153+
{64E4E20D-318F-404F-B7D4-1039FD67F84B}.Debug|Any CPU.Build.0 = Debug|Any CPU
154+
{64E4E20D-318F-404F-B7D4-1039FD67F84B}.Debug|x86.ActiveCfg = Debug|Any CPU
155+
{64E4E20D-318F-404F-B7D4-1039FD67F84B}.Debug|x86.Build.0 = Debug|Any CPU
156+
{64E4E20D-318F-404F-B7D4-1039FD67F84B}.Release|Any CPU.ActiveCfg = Release|Any CPU
157+
{64E4E20D-318F-404F-B7D4-1039FD67F84B}.Release|Any CPU.Build.0 = Release|Any CPU
158+
{64E4E20D-318F-404F-B7D4-1039FD67F84B}.Release|x86.ActiveCfg = Release|Any CPU
159+
{64E4E20D-318F-404F-B7D4-1039FD67F84B}.Release|x86.Build.0 = Release|Any CPU
142160
EndGlobalSection
143161
GlobalSection(SolutionProperties) = preSolution
144162
HideSolutionNode = FALSE
145163
EndGlobalSection
146164
GlobalSection(NestedProjects) = preSolution
147165
{D8DC2EF3-36A3-475B-A88F-861AB1E112F6} = {29A5EB8A-6B88-4AE9-A83B-0C9793134565}
148166
{B812C629-7DBF-4094-AA34-059C9094A226} = {29A5EB8A-6B88-4AE9-A83B-0C9793134565}
149-
{D8A9ACD8-2C11-4CFB-B4E2-0BFA4F6F9500} = {D8DC2EF3-36A3-475B-A88F-861AB1E112F6}
150167
{8B3640F3-9547-4B76-874D-7FA2E75AD679} = {29A5EB8A-6B88-4AE9-A83B-0C9793134565}
151168
{D689345A-26EB-432D-8442-67E1DE287FE9} = {B812C629-7DBF-4094-AA34-059C9094A226}
152169
{00D18FE2-2E27-40E2-9EFC-4482069A2F2D} = {29A5EB8A-6B88-4AE9-A83B-0C9793134565}
@@ -159,12 +176,10 @@ Global
159176
{85ABCE10-858E-44F8-A1C1-5CAA9E84F484} = {D8DC2EF3-36A3-475B-A88F-861AB1E112F6}
160177
{3B650F1B-FA32-4C3C-A79E-6C386DF9977E} = {03BB87B1-7EA0-49F8-B8A5-46A64E7A6E0C}
161178
{A7A22A0A-6409-490B-86DA-3F3DE2C307B7} = {D8DC2EF3-36A3-475B-A88F-861AB1E112F6}
179+
{C3B297B7-6782-473B-B908-42458A636100} = {D8DC2EF3-36A3-475B-A88F-861AB1E112F6}
180+
{64E4E20D-318F-404F-B7D4-1039FD67F84B} = {03BB87B1-7EA0-49F8-B8A5-46A64E7A6E0C}
162181
EndGlobalSection
163182
GlobalSection(ExtensibilityGlobals) = postSolution
164183
SolutionGuid = {080C13E0-0C5D-41FE-9CBB-EE7ED6CB69F3}
165184
EndGlobalSection
166-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
167-
src\Common\SIService.ViewModel\SIService.ViewModel.projitems*{8b3640f3-9547-4b76-874d-7fa2e75ad679}*SharedItemsImports = 5
168-
src\Common\SIService.ViewModel\SIService.ViewModel.projitems*{d8a9acd8-2c11-4cfb-b4e2-0bfa4f6f9500}*SharedItemsImports = 13
169-
EndGlobalSection
170185
EndGlobal

‎SImulator.sln

+19-7
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIUI.ViewModel", "src\Commo
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIUI", "src\Common\SIUI\SIUI.csproj", "{78C96549-6EA8-4236-B026-6ECA55D9EC3A}"
2121
EndProject
22-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SIService.ViewModel", "src\Common\SIService.ViewModel\SIService.ViewModel.shproj", "{D8A9ACD8-2C11-4CFB-B4E2-0BFA4F6F9500}"
23-
EndProject
2422
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F7CE4B38-4286-47BA-B5BA-0E4FA77E594E}"
2523
EndProject
2624
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SImulator.ViewModel.Tests", "test\SImulator\SImulator.ViewModel.Tests\SImulator.ViewModel.Tests.csproj", "{CB2B8CE7-876C-4D16-BFA4-E1F67F949280}"
@@ -35,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EDF0B6AF-197
3533
EndProject
3634
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.Client", "src\Common\SIStorageService.Client\SIStorageService.Client.csproj", "{455768A8-E95D-4E0A-978F-15FC7AEF5ECC}"
3735
EndProject
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIStorageService.ViewModel", "src\Common\SIStorageService.ViewModel\SIStorageService.ViewModel.csproj", "{9CE7BB4E-0C76-4B89-9249-49369580C25B}"
37+
EndProject
3838
Global
3939
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4040
Debug|Any CPU = Debug|Any CPU
@@ -223,6 +223,22 @@ Global
223223
{455768A8-E95D-4E0A-978F-15FC7AEF5ECC}.Release|x64.Build.0 = Release|Any CPU
224224
{455768A8-E95D-4E0A-978F-15FC7AEF5ECC}.Release|x86.ActiveCfg = Release|Any CPU
225225
{455768A8-E95D-4E0A-978F-15FC7AEF5ECC}.Release|x86.Build.0 = Release|Any CPU
226+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
227+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|Any CPU.Build.0 = Debug|Any CPU
228+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|ARM.ActiveCfg = Debug|Any CPU
229+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|ARM.Build.0 = Debug|Any CPU
230+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|x64.ActiveCfg = Debug|Any CPU
231+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|x64.Build.0 = Debug|Any CPU
232+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|x86.ActiveCfg = Debug|Any CPU
233+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Debug|x86.Build.0 = Debug|Any CPU
234+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Release|Any CPU.ActiveCfg = Release|Any CPU
235+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Release|Any CPU.Build.0 = Release|Any CPU
236+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Release|ARM.ActiveCfg = Release|Any CPU
237+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Release|ARM.Build.0 = Release|Any CPU
238+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Release|x64.ActiveCfg = Release|Any CPU
239+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Release|x64.Build.0 = Release|Any CPU
240+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Release|x86.ActiveCfg = Release|Any CPU
241+
{9CE7BB4E-0C76-4B89-9249-49369580C25B}.Release|x86.Build.0 = Release|Any CPU
226242
EndGlobalSection
227243
GlobalSection(SolutionProperties) = preSolution
228244
HideSolutionNode = FALSE
@@ -236,18 +252,14 @@ Global
236252
{64F97376-E3D1-4C19-97C8-0F3489B5BBE9} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
237253
{6A834083-BE81-4BEA-996B-1287154747A4} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
238254
{78C96549-6EA8-4236-B026-6ECA55D9EC3A} = {117739F8-28CD-4CC4-950C-E3513265A87D}
239-
{D8A9ACD8-2C11-4CFB-B4E2-0BFA4F6F9500} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
240255
{CB2B8CE7-876C-4D16-BFA4-E1F67F949280} = {F7CE4B38-4286-47BA-B5BA-0E4FA77E594E}
241256
{7BF7F1CE-2187-4372-9A31-CC0048031E09} = {117739F8-28CD-4CC4-950C-E3513265A87D}
242257
{349CBBC7-36F8-4ED6-B45B-7B34D5B970DD} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
243258
{56112D6B-FD5A-4918-982D-4D3724375CF9} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
244259
{455768A8-E95D-4E0A-978F-15FC7AEF5ECC} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
260+
{9CE7BB4E-0C76-4B89-9249-49369580C25B} = {069B16F1-8F70-4CFC-8651-E4763D225B60}
245261
EndGlobalSection
246262
GlobalSection(ExtensibilityGlobals) = postSolution
247263
SolutionGuid = {F89D1FB6-3468-4F5A-A264-5FA73A287D25}
248264
EndGlobalSection
249-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
250-
src\Common\SIService.ViewModel\SIService.ViewModel.projitems*{206d6f95-54d5-4029-8b7f-9a7841e2ce02}*SharedItemsImports = 5
251-
src\Common\SIService.ViewModel\SIService.ViewModel.projitems*{d8a9acd8-2c11-4cfb-b4e2-0bfa4f6f9500}*SharedItemsImports = 13
252-
EndGlobalSection
253265
EndGlobal

‎deploy/SIQuester.Bootstrapper/Bundle.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<bal:WixStandardBootstrapperApplication
1717
LicenseUrl=""
1818
LocalizationFile="HyperlinkTheme_ru-ru.wxl"
19-
LogoFile="Resources\logo.png"
19+
LogoFile="Resources\logo.jpg"
2020
ThemeFile="HyperlinkTheme.xml"
2121
SuppressOptionsUI="yes" />
2222

@@ -27,15 +27,15 @@
2727
Id="SIQuester.Setup.x86"
2828
Compressed="no"
2929
DisplayName="SIQuester"
30-
SourceFile="..\SIQuester.Setup\bin\Release\x86\ru-ru\SIQuester.x86.msi"
30+
SourceFile="..\..\bin\.Release\SIQuester.Setup\x86\ru-ru\SIQuester.x86.msi"
3131
DownloadUrl="https://github.com/VladimirKhil/SI/releases/download/siquester-v$(var.ProductVersion)/SIQuester.x86.msi"
3232
InstallCondition="NOT VersionNT64" />
3333

3434
<MsiPackage
3535
Id="SIQuester.Setup.x64"
3636
Compressed="no"
3737
DisplayName="SIQuester"
38-
SourceFile="..\SIQuester.Setup\bin\Release\x64\ru-ru\SIQuester.x64.msi"
38+
SourceFile="..\..\bin\.Release\SIQuester.Setup\x64\ru-ru\SIQuester.x64.msi"
3939
DownloadUrl="https://github.com/VladimirKhil/SI/releases/download/siquester-v$(var.ProductVersion)/SIQuester.x64.msi"
4040
InstallCondition="VersionNT64" />
4141
</Chain>

‎deploy/SIQuester.Bootstrapper/HyperlinkTheme.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
88
<Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
99

10-
<Image X="11" Y="16" Width="85" Height="64" ImageFile="logo.png" Visible="yes"/>
10+
<Image X="11" Y="16" Width="85" Height="64" ImageFile="logo.jpg" Visible="yes"/>
1111
<Text X="115" Y="13" Width="-11" Height="64" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
1212

1313
<Page Name="Help">

‎deploy/SIQuester.Bootstrapper/Resources/logo.ico

7.13 KB
Binary file not shown.

‎deploy/SIQuester.Bootstrapper/Resources/logo.jpg

2.44 KB
Loading

‎deploy/SIQuester.Bootstrapper/Resources/logo.png

-2.4 KB
Binary file not shown.

‎deploy/SIQuester.Bootstrapper/SIQuester.Bootstrapper.wixproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<OutputType>Bundle</OutputType>
1111
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1212
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
13-
<DefineConstants>ProductVersion=$(MsiProductVersion)</DefineConstants>
13+
<DefineConstants>ProductVersion=$(MsiProductVersion)</DefineConstants>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1616
<OutputPath>bin\$(Configuration)\</OutputPath>
@@ -52,7 +52,7 @@
5252
<Content Include="HyperlinkTheme.xml" />
5353
<Content Include="License.rtf" />
5454
<Content Include="Resources\logo.ico" />
55-
<Content Include="Resources\logo.png" />
55+
<Content Include="Resources\logo.jpg" />
5656
</ItemGroup>
5757
<ItemGroup>
5858
<EmbeddedResource Include="HyperlinkTheme_ru-ru.wxl" />

‎deploy/SIQuester.Setup/Product.wxs

+3-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
<?define UpgradeCode="C2EAE409-B7B9-49C4-AE2C-B2AD43FDD0FE" ?>
1010
<?define ProductNameR="SIQuester" ?>
1111

12-
<?if $(var.Platform) = x64 ?>
13-
<?define PublishFolder = "$(var.SIQuester.ProjectDir)bin\Release\net6.0-windows\win-x64\publish\" ?>
14-
<?else ?>
15-
<?define PublishFolder = "$(var.SIQuester.ProjectDir)bin\Release\net6.0-windows\win-x86\publish\" ?>
16-
<?endif ?>
12+
<?define SolutionDir = "$(var.SIQuester.ProjectDir)..\..\..\" ?>
13+
<?define PublishFolder = "$(var.SolutionDir)bin\.Release\SIQuester\net6.0-windows\win-$(var.Platform)\publish\" ?>
1714

1815
<Product
1916
Id="*"
@@ -161,7 +158,7 @@
161158
<File KeyPath="yes" Source="$(var.PublishFolder)licenses\Ben.Demystifier.LICENSE.txt" />
162159
</Component>
163160
<Component Guid="{321D8DBD-C9A0-4216-827C-563F95BF02B0}">
164-
<File KeyPath="yes" Source="$(var.SIQuester.ProjectDir)..\..\..\LICENSE" />
161+
<File KeyPath="yes" Source="$(var.SolutionDir)LICENSE" />
165162
</Component>
166163
<Component Id="LicensesReg" Guid="{E903B74E-2536-49A6-B842-4D8A3BAA342A}">
167164
<RegistryValue

‎siquester-build-msi.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ param (
33
[string]$platform = "x64"
44
)
55

6-
& "$Env:PROGRAMFILES\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" .\deploy\SIQuester.Setup\SIQuester.Setup.wixproj /p:Configuration=Release /p:Platform=$platform /p:OutputPath=bin/Release/$platform /p:BuildProjectReferences=false /p:MsiProductVersion=$version
6+
& "$Env:PROGRAMFILES\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" .\deploy\SIQuester.Setup\SIQuester.Setup.wixproj /p:Configuration=Release /p:Platform=$platform /p:OutputPath=../../bin/.Release/SIQuester.Setup/$platform /p:BuildProjectReferences=false /p:MsiProductVersion=$version

‎siquester-build-setup.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ param (
22
[string]$version = "1.0.0"
33
)
44

5-
& "$Env:PROGRAMFILES\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" .\deploy\SIQuester.Bootstrapper\SIQuester.Bootstrapper.wixproj /p:Configuration=Release /p:OutputPath=bin/Release /p:BuildProjectReferences=false /p:MsiProductVersion=$version
5+
& "$Env:PROGRAMFILES\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" .\deploy\SIQuester.Bootstrapper\SIQuester.Bootstrapper.wixproj /p:Configuration=Release /p:OutputPath=../../bin/.Release/SIQuester.Bootstrapper /p:BuildProjectReferences=false /p:MsiProductVersion=$version

‎src/Common/AppService.Client/ServiceCollectionExtensions.cs

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public static IServiceCollection AddAppServiceClient(this IServiceCollection ser
2323
services.Configure<AppServiceClientOptions>(optionsSection);
2424

2525
var options = optionsSection.Get<AppServiceClientOptions>();
26+
2627
if (options?.ServiceUri != null)
2728
{
2829
services.AddHttpClient<IAppServiceClient, AppServiceClient>(

0 commit comments

Comments
 (0)