diff --git a/README.md b/README.md
index bf90846..2300fc6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
# rapidreporterplusplus
A fork of http://testing.gershon.info/reporter/
-Please read the file titled "Readme.docx" for detailed instructions.
\ No newline at end of file
+Please read the file titled "Readme.docx" for detailed instructions.
+
+The secondary project is a converter tool for Issue #30, convert RR2.4/2.5 sessions into RR2.6 sessions.
\ No newline at end of file
diff --git a/Rapid Reporter/HTML/HTMLEmbedder.cs b/Rapid Reporter/HTML/HTMLEmbedder.cs
index c07e4b2..f8a40ed 100644
--- a/Rapid Reporter/HTML/HTMLEmbedder.cs
+++ b/Rapid Reporter/HTML/HTMLEmbedder.cs
@@ -13,7 +13,7 @@ internal static string BuildSessionRow_Img(int imgCount, string imgFile)
var str = MakeImageSrcData(imgFile);
return
string.Format(
- "{2}",
+ "{2}",
imgCount, str, " ");
}
diff --git a/Rapid Reporter/HTML/Htmlstrings.cs b/Rapid Reporter/HTML/Htmlstrings.cs
index e9d7d41..2811ff1 100644
--- a/Rapid Reporter/HTML/Htmlstrings.cs
+++ b/Rapid Reporter/HTML/Htmlstrings.cs
@@ -14,7 +14,7 @@ public static class Htmlstrings
static Htmlstrings()
{
- AHtmlHead = "\r\n
\r\n \r\n ";
+ AHtmlHead = "\r\n \r\n \r\n \r\n ";
BTitleOut = " ";
CStyle = "\r\n ";
DJavascript = "\r\n \r\n ";
diff --git a/Rapid Reporter/Properties/AssemblyInfo.cs b/Rapid Reporter/Properties/AssemblyInfo.cs
index 2b6177b..244e5c4 100644
--- a/Rapid Reporter/Properties/AssemblyInfo.cs
+++ b/Rapid Reporter/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("Requires .NET framework 4.5")]
[assembly: AssemblyCompany("Timothy Watkins")]
[assembly: AssemblyProduct("Rapid Reporter++")]
-[assembly: AssemblyCopyright("Copyright © 2014 Timothy Watkins.")]
+[assembly: AssemblyCopyright("Copyright © 2014-2015 Timothy Watkins.")]
[assembly: AssemblyTrademark("Rapid Reporter++")]
[assembly: AssemblyCulture("")]
@@ -50,7 +50,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.6.0.0")]
+[assembly: AssemblyFileVersion("2.6.0.0")]
[assembly: GuidAttribute("7AEB6D97-FCA8-4197-8DBD-0017E3B00468")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Rapid Reporter/Rapid Reporter.csproj b/Rapid Reporter/Rapid Reporter.csproj
index 38cd6db..d61d626 100644
--- a/Rapid Reporter/Rapid Reporter.csproj
+++ b/Rapid Reporter/Rapid Reporter.csproj
@@ -41,7 +41,7 @@
Shmuel Gershon
Session Master
0
- 2.4.0.%2a
+ 2.6.0.%2a
false
true
false
diff --git a/RapidReporter.sln b/RapidReporter.sln
index 6d584eb..728aec1 100644
--- a/RapidReporter.sln
+++ b/RapidReporter.sln
@@ -1,8 +1,12 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rapid Reporter", "Rapid Reporter\Rapid Reporter.csproj", "{196CF724-3EB5-4E53-B9D5-DA733A7D6CC7}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RapidReporterSharePointFix30", "RapidReporterSharePointFix30\RapidReporterSharePointFix30.csproj", "{3960F435-F941-4CC9-8A3B-D852484F4ECD}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -14,6 +18,10 @@ Global
{196CF724-3EB5-4E53-B9D5-DA733A7D6CC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{196CF724-3EB5-4E53-B9D5-DA733A7D6CC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{196CF724-3EB5-4E53-B9D5-DA733A7D6CC7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3960F435-F941-4CC9-8A3B-D852484F4ECD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3960F435-F941-4CC9-8A3B-D852484F4ECD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3960F435-F941-4CC9-8A3B-D852484F4ECD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3960F435-F941-4CC9-8A3B-D852484F4ECD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/RapidReporterSharePointFix30/App.config b/RapidReporterSharePointFix30/App.config
new file mode 100644
index 0000000..8e15646
--- /dev/null
+++ b/RapidReporterSharePointFix30/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/RapidReporterSharePointFix30/Form1.Designer.cs b/RapidReporterSharePointFix30/Form1.Designer.cs
new file mode 100644
index 0000000..8c2dd07
--- /dev/null
+++ b/RapidReporterSharePointFix30/Form1.Designer.cs
@@ -0,0 +1,87 @@
+namespace RapidReporterSharePointFix30
+{
+ partial class Form1
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
+ this.btnChoosefile = new System.Windows.Forms.Button();
+ this.FolderBtn = new System.Windows.Forms.Button();
+ this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+ this.SuspendLayout();
+ //
+ // openFileDialog1
+ //
+ this.openFileDialog1.FileName = "openFileDialog1";
+ //
+ // btnChoosefile
+ //
+ this.btnChoosefile.Location = new System.Drawing.Point(12, 12);
+ this.btnChoosefile.Name = "btnChoosefile";
+ this.btnChoosefile.Size = new System.Drawing.Size(154, 23);
+ this.btnChoosefile.TabIndex = 0;
+ this.btnChoosefile.Text = "Convert One Test Session";
+ this.btnChoosefile.UseVisualStyleBackColor = true;
+ this.btnChoosefile.Click += new System.EventHandler(this.btnChoosefile_Click);
+ //
+ // FolderBtn
+ //
+ this.FolderBtn.Location = new System.Drawing.Point(12, 41);
+ this.FolderBtn.Name = "FolderBtn";
+ this.FolderBtn.Size = new System.Drawing.Size(154, 23);
+ this.FolderBtn.TabIndex = 1;
+ this.FolderBtn.Text = "Convert Folder";
+ this.FolderBtn.UseVisualStyleBackColor = true;
+ this.FolderBtn.Click += new System.EventHandler(this.FolderBtn_Click);
+ //
+ // Form1
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(178, 73);
+ this.Controls.Add(this.FolderBtn);
+ this.Controls.Add(this.btnChoosefile);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "Form1";
+ this.Text = "SharePoint Issue #30";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.OpenFileDialog openFileDialog1;
+ private System.Windows.Forms.SaveFileDialog saveFileDialog1;
+ private System.Windows.Forms.Button btnChoosefile;
+ private System.Windows.Forms.Button FolderBtn;
+ private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+ }
+}
+
diff --git a/RapidReporterSharePointFix30/Form1.cs b/RapidReporterSharePointFix30/Form1.cs
new file mode 100644
index 0000000..f8754d4
--- /dev/null
+++ b/RapidReporterSharePointFix30/Form1.cs
@@ -0,0 +1,201 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace RapidReporterSharePointFix30
+{
+ public partial class Form1 : Form
+ {
+ public Form1()
+ {
+ InitializeComponent();
+ }
+
+ private void btnChoosefile_Click(object sender, EventArgs e)
+ {
+ string text;
+ var result = openFileDialog1.ShowDialog();
+ if (result != DialogResult.OK) return;
+ var fn = openFileDialog1.FileName;
+ try
+ {
+ text = File.ReadAllText(fn);
+ }
+ catch (IOException exception)
+ {
+ MessageBox.Show(exception.Message, exception.ToString());
+ return;
+ }
+ if (string.IsNullOrWhiteSpace(text))
+ {
+ MessageBox.Show(@"File was empty or could not be read;");
+ return;
+ }
+ if (text.Contains("
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
+ 157, 17
+
+
+ 293, 17
+
+
\ No newline at end of file
diff --git a/RapidReporterSharePointFix30/Program.cs b/RapidReporterSharePointFix30/Program.cs
new file mode 100644
index 0000000..5c106ae
--- /dev/null
+++ b/RapidReporterSharePointFix30/Program.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace RapidReporterSharePointFix30
+{
+ static class Program
+ {
+ ///
+ /// The main entry point for the application.
+ ///
+ [STAThread]
+ static void Main()
+ {
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
+ Application.Run(new Form1());
+ }
+ }
+}
diff --git a/RapidReporterSharePointFix30/Properties/AssemblyInfo.cs b/RapidReporterSharePointFix30/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..2646eab
--- /dev/null
+++ b/RapidReporterSharePointFix30/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("RapidReporterSharePointFix30")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Shaw Cablesystems G.P.")]
+[assembly: AssemblyProduct("RapidReporterSharePointFix30")]
+[assembly: AssemblyCopyright("Copyright © Shaw Cablesystems G.P. 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0c361859-521c-4c5b-ba7b-510102ac32b9")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/RapidReporterSharePointFix30/Properties/Resources.Designer.cs b/RapidReporterSharePointFix30/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..0d9c3c4
--- /dev/null
+++ b/RapidReporterSharePointFix30/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace RapidReporterSharePointFix30.Properties
+{
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources
+ {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources()
+ {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager
+ {
+ get
+ {
+ if ((resourceMan == null))
+ {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RapidReporterSharePointFix30.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture
+ {
+ get
+ {
+ return resourceCulture;
+ }
+ set
+ {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/RapidReporterSharePointFix30/Properties/Resources.resx b/RapidReporterSharePointFix30/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/RapidReporterSharePointFix30/Properties/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/RapidReporterSharePointFix30/Properties/Settings.Designer.cs b/RapidReporterSharePointFix30/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..0ca47b7
--- /dev/null
+++ b/RapidReporterSharePointFix30/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace RapidReporterSharePointFix30.Properties
+{
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+ {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default
+ {
+ get
+ {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/RapidReporterSharePointFix30/Properties/Settings.settings b/RapidReporterSharePointFix30/Properties/Settings.settings
new file mode 100644
index 0000000..3964565
--- /dev/null
+++ b/RapidReporterSharePointFix30/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/RapidReporterSharePointFix30/RapidReporterSharePointFix30.csproj b/RapidReporterSharePointFix30/RapidReporterSharePointFix30.csproj
new file mode 100644
index 0000000..a0ca6d1
--- /dev/null
+++ b/RapidReporterSharePointFix30/RapidReporterSharePointFix30.csproj
@@ -0,0 +1,88 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {3960F435-F941-4CC9-8A3B-D852484F4ECD}
+ WinExe
+ Properties
+ RapidReporterSharePointFix30
+ RapidReporterSharePointFix30
+ v4.5
+ 512
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Form
+
+
+ Form1.cs
+
+
+
+
+ Form1.cs
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+ Designer
+
+
+ True
+ Resources.resx
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+ True
+ Settings.settings
+ True
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/currentVersion.txt b/currentVersion.txt
index a86b05f..a2a9ac2 100644
--- a/currentVersion.txt
+++ b/currentVersion.txt
@@ -1 +1 @@
-2.5.0.0
\ No newline at end of file
+2.6.0.0
\ No newline at end of file