Skip to content

Commit e4f3796

Browse files
CodectoryCodectory
committed
1.9.18
Switched back to async github integration
1 parent a433140 commit e4f3796

File tree

6 files changed

+250
-41
lines changed

6 files changed

+250
-41
lines changed

‎Source/AutoActions/App.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@
3737
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
3838
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
3939
</dependentAssembly>
40+
<dependentAssembly>
41+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
42+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
43+
</dependentAssembly>
44+
<dependentAssembly>
45+
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
46+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
47+
</dependentAssembly>
4048
</assemblyBinding>
4149
</runtime>
4250
</configuration>

‎Source/AutoActions/AutoActions.csproj

Lines changed: 148 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,31 @@
9393
<Reference Include="CodectoryCore.Windows.FileSystem">
9494
<HintPath>..\Externals\CodectoryCore.Windows.FileSystem.dll</HintPath>
9595
</Reference>
96-
<Reference Include="ControlzEx, Version=4.0.0.0, Culture=neutral, PublicKeyToken=69f1c32f803d307e, processorArchitecture=MSIL">
97-
<HintPath>..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll</HintPath>
96+
<Reference Include="ControlzEx, Version=5.0.0.0, Culture=neutral, PublicKeyToken=69f1c32f803d307e, processorArchitecture=MSIL">
97+
<HintPath>..\packages\ControlzEx.5.0.1\lib\net462\ControlzEx.dll</HintPath>
9898
</Reference>
99-
<Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
100-
<HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
101-
<EmbedInteropTypes>False</EmbedInteropTypes>
99+
<Reference Include="GithubSharp.Core, Version=1.0.4289.25885, Culture=neutral, processorArchitecture=MSIL">
100+
<HintPath>..\packages\GithubSharp.Core.0.0.5.1\lib\GithubSharp.Core.dll</HintPath>
101+
</Reference>
102+
<Reference Include="GithubSharp.Plugins.CacheProviders.ApplicationCacher, Version=1.0.4289.25886, Culture=neutral, processorArchitecture=MSIL">
103+
<HintPath>..\packages\GithubSharp.Plugins.All.0.0.5.1\lib\GithubSharp.Plugins.CacheProviders.ApplicationCacher.dll</HintPath>
104+
</Reference>
105+
<Reference Include="GithubSharp.Plugins.CacheProviders.WebCache, Version=1.0.4289.25886, Culture=neutral, processorArchitecture=MSIL">
106+
<HintPath>..\packages\GithubSharp.Plugins.All.0.0.5.1\lib\GithubSharp.Plugins.CacheProviders.WebCache.dll</HintPath>
107+
</Reference>
108+
<Reference Include="GithubSharp.Plugins.LogProviders.SimpleLogProvider, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
109+
<HintPath>..\packages\GithubSharp.Plugins.All.0.0.5.1\lib\GithubSharp.Plugins.LogProviders.SimpleLogProvider.dll</HintPath>
110+
</Reference>
111+
<Reference Include="Hardcodet.NotifyIcon.Wpf, Version=1.1.0.0, Culture=neutral, PublicKeyToken=682384a853a08aad, processorArchitecture=MSIL">
112+
<HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net472\Hardcodet.NotifyIcon.Wpf.dll</HintPath>
113+
</Reference>
114+
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
115+
<HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
116+
<Private>True</Private>
117+
<Private>True</Private>
102118
</Reference>
103119
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
104-
<HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
120+
<HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
105121
</Reference>
106122
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
107123
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -111,28 +127,146 @@
111127
</Reference>
112128
<Reference Include="PresentationCore" />
113129
<Reference Include="System" />
130+
<Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
131+
<HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
132+
<Private>True</Private>
133+
<Private>True</Private>
134+
</Reference>
135+
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
136+
<HintPath>..\packages\System.ComponentModel.Annotations.4.6.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
137+
</Reference>
114138
<Reference Include="System.ComponentModel.Composition" />
115139
<Reference Include="System.ComponentModel.DataAnnotations" />
116140
<Reference Include="System.Configuration" />
141+
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142+
<HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
143+
<Private>True</Private>
144+
<Private>True</Private>
145+
</Reference>
117146
<Reference Include="System.Data" />
147+
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
148+
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
149+
<Private>True</Private>
150+
<Private>True</Private>
151+
</Reference>
118152
<Reference Include="System.Drawing" />
119-
<Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
120-
<HintPath>..\packages\System.Drawing.Common.5.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
153+
<Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
154+
<HintPath>..\packages\System.Drawing.Common.6.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
155+
</Reference>
156+
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
157+
<HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
158+
<Private>True</Private>
159+
<Private>True</Private>
121160
</Reference>
122161
<Reference Include="System.IdentityModel" />
123-
<Reference Include="System.IO.Compression" />
162+
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
163+
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
164+
<Private>True</Private>
165+
<Private>True</Private>
166+
</Reference>
167+
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
168+
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
169+
<Private>True</Private>
170+
<Private>True</Private>
171+
</Reference>
172+
<Reference Include="System.IO.Compression.FileSystem" />
173+
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
174+
<HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
175+
<Private>True</Private>
176+
<Private>True</Private>
177+
</Reference>
178+
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
179+
<HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
180+
<Private>True</Private>
181+
<Private>True</Private>
182+
</Reference>
183+
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
184+
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
185+
<Private>True</Private>
186+
<Private>True</Private>
187+
</Reference>
188+
<Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
189+
<HintPath>..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
190+
<Private>True</Private>
191+
<Private>True</Private>
192+
</Reference>
193+
<Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
194+
<HintPath>..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
195+
<Private>True</Private>
196+
<Private>True</Private>
197+
</Reference>
124198
<Reference Include="System.Management" />
125199
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126200
<HintPath>..\packages\Microsoft.PowerShell.5.ReferenceAssemblies.1.1.0\lib\net4\System.Management.Automation.dll</HintPath>
127201
</Reference>
202+
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
203+
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
204+
<Private>True</Private>
205+
<Private>True</Private>
206+
</Reference>
207+
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
208+
<HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
209+
<Private>True</Private>
210+
<Private>True</Private>
211+
</Reference>
128212
<Reference Include="System.Numerics" />
213+
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
214+
<HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
215+
<Private>True</Private>
216+
<Private>True</Private>
217+
</Reference>
218+
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
219+
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
220+
<Private>True</Private>
221+
<Private>True</Private>
222+
</Reference>
223+
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
224+
<HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
225+
<Private>True</Private>
226+
<Private>True</Private>
227+
</Reference>
228+
<Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
229+
<HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
230+
<Private>True</Private>
231+
<Private>True</Private>
232+
</Reference>
233+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
234+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
235+
<Private>True</Private>
236+
<Private>True</Private>
237+
</Reference>
129238
<Reference Include="System.Runtime.Serialization" />
130239
<Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
131240
<HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
132241
<Private>True</Private>
133242
<Private>True</Private>
134243
</Reference>
244+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
245+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
246+
<Private>True</Private>
247+
<Private>True</Private>
248+
</Reference>
249+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
250+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
251+
<Private>True</Private>
252+
<Private>True</Private>
253+
</Reference>
254+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
255+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
256+
<Private>True</Private>
257+
<Private>True</Private>
258+
</Reference>
259+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
260+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
261+
<Private>True</Private>
262+
<Private>True</Private>
263+
</Reference>
135264
<Reference Include="System.ServiceModel" />
265+
<Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
266+
<HintPath>..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
267+
<Private>True</Private>
268+
<Private>True</Private>
269+
</Reference>
136270
<Reference Include="System.Web" />
137271
<Reference Include="System.Web.Extensions" />
138272
<Reference Include="System.Windows.Forms" />
@@ -147,6 +281,11 @@
147281
<Reference Include="System.Xaml">
148282
<RequiredTargetFramework>4.0</RequiredTargetFramework>
149283
</Reference>
284+
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
285+
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
286+
<Private>True</Private>
287+
<Private>True</Private>
288+
</Reference>
150289
<Reference Include="Windows">
151290
<HintPath>..\Externals\Windows.winmd</HintPath>
152291
</Reference>
@@ -437,7 +576,6 @@ del "$(TargetName).exe.config"
437576
</PropertyGroup>
438577
<PropertyGroup>
439578
<PreBuildEvent>$(SolutionDir)\BuildTools\XamlDictionaryMergeTool\XamlDictionaryMergeTool.exe "$(ProjectDir)Controls" "$(ProjectDir)Controls\AppResources.xaml"
440-
441579
if $(ConfigurationName) == Release (
442580
rd "$(TargetDir)" /s /q
443581
)

