Skip to content

Commit

Permalink
Merge pull request #63 from simonec73/dev
Browse files Browse the repository at this point in the history 
Dev 2.1.3
  • Loading branch information
@simonec73
simonec73 authored Jan 28, 2024
2 parents dbea6e7 + 3a3f7f8 commit f3c7b21
Show file tree
Hide file tree
Showing 172 changed files with 5,184 additions and 1,300 deletions.
2 changes: 1 addition & 1 deletion Samples/SampleExtensions/ExtensionLibrary.cs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using ThreatsManager.Interfaces;

[assembly: ExtensionsContainer("2.1.2")]
[assembly: ExtensionsContainer("2.1.3")]
38 changes: 19 additions & 19 deletions Samples/SampleExtensions/SampleExtensions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PostSharp, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Redist.2023.0.8\lib\net45\PostSharp.dll</HintPath>
<Reference Include="PostSharp, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Redist.2024.0.5\lib\net45\PostSharp.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Patterns.Aggregation, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Aggregation.Redist.2023.0.8\lib\net45\PostSharp.Patterns.Aggregation.dll</HintPath>
<Reference Include="PostSharp.Patterns.Aggregation, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Aggregation.Redist.2024.0.5\lib\net45\PostSharp.Patterns.Aggregation.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Patterns.Common, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Common.Redist.2023.0.8\lib\net47\PostSharp.Patterns.Common.dll</HintPath>
<Reference Include="PostSharp.Patterns.Common, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Common.Redist.2024.0.5\lib\net47\PostSharp.Patterns.Common.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Patterns.Model, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Model.Redist.2023.0.8\lib\net45\PostSharp.Patterns.Model.dll</HintPath>
<Reference Include="PostSharp.Patterns.Model, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Model.Redist.2024.0.5\lib\net45\PostSharp.Patterns.Model.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Patterns.Threading, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Threading.Redist.2023.0.8\lib\net45\PostSharp.Patterns.Threading.dll</HintPath>
<Reference Include="PostSharp.Patterns.Threading, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Threading.Redist.2024.0.5\lib\net45\PostSharp.Patterns.Threading.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand All @@ -75,20 +75,20 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="ThreatsManager.AutoGenRules, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.AutoGenRules.2.1.2\lib\net481\ThreatsManager.AutoGenRules.dll</HintPath>
<Reference Include="ThreatsManager.AutoGenRules, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.AutoGenRules.2.1.3\lib\net481\ThreatsManager.AutoGenRules.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.AutoThreatGeneration, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.AutoThreatGeneration.2.1.2\lib\net481\ThreatsManager.AutoThreatGeneration.dll</HintPath>
<Reference Include="ThreatsManager.AutoThreatGeneration, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.AutoThreatGeneration.2.1.3\lib\net481\ThreatsManager.AutoThreatGeneration.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Icons, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.2\lib\net481\ThreatsManager.Icons.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.2.1.3\lib\net481\ThreatsManager.Icons.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.2\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.3\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.2\lib\net481\ThreatsManager.Utilities.dll</HintPath>
<Reference Include="ThreatsManager.Utilities, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.3\lib\net481\ThreatsManager.Utilities.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions Samples/SampleExtensions/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="PostSharp.Patterns.Aggregation.Redist" version="2023.0.8" targetFramework="net481" />
<package id="PostSharp.Patterns.Common.Redist" version="2023.0.8" targetFramework="net481" />
<package id="PostSharp.Patterns.Model.Redist" version="2023.0.8" targetFramework="net481" />
<package id="PostSharp.Patterns.Threading.Redist" version="2023.0.8" targetFramework="net481" />
<package id="PostSharp.Redist" version="2023.0.8" targetFramework="net481" />
<package id="PostSharp.Patterns.Aggregation.Redist" version="2024.0.5" targetFramework="net481" />
<package id="PostSharp.Patterns.Common.Redist" version="2024.0.5" targetFramework="net481" />
<package id="PostSharp.Patterns.Model.Redist" version="2024.0.5" targetFramework="net481" />
<package id="PostSharp.Patterns.Threading.Redist" version="2024.0.5" targetFramework="net481" />
<package id="PostSharp.Redist" version="2024.0.5" targetFramework="net481" />
<package id="System.ComponentModel.Composition" version="7.0.0" targetFramework="net472" />
<package id="System.Drawing.Common" version="7.0.0" targetFramework="net472" />
<package id="System.IO.Packaging" version="7.0.0" targetFramework="net481" />
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
<package id="ThreatsManager.AutoGenRules" version="2.1.2" targetFramework="net481" />
<package id="ThreatsManager.AutoThreatGeneration" version="2.1.2" targetFramework="net481" />
<package id="ThreatsManager.Interfaces" version="2.1.2" targetFramework="net481" />
<package id="ThreatsManager.Utilities" version="2.1.2" targetFramework="net481" />
<package id="ThreatsManager.AutoGenRules" version="2.1.3" targetFramework="net481" />
<package id="ThreatsManager.AutoThreatGeneration" version="2.1.3" targetFramework="net481" />
<package id="ThreatsManager.Interfaces" version="2.1.3" targetFramework="net481" />
<package id="ThreatsManager.Utilities" version="2.1.3" targetFramework="net481" />
</packages>
2 changes: 1 addition & 1 deletion Samples/SampleWinFormExtensions/ExtensionLibrary.cs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using ThreatsManager.Interfaces;

