Skip to content

Commit

Permalink
Merge pull request #59 from simonec73/dev
Browse files Browse the repository at this point in the history 
Alignment of the samples with v2.1.1
  • Loading branch information
@simonec73
simonec73 authored Nov 29, 2023
2 parents 7042852 + 0f6a544 commit 78d7a7f
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 42 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.0.0")]
[assembly: ExtensionsContainer("2.1.1")]
18 changes: 9 additions & 9 deletions Samples/SampleExtensions/SampleExtensions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.AutoGenRules.2.1.0\lib\net481\ThreatsManager.AutoGenRules.dll</HintPath>
<Reference Include="ThreatsManager.AutoGenRules, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.AutoGenRules.2.1.1\lib\net481\ThreatsManager.AutoGenRules.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.AutoThreatGeneration, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.AutoThreatGeneration.2.1.0\lib\net481\ThreatsManager.AutoThreatGeneration.dll</HintPath>
<Reference Include="ThreatsManager.AutoThreatGeneration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.AutoThreatGeneration.2.1.1\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.0\lib\net481\ThreatsManager.Icons.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.2.1.1\lib\net481\ThreatsManager.Icons.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.0\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.1\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.0\lib\net481\ThreatsManager.Utilities.dll</HintPath>
<Reference Include="ThreatsManager.Utilities, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.1\lib\net481\ThreatsManager.Utilities.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Samples/SampleExtensions/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<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.0" targetFramework="net481" />
<package id="ThreatsManager.AutoThreatGeneration" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Interfaces" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Utilities" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.AutoGenRules" version="2.1.1" targetFramework="net481" />
<package id="ThreatsManager.AutoThreatGeneration" version="2.1.1" targetFramework="net481" />
<package id="ThreatsManager.Interfaces" version="2.1.1" targetFramework="net481" />
<package id="ThreatsManager.Utilities" version="2.1.1" 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.0.0")]
[assembly: ExtensionsContainer("2.1.1")]
24 changes: 12 additions & 12 deletions Samples/SampleWinFormExtensions/SampleWinFormExtensions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<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.0\lib\net481\Keyoti.RapidSpell.NET4.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.1\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">
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.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.0\lib\net481\ThreatsManager.AutoGenRules.dll</HintPath>
<Reference Include="ThreatsManager.AutoGenRules, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.1\lib\net481\ThreatsManager.AutoGenRules.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Extensions.Client, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Extensions.Client.2.1.0\lib\net481\ThreatsManager.Extensions.Client.dll</HintPath>
<Reference Include="ThreatsManager.Extensions.Client, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Extensions.Client.2.1.1\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.0\lib\net481\ThreatsManager.Icons.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.2.1.1\lib\net481\ThreatsManager.Icons.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.0\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.1\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.0\lib\net481\ThreatsManager.Utilities.dll</HintPath>
<Reference Include="ThreatsManager.Utilities, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.1\lib\net481\ThreatsManager.Utilities.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities.WinForms, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.0\lib\net481\ThreatsManager.Utilities.WinForms.dll</HintPath>
<Reference Include="ThreatsManager.Utilities.WinForms, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.WinForms.2.1.1\lib\net481\ThreatsManager.Utilities.WinForms.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Samples/SampleWinFormExtensions/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
<package id="ThreatsManager.Extensions.Client" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Interfaces" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Utilities" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Utilities.WinForms" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Extensions.Client" version="2.1.1" targetFramework="net481" />
<package id="ThreatsManager.Interfaces" version="2.1.1" targetFramework="net481" />
<package id="ThreatsManager.Utilities" version="2.1.1" targetFramework="net481" />
<package id="ThreatsManager.Utilities.WinForms" version="2.1.1" targetFramework="net481" />
</packages>
2 changes: 1 addition & 1 deletion Samples/SimpleThreatModelAnalyzer/ExtensionLibrary.cs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using ThreatsManager.Interfaces;

[assembly: ExtensionsContainer("2.0.0")]
[assembly: ExtensionsContainer("2.1.1")]
14 changes: 7 additions & 7 deletions Samples/SimpleThreatModelAnalyzer/SimpleThreatModelAnalyzer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,17 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="ThreatsManager.Engine, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Engine.2.1.0\lib\net481\ThreatsManager.Engine.dll</HintPath>
<Reference Include="ThreatsManager.Engine, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Engine.2.1.1\lib\net481\ThreatsManager.Engine.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Icons, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.0\lib\net481\ThreatsManager.Icons.dll</HintPath>
<HintPath>..\packages\ThreatsManager.Utilities.2.1.1\lib\net481\ThreatsManager.Icons.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.0\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
<Reference Include="ThreatsManager.Interfaces, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Interfaces.2.1.1\lib\net481\ThreatsManager.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ThreatsManager.Utilities, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.0\lib\net481\ThreatsManager.Utilities.dll</HintPath>
<Reference Include="ThreatsManager.Utilities, Version=2.1.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
<HintPath>..\packages\ThreatsManager.Utilities.2.1.1\lib\net481\ThreatsManager.Utilities.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Samples/SimpleThreatModelAnalyzer/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<package id="System.Security.Permissions" version="7.0.0" targetFramework="net472" />
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
<package id="ThreatsManager.Engine" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Interfaces" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Utilities" version="2.1.0" targetFramework="net481" />
<package id="ThreatsManager.Engine" version="2.1.1" targetFramework="net481" />
<package id="ThreatsManager.Interfaces" version="2.1.1" targetFramework="net481" />
<package id="ThreatsManager.Utilities" version="2.1.1" targetFramework="net481" />
</packages>

0 comments on commit 78d7a7f

Please sign in to comment.