Merge pull request #5 from simonec73/dev

Dev
simonec73 · Feb 21, 2021 · 06b4700 · 06b4700
2 parents e9f8860 + a0a8d85
commit 06b4700
Show file tree

Hide file tree

Showing 47 changed files with 351 additions and 153 deletions.
diff --git a/Samples/SampleWinFormExtensions/SampleWinFormExtensions.csproj b/Samples/SampleWinFormExtensions/SampleWinFormExtensions.csproj
@@ -42,7 +42,8 @@
       <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.4.0\lib\net472\Keyoti.RapidSpell.NET4.dll</HintPath>
+      <HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.4.1\lib\net472\Keyoti.RapidSpell.NET4.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -86,8 +87,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="ThreatsManager.AutoGenRules, Version=1.4.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
-      <HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.4.0\lib\net472\ThreatsManager.AutoGenRules.dll</HintPath>
+    <Reference Include="ThreatsManager.AutoGenRules, Version=1.4.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
+      <HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.4.1\lib\net472\ThreatsManager.AutoGenRules.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="ThreatsManager.Icons, Version=1.3.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
       <HintPath>..\packages\ThreatsManager.Utilities.1.4.0\lib\net472\ThreatsManager.Icons.dll</HintPath>
@@ -101,8 +103,9 @@
     <Reference Include="ThreatsManager.Utilities, Version=1.4.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
       <HintPath>..\packages\ThreatsManager.Utilities.1.4.0\lib\net472\ThreatsManager.Utilities.dll</HintPath>
     </Reference>
-    <Reference Include="ThreatsManager.Utilities.WinForms, Version=1.4.0.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
-      <HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.4.0\lib\net472\ThreatsManager.Utilities.WinForms.dll</HintPath>
+    <Reference Include="ThreatsManager.Utilities.WinForms, Version=1.4.1.0, Culture=neutral, PublicKeyToken=e345404a827fb4c3, processorArchitecture=MSIL">
+      <HintPath>..\packages\ThreatsManager.Utilities.WinForms.1.4.1\lib\net472\ThreatsManager.Utilities.WinForms.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Samples/SampleWinFormExtensions/packages.config b/Samples/SampleWinFormExtensions/packages.config
@@ -12,5 +12,5 @@
   <package id="System.Drawing.Common" version="4.7.0" targetFramework="net472" />
   <package id="ThreatsManager.Interfaces" version="1.4.0" targetFramework="net472" />
   <package id="ThreatsManager.Utilities" version="1.4.0" targetFramework="net472" />
-  <package id="ThreatsManager.Utilities.WinForms" version="1.4.0" targetFramework="net472" />
+  <package id="ThreatsManager.Utilities.WinForms" version="1.4.1" targetFramework="net472" />
 </packages>
diff --git a/Sources/Extensions/ThreatsManager.AutoGenRules/ThreatsManager.AutoGenRules.csproj b/Sources/Extensions/ThreatsManager.AutoGenRules/ThreatsManager.AutoGenRules.csproj
@@ -2,15 +2,15 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <Description>Threats Manager Platform Auto Generation Rules library.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
     <Authors>Simone Curzi</Authors>
     <Company>Simone Curzi</Company>
     <Product>Threats Manager Platform</Product>
     <Copyright>Copyright © Simone Curzi, 2018-2021. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://www.nuget.org/packages/ThreatsManager.Engine/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonec73/threatsmanager</RepositoryUrl>
