Skip to content

Commit

Permalink
Merge pull request #2 from simonec73/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
simonec73 authored Nov 5, 2020
2 parents d9221b0 + ac29e68 commit 4027681
Show file tree
Hide file tree
Showing 173 changed files with 14,508 additions and 817 deletions.
2 changes: 1 addition & 1 deletion Samples/SampleExtensions/ExtensionLibrary.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using ThreatsManager.Interfaces;

[assembly: ExtensionsContainer("1.3.1")]
[assembly: ExtensionsContainer("1.3.3")]
14 changes: 7 additions & 7 deletions Samples/SampleExtensions/SampleExtensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="ThreatsManager.Icons, Version=1.3.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Icons.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Icons.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Interfaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.1.3.1\lib\net472\ThreatsManager.Interfaces.dll</HintPath>
<Reference Include="ThreatsManager.Interfaces, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.1.3.3\lib\net472\ThreatsManager.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Packaging, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Packaging.dll</HintPath>
<Reference Include="ThreatsManager.Packaging, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Packaging.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Utilities.dll</HintPath>
<Reference Include="ThreatsManager.Utilities, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Utilities.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/SampleExtensions/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<package id="PostSharp.Redist" version="6.6.13" targetFramework="net472" />
<package id="System.ComponentModel.Composition" version="4.7.0" targetFramework="net472" />
<package id="System.Drawing.Common" version="4.7.0" targetFramework="net472" />
<package id="ThreatsManager.Interfaces" version="1.3.1" targetFramework="net472" />
<package id="ThreatsManager.Utilities" version="1.3.1" targetFramework="net472" />
<package id="ThreatsManager.Interfaces" version="1.3.3" targetFramework="net472" />
<package id="ThreatsManager.Utilities" version="1.3.3" targetFramework="net472" />
</packages>
2 changes: 1 addition & 1 deletion Samples/SampleWinFormExtensions/ExtensionLibrary.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using ThreatsManager.Interfaces;

[assembly: ExtensionsContainer("1.3.1")]
[assembly: ExtensionsContainer("1.3.3")]
20 changes: 10 additions & 10 deletions Samples/SampleWinFormExtensions/SampleWinFormExtensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<HintPath>..\packages\Fizzler.1.2.0\lib\netstandard2.0\Fizzler.dll</HintPath>
</Reference>
<Reference Include="Keyoti.RapidSpell.NET4, Version=6.0.19.705, Culture=neutral, PublicKeyToken=58d9fd2e9ec4dc0e, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.3.1\lib\net472\Keyoti.RapidSpell.NET4.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.3.3\lib\net472\Keyoti.RapidSpell.NET4.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down Expand Up @@ -87,19 +87,19 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="ThreatsManager.Icons, Version=1.3.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Icons.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Icons.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Interfaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.1.3.1\lib\net472\ThreatsManager.Interfaces.dll</HintPath>
<Reference Include="ThreatsManager.Interfaces, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.1.3.3\lib\net472\ThreatsManager.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Packaging, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Packaging.dll</HintPath>
<Reference Include="ThreatsManager.Packaging, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Packaging.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Utilities.dll</HintPath>
<Reference Include="ThreatsManager.Utilities, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Utilities.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities.WinForms, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.3.1\lib\net472\ThreatsManager.Utilities.WinForms.dll</HintPath>
<Reference Include="ThreatsManager.Utilities.WinForms, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.3.3\lib\net472\ThreatsManager.Utilities.WinForms.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Samples/SampleWinFormExtensions/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<package id="Svg" version="3.1.1" targetFramework="net472" />
<package id="System.ComponentModel.Composition" version="4.7.0" targetFramework="net472" />
<package id="System.Drawing.Common" version="4.7.0" targetFramework="net472" />
<package id="ThreatsManager.Interfaces" version="1.3.1" targetFramework="net472" />
<package id="ThreatsManager.Utilities" version="1.3.1" targetFramework="net472" />
<package id="ThreatsManager.Utilities.WinForms" version="1.3.1" targetFramework="net472" />
<package id="ThreatsManager.Interfaces" version="1.3.3" targetFramework="net472" />
<package id="ThreatsManager.Utilities" version="1.3.3" targetFramework="net472" />
<package id="ThreatsManager.Utilities.WinForms" version="1.3.3" targetFramework="net472" />
</packages>
2 changes: 1 addition & 1 deletion Samples/SimpleThreatModelAnalyzer/ExtensionLibrary.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using ThreatsManager.Interfaces;

