summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.lib/Services/PluginService.cs4
-rw-r--r--src/main.lib/wacs.lib.csproj20
-rw-r--r--src/main.test/App.config12
-rw-r--r--src/main/App.config81
-rw-r--r--src/main/FodyWeavers.xsd111
-rw-r--r--src/main/wacs.csproj26
6 files changed, 49 insertions, 205 deletions
diff --git a/src/main.lib/Services/PluginService.cs b/src/main.lib/Services/PluginService.cs
index 7b490c1..a0db0a3 100644
--- a/src/main.lib/Services/PluginService.cs
+++ b/src/main.lib/Services/PluginService.cs
@@ -161,7 +161,7 @@ namespace PKISharp.WACS.Services
types = rex.Types;
foreach (var lex in rex.LoaderExceptions)
{
- _log.Error(lex, "Error loading type from {assembly}", assembly.FullName);
+ _log.Error(lex, "Error loading type from {assembly}: {reason}", assembly.FullName, lex.Message);
}
}
catch (Exception ex)
@@ -194,7 +194,7 @@ namespace PKISharp.WACS.Services
types = rex.Types;
foreach (var lex in rex.LoaderExceptions)
{
- _log.Error(lex, "Error loading type from {assembly}", file);
+ _log.Error(lex, "Error loading type from {assembly}: {reason}", file, lex.Message);
}
}
catch (Exception ex)
diff --git a/src/main.lib/wacs.lib.csproj b/src/main.lib/wacs.lib.csproj
index 6bf880d..b57f08f 100644
--- a/src/main.lib/wacs.lib.csproj
+++ b/src/main.lib/wacs.lib.csproj
@@ -19,10 +19,7 @@
<PackageReference Include="Serilog.Sinks.EventLog" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
<PackageReference Include="SSH.NET" Version="2016.1.0" />
- <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
- <PackageReference Include="System.Security.Cryptography.Cng" Version="4.5.0" />
- <PackageReference Include="System.Security.Cryptography.Encoding" Version="4.3.0" />
- <PackageReference Include="System.Security.Cryptography.Primitives" Version="4.3.0" />
+ <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.5.0" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="TaskScheduler" Version="2.8.15" />
@@ -33,4 +30,19 @@
<ProjectReference Include="..\fluent-command-line-parser\FluentCommandLineParser\FluentCommandLineParser.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Update="Properties\Settings.Designer.cs">
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Settings.settings</DependentUpon>
+ </Compile>
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Update="Properties\Settings.settings">
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+ </None>
+ </ItemGroup>
+
</Project>
diff --git a/src/main.test/App.config b/src/main.test/App.config
index 7a84000..6a07c7a 100644
--- a/src/main.test/App.config
+++ b/src/main.test/App.config
@@ -3,6 +3,18 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
+ <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Buffers" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="ADB9793829DDAE60" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
+ </dependentAssembly>
+ <dependentAssembly>
<assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
diff --git a/src/main/App.config b/src/main/App.config
index d70803c..a93d63d 100644
--- a/src/main/App.config
+++ b/src/main/App.config
@@ -5,9 +5,6 @@
<section name="PKISharp.WACS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</sectionGroup>
</configSections>
- <appSettings>
- <add key="ClientSettingsProvider.ServiceUri" value=""/>
- </appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
@@ -15,84 +12,6 @@
<PKISharp.WACS.Properties.Settings configSource="settings.config"/>
</applicationSettings>
<runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Reflection.TypeExtensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.ServiceProcess.ServiceController" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="Microsoft.Win32.Registry" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-3.19.8.16603" newVersion="3.19.8.16603"/>
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
- </dependentAssembly>
- </assemblyBinding>
</runtime>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
diff --git a/src/main/FodyWeavers.xsd b/src/main/FodyWeavers.xsd
deleted file mode 100644
index 44a5374..0000000
--- a/src/main/FodyWeavers.xsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
- <xs:element name="Weavers">
- <xs:complexType>
- <xs:all>
- <xs:element name="Costura" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:all>
- <xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
- <xs:annotation>
- <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
- <xs:annotation>
- <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
- <xs:annotation>
- <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
- <xs:annotation>
- <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
- <xs:annotation>
- <xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:all>
- <xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="DisableCompression" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="DisableCleanup" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="LoadAtModuleInit" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="ExcludeAssemblies" type="xs:string">
- <xs:annotation>
- <xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="IncludeAssemblies" type="xs:string">
- <xs:annotation>
- <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
- <xs:annotation>
- <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="Unmanaged64Assemblies" type="xs:string">
- <xs:annotation>
- <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="PreloadOrder" type="xs:string">
- <xs:annotation>
- <xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- </xs:all>
- <xs:attribute name="VerifyAssembly" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
- <xs:annotation>
- <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="GenerateXsd" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-</xs:schema> \ No newline at end of file
diff --git a/src/main/wacs.csproj b/src/main/wacs.csproj
index 0b6eee2..96b40dd 100644
--- a/src/main/wacs.csproj
+++ b/src/main/wacs.csproj
@@ -8,10 +8,11 @@
<OutputType>Exe</OutputType>
<RootNamespace>PKISharp.WACS.Host</RootNamespace>
<AssemblyName>wacs</AssemblyName>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,12 +36,14 @@
<PropertyGroup>
<ApplicationIcon>icon.ico</ApplicationIcon>
</PropertyGroup>
+ <PropertyGroup>
+ <ApplicationManifest>app.manifest</ApplicationManifest>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
@@ -58,16 +61,17 @@
<ItemGroup>
<None Include="App.config" />
<None Include="app.manifest" />
- <None Include="FodyWeavers.xsd">
- <SubType>Designer</SubType>
- </None>
<None Include="packages.config" />
- <None Include="settings.config" />
+ <None Include="settings.config">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<Content Include="FodyWeavers.xml" />
<Content Include="icon.ico" />
- <Content Include="Web_Config.xml" />
+ <Content Include="Web_Config.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\main.lib\wacs.lib.csproj">
@@ -82,6 +86,14 @@
<PackageReference Include="Autofac">
<Version>4.9.3</Version>
</PackageReference>
+ <PackageReference Include="Costura.Fody">
+ <Version>4.1.0</Version>
+ </PackageReference>
+ <PackageReference Include="Fody">
+ <Version>6.0.0</Version>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> \ No newline at end of file
generated by cgit v1.1 at 2025-06-01 03:06:14 +0000