diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d8c131..b6c969a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: run: msbuild ccx_testsuite.sln /t:ccx_testsuite /p:Platform="x86" /p:Configuration=Release - name: Prepare artifact upload - run: mkdir ./artifact; cp ./CCExtractorTester.exe ./artifact/; cp ./testGenerations.dll ./artifact/; cp ./CommandLine.dll ./artifact/ + run: mkdir ./artifact; cp CCExtractorTester.exe ./artifact/; cp testGenerations.dll ./artifact/; cp CommandLine.dll ./artifact/; cp CCExtractorTester.exe.config ./artifact/ working-directory: CCExtractorTester\bin\Release\ - name: Archive Release diff --git a/CCExtractorTester/Comparers/ServerComparer.cs b/CCExtractorTester/Comparers/ServerComparer.cs index 8800e98..8c07203 100644 --- a/CCExtractorTester/Comparers/ServerComparer.cs +++ b/CCExtractorTester/Comparers/ServerComparer.cs @@ -29,7 +29,7 @@ public UploadFile() private byte[] UploadFiles(string address, IEnumerable files, NameValueCollection values) { - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls; + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; var request = WebRequest.Create(address); request.Method = "POST"; var boundary = "---------------------------" + DateTime.Now.Ticks.ToString("x", NumberFormatInfo.InvariantInfo); @@ -133,7 +133,7 @@ public void CompareAndAddToResult(CompareData data) else { // Post equality status - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls; + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; using (var wb = new WebClient()) { wb.Headers.Add("user-agent", userAgent); @@ -176,7 +176,7 @@ public string SaveReport(string pathToFolder, ResultData data) public void SendExitCodeAndRuntime(RunData rd, int testId) { // Post equality status - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls; + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; using (var wb = new WebClient()) { var d = new NameValueCollection(); diff --git a/CCExtractorTester/app.config b/CCExtractorTester/app.config index c4286f8..2e0ad60 100644 --- a/CCExtractorTester/app.config +++ b/CCExtractorTester/app.config @@ -1,15 +1,15 @@ - + - - - - + + + + - + - - - + + + - \ No newline at end of file + diff --git a/CCExtractorTester/ccx_testsuite.csproj b/CCExtractorTester/ccx_testsuite.csproj index 5d1d7c5..9ad6f96 100644 --- a/CCExtractorTester/ccx_testsuite.csproj +++ b/CCExtractorTester/ccx_testsuite.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -25,6 +25,8 @@ false false true + v4.8 + true @@ -37,6 +39,7 @@ x86 false -t "E:\CCExtractor repository\TestFiles\TestAll.xml" + false full @@ -46,6 +49,7 @@ 4 x86 false + false diff --git a/README.md b/README.md index a5396e3..1db219a 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,12 @@ CCExtractortester.exe -m Server -u http://my.server/report.php -e C:\Samples\Tes * Mono 2.10 or newer (A tutorial can be found [here](http://www.nat.li/linux/how-to-install-mono-2-11-2-on-debian-squeeze)) +The following script can be used to run the testsuite on linux, by passing the required arguments to it: +``` +#!/bin/bash +exec mono CCExtractorTester.exe "$@" +``` + ### Common * CommandLineParser NuGet package ([GitHub](https://github.com/gsscoder/commandline), [nuget](https://www.nuget.org/packages/CommandLineParser)) diff --git a/conversionTools/App.config b/conversionTools/App.config index 88fa402..4bfa005 100644 --- a/conversionTools/App.config +++ b/conversionTools/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/conversionTools/conversionTools.csproj b/conversionTools/conversionTools.csproj index 27afd28..45fb924 100644 --- a/conversionTools/conversionTools.csproj +++ b/conversionTools/conversionTools.csproj @@ -9,7 +9,7 @@ Properties conversionTools conversionTools - v4.5.2 + v4.8 512 true publish\ @@ -27,6 +27,7 @@ false false true + AnyCPU diff --git a/testGenerations/Properties/Resources.Designer.cs b/testGenerations/Properties/Resources.Designer.cs index 743204e..cbe0c7c 100644 --- a/testGenerations/Properties/Resources.Designer.cs +++ b/testGenerations/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace testGenerations.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -62,20 +62,18 @@ internal Resources() { /// /// Looks up a localized string similar to <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> - /// <xs:element name="multitest"> - /// <xs:complexType> - /// <xs:sequence> - /// <xs:element name="testfile" maxOccurs="unbounded" minOccurs="1"> - /// <xs:complexType> + /// <xs:element name="multitest"> + /// <xs:complexType> /// <xs:sequence> - /// <xs:element type="xs:string" name="location"/> + /// <xs:element name="testfile" maxOccurs="unbounded" minOccurs="1"> + /// <xs:complexType> + /// <xs:sequence> + /// <xs:element type="xs:string" name="location"/> + /// </xs:sequence> + /// </xs:complexType> + /// </xs:element> /// </xs:sequence> - /// </xs:complexType> - /// </xs:element> - /// </xs:sequence> - /// </xs:complexType> - /// </xs:element> - ///</xs:schema>. + /// [rest of string was truncated]";. /// internal static string multitest { get { @@ -85,16 +83,15 @@ internal static string multitest { /// /// Looks up a localized string similar to <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - /// <xs:element name="tests"> - /// <xs:complexType> - /// <xs:sequence> - /// <xs:element name="test" maxOccurs="unbounded" minOccurs="1"> - /// <xs:complexType> + /// <xs:element name="tests"> + /// <xs:complexType> /// <xs:sequence> - /// <xs:element type="xs:string" name="sample"/> - /// <xs:element type="xs:string" name="cmd"/> - /// <xs:element type="xs:string" name="result"/> - /// </xs:sequence [rest of string was truncated]";. + /// <xs:element name="test" maxOccurs="unbounded" minOccurs="1"> + /// <xs:complexType> + /// <xs:sequence> + /// <xs:element type="xs:string" name="sample"/> + /// <xs:element type="xs:string" name="cmd"/> + /// [rest of string was truncated]";. /// internal static string tests { get { @@ -105,16 +102,14 @@ internal static string tests { /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> ///<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - /// <xs:element name="tests"> - /// <xs:complexType> - /// <xs:sequence> - /// <xs:element name="entry" maxOccurs="unbounded" minOccurs="1"> - /// <xs:complexType> + /// <xs:element name="tests"> + /// <xs:complexType> /// <xs:sequence> - /// <xs:element type="xs:string" name="command"/> - /// <xs:element name="input"> - /// <xs:complexType> - /// <xs:simp [rest of string was truncated]";. + /// <xs:element name="entry" maxOccurs="unbounded" minOccurs="1"> + /// <xs:complexType> + /// <xs:sequence> + /// <xs:element type="xs:string" name="command"/> + /// <xs:element nam [rest of string was truncated]";. /// internal static string testsuite { get { diff --git a/testGenerations/testGenerations.csproj b/testGenerations/testGenerations.csproj index 3b573d3..be317cd 100644 --- a/testGenerations/testGenerations.csproj +++ b/testGenerations/testGenerations.csproj @@ -9,7 +9,7 @@ Properties testGenerations testGenerations - v4.0 + v4.8 512 @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +30,7 @@ TRACE prompt 4 + false