Skip to content
This repository was archived by the owner on May 29, 2023. It is now read-only.

Commit 26e13a8

Browse files
trevornichollstrevornicholls
committed
Added ability to grab list of system that have not been updated this tick, the results are cipied to the clipboard
1 parent 29eeb28 commit 26e13a8

19 files changed

Lines changed: 972 additions & 287 deletions

‎DETrackerWPF/App.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
<assemblyIdentity name="ControlzEx" publicKeyToken="69f1c32f803d307e" culture="neutral" />
1414
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
1515
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="Microsoft.Web.WebView2.WinForms" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-1.0.1245.22" newVersion="1.0.1245.22" />
19+
</dependentAssembly>
20+
<dependentAssembly>
21+
<assemblyIdentity name="Microsoft.Web.WebView2.Core" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-1.0.1245.22" newVersion="1.0.1245.22" />
23+
</dependentAssembly>
1624
</assemblyBinding>
1725
</runtime>
1826
</configuration>

‎DETrackerWPF/BootStrapper.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.ComponentModel;
34
using System.Linq;
45
using System.Text;
56
using System.Threading.Tasks;
@@ -14,6 +15,9 @@ namespace DETrackerWPF
1415
{
1516
public class Bootstrapper : BootstrapperBase
1617
{
18+
19+
20+
1721
public Bootstrapper()
1822
{
1923
Initialize();
@@ -24,22 +28,26 @@ protected override void OnStartup(object sender, StartupEventArgs e)
2428
DisplayRootViewFor<ShellViewModel>();
2529
}
2630

31+
2732
// Window Open Code
2833
// http://www.mindscapehq.com/blog/index.php/2012/03/13/caliburn-micro-part-5-the-window-manager/
2934

3035
private CompositionContainer container;
3136

3237
protected override void Configure()
3338
{
34-
container = new CompositionContainer(new AggregateCatalog(AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()));
39+
container = new CompositionContainer(new AggregateCatalog(AssemblySource.Instance
40+
.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()));
3541

3642
CompositionBatch batch = new CompositionBatch();
3743

3844
batch.AddExportedValue<IWindowManager>(new WindowManager());
3945
batch.AddExportedValue<IEventAggregator>(new EventAggregator());
4046
batch.AddExportedValue(container);
4147

48+
4249
container.Compose(batch);
50+
4351
}
4452

4553
protected override object GetInstance(Type serviceType, string key)
@@ -55,5 +63,7 @@ protected override object GetInstance(Type serviceType, string key)
5563
throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
5664
}
5765

66+
67+
5868
}
5969
}

‎DETrackerWPF/DETrackerWPF.csproj‎

Lines changed: 47 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<WarningLevel>4</WarningLevel>
1515
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1616
<Deterministic>true</Deterministic>
17+
<IsWebBootstrapper>false</IsWebBootstrapper>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1720
<PublishUrl>publish\</PublishUrl>
1821
<Install>true</Install>
1922
<InstallFrom>Disk</InstallFrom>
@@ -26,11 +29,8 @@
2629
<MapFileExtensions>true</MapFileExtensions>
2730
<ApplicationRevision>0</ApplicationRevision>
2831
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
29-
<IsWebBootstrapper>false</IsWebBootstrapper>
3032
<UseApplicationTrust>false</UseApplicationTrust>
3133
<BootstrapperEnabled>true</BootstrapperEnabled>
32-
<NuGetPackageImportStamp>
33-
</NuGetPackageImportStamp>
3434
</PropertyGroup>
3535
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3636
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -56,48 +56,7 @@
5656
<ApplicationIcon>squadronkraken_small.ico</ApplicationIcon>
5757
</PropertyGroup>
5858
<ItemGroup>
59-
<Reference Include="AutoUpdater.NET, Version=1.7.2.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Autoupdater.NET.Official.1.7.2\lib\net45\AutoUpdater.NET.dll</HintPath>
61-
</Reference>
62-
<Reference Include="Caliburn.Micro.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Caliburn.Micro.Core.4.0.173\lib\netstandard2.0\Caliburn.Micro.Core.dll</HintPath>
64-
</Reference>
65-
<Reference Include="Caliburn.Micro.Platform, Version=4.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Caliburn.Micro.4.0.173\lib\net461\Caliburn.Micro.Platform.dll</HintPath>
67-
</Reference>
68-
<Reference Include="Caliburn.Micro.Platform.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Caliburn.Micro.4.0.173\lib\net461\Caliburn.Micro.Platform.Core.dll</HintPath>
70-
</Reference>
71-
<Reference Include="ControlzEx, Version=5.0.0.0, Culture=neutral, PublicKeyToken=69f1c32f803d307e, processorArchitecture=MSIL">
72-
<HintPath>..\packages\ControlzEx.5.0.1\lib\net462\ControlzEx.dll</HintPath>
73-
</Reference>
74-
<Reference Include="MahApps.Metro, Version=2.0.0.0, Culture=neutral, PublicKeyToken=51482d6f650b2b3f, processorArchitecture=MSIL">
75-
<HintPath>..\packages\MahApps.Metro.2.4.9\lib\net47\MahApps.Metro.dll</HintPath>
76-
</Reference>
77-
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.1210.39, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
78-
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1210.39\lib\net45\Microsoft.Web.WebView2.Core.dll</HintPath>
79-
</Reference>
80-
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.1210.39, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
81-
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1210.39\lib\net45\Microsoft.Web.WebView2.WinForms.dll</HintPath>
82-
</Reference>
83-
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.1210.39, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.1210.39\lib\net45\Microsoft.Web.WebView2.Wpf.dll</HintPath>
85-
</Reference>
86-
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
88-
</Reference>
89-
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
90-
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
91-
</Reference>
92-
<Reference Include="OxyPlot, Version=2.1.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
93-
<HintPath>..\packages\OxyPlot.Core.2.1.0\lib\net45\OxyPlot.dll</HintPath>
94-
</Reference>
95-
<Reference Include="OxyPlot.Wpf, Version=2.1.0.0, Culture=neutral, PublicKeyToken=75e952ba404cdbb0, processorArchitecture=MSIL">
96-
<HintPath>..\packages\OxyPlot.Wpf.2.1.0\lib\net45\OxyPlot.Wpf.dll</HintPath>
97-
</Reference>
98-
<Reference Include="OxyPlot.Wpf.Shared, Version=2.1.0.0, Culture=neutral, PublicKeyToken=75e952ba404cdbb0, processorArchitecture=MSIL">
99-
<HintPath>..\packages\OxyPlot.Wpf.Shared.2.1.0\lib\net45\OxyPlot.Wpf.Shared.dll</HintPath>
100-
</Reference>
59+
<Reference Include="netstandard" />
10160
<Reference Include="ReachFramework" />
10261
<Reference Include="System" />
10362
<Reference Include="System.ComponentModel.Composition" />
@@ -107,11 +66,6 @@
10766
<Reference Include="System.Drawing" />
10867
<Reference Include="System.Printing" />
10968
<Reference Include="System.Runtime.Serialization" />
110-
<Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
111-
<HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
112-
<Private>True</Private>
113-
<Private>True</Private>
114-
</Reference>
11569
<Reference Include="System.Web" />
11670
<Reference Include="System.Web.Extensions" />
11771
<Reference Include="System.Windows.Forms" />
@@ -148,13 +102,17 @@
148102
<Compile Include="Models\SystemsFactionsHistory.cs" />
149103
<Compile Include="ValueConverters.cs" />
150104
<Compile Include="ViewModels\OxyPlotChartViewModel.cs" />
105+
<Compile Include="ViewModels\PopUpMessageViewModel.cs" />
151106
<Compile Include="ViewModels\ShellViewModel.cs" />
152107
<Compile Include="ViewModels\SysFaction1ViewModel.cs" />
153108
<Compile Include="ViewModels\SystemDetailViewModel.cs" />
154109
<Compile Include="ViewModels\SystemHistoryViewModel.cs" />
155110
<Compile Include="Views\OxyPlotChartView.xaml.cs">
156111
<DependentUpon>OxyPlotChartView.xaml</DependentUpon>
157112
</Compile>
113+
<Compile Include="Views\PopUpMessageView.xaml.cs">
114+
<DependentUpon>PopUpMessageView.xaml</DependentUpon>
115+
</Compile>
158116
<Compile Include="Views\SysFaction1View.xaml.cs">
159117
<DependentUpon>SysFaction1View.xaml</DependentUpon>
160118
</Compile>
@@ -181,7 +139,6 @@
181139
<Generator>ResXFileCodeGenerator</Generator>
182140
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
183141
</EmbeddedResource>
184-
<None Include="packages.config" />
185142
<None Include="Properties\Settings.settings">
186143
<Generator>SettingsSingleFileGenerator</Generator>
187144
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -198,6 +155,10 @@
198155
<SubType>Designer</SubType>
199156
<Generator>MSBuild:Compile</Generator>
200157
</Page>
158+
<Page Include="Views\PopUpMessageView.xaml">
159+
<SubType>Designer</SubType>
160+
<Generator>MSBuild:Compile</Generator>
161+
</Page>
201162
<Page Include="Views\ShellView.xaml">
202163
<SubType>Designer</SubType>
203164
<Generator>MSBuild:Compile</Generator>
@@ -286,15 +247,43 @@
286247
<Install>false</Install>
287248
</BootstrapperPackage>
288249
</ItemGroup>
250+
<ItemGroup>
251+
<PackageReference Include="Autoupdater.NET.Official">
252+
<Version>1.7.3</Version>
253+
</PackageReference>
254+
<PackageReference Include="Caliburn.Micro">
255+
<Version>4.0.173</Version>
256+
</PackageReference>
257+
<PackageReference Include="ControlzEx">
258+
<Version>5.0.1</Version>
259+
</PackageReference>
260+
<PackageReference Include="MahApps.Metro">
261+
<Version>2.4.9</Version>
262+
</PackageReference>
263+
<PackageReference Include="Microsoft.Web.WebView2">
264+
<Version>1.0.1245.22</Version>
265+
</PackageReference>
266+
<PackageReference Include="Microsoft.Windows.SDK.Contracts">
267+
<Version>10.0.18362.2005</Version>
268+
</PackageReference>
269+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
270+
<Version>1.1.39</Version>
271+
</PackageReference>
272+
<PackageReference Include="ModernUI.WPF">
273+
<Version>1.0.9</Version>
274+
</PackageReference>
275+
<PackageReference Include="Newtonsoft.Json">
276+
<Version>13.0.1</Version>
277+
</PackageReference>
278+
<PackageReference Include="OxyPlot.Wpf">
279+
<Version>2.1.0</Version>
280+
</PackageReference>
281+
<PackageReference Include="System.ValueTuple">
282+
<Version>4.5.0</Version>
283+
</PackageReference>
284+
</ItemGroup>
289285
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
290286
<PropertyGroup>
291287
<PreBuildEvent>echo %25date%25 %25time%25 &gt; "$(ProjectDir)\Resources\BuildDate.txt"</PreBuildEvent>
292288
</PropertyGroup>
293-
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.1210.39\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.1210.39\build\Microsoft.Web.WebView2.targets')" />
294-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
295-
<PropertyGroup>
296-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
297-
</PropertyGroup>
298-
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.1210.39\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.1210.39\build\Microsoft.Web.WebView2.targets'))" />
299-
</Target>
300289
</Project>

0 commit comments

Comments
 (0)