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

Commit d21a5f5

Browse files
WereDevWereDev
committed
tweaks and cleanup
1 parent 91a9edf commit d21a5f5

15 files changed

Lines changed: 277 additions & 145 deletions

File tree

‎AdvancedInstaller/wu10man.aip‎

Lines changed: 14 additions & 45 deletions
Large diffs are not rendered by default.

‎AdvancedInstaller/wu10man.back.aip‎

Lines changed: 206 additions & 0 deletions
Large diffs are not rendered by default.

‎WereDev.Utils.Win32Wrappers/WereDev.Utils.Win32Wrappers.csproj‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
28+
<DebugType>none</DebugType>
2929
<Optimize>true</Optimize>
3030
<OutputPath>bin\Release\</OutputPath>
3131
<DefineConstants>TRACE</DefineConstants>
@@ -38,12 +38,6 @@
3838
<ItemGroup>
3939
<Reference Include="System" />
4040
<Reference Include="System.Core" />
41-
<Reference Include="System.Xml.Linq" />
42-
<Reference Include="System.Data.DataSetExtensions" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Net.Http" />
46-
<Reference Include="System.Xml" />
4741
</ItemGroup>
4842
<ItemGroup>
4943
<Compile Include="FileAccessBridge.cs" />

‎WereDev.Utils.Wu10Man.Core/WereDev.Utils.Wu10Man.Core.csproj‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props')" />
4+
<Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />
35
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,7 +26,7 @@
2426
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
2527
</PropertyGroup>
2628
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
29+
<DebugType>none</DebugType>
2830
<Optimize>true</Optimize>
2931
<OutputPath>bin\Release\</OutputPath>
3032
<DefineConstants>TRACE</DefineConstants>
@@ -40,7 +42,6 @@
4042
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
4143
</Reference>
4244
<Reference Include="System" />
43-
<Reference Include="System.ComponentModel.Composition" />
4445
<Reference Include="System.Core" />
4546
<Reference Include="System.Diagnostics.EventLog, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
4647
<HintPath>..\packages\System.Diagnostics.EventLog.4.7.0\lib\net461\System.Diagnostics.EventLog.dll</HintPath>
@@ -55,12 +56,6 @@
5556
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5657
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
5758
</Reference>
58-
<Reference Include="System.Xml.Linq" />
59-
<Reference Include="System.Data.DataSetExtensions" />
60-
<Reference Include="Microsoft.CSharp" />
61-
<Reference Include="System.Data" />
62-
<Reference Include="System.Net.Http" />
63-
<Reference Include="System.Xml" />
6459
</ItemGroup>
6560
<ItemGroup>
6661
<Compile Include="DependencyManager.cs" />
@@ -101,8 +96,6 @@
10196
<AdditionalFiles Include="..\stylecop.ruleset">
10297
<Link>stylecop.ruleset</Link>
10398
</AdditionalFiles>
104-
<None Include="app.config" />
105-
<None Include="packages.config" />
10699
</ItemGroup>
107100
<ItemGroup>
108101
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />

‎WereDev.Utils.Wu10Man.Providers/Models/AppManifest.cs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎WereDev.Utils.Wu10Man.Providers/PowerShellProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public PackageInfo[] ListInstalledPackages()
1919
ps.AddCommand(CommandGetPackages);
2020
var results = ps.Invoke();
2121