[assembly: ExtensionsContainer("1.3.1")]
[assembly: ExtensionsContainer("1.3.3")]
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,20 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="ThreatsManager.Engine, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Engine.1.3.1\lib\net472\ThreatsManager.Engine.dll</HintPath>
<Reference Include="ThreatsManager.Engine, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Engine.1.3.3\lib\net472\ThreatsManager.Engine.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Icons, Version=1.3.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Icons.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Icons.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Interfaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.1.3.1\lib\net472\ThreatsManager.Interfaces.dll</HintPath>
<Reference Include="ThreatsManager.Interfaces, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.1.3.3\lib\net472\ThreatsManager.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Packaging, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Packaging.dll</HintPath>
<Reference Include="ThreatsManager.Packaging, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Packaging.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities, Version=1.3.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.1\lib\net472\ThreatsManager.Utilities.dll</HintPath>
<Reference Include="ThreatsManager.Utilities, Version=1.3.3.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.1.3.3\lib\net472\ThreatsManager.Utilities.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Samples/SimpleThreatModelAnalyzer/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<package id="System.Security.Cryptography.ProtectedData" version="4.7.0" targetFramework="net472" />
<package id="System.Security.Permissions" version="4.7.0" targetFramework="net472" />
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net472" />
<package id="ThreatsManager.Engine" version="1.3.1" targetFramework="net472" />
<package id="ThreatsManager.Interfaces" version="1.3.1" targetFramework="net472" />
<package id="ThreatsManager.Utilities" version="1.3.1" targetFramework="net472" />
<package id="ThreatsManager.Engine" version="1.3.3" targetFramework="net472" />
<package id="ThreatsManager.Interfaces" version="1.3.3" targetFramework="net472" />
<package id="ThreatsManager.Utilities" version="1.3.3" targetFramework="net472" />
</packages>
67 changes: 67 additions & 0 deletions Sources/Extensions/Extensions.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30413.136
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreatsManager.AutoThreatGeneration", "ThreatsManager.AutoThreatGeneration\ThreatsManager.AutoThreatGeneration.csproj", "{C96D95AE-1081-4BD8-9004-0D34574FDC9B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreatsManager.Interfaces", "..\ThreatsManager.Interfaces\ThreatsManager.Interfaces.csproj", "{F6685B01-5E85-4DFE-AD30-DC7226326A88}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreatsManager.Utilities", "..\ThreatsManager.Utilities\ThreatsManager.Utilities.csproj", "{C598DBFD-D401-4B5D-BD6A-7D13BB1A964F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreatsManager.Extensions", "ThreatsManager.Extensions\ThreatsManager.Extensions.csproj", "{3CABCB35-25FF-440A-9226-C9E881C8636F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreatsManager.MsTmt", "ThreatsManager.MsTmt\ThreatsManager.MsTmt.csproj", "{8ACF0B4D-F9F9-4AA5-A5E0-72A700C890FC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreatsManager.PackageManagers", "ThreatsManager.PackageManagers\ThreatsManager.PackageManagers.csproj", "{8D599C3D-E2E2-49CD-A597-A0B0247CDBA4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreatsManager.DevOps", "ThreatsManager.DevOps\ThreatsManager.DevOps.csproj", "{E545F770-9A4B-41BC-91D6-4456AF295DFE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreatsManager.Quality", "ThreatsManager.Quality\ThreatsManager.Quality.csproj", "{26BBE943-E47E-49AC-9C27-CA88166F46FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C96D95AE-1081-4BD8-9004-0D34574FDC9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C96D95AE-1081-4BD8-9004-0D34574FDC9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C96D95AE-1081-4BD8-9004-0D34574FDC9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C96D95AE-1081-4BD8-9004-0D34574FDC9B}.Release|Any CPU.Build.0 = Release|Any CPU
{F6685B01-5E85-4DFE-AD30-DC7226326A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F6685B01-5E85-4DFE-AD30-DC7226326A88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F6685B01-5E85-4DFE-AD30-DC7226326A88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F6685B01-5E85-4DFE-AD30-DC7226326A88}.Release|Any CPU.Build.0 = Release|Any CPU
{C598DBFD-D401-4B5D-BD6A-7D13BB1A964F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C598DBFD-D401-4B5D-BD6A-7D13BB1A964F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C598DBFD-D401-4B5D-BD6A-7D13BB1A964F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C598DBFD-D401-4B5D-BD6A-7D13BB1A964F}.Release|Any CPU.Build.0 = Release|Any CPU
{3CABCB35-25FF-440A-9226-C9E881C8636F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3CABCB35-25FF-440A-9226-C9E881C8636F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3CABCB35-25FF-440A-9226-C9E881C8636F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3CABCB35-25FF-440A-9226-C9E881C8636F}.Release|Any CPU.Build.0 = Release|Any CPU
{8ACF0B4D-F9F9-4AA5-A5E0-72A700C890FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8ACF0B4D-F9F9-4AA5-A5E0-72A700C890FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8ACF0B4D-F9F9-4AA5-A5E0-72A700C890FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8ACF0B4D-F9F9-4AA5-A5E0-72A700C890FC}.Release|Any CPU.Build.0 = Release|Any CPU
{8D599C3D-E2E2-49CD-A597-A0B0247CDBA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D599C3D-E2E2-49CD-A597-A0B0247CDBA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D599C3D-E2E2-49CD-A597-A0B0247CDBA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D599C3D-E2E2-49CD-A597-A0B0247CDBA4}.Release|Any CPU.Build.0 = Release|Any CPU
{E545F770-9A4B-41BC-91D6-4456AF295DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E545F770-9A4B-41BC-91D6-4456AF295DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E545F770-9A4B-41BC-91D6-4456AF295DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E545F770-9A4B-41BC-91D6-4456AF295DFE}.Release|Any CPU.Build.0 = Release|Any CPU
{26BBE943-E47E-49AC-9C27-CA88166F46FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26BBE943-E47E-49AC-9C27-CA88166F46FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26BBE943-E47E-49AC-9C27-CA88166F46FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26BBE943-E47E-49AC-9C27-CA88166F46FE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {87B3BA26-85AC-46C6-84AF-183918DE3412}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 4027681

Please sign in to comment.