Skip to content

Commit febde81

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into master
2 parents c0f3f72 + 4b3d091 commit febde81

File tree

7 files changed

+47
-20
lines changed

7 files changed

+47
-20
lines changed

‎eFormAPI/Installation/AllowMultipleVersions/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.2.1")]
36-
[assembly: AssemblyFileVersion("1.1.2.1")]
35+
[assembly: AssemblyVersion("1.1.2.2")]
36+
[assembly: AssemblyFileVersion("1.1.2.2")]

‎eFormAPI/Installation/AllowMultipleVersionsBundle/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.2.1")]
36-
[assembly: AssemblyFileVersion("1.1.2.1")]
35+
[assembly: AssemblyVersion("1.1.2.2")]
36+
[assembly: AssemblyFileVersion("1.1.2.2")]

‎eFormAPI/Installation/CustomActions/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.1.2.1")]
35-
[assembly: AssemblyFileVersion("1.1.2.1")]
34+
[assembly: AssemblyVersion("1.1.2.2")]
35+
[assembly: AssemblyFileVersion("1.1.2.2")]

‎eFormAPI/Installation/MainInstaller/ClientFileList.wxs‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,28 @@
3232
<Component Id="cmp08A472F83AA798FFF49170D8CC410F5A" Guid="{1EA7C16A-7675-4A05-A02E-141220E33C93}">
3333
<File Id="filF0F9E8B4A57FC05A4817DBC8C39A5170" KeyPath="yes" Source="$(var.ClientPath)\tslint.json" />
3434
</Component>
35+
<Directory Id="dirBA983ECC6C56C15944FCD33764487768" Name=".idea">
36+
<Component Id="cmpCA56D356827064819B67C87418853D56" Guid="{96400133-6976-4211-8337-1D0BC3364410}">
37+
<File Id="fil32F13AFE7AA116C552F655AEF4D1F92E" KeyPath="yes" Source="$(var.ClientPath)\.idea\eform-client.iml" />
38+
</Component>
39+
<Component Id="cmp7D6C2B1DF27F125CF8772A78CFF78FA9" Guid="{566A5016-BADD-454F-B16F-6A0460BCCB5C}">
40+
<File Id="fil6D0EAB15DA596E0214DF20920EFC298F" KeyPath="yes" Source="$(var.ClientPath)\.idea\modules.xml" />
41+
</Component>
42+
<Component Id="cmp58DD7781EBA5EA6F2F225C8D938DA2B1" Guid="{44B0CE0E-5F58-4F85-BA81-ACC108182CB6}">
43+
<File Id="fil240D8ABE3C1A9F5261B3EFDDFEC2BEBF" KeyPath="yes" Source="$(var.ClientPath)\.idea\typescript-compiler.xml" />
44+
</Component>
45+
<Component Id="cmp93CD72BB3191BB84E669A7D833806DCB" Guid="{49DD28B0-1B36-40DE-99EB-BA7870909B8D}">
46+
<File Id="fil8B55697395C33E431F718E3CA864D89E" KeyPath="yes" Source="$(var.ClientPath)\.idea\vcs.xml" />
47+
</Component>
48+
<Component Id="cmp3CAF78FB7B68DB902F1EE7BB84222410" Guid="{1359ECB9-157E-4B37-B40A-4CEBD0199996}">
49+
<File Id="filC25A1BB8D42E6EB96B666EA989E22CE5" KeyPath="yes" Source="$(var.ClientPath)\.idea\workspace.xml" />
50+
</Component>
51+
<Directory Id="dirF332B99C315E00C9A2749F743F4DB52C" Name="inspectionProfiles">
52+
<Component Id="cmp31622047B77DE8D510BD3E678570EB67" Guid="{C047B4EE-D448-4C72-86DF-46B81BBB54D7}">
53+
<File Id="filE7EF1F21BBF16DCD7423C5E4428B77AF" KeyPath="yes" Source="$(var.ClientPath)\.idea\inspectionProfiles\Project_Default.xml" />
54+
</Component>
55+
</Directory>
56+
</Directory>
3557
<Directory Id="dirD755B5A376077818B770C05C7277D000" Name="e2e">
3658
<Component Id="cmp08441AA119FB1E8F6B300BDA87890C4A" Guid="{3F542D2A-1703-4F26-8422-B75A0DB57B02}">
3759
<File Id="fil32C55AE28DE7A2A32317DC2A0B141FB2" KeyPath="yes" Source="$(var.ClientPath)\e2e\app.e2e-spec.ts" />
@@ -238,6 +260,7 @@
238260
<File Id="fil49E90EB6175E4B2DB5863C788E156EBE" KeyPath="yes" Source="$(var.ClientPath)\src\app\models\cases\request\reply-request.model.ts" />
239261
</Component>
240262
<Component Id="cmpC1D810F5C66084C2547BED00482BBED1" Guid="{E607FC90-2E15-4A76-828D-F0C7E636A308}">
263+
241264
<File Id="fil0264F76AD0A7BF9811ECC9D3E54DF83F" KeyPath="yes" Source="$(var.ClientPath)\src\app\models\cases\request\update-columns.model.ts" />
242265
</Component>
243266
</Directory>
@@ -1113,12 +1136,19 @@
11131136
<ComponentRef Id="cmpEA82CCBE49A26F14EF2B312F5E8F144F" />
11141137
<ComponentRef Id="cmpF0C2BF536013509C9E189A8FD0DE3CCB" />
11151138
<ComponentRef Id="cmpF4775472632C543717DFABDF1887FC56" />
1139+
<ComponentRef Id="cmpD5758B9D0A388D1CF7828946C2956D40" />
11161140
<ComponentRef Id="cmp57996A3C592067508378E18924E48790" />
11171141
<ComponentRef Id="cmpBFA2A55B9A1B6E3C64809A78953E9F85" />
11181142
<ComponentRef Id="cmp71630B074F771EEAD6D5C11272B11658" />
11191143
<ComponentRef Id="cmp50851DA8881BA8C9112ED2510A806A76" />
11201144
<ComponentRef Id="cmpE72B272D855F8FD82F1852454BC50487" />
11211145
<ComponentRef Id="cmp08A472F83AA798FFF49170D8CC410F5A" />
1146+
<ComponentRef Id="cmpCA56D356827064819B67C87418853D56" />
1147+
<ComponentRef Id="cmp7D6C2B1DF27F125CF8772A78CFF78FA9" />
1148+
<ComponentRef Id="cmp58DD7781EBA5EA6F2F225C8D938DA2B1" />
1149+
<ComponentRef Id="cmp93CD72BB3191BB84E669A7D833806DCB" />
1150+
<ComponentRef Id="cmp3CAF78FB7B68DB902F1EE7BB84222410" />
1151+
<ComponentRef Id="cmp31622047B77DE8D510BD3E678570EB67" />
11221152
<ComponentRef Id="cmp08441AA119FB1E8F6B300BDA87890C4A" />
11231153
<ComponentRef Id="cmp67408B06DC1C5624B954EA9CAFCCAE0C" />
11241154
<ComponentRef Id="cmpDA6B569C78F0B22576123A215525AF73" />
@@ -1268,7 +1298,6 @@
12681298
<ComponentRef Id="cmpFF56AEB394BB15925F9D48A7A6D1929F" />
12691299
<ComponentRef Id="cmp29FF3FC7D518A3883BE84F3A601B5C19" />
12701300
<ComponentRef Id="cmp3DB5A8CE97906ABB1DB4AA90A4CB2402" />
1271-
<ComponentRef Id="cmp37979688D5332A854466592DEF0715A2" />
12721301
<ComponentRef Id="cmp2129679BD0FDFC6C6EE26C234A82EDA0" />
12731302
<ComponentRef Id="cmp25305B0034612D0F48CE5F70FA24F467" />
12741303
<ComponentRef Id="cmpCF200FB7D9CFD56BA661BBE87BE1302E" />
@@ -1291,7 +1320,6 @@
12911320
<ComponentRef Id="cmp1EEC969F11EBA0F2CE7C69C096FD1F04" />
12921321
<ComponentRef Id="cmp2BEA182D0B80C7C5994067E29FE3F193" />
12931322
<ComponentRef Id="cmp781421BC2197CEFC7D9CC2B4DDA5AF4E" />
1294-
<ComponentRef Id="cmp446CAFE7924949DF8B44C586ED3923E8" />
12951323
<ComponentRef Id="cmpD9FB2F24234B0D1EB2584107FE51C85C" />
12961324
<ComponentRef Id="cmp84A874887E6661E390CEB3BE2FFDE31F" />
12971325
<ComponentRef Id="cmpF63433574BB164B06BC416E04B5BA3C9" />
@@ -1315,7 +1343,6 @@
13151343
<ComponentRef Id="cmp65CD34C359752379AB61FD0294D39FB1" />
13161344
<ComponentRef Id="cmpD8E2988CE2306262C67EEA3D2D28B6F3" />
13171345
<ComponentRef Id="cmpBA5188AFB2BD74A2EFD8550B72D46E4B" />
1318-
<ComponentRef Id="cmpE942C5AEC20097CD395CAB14265B70D6" />
13191346
<ComponentRef Id="cmpB6EBAC264B0E2DC3EFDEE7BF8F191C32" />
13201347
<ComponentRef Id="cmp69BB627D83DC1AC1B39E64086E89E421" />
13211348
<ComponentRef Id="cmp365B8B822D7F548A6462759853650FD9" />