-    <FileVersion>1.4.0.0</FileVersion>
-    <Version>1.4.0</Version>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ThreatsManager.Engine\ThreatsManager.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/Sources/Extensions/ThreatsManager.AutoThreatGeneration/Actions/ActionsHelper.cs b/Sources/Extensions/ThreatsManager.AutoThreatGeneration/Actions/ActionsHelper.cs
@@ -137,7 +137,7 @@ public static bool ApplyMitigations(this IThreatEvent threatEvent)
                     foreach (var mitigation in mitigations)
                     {
                         var rule = GetRule(mitigation);
-                        if (rule.Evaluate(identity))
+                        if (rule?.Evaluate(identity) ?? false)
                         {
                             var strength = mitigation.Strength;
                             if (rule.StrengthId.HasValue &&

diff --git a/...Extensions/ThreatsManager.AutoThreatGeneration/ThreatsManager.AutoThreatGeneration.csproj b/...Extensions/ThreatsManager.AutoThreatGeneration/ThreatsManager.AutoThreatGeneration.csproj
@@ -3,15 +3,15 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <Description>Threats Manager Platform Auto Threat Generation library.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
     <Authors>Simone Curzi</Authors>
     <Company>Simone Curzi</Company>
     <Product>Threats Manager Platform</Product>
     <Copyright>Copyright © Simone Curzi, 2018-2021. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://www.nuget.org/packages/ThreatsManager.Engine/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonec73/threatsmanager</RepositoryUrl>
-    <FileVersion>1.4.0.0</FileVersion>
-    <Version>1.4.0</Version>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ThreatsManager.Engine\ThreatsManager.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/Sources/Extensions/ThreatsManager.DevOps/ThreatsManager.DevOps.csproj b/Sources/Extensions/ThreatsManager.DevOps/ThreatsManager.DevOps.csproj
@@ -3,15 +3,15 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <Description>Threats Manager Platform DevOps Integration library.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
     <Authors>Simone Curzi</Authors>
     <Company>Simone Curzi</Company>
     <Product>Threats Manager Platform</Product>
     <Copyright>Copyright © Simone Curzi, 2018-2021. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://www.nuget.org/packages/ThreatsManager.Engine/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonec73/threatsmanager</RepositoryUrl>
-    <FileVersion>1.4.0.0</FileVersion>
-    <Version>1.4.0</Version>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ThreatsManager.Engine\ThreatsManager.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/Sources/Extensions/ThreatsManager.Extensions.Client/ThreatsManager.Extensions.Client.csproj b/Sources/Extensions/ThreatsManager.Extensions.Client/ThreatsManager.Extensions.Client.csproj
@@ -3,15 +3,15 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <Description>Threats Manager Platform Extensions Client library.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
     <Authors>Simone Curzi</Authors>
     <Company>Simone Curzi</Company>
     <Product>Threats Manager Platform</Product>
     <Copyright>Copyright © Simone Curzi, 2018-2021. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://www.nuget.org/packages/ThreatsManager.Engine/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonec73/threatsmanager</RepositoryUrl>
-    <FileVersion>1.4.0.0</FileVersion>
-    <Version>1.4.0</Version>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ThreatsManager.Engine\ThreatsManager.snk</AssemblyOriginatorKeyFile>
     <RootNamespace>ThreatsManager.Extensions</RootNamespace>

diff --git a/Sources/Extensions/ThreatsManager.Extensions/ThreatsManager.Extensions.csproj b/Sources/Extensions/ThreatsManager.Extensions/ThreatsManager.Extensions.csproj
@@ -3,15 +3,15 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <Description>Threats Manager Platform Extensions library.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
     <Authors>Simone Curzi</Authors>
     <Company>Simone Curzi</Company>
     <Product>Threats Manager Platform</Product>
     <Copyright>Copyright © Simone Curzi, 2018-2021. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://www.nuget.org/packages/ThreatsManager.Engine/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonec73/threatsmanager</RepositoryUrl>
-    <FileVersion>1.4.0.0</FileVersion>
-    <Version>1.4.0</Version>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ThreatsManager.Engine\ThreatsManager.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/Sources/Extensions/ThreatsManager.MsTmt/ThreatsManager.MsTmt.csproj b/Sources/Extensions/ThreatsManager.MsTmt/ThreatsManager.MsTmt.csproj
@@ -3,15 +3,15 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <Description>Threats Manager Platform Microsoft Threat Modeling Tool Import library.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
     <Authors>Simone Curzi</Authors>
     <Company>Simone Curzi</Company>
     <Product>Threats Manager Platform</Product>
     <Copyright>Copyright © Simone Curzi, 2018-2021. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://www.nuget.org/packages/ThreatsManager.Engine/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonec73/threatsmanager</RepositoryUrl>
-    <FileVersion>1.4.0.0</FileVersion>
-    <Version>1.4.0</Version>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ThreatsManager.Engine\ThreatsManager.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/Sources/Extensions/ThreatsManager.PackageManagers/JsonFilePackageManager.cs b/Sources/Extensions/ThreatsManager.PackageManagers/JsonFilePackageManager.cs
@@ -21,6 +21,7 @@ public class JsonFilePackageManager : IPackageManager
         public bool CanHandle(LocationType locationType, [Required] string location)
         {
             return SupportedLocations.HasFlag(locationType) &&
+                   !location.StartsWith(@"\\") &&
                    string.Compare(Path.GetExtension(location), ".tmj", StringComparison.OrdinalIgnoreCase) == 0;
         }
 

diff --git a/Sources/Extensions/ThreatsManager.PackageManagers/PlainFilePackageManager.cs b/Sources/Extensions/ThreatsManager.PackageManagers/PlainFilePackageManager.cs
@@ -27,6 +27,7 @@ public class PlainFilePackageManager : IPackageManager
         public bool CanHandle(LocationType locationType, [Required] string location)
         {
             return SupportedLocations.HasFlag(locationType) &&
+                   !location.StartsWith(@"\\") &&
                    string.Compare(Path.GetExtension(location), ".tm", StringComparison.OrdinalIgnoreCase) == 0;
         }
 

diff --git a/Sources/Extensions/ThreatsManager.PackageManagers/ThreatsManager.PackageManagers.csproj b/Sources/Extensions/ThreatsManager.PackageManagers/ThreatsManager.PackageManagers.csproj
@@ -3,15 +3,15 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <Description>Threats Manager Platform Package Managers library.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
     <Authors>Simone Curzi</Authors>
     <Company>Simone Curzi</Company>
     <Product>Threats Manager Platform</Product>
     <Copyright>Copyright © Simone Curzi, 2018-2021. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://www.nuget.org/packages/ThreatsManager.Engine/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonec73/threatsmanager</RepositoryUrl>
-    <FileVersion>1.4.0.0</FileVersion>
-    <Version>1.4.0</Version>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ThreatsManager.Engine\ThreatsManager.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/Sources/Extensions/ThreatsManager.Quality/Analyzers/DefaultName.cs b/Sources/Extensions/ThreatsManager.Quality/Analyzers/DefaultName.cs
@@ -78,17 +78,17 @@ public double Analyze(IThreatModel model, Func<IQualityAnalyzer, IPropertiesCont
                     if (entity is IExternalInteractor)
                     {
                         if (eiRegex == null)
-                            eiRegex = new Regex($"{model.GetIdentityTypeName(entity)} [0-9]*");
+                            eiRegex = new Regex($"^{model.GetIdentityTypeName(entity)} [0-9]+$");
                         regex = eiRegex;
                     } else if (entity is IProcess)
                     {
                         if (pRegex == null)
-                            pRegex = new Regex($"{model.GetIdentityTypeName(entity)} [0-9]*");
+                            pRegex = new Regex($"^{model.GetIdentityTypeName(entity)} [0-9]+$");
                         regex = pRegex;
                     } if (entity is IDataStore)
                     {
                         if (dsRegex == null)
-                            dsRegex = new Regex($"{model.GetIdentityTypeName(entity)} [0-9]*");
+                            dsRegex = new Regex($"^{model.GetIdentityTypeName(entity)} [0-9]+$");
                         regex = dsRegex;
                     }                  
 
@@ -115,7 +115,7 @@ public double Analyze(IThreatModel model, Func<IQualityAnalyzer, IPropertiesCont
                 foreach (var group in groups)
                 {
                     if (tbRegex == null)
-                        tbRegex = new Regex($"{model.GetIdentityTypeName(group)} [0-9]*");
+                        tbRegex = new Regex($"^{model.GetIdentityTypeName(group)} [0-9]+$");
 
                     if (!string.IsNullOrWhiteSpace(group.Name) && (tbRegex?.Match(group.Name).Success ?? false))
                         found.Add(group);

diff --git a/Sources/Extensions/ThreatsManager.Quality/ThreatsManager.Quality.csproj b/Sources/Extensions/ThreatsManager.Quality/ThreatsManager.Quality.csproj
@@ -3,15 +3,15 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
     <Description>Threats Manager Platform Quality library.</Description>
-    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <AssemblyVersion>1.4.1.0</AssemblyVersion>
     <Authors>Simone Curzi</Authors>
     <Company>Simone Curzi</Company>
     <Product>Threats Manager Platform</Product>
     <Copyright>Copyright © Simone Curzi, 2018-2021. All Rights Reserved.</Copyright>
     <PackageProjectUrl>https://www.nuget.org/packages/ThreatsManager.Engine/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonec73/threatsmanager</RepositoryUrl>
-    <FileVersion>1.4.0.0</FileVersion>
-    <Version>1.4.0</Version>
+    <FileVersion>1.4.1.0</FileVersion>
+    <Version>1.4.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\ThreatsManager.Engine\ThreatsManager.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>

diff --git a/Studio/ThreatsManager.DevOps.WinForms/ThreatsManager.DevOps.WinForms.csproj b/Studio/ThreatsManager.DevOps.WinForms/ThreatsManager.DevOps.WinForms.csproj
@@ -152,8 +152,11 @@
       <HintPath>..\packages\Svg.3.1.1\lib\net452\Svg.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
@@ -162,14 +165,23 @@
     <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
     </Reference>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
     <Reference Include="System.Reflection.Metadata, Version=1.4.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Reflection.Metadata.1.5.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />

diff --git a/Studio/ThreatsManager.DevOps.WinForms/app.config b/Studio/ThreatsManager.DevOps.WinForms/app.config
@@ -34,6 +34,10 @@
         <assemblyIdentity name="PostSharp.Patterns.Threading" publicKeyToken="e7f631e6ce13f078" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.7.11.0" newVersion="6.7.11.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Studio/ThreatsManager.DevOps.WinForms/packages.config b/Studio/ThreatsManager.DevOps.WinForms/packages.config
@@ -22,7 +22,11 @@
   <package id="PostSharp.Patterns.Threading.Redist" version="6.7.11" targetFramework="net472" />
   <package id="PostSharp.Redist" version="6.7.11" targetFramework="net472" />
   <package id="Svg" version="3.1.1" targetFramework="net472" />
-  <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Collections.Immutable" version="1.7.1" targetFramework="net472" />
   <package id="System.IdentityModel.Tokens.Jwt" version="5.2.4" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Reflection.Metadata" version="1.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net472" />
 </packages>
diff --git a/Studio/ThreatsManager.Extensions.WinForms/Actions/Merge.cs b/Studio/ThreatsManager.Extensions.WinForms/Actions/Merge.cs
@@ -61,7 +61,8 @@ public void ExecuteRibbonAction(IThreatModel threatModel, IActionDefinition acti
                             DereferenceLinks = true,
                             Filter = "Threat Model (*.tm)|*.tm|Threat Model Template (*.tmt)|*.tmt|Threat Model Json Template (*.tmk)|*.tmk",
                             FilterIndex = 0,
-                            Title = "Select file to be merged"
+                            Title = "Select file to be merged",
+                            RestoreDirectory = true
                         };
                         if (dialog.ShowDialog(Form.ActiveForm) == DialogResult.OK)
                         {

diff --git a/Studio/ThreatsManager.Extensions.WinForms/Actions/SummaryExcelReport.cs b/Studio/ThreatsManager.Extensions.WinForms/Actions/SummaryExcelReport.cs
@@ -56,6 +56,7 @@ public void ExecuteRibbonAction(IThreatModel threatModel, IActionDefinition acti
                         dialog.DefaultExt = "xlsx";
                         dialog.Filter = "Excel 2016 files (*.xlsx)|*.xlsx|All files (*.*)|*.*";
                         dialog.Title = "Save Summary Excel Report";
+                        dialog.RestoreDirectory = true;
                         if (dialog.ShowDialog(Form.ActiveForm) == DialogResult.OK)
                         {
                             var threats = AnalyzeThreatModel(threatModel);