[assembly: ExtensionsContainer("2.1.2")]
[assembly: ExtensionsContainer("2.1.3")]
52 changes: 26 additions & 26 deletions Samples/SampleWinFormExtensions/SampleWinFormExtensions.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\PostSharp.2023.0.6\build\PostSharp.props" Condition="Exists('..\packages\PostSharp.2023.0.6\build\PostSharp.props')" />
<Import Project="..\packages\PostSharp.2024.0.5\build\PostSharp.props" Condition="Exists('..\packages\PostSharp.2024.0.5\build\PostSharp.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -47,26 +47,26 @@
<HintPath>..\packages\Fizzler.1.3.0\lib\netstandard2.0\Fizzler.dll</HintPath>
</Reference>
<Reference Include="Keyoti.RapidSpell.NET4, Version=6.2.22.214, Culture=neutral, PublicKeyToken=58d9fd2e9ec4dc0e, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.2\lib\net481\Keyoti.RapidSpell.NET4.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.3\lib\net481\Keyoti.RapidSpell.NET4.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PostSharp, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Redist.2023.0.8\lib\net45\PostSharp.dll</HintPath>
<Reference Include="PostSharp, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Redist.2024.0.5\lib\net45\PostSharp.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Patterns.Aggregation, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Aggregation.Redist.2023.0.8\lib\net45\PostSharp.Patterns.Aggregation.dll</HintPath>
<Reference Include="PostSharp.Patterns.Aggregation, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Aggregation.Redist.2024.0.5\lib\net45\PostSharp.Patterns.Aggregation.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Patterns.Common, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Common.Redist.2023.0.8\lib\net47\PostSharp.Patterns.Common.dll</HintPath>
<Reference Include="PostSharp.Patterns.Common, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Common.Redist.2024.0.5\lib\net47\PostSharp.Patterns.Common.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Patterns.Model, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Model.Redist.2023.0.8\lib\net45\PostSharp.Patterns.Model.dll</HintPath>
<Reference Include="PostSharp.Patterns.Model, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Model.Redist.2024.0.5\lib\net45\PostSharp.Patterns.Model.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Patterns.Threading, Version=2023.0.8.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Threading.Redist.2023.0.8\lib\net45\PostSharp.Patterns.Threading.dll</HintPath>
<Reference Include="PostSharp.Patterns.Threading, Version=2024.0.5.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
<HintPath>..\packages\PostSharp.Patterns.Threading.Redist.2024.0.5\lib\net45\PostSharp.Patterns.Threading.dll</HintPath>
</Reference>
<Reference Include="Svg, Version=3.4.0.0, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
<HintPath>..\packages\Svg.3.4.4\lib\net462\Svg.dll</HintPath>
Expand Down Expand Up @@ -106,23 +106,23 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="ThreatsManager.AutoGenRules, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.2\lib\net481\ThreatsManager.AutoGenRules.dll</HintPath>
<Reference Include="ThreatsManager.AutoGenRules, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.3\lib\net481\ThreatsManager.AutoGenRules.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Extensions.Client, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Extensions.Client.2.1.2\lib\net481\ThreatsManager.Extensions.Client.dll</HintPath>
<Reference Include="ThreatsManager.Extensions.Client, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Extensions.Client.2.1.3\lib\net481\ThreatsManager.Extensions.Client.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Icons, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.2\lib\net481\ThreatsManager.Icons.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.2.1.3\lib\net481\ThreatsManager.Icons.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.2\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.3\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.2\lib\net481\ThreatsManager.Utilities.dll</HintPath>
<Reference Include="ThreatsManager.Utilities, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.3\lib\net481\ThreatsManager.Utilities.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities.WinForms, Version=2.1.2.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.2\lib\net481\ThreatsManager.Utilities.WinForms.dll</HintPath>
<Reference Include="ThreatsManager.Utilities.WinForms, Version=2.1.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.3\lib\net481\ThreatsManager.Utilities.WinForms.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down Expand Up @@ -231,8 +231,8 @@
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\packages\PostSharp.2023.0.6\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.2023.0.6\build\PostSharp.props'))" />
<Error Condition="!Exists('..\packages\PostSharp.2023.0.6\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.2023.0.6\build\PostSharp.targets'))" />
<Error Condition="!Exists('..\packages\PostSharp.2024.0.5\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.2024.0.5\build\PostSharp.props'))" />
<Error Condition="!Exists('..\packages\PostSharp.2024.0.5\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.2024.0.5\build\PostSharp.targets'))" />
</Target>
<Import Project="..\packages\PostSharp.2023.0.6\build\PostSharp.targets" Condition="Exists('..\packages\PostSharp.2023.0.6\build\PostSharp.targets')" />
<Import Project="..\packages\PostSharp.2024.0.5\build\PostSharp.targets" Condition="Exists('..\packages\PostSharp.2024.0.5\build\PostSharp.targets')" />
</Project>
Loading

0 comments on commit f3c7b21

Please sign in to comment.