‎eFormAPI/Installation/MainInstaller/MainInstaller.wixproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@
101101
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
102102
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
103103
</PropertyGroup>
104-
<!--
105-
To modify your build process, add your task inside one of the targets below and uncomment it.
106-
Other similar extension points exist, see Wix.targets.
107-
<Target Name="BeforeBuild">
108-
</Target>
109-
<Target Name="AfterBuild">
110-
</Target>
104+
<!--
105+
To modify your build process, add your task inside one of the targets below and uncomment it.
106+
Other similar extension points exist, see Wix.targets.
107+
<Target Name="BeforeBuild">
108+
</Target>
109+
<Target Name="AfterBuild">
110+
</Target>
111111
-->
112112
</Project>

‎eFormAPI/eFormAPI.Common/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.1.2.1")]
35-
[assembly: AssemblyFileVersion("1.1.2.1")]
34+
[assembly: AssemblyVersion("1.1.2.2")]
35+
[assembly: AssemblyFileVersion("1.1.2.2")]

‎eFormAPI/eFormAPI/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Revision and Build Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.1.2.1")]
35-
[assembly: AssemblyFileVersion("1.1.2.1")]
34+
[assembly: AssemblyVersion("1.1.2.2")]
35+
[assembly: AssemblyFileVersion("1.1.2.2")]

0 commit comments

Comments
 (0)