Skip to content

Commit 42f93f4

Browse files
Gid733Gid733
authored
Merge pull request #1 from microting/master
Fix
2 parents 61f5666 + e0a6e0d commit 42f93f4

File tree

34 files changed

+702
-75
lines changed

34 files changed

+702
-75
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎.gitignore‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ eFormAPI/eFormAPI\.Common/obj/Debug/
3535

3636
eFormAPI/eFormAPI\.Common/bin/Debug/
3737

38+
eFormApi.Integration.Tests/bin/*
39+
eFormApi.Integration.Tests/obj/*
40+
41+
eFormApi.Tests/bin/*
42+
eFormApi.Tests/obj/*
43+
3844
eform-client/package-lock\.json
3945
eFormAPI/AllowMultipleVersions/obj/
4046
eFormAPI/AlowMultipleVersionsBundle/bin/
@@ -82,4 +88,11 @@ eFormAPI/Installation/CustomActions/bin/x64/Release/Microsoft.Web.Administration
8288
eFormAPI/Installation/MainInstaller/BuildedCustomActions/System.Management.Automation.dll
8389
eFormAPI/Installation/MainInstaller/LetsEncryptFileList.wxs
8490
eFormAPI/Installation/MainInstaller/ClientFileList.wxs
85-
eFormAPI/Installation/MainInstaller/ApiFileList.wxs
91+
eFormAPI/Installation/MainInstaller/ApiFileList.wxs
92+
/eFormAPI/eFormApi.Integration.Tests/obj/Release
93+
/eFormAPI/eFormApi.Integration.Tests/bin/*
94+
/eFormAPI/eFormApi.Tests/obj/Release
95+
/eFormAPI/eFormApi.Tests/bin/*
96+
/eformAPI/eFormApi.Integration.Tests/bin/*
97+
eFormAPI/eFormAPI/JasperExporter.jar
98+
eFormAPI/eFormAPI.Common/JasperExporter.jar

‎eFormAPI/CodeCoverage.runsettings‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- File name extension must be .runsettings -->
3+
<RunSettings>
4+
<DataCollectionRunSettings>
5+
<DataCollectors>
6+
<DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7+
<Configuration>
8+
<CodeCoverage>
9+
<!--
10+
Additional paths to search for .pdb (symbol) files. Symbols must be found for modules to be instrumented.
11+
If .pdb files are in the same folder as the .dll or .exe files, they are automatically found. Otherwise, specify them here.
12+
Note that searching for symbols increases code coverage runtime. So keep this small and local.
13+
-->
14+
<!--
15+
<SymbolSearchPaths>
16+
<Path>C:\Users\User\Documents\Visual Studio 2012\Projects\ProjectX\bin\Debug</Path>
17+
<Path>\\mybuildshare\builds\ProjectX</Path>
18+
</SymbolSearchPaths>
19+
-->
20+
21+
<!--
22+
About include/exclude lists:
23+
Empty "Include" clauses imply all; empty "Exclude" clauses imply none.
24+
Each element in the list is a regular expression (ECMAScript syntax). See http://msdn.microsoft.com/library/2k3te2cs.aspx.
25+
An item must first match at least one entry in the include list to be included.
26+
Included items must then not match any entries in the exclude list to remain included.
27+
-->
28+
29+
<!-- Match assembly file paths: -->
30+
<ModulePaths>
31+
<Include>
32+
<ModulePath>.*\.dll$</ModulePath>
33+
<ModulePath>.*\.exe$</ModulePath>
34+
</Include>
35+
<Exclude>
36+
<ModulePath>.*CPPUnitTestFramework.*</ModulePath>
37+
</Exclude>
38+
</ModulePaths>
39+
40+
<!-- Match fully qualified names of functions: -->
41+
<!-- (Use "\." to delimit namespaces in C# or Visual Basic, "::" in C++.) -->
42+
<Functions>
43+
<Exclude>
44+
<Function>^Fabrikam\.UnitTest\..*</Function>
45+
<Function>^std::.*</Function>
46+
<Function>^ATL::.*</Function>
47+
<Function>.*::__GetTestMethodInfo.*</Function>
48+
<Function>^Microsoft::VisualStudio::CppCodeCoverageFramework::.*</Function>
49+
<Function>^Microsoft::VisualStudio::CppUnitTestFramework::.*</Function>
50+
</Exclude>
51+
</Functions>
52+
53+
<!-- Match attributes on any code element: -->
54+
<Attributes>
55+
<Exclude>
56+
<Attribute>^System\.Diagnostics\.DebuggerHiddenAttribute$</Attribute>
57+
<Attribute>^System\.Diagnostics\.DebuggerNonUserCodeAttribute$</Attribute>
58+
<Attribute>^System\.Runtime\.CompilerServices.CompilerGeneratedAttribute$</Attribute>
59+
<Attribute>^System\.CodeDom\.Compiler.GeneratedCodeAttribute$</Attribute>
60+
<Attribute>^System\.Diagnostics\.CodeAnalysis.ExcludeFromCodeCoverageAttribute$</Attribute>
61+
</Exclude>
62+
</Attributes>
63+
64+
<!-- Match the path of the source files in which each method is defined: -->
65+
<Sources>
66+
<Exclude>
67+
<Source>.*\\atlmfc\\.*</Source>
68+
<Source>.*\\vctools\\.*</Source>
69+
<Source>.*\\public\\sdk\\.*</Source>
70+
<Source>.*\\microsoft sdks\\.*</Source>
71+
<Source>.*\\vc\\include\\.*</Source>
72+
</Exclude>
73+
</Sources>
74+
75+
<!-- Match the company name property in the assembly: -->
76+
<CompanyNames>
77+
<Exclude>
78+
<CompanyName>.*microsoft.*</CompanyName>
79+
</Exclude>
80+
</CompanyNames>
81+
82+
<!-- Match the public key token of a signed assembly: -->
83+
<PublicKeyTokens>
84+
<!-- Exclude Visual Studio extensions: -->
85+
<Exclude>
86+
<PublicKeyToken>^B77A5C561934E089$</PublicKeyToken>
87+
<PublicKeyToken>^B03F5F7F11D50A3A$</PublicKeyToken>
88+
<PublicKeyToken>^31BF3856AD364E35$</PublicKeyToken>
89+
<PublicKeyToken>^89845DCD8080CC91$</PublicKeyToken>
90+
<PublicKeyToken>^71E9BCE111E9429C$</PublicKeyToken>
91+
<PublicKeyToken>^8F50407C4E9E73B6$</PublicKeyToken>
92+
<PublicKeyToken>^E361AF139669C375$</PublicKeyToken>
93+
</Exclude>
94+
</PublicKeyTokens>
95+
96+
<!-- We recommend you do not change the following values: -->
97+
<UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
98+
<AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>
99+
<CollectFromChildProcesses>True</CollectFromChildProcesses>
100+
<CollectAspDotNet>False</CollectAspDotNet>
101+
102+
</CodeCoverage>
103+
</Configuration>
104+
</DataCollector>
105+
</DataCollectors>
106+
</DataCollectionRunSettings>
107+
</RunSettings>
108+

‎eFormAPI/DevOps/Patch-ProductWXS.ps1‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[cmdletbinding()]
2+
Param(
3+
[ValidateScript({Test-Path $_})]
4+
[ValidateNotNullOrEmpty()]
5+
[Parameter(Mandatory=$True)]
6+
[string]$filePath,
7+
8+
[Parameter(Mandatory=$True)]
9+
[ValidateNotNullOrEmpty()]
10+
[string]$version
11+
)
12+
13+
[xml]$xml = Get-Content $filePath
14+
15+
Write-Verbose ("Updating product verion to {0}" -f $version)
16+
17+
$xml.Wix.Product.Version = $version
18+
19+
Write-Verbose ("Saving to file {0}" -f $filePath)
20+
$xml.Save($filePath)

‎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.12")]
36-
[assembly: AssemblyFileVersion("1.1.2.12")]
35+
[assembly: AssemblyVersion("1.1.2.17")]
36+
[assembly: AssemblyFileVersion("1.1.2.17")]

‎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.12")]
36-
[assembly: AssemblyFileVersion("1.1.2.12")]
35+
[assembly: AssemblyVersion("1.1.2.17")]
36+
[assembly: AssemblyFileVersion("1.1.2.17")]

‎eFormAPI/Installation/CustomActions/CustomAction.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,18 @@ public static ActionResult UpdateCA(Session session)
317317
RunProcess(@"C:\Program Files\nodejs\node.exe", "svc.js uninstall", uiIisDir);
318318
IncrementProgressBar(session);
319319

320-
DeleteDirectory(Path.Combine(uiIisDir, "node_modules"));
321-
DeleteDirectory(Path.Combine(uiIisDir, "dist"));
320+
try
321+
{
322+
DeleteDirectory(Path.Combine(uiIisDir, "node_modules"));
323+
} catch { }
324+
try
325+
{
326+
DeleteDirectory(Path.Combine(uiIisDir, "dist"));
327+
} catch { }
328+
try
329+
{
330+
DeleteDirectory(Path.Combine(uiIisDir, "src"));
331+
} catch { }
322332

323333
session.Log("Set proper names to folders");
324334

‎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.12")]
35-
[assembly: AssemblyFileVersion("1.1.2.12")]
34+
[assembly: AssemblyVersion("1.1.2.17")]
35+
[assembly: AssemblyFileVersion("1.1.2.17")]

‎eFormAPI/Installation/MainInstaller/Product.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--<?define MicrotingService_TargetDir=$(var.eFormAPI.Web.TargetDir)?>-->
44
<?define ProductName="Microting eForm API" ?>
55

6-
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.1.2.12" Manufacturer="Microting A/S">
6+
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.1.2.17" Manufacturer="Microting A/S">
77
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated" AdminImage="yes" />
88

99
<UIRef Id="WixUI_InstallDirModified" />

‎eFormAPI/TestSettings.runsettings‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RunSettings>
3+
<!-- Configurations that affect the Test Framework -->
4+
<RunConfiguration>
5+
<MaxCpuCount>1</MaxCpuCount>
6+
<!-- Path relative to solution directory -->
7+
<ResultsDirectory>.\TestResults</ResultsDirectory>
8+
9+
<!-- [x86] | x64
10+
- You can also change it from menu Test, Test Settings, Default Processor Architecture -->
11+
<TargetPlatform>x64</TargetPlatform>
12+
13+
<!-- Framework35 | [Framework40] | Framework45 -->
14+
<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
15+
16+
<!-- Path to Test Adapters -->
17+
<TestAdaptersPaths>%SystemDrive%\Temp\foo;%SystemDrive%\Temp\bar</TestAdaptersPaths>
18+
</RunConfiguration>
19+
20+
<!-- Configurations for data collectors -->
21+
<DataCollectionRunSettings>
22+
<DataCollectors>
23+
<DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
24+
<Configuration>
25+
<CodeCoverage>
26+
<ModulePaths>
27+
<Exclude>
28+
<ModulePath>.*CPPUnitTestFramework.*</ModulePath>
29+
</Exclude>
30+
</ModulePaths>
31+
32+
<!-- We recommend you do not change the following values: -->
33+
<UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
34+
<AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>
35+
<CollectFromChildProcesses>True</CollectFromChildProcesses>
36+
<CollectAspDotNet>False</CollectAspDotNet>
37+
38+
</CodeCoverage>
39+
</Configuration>
40+
</DataCollector>
41+
42+
</DataCollectors>
43+
</DataCollectionRunSettings>
44+
45+
<!-- Parameters used by tests at runtime -->
46+
<TestRunParameters>
47+
<Parameter name="webAppUrl" value="http://localhost" />
48+
<Parameter name="webAppUserName" value="Admin" />
49+
<Parameter name="webAppPassword" value="Password" />
50+
</TestRunParameters>
51+
52+
<!-- Adapter Specific sections -->
53+
54+
<!-- MSTest adapter -->
55+
<MSTest>
56+
<MapInconclusiveToFailed>True</MapInconclusiveToFailed>
57+
<CaptureTraceOutput>false</CaptureTraceOutput>
58+
<DeleteDeploymentDirectoryAfterTestRunIsComplete>False</DeleteDeploymentDirectoryAfterTestRunIsComplete>
59+
<DeploymentEnabled>False</DeploymentEnabled>
60+
<AssemblyResolution>
61+
<Directory path="D:\myfolder\bin\" includeSubDirectories="false"/>
62+
</AssemblyResolution>
63+
</MSTest>
64+
65+
</RunSettings>

0 commit comments

Comments
 (0)