Преглед на файлове

1. change button check procedure behind Firmware update procedure
2. update to v1.2.0

Robert преди 4 години
родител
ревизия
efaf26331f
променени са 6 файла, в които са добавени 4 реда и са изтрити 7 реда
  1. 0 1
      AwInitilizer/MainWindow.xaml
  2. 1 2
      AwInitilizer/MainWindow.xaml.cs
  3. 1 1
      AwInitilizer/Properties/AssemblyInfo.cs
  4. 0 1
      AwInitilizer/SigninDialog.xaml
  5. 1 1
      GitVersion.yml
  6. 1 1
      Initilizer/AssemblyInfo.cs

+ 0 - 1
AwInitilizer/MainWindow.xaml

@@ -10,7 +10,6 @@
         input:InputMethod.IsInputMethodEnabled="False"
         WindowStartupLocation="CenterScreen"
         WindowState="Maximized"
-        WindowStyle="None"
         x:Name="uxManinWindow">
     <Window.Resources>
     </Window.Resources>

+ 1 - 2
AwInitilizer/MainWindow.xaml.cs

@@ -727,8 +727,6 @@ namespace AwInitilizer
             List<ProcedureBase> procedures = new List<ProcedureBase>();
 
             //init intilize procedure list
-
-            procedures.Add(new ButtonStatusCheckPorcedure());
             procedures.Add(new BasicInfoUpdateProcedure());
             procedures.Add(new FourGenModuleCheckProcedure());
             //for (int firemwareIndex = 0; firemwareIndex < ViewModel.FirmwareUpdateModels.Count ; firemwareIndex++)
@@ -738,6 +736,7 @@ namespace AwInitilizer
             //}
             procedures.Add(new FirmwareBundleUploadProcedure());
             procedures.Add(new FirmwareCheckVersionProcedure());
+            procedures.Add(new ButtonStatusCheckPorcedure());
             procedures.Add(new RestarttoIdelProcedure());
             procedures.Add(new VersionLogProcedure());
 

+ 1 - 1
AwInitilizer/Properties/AssemblyInfo.cs

@@ -53,4 +53,4 @@ using System.Windows;
 // [assembly: AssemblyVersion("1.1.2.0")]
 [assembly: AssemblyVersion("1.1.2.0")]
 [assembly: AssemblyFileVersion("1.1.2.0")]
-[assembly: AssemblyInformationalVersion("85678a5")]
+[assembly: AssemblyInformationalVersion("ccd5461")]

+ 0 - 1
AwInitilizer/SigninDialog.xaml

@@ -6,7 +6,6 @@
         xmlns:local="clr-namespace:AwInitilizer"
         mc:Ignorable="d"
         Title="Signin" Height="600" Width="800"
-        WindowStyle="None"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterOwner"
         Topmost="True"

+ 1 - 1
GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.1.2
+next-version: 1.2.0
 branches: {}
 ignore:
   sha: []

+ 1 - 1
Initilizer/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 
 [assembly: AssemblyVersion("1.1.2.0")]
 [assembly: AssemblyFileVersion("1.1.2.0")]
-[assembly: AssemblyInformationalVersion("85678a5")]
+[assembly: AssemblyInformationalVersion("ccd5461")]