Fixed a bug with the silent switch.

bitbound · Feb 27, 2017 · 3bd875b · 3bd875b
1 parent a383560
commit 3bd875b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/Make-EXE/Make-EXE.csproj b/Make-EXE/Make-EXE.csproj
@@ -57,8 +57,8 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="WPF-Auto-Update">
-      <HintPath>..\..\..\ClassLibraries\WPF Auto Updater\WPF_Auto_Updater\bin\Release\WPF-Auto-Update.dll</HintPath>
+    <Reference Include="WPF-Auto-Update, Version=0.1.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WPF_Auto_Update.1.1.0\lib\net452\WPF-Auto-Update.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Make-EXE/Models/AssemblyInfo.cs b/Make-EXE/Models/AssemblyInfo.cs
@@ -9,8 +9,8 @@ namespace Make_EXE.Models
     public class AssemblyInfo
     {
         public bool? EmbedFiles { get; set; }
-        public string AssemblyVersion { get; set; }
-        public string FileVersion { get; set; }
+        public string AssemblyVersion { get; set; } = "0.0.0.0";
+        public string FileVersion { get; set; } = "0.0.0.0";
         public string ProductName { get; set; }
         public string ProductDescription { get; set; }
         public string CompanyName { get; set; }

diff --git a/Make-EXE/Properties/AssemblyInfo.cs b/Make-EXE/Properties/AssemblyInfo.cs
@@ -51,7 +51,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("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
 [assembly: Guid("eea5aba0-927d-44ef-95ff-b4eccca23cfe")]
 
diff --git a/Make-EXE/Windows/AssemblyWindow.xaml b/Make-EXE/Windows/AssemblyWindow.xaml
@@ -19,8 +19,8 @@
         <TextBlock  Text="Copyright:" Foreground="White" FontSize="14" Margin="10,190,0,0" HorizontalAlignment="Left"  VerticalAlignment="Top"/>
         <TextBlock  Text="Save Config:" Foreground="White" FontSize="14" Margin="10,230,0,0" HorizontalAlignment="Left"  VerticalAlignment="Top"/>
         <CheckBox x:Name="checkEmbed" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,70,10,0" IsChecked="False"></CheckBox>
-        <TextBox x:Name="textAssemblyVersion" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,90,10,0" Width="150"></TextBox>
-        <TextBox x:Name="textFileVersion" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,110,10,0" Width="150"></TextBox>
+        <TextBox x:Name="textAssemblyVersion" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,90,10,0" Width="150" Text="0.0.0.0"></TextBox>
+        <TextBox x:Name="textFileVersion" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,110,10,0" Width="150" Text="0.0.0.0"></TextBox>
         <TextBox x:Name="textProductName" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,130,10,0" Width="150"></TextBox>
         <TextBox x:Name="textProductDescription" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,150,10,0" Width="150"></TextBox>
         <TextBox x:Name="textCompanyName" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,170,10,0" Width="150"></TextBox>

diff --git a/Make-EXE/Windows/AssemblyWindow.xaml.cs b/Make-EXE/Windows/AssemblyWindow.xaml.cs
@@ -25,7 +25,7 @@ public partial class AssemblyWindow : Window
         public string TargetPath { get; set; }
         public List<string> Args { get; set; }
         JavaScriptSerializer serializer = new JavaScriptSerializer();
-        AssemblyInfo jsonAssembly { get; set; }
+        AssemblyInfo jsonAssembly { get; set; } = new AssemblyInfo();
         public AssemblyWindow()
         {
             InitializeComponent();

diff --git a/Make-EXE/packages.config b/Make-EXE/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="Costura.Fody" version="1.3.3.0" targetFramework="net452" developmentDependency="true" />
   <package id="Fody" version="1.29.4" targetFramework="net452" developmentDependency="true" />
+  <package id="WPF_Auto_Update" version="1.1.0" targetFramework="net452" />
 </packages>