22-
foreach(var result in results)
22+
foreach (var result in results)
2323
{
2424
dynamic appx = result.BaseObject;
2525
var package = new PackageInfo()

‎WereDev.Utils.Wu10Man.Providers/WereDev.Utils.Wu10Man.Providers.csproj‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props')" />
4+
<Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />
35
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -21,30 +23,24 @@
2123
<DefineConstants>DEBUG;TRACE</DefineConstants>
2224
<ErrorReport>prompt</ErrorReport>
2325
<WarningLevel>4</WarningLevel>
26+
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
2427
</PropertyGroup>
2528
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
29+
<DebugType>none</DebugType>
2730
<Optimize>true</Optimize>
2831
<OutputPath>bin\Release\</OutputPath>
2932
<DefineConstants>TRACE</DefineConstants>
3033
<ErrorReport>prompt</ErrorReport>
3134
<WarningLevel>4</WarningLevel>
35+
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
3236
</PropertyGroup>
3337
<ItemGroup>
3438
<Reference Include="System" />
35-
<Reference Include="System.Configuration" />
3639
<Reference Include="System.Core" />
37-
<Reference Include="System.Data.OracleClient" />
38-
<Reference Include="System.Diagnostics.EventLog, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
39-
<HintPath>..\packages\System.Diagnostics.EventLog.4.7.0\lib\net461\System.Diagnostics.EventLog.dll</HintPath>
40-
</Reference>
41-
<Reference Include="System.Drawing" />
4240
<Reference Include="System.Management" />
4341
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4442
<HintPath>..\packages\Microsoft.PowerShell.5.ReferenceAssemblies.1.1.0\lib\net4\System.Management.Automation.dll</HintPath>
4543
</Reference>
46-
<Reference Include="System.Net" />
47-
<Reference Include="System.Security" />
4844
<Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
4945
<HintPath>..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll</HintPath>
5046
</Reference>
@@ -58,17 +54,10 @@
5854
<Reference Include="System.ServiceProcess.ServiceController, Version=4.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5955
<HintPath>..\packages\System.ServiceProcess.ServiceController.4.7.0\lib\net461\System.ServiceProcess.ServiceController.dll</HintPath>
6056
</Reference>
61-
<Reference Include="System.Transactions" />
62-
<Reference Include="System.Xml.Linq" />
63-
<Reference Include="System.Data.DataSetExtensions" />
6457
<Reference Include="Microsoft.CSharp" />
65-
<Reference Include="System.Data" />
66-
<Reference Include="System.Net.Http" />
67-
<Reference Include="System.Xml" />
6858
</ItemGroup>
6959
<ItemGroup>
7060
<Compile Include="FileIoProvider.cs" />
71-
<Compile Include="Models\AppManifest.cs" />
7261
<Compile Include="PowerShellProvider.cs" />
7362
<Compile Include="Properties\AssemblyInfo.cs" />
7463
<Compile Include="CredentialsProvider.cs" />
@@ -92,5 +81,18 @@
9281
<None Include="app.config" />
9382
<None Include="packages.config" />
9483
</ItemGroup>
84+
<ItemGroup>
85+
<AdditionalFiles Include="..\stylecop.json">
86+
<Link>stylecop.json</Link>
87+
</AdditionalFiles>
88+
<AdditionalFiles Include="..\stylecop.ruleset">
89+
<Link>stylecop.ruleset</Link>
90+
</AdditionalFiles>
91+
</ItemGroup>
92+
<ItemGroup>
93+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
94+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
95+
</ItemGroup>
96+
<ItemGroup />
9597
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9698
</Project>

‎WereDev.Utils.Wu10Man.Providers/WindowsApiProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
namespace WereDev.Utils.Wu10Man.Providers
77
{
8-
public class WindowsApiAdapter : IWindowsApiProvider
8+
public class WindowsApiProvider : IWindowsApiProvider
99
{
1010
public void ModifyPrivilege(WindowsApiPrivelegeNames privilege, bool enable)
1111
{
12-
var privelegeName = (PrivilegeName)Enum.Parse(typeof(PrivilegeName), privilege.ToString());
13-
WindowsApiBridge.ModifyPrivilege(privelegeName, enable);
12+
var privlegeName = (PrivilegeName)Enum.Parse(typeof(PrivilegeName), privilege.ToString());
13+
WindowsApiBridge.ModifyPrivilege(privlegeName, enable);
1414
}
1515
}
1616
}

‎WereDev.Utils.Wu10Man.Providers/WindowsServiceProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ namespace WereDev.Utils.Wu10Man.Providers
1414
// https://stackoverflow.com/questions/3876787/change-windows-service-password/3877268#3877268
1515
public class WindowsServiceProvider : IWindowsServiceProvider
1616
{
17-
private ServiceController _serviceController;
18-
1917
public const string UserNameLocalSystem = @".\LocalSystem";
2018

19+
private ServiceController _serviceController;
20+
2121
public WindowsServiceProvider(string serviceName)
2222
{
2323
if (string.IsNullOrEmpty(serviceName))

‎Wu10Man/App.xaml.cs‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
using Autofac;
2-
using Newtonsoft.Json;
32
using System;
4-
using System.Collections.Generic;
5-
using System.IO;
6-
using System.Linq;
73
using System.Windows;
8-
using System.Xml;
9-
using System.Xml.Serialization;
104
using WereDev.Utils.Wu10Man.Core;
115
using WereDev.Utils.Wu10Man.Core.Interfaces;
126
using WereDev.Utils.Wu10Man.Core.Interfaces.Providers;
@@ -15,10 +9,6 @@
159
using WereDev.Utils.Wu10Man.Providers;
1610
using WereDev.Utils.Wu10Man.Services;
1711
using WereDev.Utils.Wu10Man.UserWindows;
18-
using Windows.ApplicationModel;
19-
using Windows.Management.Deployment;
20-
using Windows.Services.Store;
21-
using StorageFolder = Windows.Storage.StorageFolder;
2212

2313
namespace WereDev.Utils.Wu10Man
2414
{
@@ -68,7 +58,7 @@ private void RegisterDependencies()
6858
builder.RegisterType<FileIoProvider>().As<IFileIoProvider>();
6959
builder.RegisterType<RegistryProvider>().As<IRegistryProvider>();
7060
builder.RegisterType<UserProvider>().As<IUserProvider>();
71-
builder.RegisterType<WindowsApiAdapter>().As<IWindowsApiProvider>();
61+
builder.RegisterType<WindowsApiProvider>().As<IWindowsApiProvider>();
7262
builder.RegisterType<WindowsServiceProviderFactory>().As<IWindowsServiceProviderFactory>();
7363
builder.RegisterType<PowerShellProvider>().As<IWindowsPackageProvider>();
7464

0 commit comments

Comments
 (0)