Skip to content

Commit

Permalink
Merge pull request #1921 from Analogy-LogViewer/DevExpress_v23.2
Browse files Browse the repository at this point in the history
DevExpress v23.2
  • Loading branch information
LiorBanai authored Dec 22, 2023
2 parents 1416eef + 3dab0cb commit af4e03f
Show file tree
Hide file tree
Showing 92 changed files with 510 additions and 461 deletions.
256 changes: 128 additions & 128 deletions Analogy.CommonControls.Example/Analogy.CommonControls.Example.csproj

Large diffs are not rendered by default.

256 changes: 128 additions & 128 deletions Analogy.CommonControls/Analogy.CommonControls.csproj

Large diffs are not rendered by default.

256 changes: 128 additions & 128 deletions Analogy/Analogy.csproj

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Analogy/CommonChangeLog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
{
return new List<AnalogyChangeLog>
{
new ("V6.0.0 - DevExpress V23.2 #1922", AnalogChangeLogType.None, "Lior Banai", new DateTime(2023, 12, 22), "6.0.0"),
new ("V6.0.0 - [Detailed Message] is always in front of main window #1911", AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2023, 12, 15), "6.0.0"),
new ("V6.0.0 - [Detailed Message] Time format is not the same as main window #1901", AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2023, 12, 15), "6.0.0"),
new ("V6.0.0 - DevExpress NET8 support - V23.1.7", AnalogChangeLogType.None, "Lior Banai", new DateTime(2023, 12, 15), "6.0.0"),
Expand Down
126 changes: 59 additions & 67 deletions DevExpress.Sync/DevExpress.Sync/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions DevExpress.Sync/DevExpress.Sync/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ public MainForm()
{
InitializeComponent();
}



private void btnCopy_Click(object sender, EventArgs e)
{
var targetFolder = txtbTarget.Text;
var sourceFolder = txtbSource.Text;
CopyFiles(Path.Combine(targetFolder, ".net core"), sourceFolder, true);
CopyFiles(Path.Combine(targetFolder, ".net framework"), sourceFolder, false);
MessageBox.Show("Done", "Done");

}

private void CopyFiles(string targetFolder, string sourceFolder, bool isNet)
Expand Down Expand Up @@ -93,8 +89,8 @@ private void CopyFilesWithUpgrade(string targetFolder, string sourceFolder, bool
foreach (string fullPath in files)
{
var file = Path.GetFileName(fullPath);
file = file.Replace("v21.2", "v22.1");
var targetFullPath = fullPath.Replace("v21.2", "v22.1");
file = file.Replace("v23.1", "v23.2");
var targetFullPath = fullPath.Replace("v23.1", "v23.2");

if (isNet)
{
Expand Down Expand Up @@ -139,4 +135,4 @@ private void CopyFilesWithUpgrade(string targetFolder, string sourceFolder, bool
}
}
}
}
}
62 changes: 61 additions & 1 deletion DevExpress.Sync/DevExpress.Sync/MainForm.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,64 @@
<root>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
Expand Down
Loading

0 comments on commit af4e03f

Please sign in to comment.