Skip to content

Commit 35bfa21

Browse files
committed
Push release preparations 1.1.1.0
1 parent f2c2c15 commit 35bfa21

10 files changed

+73
-70
lines changed

App/AssemblyInfo1.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
// Revision
3030
//
3131
#if (DEBUG)
32-
[assembly: AssemblyVersion("1.06.*")]
32+
[assembly: AssemblyVersion("1.07.*")]
3333
#else
34-
[assembly: AssemblyVersion("1.1.0.0")]
34+
[assembly: AssemblyVersion("1.1.1.0")]
3535
#endif

Deploy/SpeditUpdater/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private static void Worker(object arg)
4444
UpdateMarquee um = (UpdateMarquee)arg;
4545
string zipFile = Path.Combine(Environment.CurrentDirectory, "updateZipFile.zip");
4646

47-
byte[] zipFileContent = SpeditUpdater.Properties.Resources.spedit1_1_0_0Update;
47+
byte[] zipFileContent = SpeditUpdater.Properties.Resources.spedit1_1_1_0Update;
4848

4949
File.WriteAllBytes(zipFile, zipFileContent);
5050

Deploy/SpeditUpdater/Properties/Resources.Designer.cs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Deploy/SpeditUpdater/Properties/Resources.resx

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<data name="IconPng" type="System.Resources.ResXFileRef, System.Windows.Forms">
122122
<value>..\Res\IconPng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123123
</data>
124-
<data name="spedit1_1_0_0Update" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\Res\spedit1.1.0.0Update.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
124+
<data name="spedit1_1_1_0Update" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>..\Res\spedit1.1.1.0Update.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126126
</data>
127127
</root>
2.29 MB
Binary file not shown.

Deploy/SpeditUpdater/SpeditUpdater.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
<None Include="Res\spedit1.0.3.1Update.zip" />
4646
<None Include="Res\spedit1.0.3.2Update.zip" />
4747
<None Include="Res\spedit1.1.0.0Update.zip" />
48+
<None Include="Res\spedit1.1.1.0.zip" />
49+
<None Include="Res\spedit1.1.1.0Update.zip" />
4850
</ItemGroup>
4951
<ItemGroup>
5052
<Compile Include="Program.cs" />

Deploy/SpeditUpdater/UpdateMarquee.Designer.cs

+60-56
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Deploy/SpeditUpdater/UpdateMarquee.resx

+1-4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<value>51, 22</value>
127127
</data>
128128
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
129-
<value>242, 23</value>
129+
<value>161, 23</value>
130130
</data>
131131
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
132132
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
@@ -1944,9 +1944,6 @@
19441944
AACAPwAAgD8AAP//AAA=
19451945
</value>
19461946
</data>
1947-
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
1948-
<value>NoControl</value>
1949-
</data>
19501947
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
19511948
<value>CenterScreen</value>
19521949
</data>

Interop/Updater/UpdateWindow.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
1212
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
1313
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
14-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
15-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
14+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
15+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Red.xaml" />
1616
</ResourceDictionary.MergedDictionaries>
1717
</ResourceDictionary>
1818
</mahapps:MetroWindow.Resources>

Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Spedit
1313
{
1414
public static class Program
1515
{
16-
public const string ProgramInternalVersion = "6";
16+
public const string ProgramInternalVersion = "7";
1717

1818
public static MainWindow MainWindow;
1919
public static OptionsControl OptionsObject;

0 commit comments

Comments
 (0)