Merge pull request #12 from Tarun-Arora/tls_issue

Upgrade to .NET 4.8 and Fix TLS issue
CCExtractor · Dec 25, 2023 · e4893e9 · e4893e9
2 parents b1620a5 + 787093f
commit e4893e9
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 51 deletions.
diff --git 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
@@ -29,7 +29,7 @@ public UploadFile()
 
         private byte[] UploadFiles(string address, IEnumerable<UploadFile> 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
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="ReportFolder" value="E:\CCExtractor repository\reports" />
-    <add key="SampleFolder" value="E:\CCExtractor repository\TestFiles" />
-    <add key="CorrectResultFolder" value="E:\CCExtractor repository\TestResults" />
-    <add key="CCExtractorLocation" value="C:\Program Files (x86)\CCExtractor\ccextractorwin.exe" />
+    <add key="ReportFolder" value="E:\CCExtractor repository\reports"/>
+    <add key="SampleFolder" value="E:\CCExtractor repository\TestFiles"/>
+    <add key="CorrectResultFolder" value="E:\CCExtractor repository\TestResults"/>
+    <add key="CCExtractorLocation" value="C:\Program Files (x86)\CCExtractor\ccextractorwin.exe"/>
     <!-- only necessary if you want to use a test with UDP -->
-    <add key="FFMpegLocation" value="C:\Program Files (x86)\WinFF\ffmpeg.exe" />
+    <add key="FFMpegLocation" value="C:\Program Files (x86)\WinFF\ffmpeg.exe"/>
     <!-- Comparer should be one of the next values: "Diff" (linux only), "Diffplex", "Diffplexreduced" (saves only the lines that are modified) -->
-    <add key="Comparer" value="Diffplex" />
-    <add key="UseThreading" value="false" />
-    <add key="BreakOnErrors" value="false" />
+    <add key="Comparer" value="Diffplex"/>
+    <add key="UseThreading" value="false"/>
+    <add key="BreakOnErrors" value="false"/>
   </appSettings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/CCExtractorTester/ccx_testsuite.csproj b/CCExtractorTester/ccx_testsuite.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -25,6 +25,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,6 +39,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
     <Commandlineparameters>-t "E:\CCExtractor repository\TestFiles\TestAll.xml"</Commandlineparameters>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>full</DebugType>
@@ -46,6 +49,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">

diff --git 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
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/conversionTools/conversionTools.csproj b/conversionTools/conversionTools.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>conversionTools</RootNamespace>
     <AssemblyName>conversionTools</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
@@ -27,6 +27,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/testGenerations/Properties/Resources.Designer.cs b/testGenerations/Properties/Resources.Designer.cs
diff --git a/testGenerations/testGenerations.csproj b/testGenerations/testGenerations.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>testGenerations</RootNamespace>
     <AssemblyName>testGenerations</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />