holger/Katteker
1
1
Fork 0
Code Issues Pull Requests Releases Activity

cleanup

Browse Source
This commit is contained in:
Holger Börchers 2018-08-25 20:42:08 +02:00
parent bfb6971564
commit 1676d03490
10 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Creator/App.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />

6
Creator/KattekerCreator.csproj
View File

@ -45,6 +45,9 @@
<Reference Include="McMaster.Extensions.CommandLineUtils, Version=2.2.5.0, Culture=neutral, PublicKeyToken=6f71cb76b82f055d, processorArchitecture=MSIL"> <Reference Include="McMaster.Extensions.CommandLineUtils, Version=2.2.5.0, Culture=neutral, PublicKeyToken=6f71cb76b82f055d, processorArchitecture=MSIL">
<HintPath>..\packages\McMaster.Extensions.CommandLineUtils.2.2.5\lib\net45\McMaster.Extensions.CommandLineUtils.dll</HintPath> <HintPath>..\packages\McMaster.Extensions.CommandLineUtils.2.2.5\lib\net45\McMaster.Extensions.CommandLineUtils.dll</HintPath>
</Reference> </Reference>
<Reference Include="ResourceLib, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Vestris.ResourceLib.2.0.0\lib\net45\ResourceLib.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
@ -54,9 +57,6 @@
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath> <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Vestris.ResourceLib, Version=1.6.422.0, Culture=neutral, PublicKeyToken=ec632d8ba5e5750d, processorArchitecture=MSIL">
<HintPath>..\packages\Vestris.ResourceLib.1.6.422\lib\Vestris.ResourceLib.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AssemblyFileInfo.cs" /> <Compile Include="AssemblyFileInfo.cs" />

2
Creator/Program.Arguments.cs
View File

@ -22,6 +22,7 @@ namespace KattekerCreator
get => _programFile; get => _programFile;
set => _programFile = Path.GetFullPath(value); set => _programFile = Path.GetFullPath(value);
} }
[Option("-L|--changelog", Description = "Path of the changelog file")] [Option("-L|--changelog", Description = "Path of the changelog file")]
private string ChangeLog private string ChangeLog
{ {
@ -50,6 +51,5 @@ namespace KattekerCreator
private string FilterAsString { get; set; } private string FilterAsString { get; set; }
private IEnumerable<string> Filter => string.IsNullOrWhiteSpace(FilterAsString) ? Enumerable.Empty<string>() : FilterAsString.Split(';'); private IEnumerable<string> Filter => string.IsNullOrWhiteSpace(FilterAsString) ? Enumerable.Empty<string>() : FilterAsString.Split(';');
} }
} }

2
Creator/packages.config
View File

@ -2,5 +2,5 @@
<packages> <packages>
<package id="McMaster.Extensions.CommandLineUtils" version="2.2.5" targetFramework="net462" /> <package id="McMaster.Extensions.CommandLineUtils" version="2.2.5" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" /> <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
<package id="Vestris.ResourceLib" version="1.6.422" targetFramework="net462" /> <package id="Vestris.ResourceLib" version="2.0.0" targetFramework="net462" />
</packages> </packages>

4
Example/Example.csproj
View File

@ -44,8 +44,8 @@
<Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> <Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath> <HintPath>..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
</Reference> </Reference>
<Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath> <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
</Reference> </Reference>
<Reference Include="MaterialDesignThemes.Wpf, Version=2.4.1.1101, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.1.1101, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.2.4.1.1101\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath> <HintPath>..\packages\MaterialDesignThemes.2.4.1.1101\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>

6
Example/MainWindowViewModel.cs
View File

@ -13,7 +13,7 @@ namespace Example
public class MainWindowViewModel : BindableBase, IDisposable public class MainWindowViewModel : BindableBase, IDisposable
{ {
private bool _showRestartAppDialog; private bool _showRestartAppDialog;
private UpdateManager _updateManager; private readonly UpdateManager _updateManager;
public MainWindowViewModel() public MainWindowViewModel()
{ {
@ -32,13 +32,12 @@ namespace Example
ShowRestartAppDialog = false; ShowRestartAppDialog = false;
} }
private async Task UpdateAsync(string startup) private async Task UpdateAsync(string startup)
{ {
var silent = bool.Parse(startup); var silent = bool.Parse(startup);
try try
{ {
var releases = (await _updateManager.CheckForUpdateAsync()).ToList(); var releases = (await _updateManager.CheckForUpdateAsync().ConfigureAwait(false)).ToList();
if (releases.Any()) if (releases.Any())
{ {
MessageQueue.Enqueue("Update available", "Update now", ActionHandler); MessageQueue.Enqueue("Update available", "Update now", ActionHandler);
@ -62,7 +61,6 @@ namespace Example
if (await _updateManager.UpdateAppAsync().ConfigureAwait(false)) if (await _updateManager.UpdateAppAsync().ConfigureAwait(false))
{ {
ShowRestartAppDialog = true; ShowRestartAppDialog = true;
//manager.RestartApp();
} }
} }

2
Example/Properties/AssemblyInfo.cs
View File

@ -28,7 +28,6 @@ using System.Windows;
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: ThemeInfo( [assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page, //(used if a resource is not found in the page,
@ -38,7 +37,6 @@ using System.Windows;
// app, or any theme specific resource dictionaries) // app, or any theme specific resource dictionaries)
)] )]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version

2
Example/packages.config
View File

@ -2,7 +2,7 @@
<packages> <packages>
<package id="Autofac" version="4.8.1" targetFramework="net45" /> <package id="Autofac" version="4.8.1" targetFramework="net45" />
<package id="CommonServiceLocator" version="1.3" targetFramework="net45" /> <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
<package id="MaterialDesignColors" version="1.1.2" targetFramework="net45" /> <package id="MaterialDesignColors" version="1.1.3" targetFramework="net45" />
<package id="MaterialDesignThemes" version="2.4.1.1101" targetFramework="net45" /> <package id="MaterialDesignThemes" version="2.4.1.1101" targetFramework="net45" />
<package id="Prism.Autofac" version="6.3.0" targetFramework="net45" /> <package id="Prism.Autofac" version="6.3.0" targetFramework="net45" />
<package id="Prism.Core" version="6.3.0" targetFramework="net45" /> <package id="Prism.Core" version="6.3.0" targetFramework="net45" />

1
Katteker.Gui/Katteker.UserInterface.csproj
View File

@ -59,7 +59,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
<None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">

4
Katteker.Gui/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Katteker" version="1.1.0" targetFramework="net45" />
</packages>