‎Source/AutoActions/AutoActionsDaemon.cs

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ namespace AutoActions
2727
{
2828
public class AutoActionsDaemon : BaseViewModel
2929
{
30-
CodectoryCore.UI.Wpf.SplashScreen _splashScreen = new CodectoryCore.UI.Wpf.SplashScreen();
3130

3231
readonly object _accessLock = new object();
3332
private bool _showView = false;
@@ -99,13 +98,23 @@ public Version Version
9998
public AutoActionsDaemon()
10099
{
101100
//ChangeLanguage( new System.Globalization.CultureInfo("en-US"));
102-
_splashScreen.SetImageFromBitmap(ProjectLocales.SplashScreen);
101+
CodectoryCore.UI.Wpf.SplashScreen splashScreen = new CodectoryCore.UI.Wpf.SplashScreen();
102+
103+
splashScreen.SetImageFromBitmap(ProjectLocales.SplashScreen);
103104
if (!Settings.HideSplashScreenOnStartup)
104105
{
105-
_splashScreen.Show();
106+
splashScreen.Show();
106107
System.Threading.Thread.Sleep(1000);
107108
}
108-
Initialize();
109+
try
110+
{
111+
Initialize();
112+
113+
}
114+
finally
115+
{
116+
splashScreen.Close();
117+
}
109118
}
110119

111120
private void ChangeLanguage(CultureInfo culture)
@@ -136,21 +145,31 @@ private void Initialize()
136145
InitializeSettings();
137146

138147
Globals.Logs.Add("Initializing...", false);
139-
if (Settings.CheckForNewVersion)
140-
Task.Run(() =>
148+
Task.Run(() =>
149+
{
150+
if (Settings.CheckForNewVersion)
141151
{
152+
142153
CheckUpdateResult result = Globals.Instance.CheckUpdate();
143154
if (result.UpdateAvailable && Settings.AutoUpdate)
144155
{
145-
_splashScreen.Text = ProjectLocales.Updating;
156+
Application.Current.Dispatcher.Invoke(() =>
157+
{
158+
CodectoryCore.UI.Wpf.SplashScreen updateScreen = new CodectoryCore.UI.Wpf.SplashScreen();
159+
updateScreen.SetImageFromBitmap(ProjectLocales.SplashScreen);
160+
updateScreen.Text = ProjectLocales.Updating;
146161
if (!Settings.HideSplashScreenOnAutoUpdate)
147162
{
148-
App.Current.Dispatcher.Invoke(() => _splashScreen.Show());
163+
updateScreen.Show();
149164
System.Threading.Thread.Sleep(1000);
150165
}
166+
});
167+
151168
Globals.Instance.AutoUpdate(result.GitHubData);
152169
}
153-
});
170+
}
171+
});
172+
154173
InitializeDisplayManager();
155174
InitializeAudioManager();
156175
InitializeTrayMenuHelper();
@@ -160,18 +179,14 @@ private void Initialize()
160179
Initialized = true;
161180
Globals.Logs.Add("Initialized", false);
162181
Start();
163-
_splashScreen.Close();
164182

165183
}
166184
catch (Exception ex)
167185
{
168186
Globals.Logs.AddException(ex);
169187
throw ex;
170188
}
171-
finally
172-
{
173-
_splashScreen.Close();
174-
}
189+
175190
}
176191
}
177192

0 commit comments

Comments
 (0)