diff --git a/MigrationBackup/244a8449/XrmToolBox.Extensibility/NuGetUpgradeLog.html b/MigrationBackup/244a8449/XrmToolBox.Extensibility/NuGetUpgradeLog.html
new file mode 100644
index 000000000..65f022d3b
--- /dev/null
+++ b/MigrationBackup/244a8449/XrmToolBox.Extensibility/NuGetUpgradeLog.html
@@ -0,0 +1,205 @@
+<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+
+    <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="NuGetUpgradeReportTitle">
+          NuGetMigrationLog
+        </title><style>
+            
+                    /* Body style, for the entire document */
+                    body
+                    {
+                        background: #F3F3F4;
+                        color: #1E1E1F;
+                        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+                        font-size: 12pt;
+                        padding: 0;
+                        margin: 0;
+                    }
+
+                    /* Header1 style, used for the main title */
+                    h1
+                    {
+                        padding: 10px 0px 10px 10px;
+                        font-size: 21pt;
+                        background-color: #E2E2E2;
+                        border-bottom: 1px #C1C1C2 solid; 
+                        color: #201F20;
+                        margin: 0;
+                        font-weight: normal;
+                    }
+
+                    /* Header2 style, used for "Overview" and other sections */
+                    h2
+                    {
+                        font-size: 18pt;
+                        font-weight: normal;
+                        padding: 15px 0 5px 0;
+                        margin: 0;
+                    }
+
+                    /* Header3 style, used for sub-sections, such as project name */
+                    h3
+                    {
+                        font-weight: normal;
+                        font-size: 15pt;
+                        margin: 0;
+                        padding: 15px 0 5px 0;
+                        background-color: transparent;
+                    }
+
+                    .info-text
+                    {
+                        margin: 0px 0 0.75em 0;
+                    }
+
+                    /* Color all hyperlinks one color */
+                    a
+                    {
+                        color: #1382CE;
+                    }
+
+                    /* Table styles */ 
+                    table
+                    {
+                        border-spacing: 0 0;
+                        border-collapse: collapse;
+                        font-size: 11pt;
+                    }
+
+                    table th
+                    {
+                        background: #E7E7E8;
+                        text-align: left;
+                        text-decoration: none;
+                        font-weight: normal;
+                        padding: 3px 6px 3px 6px;
+                    }
+
+                    table td
+                    {
+                        vertical-align: top;
+                        padding: 3px 6px 5px 5px;
+                        margin: 0px;
+                        border: 1px solid #E7E7E8;
+                        background: #F7F7F8;
+                    }
+
+                    /* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
+                    .localLink
+                    {
+                        color: #1E1E1F;
+                        background: #EEEEED;
+                        text-decoration: none;
+                    }
+
+                    .localLink:hover
+                    {
+                        color: #1382CE;
+                        background: #FFFF99;
+                        text-decoration: none;
+                    }
+
+                    .issueCell
+                    {
+                        width: 100%;
+                    }
+
+                    .packageIssue
+                    {
+                        margin-left: 25px;
+                    }
+
+                    /* Padding around the content after the h1 */ 
+                    #content 
+                    {
+	                    padding: 0px 20px 20px 20px; 
+                    }
+
+                    .issues table
+                    {
+                        width: 97%;
+                    }
+
+                    /* All Icons */
+                    .IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
+                    {
+                        min-width:18px;
+                        min-height:18px; 
+                        background-repeat:no-repeat;
+                        background-position:center;
+                    }
+
+                    .IconSuccessEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
+                    }
+
+                    .IconInfoEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
+                    }
+
+                    .IconWarningEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
+                    }
+
+                    .IconErrorEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
+                    }
+                
+          </style></head><body><h1>
+          NuGet Migration Report - XrmToolBox.Extensibility</h1><div id="content"><h2 _locID="OverviewTitle">Overview</h2><div class="info-text">Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.</div><div class="info-text">
+            If you run into any problems, have feedback, questions, or concerns, please
+            <a href="https://github.com/NuGet/Home/issues/">file an issue on the NuGet GitHub repository.</a></div><div class="info-text">
+            Changed files and this report have been backed up here:
+            <a href="C:\P\T\Github\XrmToolBox\MigrationBackup\244a8449\XrmToolBox.Extensibility">C:\P\T\Github\XrmToolBox\MigrationBackup\244a8449\XrmToolBox.Extensibility</a></div><div class="info-text"><a href="https://aka.ms/nuget-pc2pr-migrator-rollback">Help me rollback to packages.config</a></div><h2 _locID="PackagesTitle">Packages processed</h2><h3 _locID="IncludePackagesTitle">Top-level dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.CoreAssemblies</span></td><td><span>
+                v9.0.2.59</span></td></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.Workflow</span></td><td><span>
+                v9.0.2.59</span></td></tr><tr><td class="issueCell"><span>Microsoft.Extensions.AI</span></td><td><span>
+                v9.7.1</span></td></tr><tr><td class="issueCell"><span>Microsoft.Extensions.Caching.Abstractions</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>Microsoft.Extensions.Logging.Abstractions</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>Microsoft.NETCore.Platforms</span></td><td><span>
+                v7.0.4</span></td></tr><tr><td class="issueCell"><span>Microsoft.NETCore.Targets</span></td><td><span>
+                v5.0.0</span></td></tr><tr><td class="issueCell"><span>Microsoft.Toolkit.Uwp.Notifications</span></td><td><span>
+                v7.1.3</span></td></tr><tr><td class="issueCell"><span>Microsoft.Web.Xdt</span></td><td><span>
+                v7.0.0-preview.22423.2</span></td></tr><tr><td class="issueCell"><span>MscrmTools.Xrm.Connection</span></td><td><span>
+                v1.2025.9.64</span></td></tr><tr><td class="issueCell"><span>Newtonsoft.Json</span></td><td><span>
+                v13.0.3</span></td></tr><tr><td class="issueCell"><span>System.Memory</span></td><td><span>
+                v4.6.3</span></td></tr><tr><td class="issueCell"><span>System.Runtime</span></td><td><span>
+                v4.3.1</span></td></tr><tr><td class="issueCell"><span>System.Runtime.CompilerServices.Unsafe</span></td><td><span>
+                v7.0.0-preview.2.22152.2</span></td></tr><tr><td class="issueCell"><span>System.Security.Cryptography.Algorithms</span></td><td><span>
+                v4.3.1</span></td></tr><tr><td class="issueCell"><span>System.Security.Cryptography.X509Certificates</span></td><td><span>
+                v4.3.2</span></td></tr><tr><td class="issueCell"><span>System.ServiceModel.Http</span></td><td><span>
+                v8.1.2</span></td></tr><tr><td class="issueCell"><span>System.ServiceModel.Primitives</span></td><td><span>
+                v8.1.2</span></td></tr><tr><td class="issueCell"><span>System.Text.Json</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>System.Threading.Channels</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>System.Threading.Tasks.Extensions</span></td><td><span>
+                v4.6.3</span></td></tr><tr><td class="issueCell"><span>System.ValueTuple</span></td><td><span>
+                v4.6.1</span></td></tr></table></div><p /><h3 _locID="IncludePackagesTitle">Transitive dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>Microsoft.Bcl.AsyncInterfaces</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.Deployment</span></td><td><span>
+                v9.0.2.34</span></td></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.XrmTooling.CoreAssembly</span></td><td><span>
+                v9.1.1.65</span></td></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.XrmTooling.WpfControls</span></td><td><span>
+                v9.1.1.65</span></td></tr><tr><td class="issueCell"><span>Microsoft.Extensions.AI.Abstractions</span></td><td><span>
+                v9.7.1</span></td></tr><tr><td class="issueCell"><span>Microsoft.Extensions.DependencyInjection.Abstractions</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>Microsoft.Extensions.Primitives</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>Microsoft.IdentityModel.Clients.ActiveDirectory</span></td><td><span>
+                v5.3.0</span></td></tr><tr><td class="issueCell"><span>Microsoft.NETFramework.ReferenceAssemblies</span></td><td><span>
+                v1.0.0</span></td></tr><tr><td class="issueCell"><span>Microsoft.NETFramework.ReferenceAssemblies.net48</span></td><td><span>
+                v1.0.0</span></td></tr><tr><td class="issueCell"><span>Microsoft.Rest.ClientRuntime</span></td><td><span>
+                v2.3.24</span></td></tr><tr><td class="issueCell"><span>Microsoft.Windows.SDK.Contracts</span></td><td><span>
+                v10.0.19041.1</span></td></tr><tr><td class="issueCell"><span>System.Buffers</span></td><td><span>
+                v4.6.1</span></td></tr><tr><td class="issueCell"><span>System.Diagnostics.DiagnosticSource</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>System.IO</span></td><td><span>
+                v4.3.0</span></td></tr><tr><td class="issueCell"><span>System.IO.Pipelines</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>System.Net.Http</span></td><td><span>
+                v4.3.4</span></td></tr><tr><td class="issueCell"><span>System.Numerics.Vectors</span></td><td><span>
+                v4.6.1</span></td></tr><tr><td class="issueCell"><span>System.Private.Uri</span></td><td><span>
+                v4.3.2</span></td></tr><tr><td class="issueCell"><span>System.Runtime.WindowsRuntime</span></td><td><span>
+                v4.6.0</span></td></tr><tr><td class="issueCell"><span>System.Runtime.WindowsRuntime.UI.Xaml</span></td><td><span>
+                v4.6.0</span></td></tr><tr><td class="issueCell"><span>System.Security.Cryptography.Encoding</span></td><td><span>
+                v4.3.0</span></td></tr><tr><td class="issueCell"><span>System.Security.Cryptography.Primitives</span></td><td><span>
+                v4.3.0</span></td></tr><tr><td class="issueCell"><span>System.Text.Encodings.Web</span></td><td><span>
+                v9.0.7</span></td></tr></table></div><h2 _locID="IssuesTitle">Package compatibility issues</h2><div class="issues"><table><tr><th /><th class="issueCell" _locID="DescriptionTableHeader">Description</th></tr><tr><td class="IconInfoEncoded" /><td class="issueCell">
+                No issues were found.
+              </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/MigrationBackup/244a8449/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj b/MigrationBackup/244a8449/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj
new file mode 100644
index 000000000..51975703c
--- /dev/null
+++ b/MigrationBackup/244a8449/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj
@@ -0,0 +1,406 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{DF77AEA3-43F7-403C-91AF-3023A3BB06EC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>XrmToolBox.Extensibility</RootNamespace>
+    <AssemblyName>XrmToolBox.Extensibility</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
+    <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
+    <UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
+    <UpdateAssemblyInfoVersion>True</UpdateAssemblyInfoVersion>
+    <AssemblyVersionSettings>None.YearStamp.MonthStamp.DayStamp</AssemblyVersionSettings>
+    <AssemblyFileVersionSettings>None.YearStamp.MonthStamp.DayStamp</AssemblyFileVersionSettings>
+    <AssemblyInfoVersionSettings>None.YearStamp.MonthStamp.DayStamp</AssemblyInfoVersionSettings>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Without GemBox|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug Without GemBox\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="McTools.Xrm.Connection, Version=1.2025.9.64, Culture=neutral, PublicKeyToken=96037217801d9658, processorArchitecture=MSIL">
+      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.9.64\lib\net48\McTools.Xrm.Connection.dll</HintPath>
+    </Reference>
+    <Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2025.9.64, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
+      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.9.64\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.59\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.AI, Version=9.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.AI.9.7.1\lib\net462\Microsoft.Extensions.AI.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.AI.Abstractions, Version=9.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.AI.Abstractions.9.7.1\lib\net462\Microsoft.Extensions.AI.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.9.0.7\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.5.3.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.1.65\lib\net462\Microsoft.Rest.ClientRuntime.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Toolkit.Uwp.Notifications, Version=7.1.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Toolkit.Uwp.Notifications.7.1.3\lib\net461\Microsoft.Toolkit.Uwp.Notifications.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Web.XmlTransform, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Xdt.7.0.0-preview.22423.2\lib\netstandard2.0\Microsoft.Web.XmlTransform.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Sdk, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.59\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Sdk.Deployment, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.Deployment.9.0.2.34\lib\net462\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Sdk.Workflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.Workflow.9.0.2.59\lib\net462\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Tooling.Connector, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Tooling.CrmConnectControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.CrmConnectControl.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Tooling.Ui.Styles, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.Ui.Styles.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Tooling.WebResourceUtility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.WebResourceUtility.dll</HintPath>
+    </Reference>
+    <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="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Activities" />
+    <Reference Include="System.Activities.Presentation" />
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.ComponentModel.Composition.registration" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.7\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.DirectoryServices.AccountManagement" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.9.0.7\lib\net462\System.IO.Pipelines.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.7.0.0-preview.2.22152.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Duplex, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Duplex.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Http, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ServiceModel.Http.8.1.2\lib\net462\System.ServiceModel.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Primitives, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Security, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Web" />
+    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.9.0.7\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.9.0.7\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Channels, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Channels.9.0.7\lib\net462\System.Threading.Channels.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Workflow.Activities" />
+    <Reference Include="System.Workflow.ComponentModel" />
+    <Reference Include="System.Workflow.Runtime" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Args\DuplicateToolArgs.cs" />
+    <Compile Include="Args\DuplicateToolWithConnectionArgs.cs" />
+    <Compile Include="Args\StatusBarMessageEventArgs.cs" />
+    <Compile Include="Extensions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ExternalMethodCallerInfo.cs" />
+    <Compile Include="Forms\CurrencySelectionDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\CurrencySelectionDialog.Designer.cs">
+      <DependentUpon>CurrencySelectionDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\ErrorDetail.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\ErrorDetail.designer.cs">
+      <DependentUpon>ErrorDetail.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Icons.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Icons.resx</DependentUpon>
+    </Compile>
+    <Compile Include="InformationPanel.cs" />
+    <Compile Include="Interfaces\IConnectionControlUpdateSettings.cs" />
+    <Compile Include="Interfaces\INoHighlightingPlugin.cs" />
+    <Compile Include="Interfaces\IAboutPlugin.cs" />
+    <Compile Include="Interfaces\ICodePlexPlugin.cs" />
+    <Compile Include="Interfaces\ICompanion.cs" />
+    <Compile Include="Interfaces\IDuplicatableTool.cs" />
+    <Compile Include="Interfaces\IEarlyBoundProxy.cs" />
+    <Compile Include="Interfaces\IGitHubPlugin.cs" />
+    <Compile Include="Interfaces\IHelpPlugin.cs" />
+    <Compile Include="Interfaces\IMessageBusHost.cs" />
+    <Compile Include="Interfaces\INoConnectionRequired.cs" />
+    <Compile Include="Interfaces\IPluginMetadata.cs" />
+    <Compile Include="Interfaces\ISettingsPlugin.cs" />
+    <Compile Include="Interfaces\IShortcutReceiver.cs" />
+    <Compile Include="Interfaces\IPrivatePlugin.cs" />
+    <Compile Include="Interfaces\IStatusBarMessenger.cs" />
+    <Compile Include="Interfaces\IStatusBarMessager.cs" />
+    <Compile Include="Interfaces\IToolLibrary.cs" />
+    <Compile Include="Interfaces\IToolLibrarySettings.cs" />
+    <Compile Include="Interfaces\IXrmToolBoxLibraryTool.cs" />
+    <Compile Include="Interfaces\IXrmToolBoxPluginControl.cs" />
+    <Compile Include="Interfaces\IPayPalPlugin.cs" />
+    <Compile Include="Interfaces\IPluginMetadataExt.cs" />
+    <Compile Include="Interfaces\IWorkerHost.cs" />
+    <Compile Include="Interfaces\IXrmToolBoxPlugin.cs" />
+    <Compile Include="Args\MessageBusEventArgs.cs" />
+    <Compile Include="ITSecurityChecker.cs" />
+    <Compile Include="LogManager.cs" />
+    <Compile Include="Manifest\Manifest.cs" />
+    <Compile Include="Manifest\ManifestLoader.cs" />
+    <Compile Include="Manifest\PluginMetadata.cs" />
+    <Compile Include="Paths.cs" />
+    <Compile Include="PluginBase.cs" />
+    <Compile Include="MultipleConnectionsPluginControlBase.cs" />
+    <Compile Include="PluginControlBase.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PluginCloseInfo.cs" />
+    <Compile Include="PluginNotFoundException.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Args\RequestConnectionEventArgs.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="SettingsManager.cs" />
+    <Compile Include="AdditionalConnections.cs" />
+    <Compile Include="UserControls\LargePluginModel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControls\LargePluginModel.Designer.cs">
+      <DependentUpon>LargePluginModel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControls\NotificationArea.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControls\NotificationArea.Designer.cs">
+      <DependentUpon>NotificationArea.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControls\PluginModel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControls\SmallPluginLabel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="UserControls\SmallPluginModel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControls\SmallPluginModel.Designer.cs">
+      <DependentUpon>SmallPluginModel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Worker.cs" />
+    <Compile Include="WorkAsyncInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Forms\CurrencySelectionDialog.resx">
+      <DependentUpon>CurrencySelectionDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ErrorDetail.resx">
+      <DependentUpon>ErrorDetail.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Icons.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Icons.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControls\LargePluginModel.resx">
+      <DependentUpon>LargePluginModel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControls\NotificationArea.resx">
+      <DependentUpon>NotificationArea.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControls\PluginModel.resx">
+      <DependentUpon>PluginModel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControls\SmallPluginModel.resx">
+      <DependentUpon>SmallPluginModel.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\progress.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Resources\notif_icn_alert16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\notif_icn_crit16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\notif_icn_info16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\paypal.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\error_52.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\money_dollar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\money_pound.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\money_euro.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\progress_new.gif" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.NETFramework.ReferenceAssemblies.net48.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net48.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NETFramework.ReferenceAssemblies.net48.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net48.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net461\System.Runtime.WindowsRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net461\System.Runtime.WindowsRuntime.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.NETFramework.ReferenceAssemblies.net48.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net48.targets" Condition="Exists('..\packages\Microsoft.NETFramework.ReferenceAssemblies.net48.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net48.targets')" />
+  <Import Project="..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net461\System.Runtime.WindowsRuntime.targets" Condition="Exists('..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net461\System.Runtime.WindowsRuntime.targets')" />
+  <Import Project="..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets" Condition="Exists('..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets')" />
+  <Import Project="..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/XrmToolBox.Extensibility/packages.config b/MigrationBackup/244a8449/XrmToolBox.Extensibility/packages.config
similarity index 83%
rename from XrmToolBox.Extensibility/packages.config
rename to MigrationBackup/244a8449/XrmToolBox.Extensibility/packages.config
index 6a369ab76..4ad25a700 100644
--- a/XrmToolBox.Extensibility/packages.config
+++ b/MigrationBackup/244a8449/XrmToolBox.Extensibility/packages.config
@@ -1,43 +1,49 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.7" targetFramework="net48" />
-  <package id="Microsoft.CrmSdk.CoreAssemblies" version="9.0.2.59" targetFramework="net48" />
-  <package id="Microsoft.CrmSdk.Deployment" version="9.0.2.34" targetFramework="net462" />
-  <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.59" targetFramework="net48" />
-  <package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.1.1.65" targetFramework="net48" />
-  <package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.1.1.65" targetFramework="net48" />
-  <package id="Microsoft.Extensions.AI" version="9.7.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.AI.Abstractions" version="9.7.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="9.0.7" targetFramework="net48" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.7" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.7" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Primitives" version="9.0.7" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="5.3.0" targetFramework="net462" />
-  <package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net48" />
-  <package id="Microsoft.NETCore.Targets" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Rest.ClientRuntime" version="2.3.24" targetFramework="net462" />
-  <package id="Microsoft.Web.Xdt" version="7.0.0-preview.22423.2" targetFramework="net48" />
-  <package id="MscrmTools.Xrm.Connection" version="1.2025.7.63" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
-  <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="9.0.7" targetFramework="net48" />
-  <package id="System.IO" version="4.3.0" targetFramework="net48" />
-  <package id="System.IO.Pipelines" version="9.0.7" targetFramework="net48" />
-  <package id="System.Memory" version="4.6.3" targetFramework="net48" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
-  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
-  <package id="System.Private.Uri" version="4.3.2" targetFramework="net462" />
-  <package id="System.Runtime" version="4.3.1" targetFramework="net462" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="7.0.0-preview.2.22152.2" targetFramework="net48" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" requireReinstallation="true" />
-  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
-  <package id="System.ServiceModel.Http" version="8.1.2" targetFramework="net48" />
-  <package id="System.ServiceModel.Primitives" version="8.1.2" targetFramework="net48" />
-  <package id="System.Text.Encodings.Web" version="9.0.7" targetFramework="net48" />
-  <package id="System.Text.Json" version="9.0.7" targetFramework="net48" />
-  <package id="System.Threading.Channels" version="9.0.7" targetFramework="net48" />
-  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net48" />
-  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.CrmSdk.CoreAssemblies" version="9.0.2.59" targetFramework="net48" />
+  <package id="Microsoft.CrmSdk.Deployment" version="9.0.2.34" targetFramework="net462" />
+  <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.59" targetFramework="net48" />
+  <package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.1.1.65" targetFramework="net48" />
+  <package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.1.1.65" targetFramework="net48" />
+  <package id="Microsoft.Extensions.AI" version="9.7.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.AI.Abstractions" version="9.7.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="5.3.0" targetFramework="net462" />
+  <package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Targets" version="5.0.0" targetFramework="net48" />
+  <package id="Microsoft.NETFramework.ReferenceAssemblies" version="1.0.0" targetFramework="net48" developmentDependency="true" />
+  <package id="Microsoft.NETFramework.ReferenceAssemblies.net48" version="1.0.0" targetFramework="net48" developmentDependency="true" />
+  <package id="Microsoft.Rest.ClientRuntime" version="2.3.24" targetFramework="net462" />
+  <package id="Microsoft.Toolkit.Uwp.Notifications" version="7.1.3" targetFramework="net48" />
+  <package id="Microsoft.Web.Xdt" version="7.0.0-preview.22423.2" targetFramework="net48" />
+  <package id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" targetFramework="net48" />
+  <package id="MscrmTools.Xrm.Connection" version="1.2025.9.64" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.7" targetFramework="net48" />
+  <package id="System.IO" version="4.3.0" targetFramework="net48" />
+  <package id="System.IO.Pipelines" version="9.0.7" targetFramework="net48" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net48" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
+  <package id="System.Private.Uri" version="4.3.2" targetFramework="net462" />
+  <package id="System.Runtime" version="4.3.1" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="7.0.0-preview.2.22152.2" targetFramework="net48" />
+  <package id="System.Runtime.WindowsRuntime" version="4.6.0" targetFramework="net48" />
+  <package id="System.Runtime.WindowsRuntime.UI.Xaml" version="4.6.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" requireReinstallation="true" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
+  <package id="System.ServiceModel.Http" version="8.1.2" targetFramework="net48" />
+  <package id="System.ServiceModel.Primitives" version="8.1.2" targetFramework="net48" />
+  <package id="System.Text.Encodings.Web" version="9.0.7" targetFramework="net48" />
+  <package id="System.Text.Json" version="9.0.7" targetFramework="net48" />
+  <package id="System.Threading.Channels" version="9.0.7" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/MsCrmTools.SampleTool.csproj b/MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/MsCrmTools.SampleTool.csproj
new file mode 100644
index 000000000..ff41e7653
--- /dev/null
+++ b/MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/MsCrmTools.SampleTool.csproj
@@ -0,0 +1,278 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.props" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{5BF1E228-F898-40CF-B8FB-8412D8C81CFF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MsCrmTools.SampleTool</RootNamespace>
+    <AssemblyName>MsCrmTools.SampleTool</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
+    <AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
+    <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
+    <UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
+    <UpdateAssemblyInfoVersion>True</UpdateAssemblyInfoVersion>
+    <AssemblyVersionSettings>None.YearStamp.MonthStamp.DayStamp</AssemblyVersionSettings>
+    <AssemblyFileVersionSettings>None.YearStamp.MonthStamp.DayStamp</AssemblyFileVersionSettings>
+    <AssemblyInfoVersionSettings>None.YearStamp.MonthStamp.DayStamp</AssemblyInfoVersionSettings>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Without GemBox|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug Without GemBox\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="McTools.Xrm.Connection, Version=1.2025.9.64, Culture=neutral, PublicKeyToken=96037217801d9658, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MscrmTools.Xrm.Connection.1.2025.9.64\lib\net48\McTools.Xrm.Connection.dll</HintPath>
+    </Reference>
+    <Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2025.9.64, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MscrmTools.Xrm.Connection.1.2025.9.64\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.59\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.5.3.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.1.65\lib\net462\Microsoft.Rest.ClientRuntime.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Toolkit.Uwp.Notifications, Version=7.1.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Toolkit.Uwp.Notifications.7.1.3\lib\net461\Microsoft.Toolkit.Uwp.Notifications.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Sdk, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.59\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Sdk.Deployment, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.Deployment.9.0.2.34\lib\net462\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Sdk.Workflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.Workflow.9.0.2.59\lib\net462\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Tooling.Connector, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Tooling.CrmConnectControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.CrmConnectControl.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Tooling.Ui.Styles, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.Ui.Styles.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xrm.Tooling.WebResourceUtility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.WebResourceUtility.dll</HintPath>
+    </Reference>
+    <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="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Activities" />
+    <Reference Include="System.Activities.Presentation" />
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.DirectoryServices.AccountManagement" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.Pipelines.9.0.7\lib\net462\System.IO.Pipelines.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.7.0.0-preview.2.22152.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Duplex, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Duplex.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Http, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ServiceModel.Http.8.1.2\lib\net462\System.ServiceModel.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Primitives, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Security, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Web" />
+    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Encodings.Web.9.0.7\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Json.9.0.7\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Workflow.Activities" />
+    <Reference Include="System.Workflow.ComponentModel" />
+    <Reference Include="System.Workflow.Runtime" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="PluginCompanion.cs" />
+    <Compile Include="PluginMulti.cs" />
+    <Compile Include="Plugin.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="CompanionTool.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CompanionTool.Designer.cs">
+      <DependentUpon>CompanionTool.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SampleTool.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SampleTool.Designer.cs">
+      <DependentUpon>SampleTool.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SampleToolMulti.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SampleToolMulti.Designer.cs">
+      <DependentUpon>SampleToolMulti.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Settings.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CompanionTool.resx">
+      <DependentUpon>CompanionTool.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SampleTool.resx">
+      <DependentUpon>SampleTool.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SampleToolMulti.resx">
+      <DependentUpon>SampleToolMulti.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\XrmToolBox.Extensibility\XrmToolBox.Extensibility.csproj">
+      <Project>{df77aea3-43f7-403c-91af-3023a3bb06ec}</Project>
+      <Name>XrmToolBox.Extensibility</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\XrmToolBox\XrmToolBox.csproj">
+      <Project>{328d55be-8b9a-4087-a5c2-9fbaf623f54b}</Project>
+      <Name>XrmToolBox</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy /y "$(TargetPath)" "$(SolutionDir)XrmToolBox\$(OutDir)Plugins\"
+xcopy /y "$(TargetPath)" "C:\P\X\Debug\Plugins\"</PostBuildEvent>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_ConfigurationName="Release" />
+    </VisualStudio>
+  </ProjectExtensions>
+  <Import Project="..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.NETFramework.ReferenceAssemblies.net48.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net48.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.NETFramework.ReferenceAssemblies.net48.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net48.targets'))" />
+    <Error Condition="!Exists('..\..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net461\System.Runtime.WindowsRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net461\System.Runtime.WindowsRuntime.targets'))" />
+    <Error Condition="!Exists('..\..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\Microsoft.NETFramework.ReferenceAssemblies.net48.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net48.targets" Condition="Exists('..\..\packages\Microsoft.NETFramework.ReferenceAssemblies.net48.1.0.0\build\Microsoft.NETFramework.ReferenceAssemblies.net48.targets')" />
+  <Import Project="..\..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net461\System.Runtime.WindowsRuntime.targets" Condition="Exists('..\..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net461\System.Runtime.WindowsRuntime.targets')" />
+  <Import Project="..\..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets" Condition="Exists('..\..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets')" />
+  <Import Project="..\..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.targets" Condition="Exists('..\..\packages\Microsoft.Windows.SDK.Contracts.10.0.19041.1\build\Microsoft.Windows.SDK.Contracts.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/NuGetUpgradeLog.html b/MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/NuGetUpgradeLog.html
new file mode 100644
index 000000000..c908ead95
--- /dev/null
+++ b/MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/NuGetUpgradeLog.html
@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+
+    <html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="NuGetUpgradeReportTitle">
+          NuGetMigrationLog
+        </title><style>
+            
+                    /* Body style, for the entire document */
+                    body
+                    {
+                        background: #F3F3F4;
+                        color: #1E1E1F;
+                        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+                        font-size: 12pt;
+                        padding: 0;
+                        margin: 0;
+                    }
+
+                    /* Header1 style, used for the main title */
+                    h1
+                    {
+                        padding: 10px 0px 10px 10px;
+                        font-size: 21pt;
+                        background-color: #E2E2E2;
+                        border-bottom: 1px #C1C1C2 solid; 
+                        color: #201F20;
+                        margin: 0;
+                        font-weight: normal;
+                    }
+
+                    /* Header2 style, used for "Overview" and other sections */
+                    h2
+                    {
+                        font-size: 18pt;
+                        font-weight: normal;
+                        padding: 15px 0 5px 0;
+                        margin: 0;
+                    }
+
+                    /* Header3 style, used for sub-sections, such as project name */
+                    h3
+                    {
+                        font-weight: normal;
+                        font-size: 15pt;
+                        margin: 0;
+                        padding: 15px 0 5px 0;
+                        background-color: transparent;
+                    }
+
+                    .info-text
+                    {
+                        margin: 0px 0 0.75em 0;
+                    }
+
+                    /* Color all hyperlinks one color */
+                    a
+                    {
+                        color: #1382CE;
+                    }
+
+                    /* Table styles */ 
+                    table
+                    {
+                        border-spacing: 0 0;
+                        border-collapse: collapse;
+                        font-size: 11pt;
+                    }
+
+                    table th
+                    {
+                        background: #E7E7E8;
+                        text-align: left;
+                        text-decoration: none;
+                        font-weight: normal;
+                        padding: 3px 6px 3px 6px;
+                    }
+
+                    table td
+                    {
+                        vertical-align: top;
+                        padding: 3px 6px 5px 5px;
+                        margin: 0px;
+                        border: 1px solid #E7E7E8;
+                        background: #F7F7F8;
+                    }
+
+                    /* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
+                    .localLink
+                    {
+                        color: #1E1E1F;
+                        background: #EEEEED;
+                        text-decoration: none;
+                    }
+
+                    .localLink:hover
+                    {
+                        color: #1382CE;
+                        background: #FFFF99;
+                        text-decoration: none;
+                    }
+
+                    .issueCell
+                    {
+                        width: 100%;
+                    }
+
+                    .packageIssue
+                    {
+                        margin-left: 25px;
+                    }
+
+                    /* Padding around the content after the h1 */ 
+                    #content 
+                    {
+	                    padding: 0px 20px 20px 20px; 
+                    }
+
+                    .issues table
+                    {
+                        width: 97%;
+                    }
+
+                    /* All Icons */
+                    .IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
+                    {
+                        min-width:18px;
+                        min-height:18px; 
+                        background-repeat:no-repeat;
+                        background-position:center;
+                    }
+
+                    .IconSuccessEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
+                    }
+
+                    .IconInfoEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
+                    }
+
+                    .IconWarningEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
+                    }
+
+                    .IconErrorEncoded
+                    {
+                        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
+                    }
+                
+          </style></head><body><h1>
+          NuGet Migration Report - Plugins\MsCrmTools.SampleTool</h1><div id="content"><h2 _locID="OverviewTitle">Overview</h2><div class="info-text">Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.</div><div class="info-text">
+            If you run into any problems, have feedback, questions, or concerns, please
+            <a href="https://github.com/NuGet/Home/issues/">file an issue on the NuGet GitHub repository.</a></div><div class="info-text">
+            Changed files and this report have been backed up here:
+            <a href="C:\P\T\Github\XrmToolBox\MigrationBackup\d53d5dde\Plugins\MsCrmTools.SampleTool">C:\P\T\Github\XrmToolBox\MigrationBackup\d53d5dde\Plugins\MsCrmTools.SampleTool</a></div><div class="info-text"><a href="https://aka.ms/nuget-pc2pr-migrator-rollback">Help me rollback to packages.config</a></div><h2 _locID="PackagesTitle">Packages processed</h2><h3 _locID="IncludePackagesTitle">Top-level dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.CoreAssemblies</span></td><td><span>
+                v9.0.2.59</span></td></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.Workflow</span></td><td><span>
+                v9.0.2.59</span></td></tr><tr><td class="issueCell"><span>Microsoft.NETCore.Platforms</span></td><td><span>
+                v7.0.4</span></td></tr><tr><td class="issueCell"><span>Microsoft.NETCore.Targets</span></td><td><span>
+                v5.0.0</span></td></tr><tr><td class="issueCell"><span>Microsoft.Toolkit.Uwp.Notifications</span></td><td><span>
+                v7.1.3</span></td></tr><tr><td class="issueCell"><span>MscrmTools.Xrm.Connection</span></td><td><span>
+                v1.2025.9.64</span></td></tr><tr><td class="issueCell"><span>Newtonsoft.Json</span></td><td><span>
+                v13.0.3</span></td></tr><tr><td class="issueCell"><span>System.Memory</span></td><td><span>
+                v4.6.3</span></td></tr><tr><td class="issueCell"><span>System.Runtime</span></td><td><span>
+                v4.3.1</span></td></tr><tr><td class="issueCell"><span>System.Runtime.CompilerServices.Unsafe</span></td><td><span>
+                v7.0.0-preview.2.22152.2</span></td></tr><tr><td class="issueCell"><span>System.Security.Cryptography.Algorithms</span></td><td><span>
+                v4.3.1</span></td></tr><tr><td class="issueCell"><span>System.Security.Cryptography.X509Certificates</span></td><td><span>
+                v4.3.2</span></td></tr><tr><td class="issueCell"><span>System.ServiceModel.Http</span></td><td><span>
+                v8.1.2</span></td></tr><tr><td class="issueCell"><span>System.ServiceModel.Primitives</span></td><td><span>
+                v8.1.2</span></td></tr><tr><td class="issueCell"><span>System.Text.Json</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>System.Threading.Tasks.Extensions</span></td><td><span>
+                v4.6.3</span></td></tr><tr><td class="issueCell"><span>System.ValueTuple</span></td><td><span>
+                v4.6.1</span></td></tr></table></div><p /><h3 _locID="IncludePackagesTitle">Transitive dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>Microsoft.Bcl.AsyncInterfaces</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.Deployment</span></td><td><span>
+                v9.0.2.34</span></td></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.XrmTooling.CoreAssembly</span></td><td><span>
+                v9.1.1.65</span></td></tr><tr><td class="issueCell"><span>Microsoft.CrmSdk.XrmTooling.WpfControls</span></td><td><span>
+                v9.1.1.65</span></td></tr><tr><td class="issueCell"><span>Microsoft.IdentityModel.Clients.ActiveDirectory</span></td><td><span>
+                v5.3.0</span></td></tr><tr><td class="issueCell"><span>Microsoft.NETFramework.ReferenceAssemblies</span></td><td><span>
+                v1.0.0</span></td></tr><tr><td class="issueCell"><span>Microsoft.NETFramework.ReferenceAssemblies.net48</span></td><td><span>
+                v1.0.0</span></td></tr><tr><td class="issueCell"><span>Microsoft.Rest.ClientRuntime</span></td><td><span>
+                v2.3.24</span></td></tr><tr><td class="issueCell"><span>Microsoft.Windows.SDK.Contracts</span></td><td><span>
+                v10.0.19041.1</span></td></tr><tr><td class="issueCell"><span>System.Buffers</span></td><td><span>
+                v4.6.1</span></td></tr><tr><td class="issueCell"><span>System.IO</span></td><td><span>
+                v4.3.0</span></td></tr><tr><td class="issueCell"><span>System.IO.Pipelines</span></td><td><span>
+                v9.0.7</span></td></tr><tr><td class="issueCell"><span>System.Net.Http</span></td><td><span>
+                v4.3.4</span></td></tr><tr><td class="issueCell"><span>System.Numerics.Vectors</span></td><td><span>
+                v4.6.1</span></td></tr><tr><td class="issueCell"><span>System.Private.Uri</span></td><td><span>
+                v4.3.2</span></td></tr><tr><td class="issueCell"><span>System.Runtime.WindowsRuntime</span></td><td><span>
+                v4.6.0</span></td></tr><tr><td class="issueCell"><span>System.Runtime.WindowsRuntime.UI.Xaml</span></td><td><span>
+                v4.6.0</span></td></tr><tr><td class="issueCell"><span>System.Security.Cryptography.Encoding</span></td><td><span>
+                v4.3.0</span></td></tr><tr><td class="issueCell"><span>System.Security.Cryptography.Primitives</span></td><td><span>
+                v4.3.0</span></td></tr><tr><td class="issueCell"><span>System.Text.Encodings.Web</span></td><td><span>
+                v9.0.7</span></td></tr></table></div><h2 _locID="IssuesTitle">Package compatibility issues</h2><div class="issues"><table><tr><th /><th class="issueCell" _locID="DescriptionTableHeader">Description</th></tr><tr><td class="IconInfoEncoded" /><td class="issueCell">
+                No issues were found.
+              </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/Plugins/MsCrmTools.SampleTool/packages.config b/MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/packages.config
similarity index 79%
rename from Plugins/MsCrmTools.SampleTool/packages.config
rename to MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/packages.config
index 1a024fe7b..8b17f9705 100644
--- a/Plugins/MsCrmTools.SampleTool/packages.config
+++ b/MigrationBackup/d53d5dde/Plugins/MsCrmTools.SampleTool/packages.config
@@ -1,34 +1,40 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.7" targetFramework="net48" />
-  <package id="Microsoft.CrmSdk.CoreAssemblies" version="9.0.2.59" targetFramework="net48" />
-  <package id="Microsoft.CrmSdk.Deployment" version="9.0.2.34" targetFramework="net462" />
-  <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.59" targetFramework="net48" />
-  <package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.1.1.65" targetFramework="net48" />
-  <package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.1.1.65" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="5.3.0" targetFramework="net462" />
-  <package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net48" />
-  <package id="Microsoft.NETCore.Targets" version="5.0.0" targetFramework="net462" />
-  <package id="Microsoft.Rest.ClientRuntime" version="2.3.24" targetFramework="net462" />
-  <package id="MscrmTools.Xrm.Connection" version="1.2025.7.63" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
-  <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
-  <package id="System.IO" version="4.3.0" targetFramework="net48" />
-  <package id="System.IO.Pipelines" version="9.0.7" targetFramework="net48" />
-  <package id="System.Memory" version="4.6.3" targetFramework="net48" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
-  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
-  <package id="System.Private.Uri" version="4.3.2" targetFramework="net462" />
-  <package id="System.Runtime" version="4.3.1" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="7.0.0-preview.2.22152.2" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" requireReinstallation="true" />
-  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
-  <package id="System.ServiceModel.Http" version="8.1.2" targetFramework="net48" />
-  <package id="System.ServiceModel.Primitives" version="8.1.2" targetFramework="net48" />
-  <package id="System.Text.Encodings.Web" version="9.0.7" targetFramework="net48" />
-  <package id="System.Text.Json" version="9.0.7" targetFramework="net48" />
-  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net48" />
-  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.7" targetFramework="net48" />
+  <package id="Microsoft.CrmSdk.CoreAssemblies" version="9.0.2.59" targetFramework="net48" />
+  <package id="Microsoft.CrmSdk.Deployment" version="9.0.2.34" targetFramework="net462" />
+  <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.59" targetFramework="net48" />
+  <package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.1.1.65" targetFramework="net48" />
+  <package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.1.1.65" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="5.3.0" targetFramework="net462" />
+  <package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net48" />
+  <package id="Microsoft.NETCore.Targets" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.NETFramework.ReferenceAssemblies" version="1.0.0" targetFramework="net48" developmentDependency="true" />
+  <package id="Microsoft.NETFramework.ReferenceAssemblies.net48" version="1.0.0" targetFramework="net48" developmentDependency="true" />
+  <package id="Microsoft.Rest.ClientRuntime" version="2.3.24" targetFramework="net462" />
+  <package id="Microsoft.Toolkit.Uwp.Notifications" version="7.1.3" targetFramework="net48" />
+  <package id="Microsoft.Windows.SDK.Contracts" version="10.0.19041.1" targetFramework="net48" />
+  <package id="MscrmTools.Xrm.Connection" version="1.2025.9.64" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
+  <package id="System.IO" version="4.3.0" targetFramework="net48" />
+  <package id="System.IO.Pipelines" version="9.0.7" targetFramework="net48" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net48" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
+  <package id="System.Private.Uri" version="4.3.2" targetFramework="net462" />
+  <package id="System.Runtime" version="4.3.1" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="7.0.0-preview.2.22152.2" targetFramework="net462" />
+  <package id="System.Runtime.WindowsRuntime" version="4.6.0" targetFramework="net48" />
+  <package id="System.Runtime.WindowsRuntime.UI.Xaml" version="4.6.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" requireReinstallation="true" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
+  <package id="System.ServiceModel.Http" version="8.1.2" targetFramework="net48" />
+  <package id="System.ServiceModel.Primitives" version="8.1.2" targetFramework="net48" />
+  <package id="System.Text.Encodings.Web" version="9.0.7" targetFramework="net48" />
+  <package id="System.Text.Json" version="9.0.7" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/Plugins/MsCrmTools.SampleTool/MsCrmTools.SampleTool.csproj b/Plugins/MsCrmTools.SampleTool/MsCrmTools.SampleTool.csproj
index 0f0bf5afc..663fd9c81 100644
--- a/Plugins/MsCrmTools.SampleTool/MsCrmTools.SampleTool.csproj
+++ b/Plugins/MsCrmTools.SampleTool/MsCrmTools.SampleTool.csproj
@@ -56,126 +56,23 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="McTools.Xrm.Connection, Version=1.2025.7.63, Culture=neutral, PublicKeyToken=96037217801d9658, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MscrmTools.Xrm.Connection.1.2025.7.63\lib\net48\McTools.Xrm.Connection.dll</HintPath>
-    </Reference>
-    <Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2025.7.63, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MscrmTools.Xrm.Connection.1.2025.7.63\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.59\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.5.3.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.1.65\lib\net462\Microsoft.Rest.ClientRuntime.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Sdk, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.59\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Sdk.Deployment, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.Deployment.9.0.2.34\lib\net462\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Sdk.Workflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.Workflow.9.0.2.59\lib\net462\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Tooling.Connector, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Tooling.CrmConnectControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.CrmConnectControl.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Tooling.Ui.Styles, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.Ui.Styles.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Tooling.WebResourceUtility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.WebResourceUtility.dll</HintPath>
-    </Reference>
-    <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="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Activities" />
     <Reference Include="System.Activities.Presentation" />
-    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IdentityModel" />
-    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Pipelines, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.Pipelines.9.0.7\lib\net462\System.IO.Pipelines.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.7.0.0-preview.2.22152.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceModel.Duplex, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Duplex.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Http, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ServiceModel.Http.8.1.2\lib\net462\System.ServiceModel.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Primitives, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Security, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Security.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceModel.Web" />
-    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Text.Encodings.Web.9.0.7\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Text.Json.9.0.7\lib\net462\System.Text.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms" />
@@ -236,7 +133,59 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies">
+      <Version>9.0.2.59</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CrmSdk.Workflow">
+      <Version>9.0.2.59</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.Platforms">
+      <Version>7.0.4</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.Targets">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
+      <Version>7.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="MscrmTools.Xrm.Connection">
+      <Version>1.2025.9.64</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="System.Memory">
+      <Version>4.6.3</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime">
+      <Version>4.3.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+      <Version>7.0.0-preview.2.22152.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.Algorithms">
+      <Version>4.3.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.X509Certificates">
+      <Version>4.3.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.ServiceModel.Http">
+      <Version>8.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.ServiceModel.Primitives">
+      <Version>8.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>9.0.7</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Extensions">
+      <Version>4.6.3</Version>
+    </PackageReference>
+    <PackageReference Include="System.ValueTuple">
+      <Version>4.6.1</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
@@ -248,13 +197,6 @@ xcopy /y "$(TargetPath)" "C:\P\X\Debug\Plugins\"</PostBuildEvent>
       <UserProperties BuildVersion_ConfigurationName="Release" />
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Plugins/MsCrmTools.SampleTool/SampleTool.Designer.cs b/Plugins/MsCrmTools.SampleTool/SampleTool.Designer.cs
index fe4919cb6..272adf3e8 100644
--- a/Plugins/MsCrmTools.SampleTool/SampleTool.Designer.cs
+++ b/Plugins/MsCrmTools.SampleTool/SampleTool.Designer.cs
@@ -45,18 +45,48 @@ private void InitializeComponent()
             this.btnCheckMultiSample = new System.Windows.Forms.Button();
             this.btnDoSomethingWrong = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
+            this.btnOpenNotif = new System.Windows.Forms.Button();
+            this.gbToast = new System.Windows.Forms.GroupBox();
+            this.lblHeader = new System.Windows.Forms.Label();
+            this.txtHeader = new System.Windows.Forms.TextBox();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.lblMessage = new System.Windows.Forms.Label();
+            this.gbErrorHandling = new System.Windows.Forms.GroupBox();
+            this.btnShowNotif = new System.Windows.Forms.Button();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.gbNotification = new System.Windows.Forms.GroupBox();
+            this.lblNotifType = new System.Windows.Forms.Label();
+            this.cbbNotifType = new System.Windows.Forms.ComboBox();
+            this.lblNotifMessage = new System.Windows.Forms.Label();
+            this.txtNotifMessage = new System.Windows.Forms.TextBox();
+            this.lblNotifAction = new System.Windows.Forms.Label();
+            this.cbbNotifActions = new System.Windows.Forms.ComboBox();
+            this.lblNotifButtonText = new System.Windows.Forms.Label();
+            this.txtNotifButton = new System.Windows.Forms.TextBox();
+            this.txtNotifLink = new System.Windows.Forms.TextBox();
+            this.lblNotifLinkText = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.chkNotifCanBeClosed = new System.Windows.Forms.CheckBox();
+            this.notificationControl1 = new XrmToolBox.Extensibility.UserControls.NotificationControl();
+            this.lblNotifAutoClose = new System.Windows.Forms.Label();
+            this.nudNotif = new System.Windows.Forms.NumericUpDown();
             this.gbOptions.SuspendLayout();
             this.toolStripMenu.SuspendLayout();
+            this.gbToast.SuspendLayout();
+            this.gbErrorHandling.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.gbNotification.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.nudNotif)).BeginInit();
             this.SuspendLayout();
             // 
             // gbOptions
             // 
             this.gbOptions.Controls.Add(this.cbMultipleCalls);
-            this.gbOptions.Location = new System.Drawing.Point(24, 66);
-            this.gbOptions.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.gbOptions.Location = new System.Drawing.Point(3, 7);
+            this.gbOptions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.gbOptions.Name = "gbOptions";
-            this.gbOptions.Padding = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.gbOptions.Size = new System.Drawing.Size(243, 75);
+            this.gbOptions.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.gbOptions.Size = new System.Drawing.Size(375, 60);
             this.gbOptions.TabIndex = 3;
             this.gbOptions.TabStop = false;
             this.gbOptions.Text = "Options";
@@ -64,17 +94,16 @@ private void InitializeComponent()
             // cbMultipleCalls
             // 
             this.cbMultipleCalls.AutoSize = true;
-            this.cbMultipleCalls.Location = new System.Drawing.Point(20, 28);
-            this.cbMultipleCalls.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.cbMultipleCalls.Location = new System.Drawing.Point(18, 22);
+            this.cbMultipleCalls.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.cbMultipleCalls.Name = "cbMultipleCalls";
-            this.cbMultipleCalls.Size = new System.Drawing.Size(124, 24);
+            this.cbMultipleCalls.Size = new System.Drawing.Size(106, 20);
             this.cbMultipleCalls.TabIndex = 0;
             this.cbMultipleCalls.Text = "Multiple calls";
             this.cbMultipleCalls.UseVisualStyleBackColor = true;
             // 
             // toolStripMenu
             // 
-            this.toolStripMenu.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.toolStripMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbClose,
             this.toolStripSeparator2,
@@ -87,7 +116,7 @@ private void InitializeComponent()
             this.toolStripMenu.Location = new System.Drawing.Point(0, 0);
             this.toolStripMenu.Name = "toolStripMenu";
             this.toolStripMenu.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.toolStripMenu.Size = new System.Drawing.Size(1065, 34);
+            this.toolStripMenu.Size = new System.Drawing.Size(1238, 27);
             this.toolStripMenu.TabIndex = 4;
             this.toolStripMenu.Text = "toolStrip1";
             // 
@@ -97,21 +126,21 @@ private void InitializeComponent()
             this.tsbClose.Image = ((System.Drawing.Image)(resources.GetObject("tsbClose.Image")));
             this.tsbClose.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbClose.Name = "tsbClose";
-            this.tsbClose.Size = new System.Drawing.Size(34, 29);
+            this.tsbClose.Size = new System.Drawing.Size(29, 24);
             this.tsbClose.Text = "Close this tool";
             this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 34);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 27);
             // 
             // tsbWhoAmI
             // 
             this.tsbWhoAmI.Image = ((System.Drawing.Image)(resources.GetObject("tsbWhoAmI.Image")));
             this.tsbWhoAmI.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbWhoAmI.Name = "tsbWhoAmI";
-            this.tsbWhoAmI.Size = new System.Drawing.Size(118, 29);
+            this.tsbWhoAmI.Size = new System.Drawing.Size(93, 24);
             this.tsbWhoAmI.Text = "Who am I";
             this.tsbWhoAmI.ToolTipText = "Perfomrs a Who I Am request";
             this.tsbWhoAmI.Click += new System.EventHandler(this.tsbWhoAmI_Click);
@@ -119,7 +148,7 @@ private void InitializeComponent()
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 34);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 27);
             // 
             // tsbCancel
             // 
@@ -127,7 +156,7 @@ private void InitializeComponent()
             this.tsbCancel.Image = ((System.Drawing.Image)(resources.GetObject("tsbCancel.Image")));
             this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbCancel.Name = "tsbCancel";
-            this.tsbCancel.Size = new System.Drawing.Size(91, 29);
+            this.tsbCancel.Size = new System.Drawing.Size(73, 24);
             this.tsbCancel.Text = "Cancel";
             this.tsbCancel.ToolTipText = "Cancel the current request";
             this.tsbCancel.Click += new System.EventHandler(this.tsbCancel_Click);
@@ -135,45 +164,46 @@ private void InitializeComponent()
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 34);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 27);
             // 
             // tsbDuplicate
             // 
             this.tsbDuplicate.Image = ((System.Drawing.Image)(resources.GetObject("tsbDuplicate.Image")));
             this.tsbDuplicate.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbDuplicate.Name = "tsbDuplicate";
-            this.tsbDuplicate.Size = new System.Drawing.Size(114, 29);
+            this.tsbDuplicate.Size = new System.Drawing.Size(93, 24);
             this.tsbDuplicate.Text = "Duplicate";
             this.tsbDuplicate.Click += new System.EventHandler(this.tsbDuplicate_Click);
             // 
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 34);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 27);
             // 
             // txtState
             // 
-            this.txtState.Location = new System.Drawing.Point(24, 197);
-            this.txtState.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.txtState.Location = new System.Drawing.Point(434, 95);
+            this.txtState.Margin = new System.Windows.Forms.Padding(2);
             this.txtState.Name = "txtState";
-            this.txtState.Size = new System.Drawing.Size(244, 26);
+            this.txtState.Size = new System.Drawing.Size(217, 22);
             this.txtState.TabIndex = 5;
             // 
             // lblState
             // 
             this.lblState.AutoSize = true;
-            this.lblState.Location = new System.Drawing.Point(20, 168);
+            this.lblState.Location = new System.Drawing.Point(431, 71);
             this.lblState.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblState.Name = "lblState";
-            this.lblState.Size = new System.Drawing.Size(48, 20);
+            this.lblState.Size = new System.Drawing.Size(38, 16);
             this.lblState.TabIndex = 6;
             this.lblState.Text = "State";
             // 
             // btnCheckMultiSample
             // 
-            this.btnCheckMultiSample.Location = new System.Drawing.Point(400, 86);
+            this.btnCheckMultiSample.Location = new System.Drawing.Point(434, 19);
+            this.btnCheckMultiSample.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnCheckMultiSample.Name = "btnCheckMultiSample";
-            this.btnCheckMultiSample.Size = new System.Drawing.Size(434, 38);
+            this.btnCheckMultiSample.Size = new System.Drawing.Size(386, 30);
             this.btnCheckMultiSample.TabIndex = 7;
             this.btnCheckMultiSample.Text = "Is Sample Tool for multiconnection installed?";
             this.btnCheckMultiSample.UseVisualStyleBackColor = true;
@@ -181,10 +211,11 @@ private void InitializeComponent()
             // 
             // btnDoSomethingWrong
             // 
-            this.btnDoSomethingWrong.Location = new System.Drawing.Point(400, 191);
-            this.btnDoSomethingWrong.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btnDoSomethingWrong.Dock = System.Windows.Forms.DockStyle.Top;
+            this.btnDoSomethingWrong.Location = new System.Drawing.Point(6, 21);
+            this.btnDoSomethingWrong.Margin = new System.Windows.Forms.Padding(4);
             this.btnDoSomethingWrong.Name = "btnDoSomethingWrong";
-            this.btnDoSomethingWrong.Size = new System.Drawing.Size(434, 35);
+            this.btnDoSomethingWrong.Size = new System.Drawing.Size(363, 44);
             this.btnDoSomethingWrong.TabIndex = 8;
             this.btnDoSomethingWrong.Text = "Do something wrong";
             this.btnDoSomethingWrong.UseVisualStyleBackColor = true;
@@ -192,35 +223,320 @@ private void InitializeComponent()
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(400, 236);
-            this.button1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.button1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.button1.Location = new System.Drawing.Point(6, 65);
+            this.button1.Margin = new System.Windows.Forms.Padding(4);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(434, 35);
+            this.button1.Size = new System.Drawing.Size(363, 48);
             this.button1.TabIndex = 9;
             this.button1.Text = "Do something wrong without catch";
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
+            // btnOpenNotif
+            // 
+            this.btnOpenNotif.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.btnOpenNotif.Location = new System.Drawing.Point(6, 143);
+            this.btnOpenNotif.Name = "btnOpenNotif";
+            this.btnOpenNotif.Size = new System.Drawing.Size(363, 36);
+            this.btnOpenNotif.TabIndex = 10;
+            this.btnOpenNotif.Text = "Open Toast Notification";
+            this.btnOpenNotif.UseVisualStyleBackColor = true;
+            this.btnOpenNotif.Click += new System.EventHandler(this.btnOpenNotif_Click);
+            // 
+            // gbToast
+            // 
+            this.gbToast.Controls.Add(this.textBox1);
+            this.gbToast.Controls.Add(this.btnOpenNotif);
+            this.gbToast.Controls.Add(this.lblMessage);
+            this.gbToast.Controls.Add(this.txtHeader);
+            this.gbToast.Controls.Add(this.lblHeader);
+            this.gbToast.Location = new System.Drawing.Point(3, 200);
+            this.gbToast.Name = "gbToast";
+            this.gbToast.Padding = new System.Windows.Forms.Padding(6);
+            this.gbToast.Size = new System.Drawing.Size(375, 185);
+            this.gbToast.TabIndex = 11;
+            this.gbToast.TabStop = false;
+            this.gbToast.Text = "Toast Notification";
+            // 
+            // lblHeader
+            // 
+            this.lblHeader.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lblHeader.Location = new System.Drawing.Point(6, 21);
+            this.lblHeader.Name = "lblHeader";
+            this.lblHeader.Size = new System.Drawing.Size(363, 30);
+            this.lblHeader.TabIndex = 0;
+            this.lblHeader.Text = "Header";
+            this.lblHeader.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // txtHeader
+            // 
+            this.txtHeader.Dock = System.Windows.Forms.DockStyle.Top;
+            this.txtHeader.Location = new System.Drawing.Point(6, 51);
+            this.txtHeader.Name = "txtHeader";
+            this.txtHeader.Size = new System.Drawing.Size(363, 22);
+            this.txtHeader.TabIndex = 1;
+            // 
+            // textBox1
+            // 
+            this.textBox1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.textBox1.Location = new System.Drawing.Point(6, 103);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(363, 22);
+            this.textBox1.TabIndex = 3;
+            // 
+            // lblMessage
+            // 
+            this.lblMessage.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lblMessage.Location = new System.Drawing.Point(6, 73);
+            this.lblMessage.Name = "lblMessage";
+            this.lblMessage.Size = new System.Drawing.Size(363, 30);
+            this.lblMessage.TabIndex = 2;
+            this.lblMessage.Text = "Message";
+            this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // gbErrorHandling
+            // 
+            this.gbErrorHandling.Controls.Add(this.button1);
+            this.gbErrorHandling.Controls.Add(this.btnDoSomethingWrong);
+            this.gbErrorHandling.Location = new System.Drawing.Point(3, 74);
+            this.gbErrorHandling.Name = "gbErrorHandling";
+            this.gbErrorHandling.Padding = new System.Windows.Forms.Padding(6);
+            this.gbErrorHandling.Size = new System.Drawing.Size(375, 123);
+            this.gbErrorHandling.TabIndex = 12;
+            this.gbErrorHandling.TabStop = false;
+            this.gbErrorHandling.Text = "Error management";
+            // 
+            // btnShowNotif
+            // 
+            this.btnShowNotif.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.btnShowNotif.Location = new System.Drawing.Point(3, 566);
+            this.btnShowNotif.Name = "btnShowNotif";
+            this.btnShowNotif.Size = new System.Drawing.Size(357, 49);
+            this.btnShowNotif.TabIndex = 14;
+            this.btnShowNotif.Text = "Show Notification (New)";
+            this.btnShowNotif.UseVisualStyleBackColor = true;
+            this.btnShowNotif.Click += new System.EventHandler(this.btnShowNotif_Click);
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.gbNotification);
+            this.panel1.Controls.Add(this.btnCheckMultiSample);
+            this.panel1.Controls.Add(this.gbOptions);
+            this.panel1.Controls.Add(this.txtState);
+            this.panel1.Controls.Add(this.gbErrorHandling);
+            this.panel1.Controls.Add(this.lblState);
+            this.panel1.Controls.Add(this.gbToast);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(0, 63);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1238, 682);
+            this.panel1.TabIndex = 15;
+            // 
+            // gbNotification
+            // 
+            this.gbNotification.Controls.Add(this.nudNotif);
+            this.gbNotification.Controls.Add(this.lblNotifAutoClose);
+            this.gbNotification.Controls.Add(this.chkNotifCanBeClosed);
+            this.gbNotification.Controls.Add(this.label1);
+            this.gbNotification.Controls.Add(this.txtNotifLink);
+            this.gbNotification.Controls.Add(this.lblNotifLinkText);
+            this.gbNotification.Controls.Add(this.txtNotifButton);
+            this.gbNotification.Controls.Add(this.lblNotifButtonText);
+            this.gbNotification.Controls.Add(this.cbbNotifActions);
+            this.gbNotification.Controls.Add(this.lblNotifAction);
+            this.gbNotification.Controls.Add(this.txtNotifMessage);
+            this.gbNotification.Controls.Add(this.lblNotifMessage);
+            this.gbNotification.Controls.Add(this.cbbNotifType);
+            this.gbNotification.Controls.Add(this.lblNotifType);
+            this.gbNotification.Controls.Add(this.btnShowNotif);
+            this.gbNotification.Location = new System.Drawing.Point(849, 7);
+            this.gbNotification.Name = "gbNotification";
+            this.gbNotification.Size = new System.Drawing.Size(363, 618);
+            this.gbNotification.TabIndex = 15;
+            this.gbNotification.TabStop = false;
+            this.gbNotification.Text = "Notification";
+            // 
+            // lblNotifType
+            // 
+            this.lblNotifType.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lblNotifType.Location = new System.Drawing.Point(3, 18);
+            this.lblNotifType.Name = "lblNotifType";
+            this.lblNotifType.Size = new System.Drawing.Size(357, 41);
+            this.lblNotifType.TabIndex = 15;
+            this.lblNotifType.Text = "Type";
+            this.lblNotifType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // cbbNotifType
+            // 
+            this.cbbNotifType.Dock = System.Windows.Forms.DockStyle.Top;
+            this.cbbNotifType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbNotifType.FormattingEnabled = true;
+            this.cbbNotifType.Location = new System.Drawing.Point(3, 59);
+            this.cbbNotifType.Name = "cbbNotifType";
+            this.cbbNotifType.Size = new System.Drawing.Size(357, 24);
+            this.cbbNotifType.TabIndex = 16;
+            // 
+            // lblNotifMessage
+            // 
+            this.lblNotifMessage.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lblNotifMessage.Location = new System.Drawing.Point(3, 83);
+            this.lblNotifMessage.Name = "lblNotifMessage";
+            this.lblNotifMessage.Size = new System.Drawing.Size(357, 41);
+            this.lblNotifMessage.TabIndex = 17;
+            this.lblNotifMessage.Text = "Message";
+            this.lblNotifMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // txtNotifMessage
+            // 
+            this.txtNotifMessage.Dock = System.Windows.Forms.DockStyle.Top;
+            this.txtNotifMessage.Location = new System.Drawing.Point(3, 124);
+            this.txtNotifMessage.Multiline = true;
+            this.txtNotifMessage.Name = "txtNotifMessage";
+            this.txtNotifMessage.Size = new System.Drawing.Size(357, 66);
+            this.txtNotifMessage.TabIndex = 18;
+            this.txtNotifMessage.Text = "A sample notification";
+            // 
+            // lblNotifAction
+            // 
+            this.lblNotifAction.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lblNotifAction.Location = new System.Drawing.Point(3, 190);
+            this.lblNotifAction.Name = "lblNotifAction";
+            this.lblNotifAction.Size = new System.Drawing.Size(357, 41);
+            this.lblNotifAction.TabIndex = 19;
+            this.lblNotifAction.Text = "Actions";
+            this.lblNotifAction.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // cbbNotifActions
+            // 
+            this.cbbNotifActions.Dock = System.Windows.Forms.DockStyle.Top;
+            this.cbbNotifActions.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbNotifActions.FormattingEnabled = true;
+            this.cbbNotifActions.Location = new System.Drawing.Point(3, 231);
+            this.cbbNotifActions.Name = "cbbNotifActions";
+            this.cbbNotifActions.Size = new System.Drawing.Size(357, 24);
+            this.cbbNotifActions.TabIndex = 20;
+            // 
+            // lblNotifButtonText
+            // 
+            this.lblNotifButtonText.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lblNotifButtonText.Location = new System.Drawing.Point(3, 255);
+            this.lblNotifButtonText.Name = "lblNotifButtonText";
+            this.lblNotifButtonText.Size = new System.Drawing.Size(357, 41);
+            this.lblNotifButtonText.TabIndex = 21;
+            this.lblNotifButtonText.Text = "Button text";
+            this.lblNotifButtonText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // txtNotifButton
+            // 
+            this.txtNotifButton.Dock = System.Windows.Forms.DockStyle.Top;
+            this.txtNotifButton.Location = new System.Drawing.Point(3, 296);
+            this.txtNotifButton.Name = "txtNotifButton";
+            this.txtNotifButton.Size = new System.Drawing.Size(357, 22);
+            this.txtNotifButton.TabIndex = 22;
+            this.txtNotifButton.Text = "Click me";
+            // 
+            // txtNotifLink
+            // 
+            this.txtNotifLink.Dock = System.Windows.Forms.DockStyle.Top;
+            this.txtNotifLink.Location = new System.Drawing.Point(3, 359);
+            this.txtNotifLink.Name = "txtNotifLink";
+            this.txtNotifLink.Size = new System.Drawing.Size(357, 22);
+            this.txtNotifLink.TabIndex = 24;
+            this.txtNotifLink.Text = "Read more";
+            // 
+            // lblNotifLinkText
+            // 
+            this.lblNotifLinkText.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lblNotifLinkText.Location = new System.Drawing.Point(3, 318);
+            this.lblNotifLinkText.Name = "lblNotifLinkText";
+            this.lblNotifLinkText.Size = new System.Drawing.Size(357, 41);
+            this.lblNotifLinkText.TabIndex = 23;
+            this.lblNotifLinkText.Text = "Link text";
+            this.lblNotifLinkText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            this.label1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label1.Location = new System.Drawing.Point(3, 381);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(357, 41);
+            this.label1.TabIndex = 25;
+            this.label1.Text = "Can be closed";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // chkNotifCanBeClosed
+            // 
+            this.chkNotifCanBeClosed.Dock = System.Windows.Forms.DockStyle.Top;
+            this.chkNotifCanBeClosed.Location = new System.Drawing.Point(3, 422);
+            this.chkNotifCanBeClosed.Name = "chkNotifCanBeClosed";
+            this.chkNotifCanBeClosed.Size = new System.Drawing.Size(357, 38);
+            this.chkNotifCanBeClosed.TabIndex = 26;
+            this.chkNotifCanBeClosed.UseVisualStyleBackColor = true;
+            // 
+            // notificationControl1
+            // 
+            this.notificationControl1.Action = XrmToolBox.Extensibility.UserControls.NotificationAction.None;
+            this.notificationControl1.ButtonText = "Action";
+            this.notificationControl1.CanBeClosed = true;
+            this.notificationControl1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.notificationControl1.LinkText = "Learn more";
+            this.notificationControl1.Location = new System.Drawing.Point(0, 27);
+            this.notificationControl1.Message = "Message";
+            this.notificationControl1.Name = "notificationControl1";
+            this.notificationControl1.Padding = new System.Windows.Forms.Padding(4);
+            this.notificationControl1.Size = new System.Drawing.Size(1238, 36);
+            this.notificationControl1.TabIndex = 13;
+            this.notificationControl1.Type = XrmToolBox.Extensibility.UserControls.NotificationType.Info;
+            this.notificationControl1.Visible = false;
+            // 
+            // lblNotifAutoClose
+            // 
+            this.lblNotifAutoClose.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lblNotifAutoClose.Location = new System.Drawing.Point(3, 460);
+            this.lblNotifAutoClose.Name = "lblNotifAutoClose";
+            this.lblNotifAutoClose.Size = new System.Drawing.Size(357, 41);
+            this.lblNotifAutoClose.TabIndex = 27;
+            this.lblNotifAutoClose.Text = "Delay before auto close (s)";
+            this.lblNotifAutoClose.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // nudNotif
+            // 
+            this.nudNotif.Dock = System.Windows.Forms.DockStyle.Top;
+            this.nudNotif.Location = new System.Drawing.Point(3, 501);
+            this.nudNotif.Name = "nudNotif";
+            this.nudNotif.Size = new System.Drawing.Size(357, 22);
+            this.nudNotif.TabIndex = 28;
+            this.nudNotif.Value = new decimal(new int[] {
+            5,
+            0,
+            0,
+            0});
+            // 
             // SampleTool
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.btnDoSomethingWrong);
-            this.Controls.Add(this.btnCheckMultiSample);
-            this.Controls.Add(this.lblState);
-            this.Controls.Add(this.txtState);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.notificationControl1);
             this.Controls.Add(this.toolStripMenu);
-            this.Controls.Add(this.gbOptions);
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "SampleTool";
             this.PluginIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PluginIcon")));
-            this.Size = new System.Drawing.Size(1065, 462);
+            this.Size = new System.Drawing.Size(1238, 745);
             this.Load += new System.EventHandler(this.SampleTool_Load);
             this.gbOptions.ResumeLayout(false);
             this.gbOptions.PerformLayout();
             this.toolStripMenu.ResumeLayout(false);
             this.toolStripMenu.PerformLayout();
+            this.gbToast.ResumeLayout(false);
+            this.gbToast.PerformLayout();
+            this.gbErrorHandling.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.gbNotification.ResumeLayout(false);
+            this.gbNotification.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.nudNotif)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -243,5 +559,30 @@ private void InitializeComponent()
         private System.Windows.Forms.Button btnCheckMultiSample;
         private System.Windows.Forms.Button btnDoSomethingWrong;
         private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Button btnOpenNotif;
+        private System.Windows.Forms.GroupBox gbToast;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Label lblMessage;
+        private System.Windows.Forms.TextBox txtHeader;
+        private System.Windows.Forms.Label lblHeader;
+        private System.Windows.Forms.GroupBox gbErrorHandling;
+        private XrmToolBox.Extensibility.UserControls.NotificationControl notificationControl1;
+        private System.Windows.Forms.Button btnShowNotif;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.GroupBox gbNotification;
+        private System.Windows.Forms.ComboBox cbbNotifType;
+        private System.Windows.Forms.Label lblNotifType;
+        private System.Windows.Forms.ComboBox cbbNotifActions;
+        private System.Windows.Forms.Label lblNotifAction;
+        private System.Windows.Forms.TextBox txtNotifMessage;
+        private System.Windows.Forms.Label lblNotifMessage;
+        private System.Windows.Forms.TextBox txtNotifLink;
+        private System.Windows.Forms.Label lblNotifLinkText;
+        private System.Windows.Forms.TextBox txtNotifButton;
+        private System.Windows.Forms.Label lblNotifButtonText;
+        private System.Windows.Forms.CheckBox chkNotifCanBeClosed;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.NumericUpDown nudNotif;
+        private System.Windows.Forms.Label lblNotifAutoClose;
     }
 }
diff --git a/Plugins/MsCrmTools.SampleTool/SampleTool.cs b/Plugins/MsCrmTools.SampleTool/SampleTool.cs
index ed6d3ad8e..a1eed1501 100644
--- a/Plugins/MsCrmTools.SampleTool/SampleTool.cs
+++ b/Plugins/MsCrmTools.SampleTool/SampleTool.cs
@@ -4,14 +4,17 @@
 // BLOG: http://mscrmtools.blogspot.com
 
 using Microsoft.Crm.Sdk.Messages;
+using Microsoft.Toolkit.Uwp.Notifications;
 using Microsoft.Xrm.Sdk.Query;
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Windows.Forms;
 using XrmToolBox;
 using XrmToolBox.Extensibility;
 using XrmToolBox.Extensibility.Args;
 using XrmToolBox.Extensibility.Interfaces;
+using XrmToolBox.Extensibility.UserControls;
 
 namespace MsCrmTools.SampleTool
 {
@@ -40,6 +43,11 @@ public SampleTool()
             LogInfo("An information message");
             LogWarning("A warning message");
             LogError("An error message");
+
+            cbbNotifType.DataSource = Enum.GetValues(typeof(NotificationType));
+            cbbNotifType.SelectedIndex = 0;
+            cbbNotifActions.DataSource = Enum.GetValues(typeof(NotificationAction));
+            cbbNotifActions.SelectedIndex = 0;
         }
 
         public event EventHandler<StatusBarMessageEventArgs> SendMessageToStatusBar;
@@ -241,6 +249,11 @@ public void ShowAboutDialog()
 
         #endregion IAboutPlugin implementation
 
+        public override void HandleToastActivation(ToastNotificationActivatedEventArgsCompat args)
+        {
+            MessageBox.Show(this, "Toast activated!\n\n" + args.Argument, "Toast Activated", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+
         private void btnCheckMultiSample_Click(object sender, EventArgs e)
         {
             var expectedPlugin = PluginManagerExtended.Instance.PluginsExt.FirstOrDefault(p =>
@@ -273,14 +286,68 @@ private void btnDoSomethingWrong_Click(object sender, EventArgs e)
             WorkAsync(asyncinfo);
         }
 
+        private void btnOpenNotif_Click(object sender, EventArgs e)
+        {
+            new ToastContentBuilder()
+                .AddArgument("PluginControlId", PluginControlId.ToString())
+                .AddHeader(ToolName, txtHeader.Text, "")
+                .AddText(textBox1.Text)
+                .Show();
+        }
+
+        private void btnShowNotif_Click(object sender, EventArgs e)
+        {
+            Enum.TryParse(cbbNotifType.SelectedValue.ToString(), out NotificationType status);
+            Enum.TryParse(cbbNotifActions.SelectedValue.ToString(), out NotificationAction action);
+
+            notificationControl1.Type = status;
+            notificationControl1.Message = txtNotifMessage.Text;
+            notificationControl1.Action = action;
+            notificationControl1.ButtonText = txtNotifButton.Text;
+
+            notificationControl1.ButtonClicked -= NotificationControl1_ButtonClicked;
+            notificationControl1.ButtonClicked += NotificationControl1_ButtonClicked;
+
+            notificationControl1.CanBeClosed = chkNotifCanBeClosed.Checked;
+            notificationControl1.LinkText = txtNotifLink.Text;
+            notificationControl1.LinkClicked -= NotificationControl1_LinkClicked;
+            notificationControl1.LinkClicked += NotificationControl1_LinkClicked;
+
+            notificationControl1.SetVisible(true, Convert.ToInt32(nudNotif.Value) * 1000);
+        }
+
         private void button1_Click(object sender, EventArgs e)
         {
             throw new Exception("I wasn't expected this exception");
         }
 
+        private void NotificationControl1_ButtonClicked(object sender, EventArgs e)
+        {
+            MessageBox.Show("Button clicked!");
+        }
+
+        private void NotificationControl1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            MessageBox.Show("Link clicked!");
+        }
+
+        private void NotificationControl2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            Process.Start("http://github.com/MscrmTools/XrmToolBox");
+        }
+
         private void SampleTool_Load(object sender, EventArgs e)
         {
-            ShowInfoNotification("This is a notification that can lead to XrmToolBox repository", new Uri("http://github.com/MscrmTools/XrmToolBox"));
+            //ShowInfoNotification("This is a notification that can lead to XrmToolBox repository", new Uri("http://github.com/MscrmTools/XrmToolBox"));
+
+            Notification.Message = "This is a notification that can lead to XrmToolBox repository!";
+            Notification.Type = NotificationType.Info;
+            Notification.Action = NotificationAction.Link;
+            Notification.LinkText = "Go to repository";
+            Notification.LinkClicked -= NotificationControl2_LinkClicked;
+            Notification.LinkClicked += NotificationControl2_LinkClicked;
+            Notification.SetVisible(true, 10);
+            Notification.CanBeClosed = true;
         }
 
         #region IMessageBusHost
diff --git a/Plugins/MsCrmTools.SampleTool/SampleTool.resx b/Plugins/MsCrmTools.SampleTool/SampleTool.resx
index d572b05dd..e26d15349 100644
--- a/Plugins/MsCrmTools.SampleTool/SampleTool.resx
+++ b/Plugins/MsCrmTools.SampleTool/SampleTool.resx
@@ -124,55 +124,55 @@
   <data name="tsbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD5SURBVDhPY0AGRxwM/oMwlIsB8MqDJL4d3gXG2BThlQcJ
-        fN294f9TT10wBrGRFRGShyjYvPz/c18jOAbxQeL45KDawcAYJPBl9bz/rwLN4RjExyYG1WwM0YoAYEO+
-        Lp7+/02oDVYMksOlGQYghszt//8u0hEFg8QIaQYDkKJv0zr+f4h1Q8EgMagBuAFY88Sm/58TvbFikBxO
-        Q0AS33uq/39N9YdjEB+bGIYhIIEf7WX/v2eGwDGIDxLHJwfVDjHgV1Ph/595kWAMYkMVgAIMHLA45OEA
-        rOhPXQ4YI2mGAULyYABWhEsSCAjJgwHYyRAmVkBInlTAwAAAGRZmoO4izFMAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADxSURBVDhPY2BAAkccDP6DMLIYMsArD5L4dngXGGNThFce
+        JPB194b/Tz11wRjERlZESB6iYPPy/899jeAYxIc5GZcc3AAGBgZjkMCX1fP+vwo0h2MQH5sYVLMxsgFw
+        Q74unv7/TagNVgySw6UZBiCGzO3//y7SEQWDxAhpBgNwaE/r+P8h1g0Fg8TQ/Y0BwJonNv3/nOiNFYPk
+        cBoCkvjeU/3/a6o/HIP42MQwDAEJ/Ggv+/89MwSOQXxYNOKSQzHgV1Ph/595kWAMYiMFGDhgccjDAVjR
+        n7ocMMYS2oTkEYpwSRIhDwZgJ6MLIgFC8qQDABkWZqDwjDEwAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="tsbWhoAmI.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHoSURBVDhPpdHfS9NRGMfxtTW/2qy/wRvpQqGCbtYGMWdI
-        IRU17dbwykpWa5W/LtK25b4Tf+C0pYsiQ7fSMCJolm7mUkSK7Jcg6F03FVQElaV7d77fBHWzGPaBB87F
-        Oa+H5zmaf4W5UpaPGwszxv8E3uSlAJ7Qs/TQxLyLZODp7HvSBpjSwOu1QMXV8fSBxKQAXq0ASvdk4MZE
-        /frYUnwTiXFRL1cA+7XJNUDFLSPt0bOpgDL7r2Eti6MCeJ6vXjgmR9XHSnkHQ1yKWDjVuwf/esD3fh0L
-        93X8jGhZmspHvu7D1jhMuT+uAs0PZdxDFir7BBBLApTuX4N6vvVuZuGBFsQIrTdd2Dz3OOSWcXTX0RyR
-        8TwqwB4y0ZEMfKjJ5FOjpALqHgTg7S7DcqGEvVVHsQfqaBHA5ccFnA6b6BxdBcwWZ/PuuIHPTRI/7upY
-        HBHAizxq23ZjPb8P87kjVHbW0jok4x2xcua2Ajj/AKHcLCK7DMzbsvl4MZO5YAbxniwG+3Ipa9jB/moL
-        JudhTrTXCMCHHLXiuGPmyhMBuAwSDVskgjkS4Z16/EV66ku24vNsp2PASHj6AD3TxbTEDhIYK6dr4iS+
-        mBVnv5mACmzL4K3LwZeAO/VL/pKmWCHOAQGMLY+w8Wg0vwFMUUgXEnlD8gAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHsSURBVDhPpdHfS1NxGMfx/Wgebdbf4I10MaGCbuYGMWdE
+        IRU169bwykpW6/RLvUjbljsTXTht5aLI0K00jAg6K93MpYgUuX6BoHfdVFARVJaed+wUmGcrDD/wvXn4
+        fl8Pz/PV6f4RZvejrf1XeG1dJfDSkgP4Y09yanmjzHnRAo9n3rJigCkdvFgO1F0aXzmgTOrg+RKQ7a4F
+        rk0058cW03qUcT1KZglwX5lcBtTdsNKZPJ4LZGf/MWxgYVSP8rRMvXBASqqPsycwFOOc7OBIXznhfMDX
+        ASPzd418lw0sTpUhXQ3iah2mNpxWgfb7Er6Eg/r+csIpDZDt/jlq4kvfGubvGSBjIXTdi8t/h90+CU9P
+        E+2yhP9BBe6YjS4t8K6hkA+tggqoe8hYCPTU4DhVzdbT+3BHmuiQJc4/rOBo3Eb36B/ATFUxbw6a+dgm
+        8O22kYURPcozC40XtuA8uQ37ib3UdzcSSkgERpwcu5kFxF9ArLQIebOZOVcx788WMhstIN1bxFB/KTUt
+        G9lxxoFN3MOhzgZCiSBS0onnlp2Lj0R0XrNAy1qBaIlAfJOJ8HYTzdXrCPo30DVoJT69k97pKjpSu4iM
+        1XJ54jDBlBNxwE5EBdYX8Mrr4VPEl/slf0lbqhJx0E5k7PcIq8lPTFFIF74E15wAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsbCancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIQSURBVDhPjZLtS1NhGMafD+tvSIm+SpplsMSQQqqVCWvM
-        fMmZsLaQUR8sKJOgPigxUmyEBVGBRBrRi46tEIkUQ1okbGpNwbIXolK3ZcuZb1+unuvxGJ06iDdc3Df3
-        /fttB84R/9aQpdTf766BUXjTMOOKFJb3vGm6il9DUcyPjGF+9O1y5Dwrd7yR0XB9hSk3X8PcwCBmWu8h
-        eeWWLtzxRoaspi3XgFwMN7Ug1d2LH74bmK6/bBjeyJClo+Tw7mL/oNeHZHsnvp9vROJ0/aohk2zrAB26
-        4tkRD+INPsRPXkCs+syaQjYun4iueOqoRsxzFjO372OlUg+Cf/pcX0jNibqLWIyOqZm7mKcWdEX34WOY
-        OnoKS+MfkbrbgSlnDb4dcCiQfXF4BInaBtX/nunQFV1lLkxWHMdEsRs/b7Zj6d0HfNlhVT/AvhB+jfiJ
-        c6ozvPMJ6NAVT0qcmLC7lMCa9rbgc1aBmtlnO7vUzD9YkK+R96+WcuXQFX57Fd4fcuPT1j0Y32heU8jS
-        oSt6c/cHHpU6MWp3IppdgMiGnFVDhiwduupbCJr3Pr9jcyBiq8KrzTvRl55tGN7IkKWj5JV6uG1X//Wi
-        EoSslejJzEdg/SZduOONDFlN01fblvwXzZaDCNoq8dhaoUtA7rz7rGjNygtp+H9lkkm/lGEOuXJyYZTG
-        DPNLk8m0XXJpMuuEEOI3w4lEo769RIcAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIQSURBVDhPjZLdS5NhGMafg/U3pESnUmYZLDGkkGxlwRoz
+        bbkpzC1k1IEJZRHUwSRGio6wICoQSSUqdWyFiDQxpEkDt6mbsLIPojK3ZcuZXydXXI9MescQb7i4b577
+        93uf5+AVIqNCmirXmLUB2cJdJq+oQLnBO916D39DYaxEoliZeb+RSBRLoTC4I5PpyZqg3HYfy/4gFjuf
+        Inn3sSI8444MWYXsLzd4J1s7kBoawW/nQyzY27OGOzJk6WzcfKzCFXQ4kewZwK+bLUhcsW8ZMsnuftCh
+        K17X2BBvdiJ++RZi9Ve3FbJxezvoimFjPWK2a1jseoZ0pZ57NvvyqE/Oieu3sRaOyplnMVsT6Iqh8xcw
+        X9eI9dnPSPX2Y97cgB+njBJkX5uMINHULPv/Mx26YvCcBT+rL2Kuwoo/j3qw/uETvh3Wyg+wr05MIX7p
+        huwM93wBHbriVaUZc3rL5vMXHB34ml8qZ/algUE584JVf1Duv2sM0qErXPpafDxrxZcDZZjdrd5WyNKh
+        K0aKTrr7qsyY0ZsRLihFYFfhliFDlg5d+S941MffPNEZEdDV4t2+IxjNLcga7siQpaP4G18cPDr24HQl
+        fFoTvHtL4N65RxGecUeGrEJOV/f+krdtmjPw6Ex4qa1WxK0zwXFCi878Yl+mly6VECL3Tp7aZyksQra0
+        5KnHVSrVISFEjhBiB6V/w4lEo/gqYL8AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tsbDuplicate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK
+        YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X
+        /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t
+        I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM
+        cX79DFKrHHD5d9D26hvicx4pABt2lpg10zYzU0zr7+e3xXGcrkEB2O2TNec9nJFwB3alZn5jZorfeDZh
+        6Q3g8s06BeCoKF4MRURoH1+BY2oNCbeb0TIclIYxOhzf8frTOuo7FxCbbVIAzpni0iceEc8vhzEwGkJD
+        lx83ymxifejdKjRNk/8PWnyIyTQqAJek0jqHwfEVscu31baIu8+90sTE4nY025dQ2/5FIPpnXlzKuK8A
+        HBUzHot52djqQ6HZhfR7IwK4mKpHtvEDMqvfCiQ6zaAAXM8x94aIWTNrLLG4kVUzgaTSPlzLtyJOZxbb
+        1wtfyg4Q+AfA3aZlButjSfxGcUJBk4g5tuP3haQKRKXcUQDOmbvNTpPOJeFFjordZmbWTNvMTHFUcpUC
+        nOccAdABIDXXE1nzAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.PluginIcon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/Plugins/MsCrmTools.SampleTool/app.config b/Plugins/MsCrmTools.SampleTool/app.config
index f0c632254..240afe74d 100644
--- a/Plugins/MsCrmTools.SampleTool/app.config
+++ b/Plugins/MsCrmTools.SampleTool/app.config
@@ -76,7 +76,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/XrmToolBox.Extensibility/DrawExtensions.cs b/XrmToolBox.Extensibility/DrawExtensions.cs
new file mode 100644
index 000000000..0d1f6f268
--- /dev/null
+++ b/XrmToolBox.Extensibility/DrawExtensions.cs
@@ -0,0 +1,67 @@
+﻿using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace XrmToolBox.Extensibility
+{
+    public static class DrawExtensions
+    {
+        public static void DrawRoundedRectangle(this Graphics graphics, Pen pen, Rectangle bounds, int cornerRadius)
+        {
+            if (graphics == null)
+                throw new ArgumentNullException(nameof(graphics));
+            if (pen == null)
+                throw new ArgumentNullException(nameof(pen));
+
+            using (GraphicsPath path = RoundedRect(bounds, cornerRadius))
+            {
+                graphics.DrawPath(pen, path);
+            }
+        }
+
+        public static void FillRoundedRectangle(this Graphics graphics, Brush brush, Rectangle bounds, int cornerRadius)
+        {
+            if (graphics == null)
+                throw new ArgumentNullException(nameof(graphics));
+            if (brush == null)
+                throw new ArgumentNullException(nameof(brush));
+
+            using (GraphicsPath path = RoundedRect(bounds, cornerRadius))
+            {
+                graphics.FillPath(brush, path);
+            }
+        }
+
+        public static GraphicsPath RoundedRect(Rectangle bounds, int radius)
+        {
+            int diameter = radius * 2;
+            Size size = new Size(diameter, diameter);
+            Rectangle arc = new Rectangle(bounds.Location, new Size(size.Width - 1, size.Height - 1));
+            GraphicsPath path = new GraphicsPath();
+
+            if (radius == 0)
+            {
+                path.AddRectangle(bounds);
+                return path;
+            }
+
+            // top left arc
+            path.AddArc(arc, 180, 90);
+
+            // top right arc
+            arc.X = bounds.Right - diameter;
+            path.AddArc(arc, 270, 90);
+
+            // bottom right arc
+            arc.Y = bounds.Bottom - diameter;
+            path.AddArc(arc, 0, 90);
+
+            // bottom left arc
+            arc.X = bounds.Left;
+            path.AddArc(arc, 90, 90);
+
+            path.CloseFigure();
+            return path;
+        }
+    }
+}
\ No newline at end of file
diff --git a/XrmToolBox.Extensibility/MultipleConnectionsPluginControlBase.cs b/XrmToolBox.Extensibility/MultipleConnectionsPluginControlBase.cs
index d9cafab85..907653dd7 100644
--- a/XrmToolBox.Extensibility/MultipleConnectionsPluginControlBase.cs
+++ b/XrmToolBox.Extensibility/MultipleConnectionsPluginControlBase.cs
@@ -1,10 +1,11 @@
-﻿using System;
+﻿using McTools.Xrm.Connection;
+using Microsoft.Xrm.Sdk;
+using System;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
-using McTools.Xrm.Connection;
-using Microsoft.Xrm.Sdk;
 using System.ComponentModel;
 using System.ComponentModel.Composition;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace XrmToolBox.Extensibility
@@ -50,7 +51,7 @@ public override void UpdateConnection(IOrganizationService newService, Connectio
         {
             if (actionName == "AdditionalOrganization")
             {
-                if (!AdditionalConnectionDetails.Contains(detail))
+                if (!AdditionalConnectionDetails.Any(d => d.ConnectionId == detail.ConnectionId))
                 {
                     AdditionalConnectionDetails.Add(detail);
                 }
diff --git a/XrmToolBox.Extensibility/PluginControlBase.cs b/XrmToolBox.Extensibility/PluginControlBase.cs
index b030aab25..fc475220f 100644
--- a/XrmToolBox.Extensibility/PluginControlBase.cs
+++ b/XrmToolBox.Extensibility/PluginControlBase.cs
@@ -4,12 +4,16 @@
 // BLOG: http://www.dotnetdust.blogspot.com/
 
 using McTools.Xrm.Connection;
+using Microsoft.Toolkit.Uwp.Notifications;
 using Microsoft.Xrm.Sdk;
 using System;
 using System.ComponentModel;
 using System.ComponentModel.Composition;
+using System.Diagnostics;
 using System.Drawing;
+using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using XrmToolBox.Extensibility.Forms;
 using XrmToolBox.Extensibility.Interfaces;
@@ -31,15 +35,32 @@ public class PluginControlBase : UserControl, IXrmToolBoxPluginControl, IWorkerH
         public PluginControlBase()
         {
             logManager = new LogManager(GetType());
+
+            Tag = PluginControlId;
+
+            ToastNotificationManagerCompat.OnActivated += toastArgs =>
+            {
+                ToastArguments args = ToastArguments.Parse(toastArgs.Argument);
+                if (args.Contains("PluginControlId") && Guid.TryParse(args["PluginControlId"], out Guid id) && id == PluginControlId)
+                {
+                    Invoke(new Action(() =>
+                    {
+                        HandleToastActivation(toastArgs);
+                    }));
+                }
+            };
         }
 
         public ConnectionDetail ConnectionDetail { get; set; }
+        public NotificationControl Notification => ParentForm.Controls.OfType<Panel>().FirstOrDefault(p => p.Name == "pnlMain")?.Controls.OfType<NotificationControl>().FirstOrDefault();
+        public Guid PluginControlId { get; } = Guid.NewGuid();
 
         [Category("Tool Control Properties")]
         [Description("Icon")]
         public Icon PluginIcon { get; set; }
 
         public Image TabIcon { get; set; }
+
         public string ToolName { get; set; }
 
         public void CloseTool()
@@ -53,6 +74,36 @@ public virtual void CloseToolPrompt()
             CloseTool();
         }
 
+        public virtual void HandleToastActivation(ToastNotificationActivatedEventArgsCompat args)
+        {
+            var toastArgs = ToastArguments.Parse(args.Argument);
+            if (!toastArgs.Contains("action") || toastArgs["action"] != "showXrmToolBox")
+            {
+                return;
+            }
+            string pid = toastArgs["pid"];
+
+            try
+            {
+                // Get the process by ID
+                Process process = Process.GetProcessById(int.Parse(pid));
+
+                // Check if the process has a main window
+                if (process.MainWindowHandle != IntPtr.Zero)
+                {
+                    // Bring the process to the foreground
+                    SetForegroundWindow(process.MainWindowHandle);
+                }
+            }
+            catch (Exception ex)
+            {
+                // Do not fail on notification click
+            }
+        }
+
+        [DllImport("user32.dll")]
+        private static extern bool SetForegroundWindow(IntPtr hWnd);
+
         #region IMsCrmToolsPluginUserControl Members
 
         public event EventHandler OnCloseTool;
@@ -412,6 +463,7 @@ public void OpenLogFile()
 
         #region Noticiation zone
 
+        [Obsolete("Use new Notification control. https://www.xrmtoolbox.com/documentation/for-developers/Use-Notifications/")]
         protected void HideNotification()
         {
             if (Parent == null)
@@ -426,6 +478,7 @@ protected void HideNotification()
             }
         }
 
+        [Obsolete("Use new Notification control. https://www.xrmtoolbox.com/documentation/for-developers/Use-Notifications/")]
         protected void ShowErrorNotification(string message, Uri moreInfoUri, int height = 32)
         {
             if (Parent == null)
@@ -444,6 +497,7 @@ protected void ShowErrorNotification(string message, Uri moreInfoUri, int height
             }
         }
 
+        [Obsolete("Use new Notification control. https://www.xrmtoolbox.com/documentation/for-developers/Use-Notifications/")]
         protected void ShowInfoNotification(string message, Uri moreInfoUri, int height = 32)
         {
             if (Parent == null)
@@ -462,6 +516,7 @@ protected void ShowInfoNotification(string message, Uri moreInfoUri, int height
             }
         }
 
+        [Obsolete("Use new Notification control. https://www.xrmtoolbox.com/documentation/for-developers/Use-Notifications/")]
         protected void ShowWarningNotification(string message, Uri moreInfoUri, int height = 32)
         {
             if (Parent == null)
diff --git a/XrmToolBox.Extensibility/Properties/AssemblyInfo.cs b/XrmToolBox.Extensibility/Properties/AssemblyInfo.cs
index 41bd7c731..64675e19e 100644
--- a/XrmToolBox.Extensibility/Properties/AssemblyInfo.cs
+++ b/XrmToolBox.Extensibility/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2025.7.71")]
-[assembly: AssemblyFileVersion("1.2025.7.71")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2025.10.74")]
+[assembly: AssemblyFileVersion("1.2025.10.74")]
\ No newline at end of file
diff --git a/XrmToolBox.Extensibility/Properties/Resources.Designer.cs b/XrmToolBox.Extensibility/Properties/Resources.Designer.cs
index f80cd8e53..75bd4674b 100644
--- a/XrmToolBox.Extensibility/Properties/Resources.Designer.cs
+++ b/XrmToolBox.Extensibility/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace XrmToolBox.Extensibility.Properties {
     // à l'aide d'un outil, tel que ResGen ou Visual Studio.
     // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
     // avec l'option /str ou régénérez votre projet VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -70,6 +70,26 @@ internal static System.Drawing.Bitmap error_52 {
             }
         }
         
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Error32 {
+            get {
+                object obj = ResourceManager.GetObject("Error32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap info {
+            get {
+                object obj = ResourceManager.GetObject("info", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
@@ -119,5 +139,25 @@ internal static System.Drawing.Bitmap progress_new {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Success {
+            get {
+                object obj = ResourceManager.GetObject("Success", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap warning {
+            get {
+                object obj = ResourceManager.GetObject("warning", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/XrmToolBox.Extensibility/Properties/Resources.resx b/XrmToolBox.Extensibility/Properties/Resources.resx
index 5e4983df6..9c48e67d8 100644
--- a/XrmToolBox.Extensibility/Properties/Resources.resx
+++ b/XrmToolBox.Extensibility/Properties/Resources.resx
@@ -136,4 +136,16 @@
   <data name="progress_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\progress_new.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Error32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Error32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="info" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Success" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Success.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/XrmToolBox.Extensibility/Resources/Error32.png b/XrmToolBox.Extensibility/Resources/Error32.png
new file mode 100644
index 000000000..e06bd2cc6
Binary files /dev/null and b/XrmToolBox.Extensibility/Resources/Error32.png differ
diff --git a/XrmToolBox.Extensibility/Resources/Success.png b/XrmToolBox.Extensibility/Resources/Success.png
new file mode 100644
index 000000000..ae9fe655a
Binary files /dev/null and b/XrmToolBox.Extensibility/Resources/Success.png differ
diff --git a/XrmToolBox.Extensibility/Resources/info.png b/XrmToolBox.Extensibility/Resources/info.png
new file mode 100644
index 000000000..fa7195ae5
Binary files /dev/null and b/XrmToolBox.Extensibility/Resources/info.png differ
diff --git a/XrmToolBox.Extensibility/Resources/warning.png b/XrmToolBox.Extensibility/Resources/warning.png
new file mode 100644
index 000000000..366efd5d4
Binary files /dev/null and b/XrmToolBox.Extensibility/Resources/warning.png differ
diff --git a/XrmToolBox.Extensibility/UserControls/NotificationArea.Designer.cs b/XrmToolBox.Extensibility/UserControls/NotificationArea.Designer.cs
index e7a854fd3..22831849e 100644
--- a/XrmToolBox.Extensibility/UserControls/NotificationArea.Designer.cs
+++ b/XrmToolBox.Extensibility/UserControls/NotificationArea.Designer.cs
@@ -42,8 +42,9 @@ private void InitializeComponent()
             this.pbNotif.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbNotif.Dock = System.Windows.Forms.DockStyle.Left;
             this.pbNotif.Location = new System.Drawing.Point(0, 0);
+            this.pbNotif.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pbNotif.Name = "pbNotif";
-            this.pbNotif.Size = new System.Drawing.Size(32, 47);
+            this.pbNotif.Size = new System.Drawing.Size(28, 38);
             this.pbNotif.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pbNotif.TabIndex = 1;
             this.pbNotif.TabStop = false;
@@ -54,7 +55,7 @@ private void InitializeComponent()
             this.llLearMore.Dock = System.Windows.Forms.DockStyle.Top;
             this.llLearMore.Location = new System.Drawing.Point(0, 0);
             this.llLearMore.Name = "llLearMore";
-            this.llLearMore.Size = new System.Drawing.Size(84, 20);
+            this.llLearMore.Size = new System.Drawing.Size(71, 16);
             this.llLearMore.TabIndex = 4;
             this.llLearMore.TabStop = true;
             this.llLearMore.Text = "learn more";
@@ -65,18 +66,19 @@ private void InitializeComponent()
             this.panel1.Controls.Add(this.llDismiss);
             this.panel1.Controls.Add(this.llLearMore);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panel1.Location = new System.Drawing.Point(582, 0);
+            this.panel1.Location = new System.Drawing.Point(517, 0);
+            this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(89, 47);
+            this.panel1.Size = new System.Drawing.Size(79, 38);
             this.panel1.TabIndex = 5;
             // 
             // llDismiss
             // 
             this.llDismiss.AutoSize = true;
             this.llDismiss.Dock = System.Windows.Forms.DockStyle.Top;
-            this.llDismiss.Location = new System.Drawing.Point(0, 20);
+            this.llDismiss.Location = new System.Drawing.Point(0, 16);
             this.llDismiss.Name = "llDismiss";
-            this.llDismiss.Size = new System.Drawing.Size(61, 20);
+            this.llDismiss.Size = new System.Drawing.Size(53, 16);
             this.llDismiss.TabIndex = 5;
             this.llDismiss.TabStop = true;
             this.llDismiss.Text = "dismiss";
@@ -86,23 +88,24 @@ private void InitializeComponent()
             // 
             this.lblMessage.AutoSize = true;
             this.lblMessage.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lblMessage.Location = new System.Drawing.Point(32, 0);
+            this.lblMessage.Location = new System.Drawing.Point(28, 0);
             this.lblMessage.Name = "lblMessage";
-            this.lblMessage.Size = new System.Drawing.Size(82, 20);
+            this.lblMessage.Size = new System.Drawing.Size(72, 16);
             this.lblMessage.TabIndex = 6;
             this.lblMessage.Text = "[Message]";
             // 
             // NotificationArea
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Info;
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.Controls.Add(this.lblMessage);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.pbNotif);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "NotificationArea";
-            this.Size = new System.Drawing.Size(671, 47);
+            this.Size = new System.Drawing.Size(596, 38);
             ((System.ComponentModel.ISupportInitialize)(this.pbNotif)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
diff --git a/XrmToolBox.Extensibility/UserControls/NotificationArea.cs b/XrmToolBox.Extensibility/UserControls/NotificationArea.cs
index a22e39f61..8ede2b403 100644
--- a/XrmToolBox.Extensibility/UserControls/NotificationArea.cs
+++ b/XrmToolBox.Extensibility/UserControls/NotificationArea.cs
@@ -13,13 +13,11 @@ public NotificationArea()
             InitializeComponent();
         }
 
-        private void Initialize(string message, Uri infoUri, int height = 30)
+        public void ShowErrorNotification(string message, Uri infoUri, int height = 30)
         {
-            lblMessage.Text = message;
-            Height = height;
-            llLearMore.Visible = infoUri != null;
-            moreInfoUri = infoUri;
-            Visible = true;
+            Initialize(message, infoUri, height);
+
+            pbNotif.Image = Icons.notif_icn_crit16;
         }
 
         public void ShowInfoNotification(string message, Uri infoUri, int height = 30)
@@ -36,11 +34,13 @@ public void ShowWarningNotification(string message, Uri infoUri, int height = 30
             pbNotif.Image = Icons.notif_icn_alert16;
         }
 
-        public void ShowErrorNotification(string message, Uri infoUri, int height = 30)
+        private void Initialize(string message, Uri infoUri, int height = 30)
         {
-            Initialize(message, infoUri, height);
-
-            pbNotif.Image = Icons.notif_icn_crit16;
+            lblMessage.Text = message;
+            Height = height;
+            llLearMore.Visible = infoUri != null;
+            moreInfoUri = infoUri;
+            Visible = true;
         }
 
         private void llDismiss_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -50,7 +50,7 @@ private void llDismiss_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 
         private void llLearnMore_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            Process.Start(moreInfoUri.AbsoluteUri); 
+            Process.Start(moreInfoUri.AbsoluteUri);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/XrmToolBox.Extensibility/UserControls/NotificationControl.Designer.cs b/XrmToolBox.Extensibility/UserControls/NotificationControl.Designer.cs
new file mode 100644
index 000000000..2237292b6
--- /dev/null
+++ b/XrmToolBox.Extensibility/UserControls/NotificationControl.Designer.cs
@@ -0,0 +1,97 @@
+﻿namespace XrmToolBox.Extensibility.UserControls
+{
+    partial class NotificationControl
+    {
+        /// <summary> 
+        /// Variable nécessaire au concepteur.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Nettoyage des ressources utilisées.
+        /// </summary>
+        /// <param name="disposing">true si les ressources managées doivent être supprimées ; sinon, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Code généré par le Concepteur de composants
+
+        /// <summary> 
+        /// Méthode requise pour la prise en charge du concepteur - ne modifiez pas 
+        /// le contenu de cette méthode avec l'éditeur de code.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.lblClose = new System.Windows.Forms.Label();
+            this.btnAction = new System.Windows.Forms.Button();
+            this.lLabel = new System.Windows.Forms.LinkLabel();
+            this.SuspendLayout();
+            // 
+            // lblClose
+            // 
+            this.lblClose.BackColor = System.Drawing.Color.Transparent;
+            this.lblClose.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.lblClose.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lblClose.Location = new System.Drawing.Point(607, 4);
+            this.lblClose.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
+            this.lblClose.Name = "lblClose";
+            this.lblClose.Size = new System.Drawing.Size(29, 28);
+            this.lblClose.TabIndex = 0;
+            this.lblClose.Text = "X";
+            this.lblClose.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.lblClose.Click += new System.EventHandler(this.lblClose_Click);
+            // 
+            // btnAction
+            // 
+            this.btnAction.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnAction.Location = new System.Drawing.Point(478, 4);
+            this.btnAction.Name = "btnAction";
+            this.btnAction.Size = new System.Drawing.Size(129, 28);
+            this.btnAction.TabIndex = 1;
+            this.btnAction.Text = "button1";
+            this.btnAction.UseVisualStyleBackColor = true;
+            this.btnAction.Click += new System.EventHandler(this.btnAction_Click);
+            // 
+            // lLabel
+            // 
+            this.lLabel.BackColor = System.Drawing.Color.Transparent;
+            this.lLabel.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lLabel.Location = new System.Drawing.Point(354, 4);
+            this.lLabel.Name = "lLabel";
+            this.lLabel.Size = new System.Drawing.Size(124, 28);
+            this.lLabel.TabIndex = 2;
+            this.lLabel.TabStop = true;
+            this.lLabel.Text = "linkLabel1";
+            this.lLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.lLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lLabel_LinkClicked);
+            // 
+            // NotificationControl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.lLabel);
+            this.Controls.Add(this.btnAction);
+            this.Controls.Add(this.lblClose);
+            this.Name = "NotificationControl";
+            this.Padding = new System.Windows.Forms.Padding(4);
+            this.Size = new System.Drawing.Size(640, 36);
+            this.Load += new System.EventHandler(this.NotificationControl_Load);
+            this.Paint += new System.Windows.Forms.PaintEventHandler(this.NotificationControl_Paint);
+            this.Resize += new System.EventHandler(this.NotificationControl_Resize);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label lblClose;
+        private System.Windows.Forms.Button btnAction;
+        private System.Windows.Forms.LinkLabel lLabel;
+    }
+}
diff --git a/XrmToolBox.Extensibility/UserControls/NotificationControl.cs b/XrmToolBox.Extensibility/UserControls/NotificationControl.cs
new file mode 100644
index 000000000..69fa62947
--- /dev/null
+++ b/XrmToolBox.Extensibility/UserControls/NotificationControl.cs
@@ -0,0 +1,219 @@
+﻿using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.Windows.Forms;
+using XrmToolBox.Extensibility.Properties;
+
+namespace XrmToolBox.Extensibility.UserControls
+{
+    public enum NotificationAction
+    {
+        None,
+        Button,
+        Link,
+        Both
+    }
+
+    public enum NotificationType
+    {
+        Success,
+        Error,
+        Warning,
+        Info
+    }
+
+    public partial class NotificationControl : UserControl
+    {
+        private NotificationAction action = NotificationAction.None;
+        private string buttonText = "Action";
+        private bool canBeClosed = true;
+        private string linkText = "Learn more";
+        private string message = "Message";
+        private NotificationType type = NotificationType.Info;
+
+        public NotificationControl()
+        {
+            InitializeComponent();
+
+            lLabel.Paint -= NotificationControl_Paint;
+        }
+
+        public event EventHandler ButtonClicked;
+
+        public event LinkLabelLinkClickedEventHandler LinkClicked;
+
+        public NotificationAction Action
+        {
+            get => action;
+            set
+            {
+                action = value;
+                btnAction.Visible = action == NotificationAction.Button || action == NotificationAction.Both;
+                lLabel.Visible = action == NotificationAction.Link || action == NotificationAction.Both;
+            }
+        }
+
+        public string ButtonText
+        {
+            get => buttonText;
+            set
+            {
+                buttonText = value;
+                btnAction.Text = buttonText;
+
+                var size = TextRenderer.MeasureText(btnAction.Text, btnAction.Font);
+                btnAction.Width = size.Width + 10;
+            }
+        }
+
+        public bool CanBeClosed
+        {
+            get => canBeClosed;
+            set
+            {
+                canBeClosed = value;
+                lblClose.Visible = canBeClosed;
+            }
+        }
+
+        public string LinkText
+        {
+            get => linkText;
+            set
+            {
+                linkText = value;
+                lLabel.Text = linkText;
+
+                var size = TextRenderer.MeasureText(lLabel.Text, lLabel.Font);
+                lLabel.Width = size.Width + 10;
+            }
+        }
+
+        public string Message
+        {
+            get => message;
+            set
+            {
+                message = value;
+                Invalidate();
+            }
+        }
+
+        public NotificationType Type
+        {
+            get => type;
+            set
+            {
+                type = value;
+
+                Invalidate();
+            }
+        }
+
+        public void SetVisible(bool visible, int delayBeforeAutoHide = 0)
+        {
+            this.Visible = visible;
+
+            if (visible && delayBeforeAutoHide > 0)
+            {
+                Timer timer = new Timer();
+                timer.Interval = delayBeforeAutoHide;
+                timer.Tick += (s, e) =>
+                {
+                    this.Visible = false;
+                    timer.Stop();
+                    timer.Dispose();
+                };
+                timer.Start();
+            }
+        }
+
+        private void btnAction_Click(object sender, System.EventArgs e)
+        {
+            ButtonClicked?.Invoke(this, e);
+        }
+
+        private void lblClose_Click(object sender, EventArgs e)
+        {
+            this.Visible = false;
+        }
+
+        private void lLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            LinkClicked?.Invoke(this, e);
+        }
+
+        private void NotificationControl_Load(object sender, System.EventArgs e)
+        {
+            ToolTip toolTip = new ToolTip();
+            toolTip.SetToolTip(this, Message);
+        }
+
+        private void NotificationControl_Paint(object sender, PaintEventArgs e)
+        {
+            if (sender != this)
+                return;
+
+            Debug.Print(((Control)sender).Name + " : " + e.ToString());
+
+            Color borderColor = Color.LightGray;
+            Color backgroundColor = SystemColors.Info;
+            Color foreColor = Color.FromArgb(36, 36, 36);
+            Image img = Resources.info;
+
+            switch (Type)
+            {
+                case NotificationType.Success:
+                    {
+                        borderColor = Color.FromArgb(159, 216, 159);
+                        backgroundColor = Color.FromArgb(241, 250, 241);
+                        img = Resources.Success;
+                        break;
+                    }
+                case NotificationType.Error:
+                    {
+                        borderColor = Color.FromArgb(238, 172, 178);
+                        backgroundColor = Color.FromArgb(253, 243, 244);
+                        img = Resources.Error32;
+                        break;
+                    }
+                case NotificationType.Warning:
+                    {
+                        borderColor = Color.FromArgb(253, 207, 180);
+                        backgroundColor = Color.FromArgb(255, 249, 245);
+                        img = Resources.warning;
+                        break;
+                    }
+            }
+
+            if (e.ClipRectangle.X == lLabel.Left)
+            {
+                e.Graphics.FillRectangle(new SolidBrush(backgroundColor), e.ClipRectangle);
+                return;
+            }
+
+            if (e.ClipRectangle.X == lblClose.Left)
+            {
+                e.Graphics.FillRectangle(new SolidBrush(backgroundColor), e.ClipRectangle);
+                return;
+            }
+
+            e.Graphics.FillRoundedRectangle(new SolidBrush(backgroundColor), e.ClipRectangle, 6);
+            e.Graphics.DrawRoundedRectangle(new Pen(new SolidBrush(borderColor)), e.ClipRectangle, 6);
+            e.Graphics.DrawImage(img, new Rectangle(10, e.ClipRectangle.Height / 2 - 8, 16, 16));
+
+            var size = TextRenderer.MeasureText(Message, Font);
+
+            this.Height = size.Height + 20;
+
+            TextRenderer.DrawText(e.Graphics, Message, Font,
+   new Rectangle(36, e.ClipRectangle.Height / 2 - size.Height / 2, e.ClipRectangle.Width - 50 - (btnAction.Visible ? btnAction.Width : 0) - (lLabel.Visible ? lLabel.Width : 0) - (CanBeClosed ? lblClose.Width : 0), e.ClipRectangle.Height), Color.FromArgb(36, 36, 36), Color.Transparent,
+   TextFormatFlags.EndEllipsis);
+        }
+
+        private void NotificationControl_Resize(object sender, System.EventArgs e)
+        {
+            Invalidate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/XrmToolBox.Extensibility/UserControls/NotificationControl.resx b/XrmToolBox.Extensibility/UserControls/NotificationControl.resx
new file mode 100644
index 000000000..1af7de150
--- /dev/null
+++ b/XrmToolBox.Extensibility/UserControls/NotificationControl.resx
@@ -0,0 +1,120 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj b/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj
index 8b897daa1..25256ea2b 100644
--- a/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj
+++ b/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj
@@ -51,153 +51,25 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="McTools.Xrm.Connection, Version=1.2025.7.63, Culture=neutral, PublicKeyToken=96037217801d9658, processorArchitecture=MSIL">
-      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.7.63\lib\net48\McTools.Xrm.Connection.dll</HintPath>
-    </Reference>
-    <Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2025.7.63, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
-      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.7.63\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.59\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.AI, Version=9.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.AI.9.7.1\lib\net462\Microsoft.Extensions.AI.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.AI.Abstractions, Version=9.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.AI.Abstractions.9.7.1\lib\net462\Microsoft.Extensions.AI.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.7\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=9.0.0.7, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Primitives.9.0.7\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.5.3.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.1.65\lib\net462\Microsoft.Rest.ClientRuntime.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.XmlTransform, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Web.Xdt.7.0.0-preview.22423.2\lib\netstandard2.0\Microsoft.Web.XmlTransform.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Sdk, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.59\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Sdk.Deployment, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.Deployment.9.0.2.34\lib\net462\Microsoft.Xrm.Sdk.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Sdk.Workflow, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.Workflow.9.0.2.59\lib\net462\Microsoft.Xrm.Sdk.Workflow.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Tooling.Connector, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.Connector.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Tooling.CrmConnectControl, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.CrmConnectControl.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Tooling.Ui.Styles, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.Ui.Styles.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xrm.Tooling.WebResourceUtility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.WpfControls.9.1.1.65\lib\net462\Microsoft.Xrm.Tooling.WebResourceUtility.dll</HintPath>
-    </Reference>
-    <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="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Activities" />
     <Reference Include="System.Activities.Presentation" />
-    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.Composition.registration" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.7\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IdentityModel" />
-    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Pipelines, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.9.0.7\lib\net462\System.IO.Pipelines.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.7.0.0-preview.2.22152.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceModel.Duplex, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Duplex.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Http, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ServiceModel.Http.8.1.2\lib\net462\System.ServiceModel.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Primitives, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Security, Version=8.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ServiceModel.Primitives.8.1.2\lib\net462\System.ServiceModel.Security.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceModel.Web" />
-    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.9.0.7\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.9.0.7\lib\net462\System.Text.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Channels, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Channels.9.0.7\lib\net462\System.Threading.Channels.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms" />
@@ -214,6 +86,7 @@
     <Compile Include="Args\DuplicateToolArgs.cs" />
     <Compile Include="Args\DuplicateToolWithConnectionArgs.cs" />
     <Compile Include="Args\StatusBarMessageEventArgs.cs" />
+    <Compile Include="DrawExtensions.cs" />
     <Compile Include="Extensions.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -296,6 +169,12 @@
     <Compile Include="UserControls\NotificationArea.Designer.cs">
       <DependentUpon>NotificationArea.cs</DependentUpon>
     </Compile>
+    <Compile Include="UserControls\NotificationControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControls\NotificationControl.Designer.cs">
+      <DependentUpon>NotificationControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="UserControls\PluginModel.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -332,6 +211,9 @@
     <EmbeddedResource Include="UserControls\NotificationArea.resx">
       <DependentUpon>NotificationArea.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControls\NotificationControl.resx">
+      <DependentUpon>NotificationControl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UserControls\PluginModel.resx">
       <DependentUpon>PluginModel.cs</DependentUpon>
     </EmbeddedResource>
@@ -348,7 +230,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="Resources\notif_icn_alert16.png" />
   </ItemGroup>
   <ItemGroup>
@@ -375,14 +256,87 @@
   <ItemGroup>
     <None Include="Resources\progress_new.gif" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies">
+      <Version>9.0.2.59</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CrmSdk.Workflow">
+      <Version>9.0.2.59</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.AI">
+      <Version>9.7.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions">
+      <Version>9.0.7</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
+      <Version>9.0.7</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.Platforms">
+      <Version>7.0.4</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.Targets">
+      <Version>5.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
+      <Version>7.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Web.Xdt">
+      <Version>7.0.0-preview.22423.2</Version>
+    </PackageReference>
+    <PackageReference Include="MscrmTools.Xrm.Connection">
+      <Version>1.2025.9.64</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="System.Memory">
+      <Version>4.6.3</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime">
+      <Version>4.3.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+      <Version>7.0.0-preview.2.22152.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.Algorithms">
+      <Version>4.3.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.X509Certificates">
+      <Version>4.3.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.ServiceModel.Http">
+      <Version>8.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.ServiceModel.Primitives">
+      <Version>8.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>9.0.7</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Channels">
+      <Version>9.0.7</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Extensions">
+      <Version>4.6.3</Version>
+    </PackageReference>
+    <PackageReference Include="System.ValueTuple">
+      <Version>4.6.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\warning.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Error32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\info.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Success.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs b/XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs
index e23ad2e55..698f5bd8b 100644
--- a/XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs
+++ b/XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2025.7.71")]
-[assembly: AssemblyFileVersion("1.2025.7.71")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2025.10.74")]
+[assembly: AssemblyFileVersion("1.2025.710.74")]
\ No newline at end of file
diff --git a/XrmToolBox.ToolLibrary/ToolLibrary.cs b/XrmToolBox.ToolLibrary/ToolLibrary.cs
index 61d2559a3..413a6e68e 100644
--- a/XrmToolBox.ToolLibrary/ToolLibrary.cs
+++ b/XrmToolBox.ToolLibrary/ToolLibrary.cs
@@ -180,8 +180,8 @@ public void AnalyzePackage(XtbPlugin plugin, Version targetVersion = null)
 
                         existingFileVersion = existingFileVersion.Simplify();
 
-                        if (targetVersion == null && !existingFileVersion.Equals(new Version(plugin.Version).Simplify())
-                            || targetVersion != null && !existingFileVersion.Equals(targetVersion))
+                        if (targetVersion == null && existingFileVersion < new Version(plugin.Version).Simplify()
+                            || targetVersion != null && existingFileVersion < targetVersion.Simplify())
                         {
                             update = true;
                         }
@@ -318,7 +318,9 @@ public async Task<PackageVersion> GetPackageVersion(string packageName)
                     versions.Add(subItem);
             }
 
-            var latestVersion = versions.OrderBy(t => DateTime.Parse(t["commitTimeStamp"].ToString())).Last();
+            var latestVersion = versions
+                .Where(t => t["catalogEntry"]["listed"] != null && (bool)t["catalogEntry"]["listed"] == true)
+                .OrderBy(t => DateTime.Parse(t["commitTimeStamp"].ToString())).Last();
 
             var pv = await GetSpecificPackageVersion(packageName, latestVersion);
             while (pv.IsPrerelease && (!AllowConnectionControlPreRelease || packageName != "MscrmTools.Xrm.Connection"))
diff --git a/XrmToolBox.ToolLibrary/XrmToolBox.ToolLibrary.csproj b/XrmToolBox.ToolLibrary/XrmToolBox.ToolLibrary.csproj
index 1fd0e0674..191bb2a7f 100644
--- a/XrmToolBox.ToolLibrary/XrmToolBox.ToolLibrary.csproj
+++ b/XrmToolBox.ToolLibrary/XrmToolBox.ToolLibrary.csproj
@@ -34,11 +34,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="McTools.Xrm.Connection, Version=1.2025.7.63, Culture=neutral, PublicKeyToken=96037217801d9658, processorArchitecture=MSIL">
-      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.7.63\lib\net48\McTools.Xrm.Connection.dll</HintPath>
+    <Reference Include="McTools.Xrm.Connection, Version=1.2025.9.64, Culture=neutral, PublicKeyToken=96037217801d9658, processorArchitecture=MSIL">
+      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.9.64\lib\net48\McTools.Xrm.Connection.dll</HintPath>
     </Reference>
-    <Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2025.7.63, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
-      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.7.63\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
+    <Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2025.9.64, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
+      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.9.64\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
diff --git a/XrmToolBox.ToolLibrary/packages.config b/XrmToolBox.ToolLibrary/packages.config
index c6890571d..8c6325ce7 100644
--- a/XrmToolBox.ToolLibrary/packages.config
+++ b/XrmToolBox.ToolLibrary/packages.config
@@ -17,7 +17,7 @@
   <package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net48" />
   <package id="Microsoft.NETCore.Targets" version="5.0.0" targetFramework="net48" />
   <package id="Microsoft.Rest.ClientRuntime" version="2.3.24" targetFramework="net462" />
-  <package id="MscrmTools.Xrm.Connection" version="1.2025.7.63" targetFramework="net48" />
+  <package id="MscrmTools.Xrm.Connection" version="1.2025.9.64" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
   <package id="System.Diagnostics.DiagnosticSource" version="9.0.7" targetFramework="net48" />
diff --git a/XrmToolBox/AppCode/WebProxyHelper.cs b/XrmToolBox/AppCode/WebProxyHelper.cs
index 4533e4eac..1fad7b983 100644
--- a/XrmToolBox/AppCode/WebProxyHelper.cs
+++ b/XrmToolBox/AppCode/WebProxyHelper.cs
@@ -7,69 +7,46 @@ internal class WebProxyHelper
     {
         public static void ApplyProxy()
         {
-            //if (ConnectionManager.Instance.ConnectionsList.UseCustomProxy)
-            //{
-            //    WebRequest.DefaultWebProxy = new WebProxy
-            //    {
-            //        Address = new Uri(ConnectionManager.Instance.ConnectionsList.ProxyAddress, UriKind.Absolute),
-            //        BypassProxyOnLocal = ConnectionManager.Instance.ConnectionsList.ByPassProxyOnLocal,
-            //        UseDefaultCredentials = ConnectionManager.Instance.ConnectionsList.UseDefaultCredentials,
-            //    };
-
-            //    if (!((WebProxy)WebRequest.DefaultWebProxy).UseDefaultCredentials)
-            //    {
-            //        var userNamePart = ConnectionManager.Instance.ConnectionsList.UserName.Split('\\');
-
-            //        WebRequest.DefaultWebProxy.Credentials = new NetworkCredential
-            //        {
-            //            Domain = userNamePart.Length == 2 ? userNamePart[0] : null,
-            //            UserName = userNamePart.Length == 2 ? userNamePart[1] : userNamePart[0],
-            //            Password = ConnectionManager.Instance.ConnectionsList.Password
-            //        };
-            //    }
-            //}
-            //else if (ConnectionManager.Instance.ConnectionsList.UseInternetExplorerProxy)
-            //{
-            //    WebRequest.DefaultWebProxy = WebRequest.GetSystemWebProxy();
-            //    //Use default credentials if no proxy credentials
-            //    if (WebRequest.DefaultWebProxy.Credentials == null)
-            //        WebRequest.DefaultWebProxy.Credentials = CredentialCache.DefaultCredentials;
-            //}
-            //else
-            //{
-            //    WebRequest.DefaultWebProxy = null;
-            //}
-            if (Options.Instance.UseCustomProxy)
+            try
             {
-                WebRequest.DefaultWebProxy = new WebProxy
-                {
-                    Address = new Uri(Options.Instance.ProxyAddress, UriKind.Absolute),
-                    BypassProxyOnLocal = Options.Instance.ByPassProxyOnLocal,
-                    UseDefaultCredentials = Options.Instance.UseDefaultCredentials,
-                };
+                WebRequest.DefaultWebProxy = null;
 
-                if (!((WebProxy)WebRequest.DefaultWebProxy).UseDefaultCredentials)
+                if (Options.Instance.UseCustomProxy)
                 {
-                    var userNamePart = Options.Instance.UserName.Split('\\');
-
-                    WebRequest.DefaultWebProxy.Credentials = new NetworkCredential
+                    WebRequest.DefaultWebProxy = new WebProxy
                     {
-                        Domain = userNamePart.Length == 2 ? userNamePart[0] : null,
-                        UserName = userNamePart.Length == 2 ? userNamePart[1] : userNamePart[0],
-                        Password = Options.Instance.Password
+                        Address = new Uri(Options.Instance.ProxyAddress, UriKind.Absolute),
+                        BypassProxyOnLocal = Options.Instance.ByPassProxyOnLocal,
+                        UseDefaultCredentials = Options.Instance.UseDefaultCredentials,
                     };
+
+                    if (!((WebProxy)WebRequest.DefaultWebProxy).UseDefaultCredentials)
+                    {
+                        var userNamePart = Options.Instance.UserName.Split('\\');
+
+                        WebRequest.DefaultWebProxy.Credentials = new NetworkCredential
+                        {
+                            Domain = userNamePart.Length == 2 ? userNamePart[0] : null,
+                            UserName = userNamePart.Length == 2 ? userNamePart[1] : userNamePart[0],
+                            Password = Options.Instance.Password
+                        };
+                    }
+                }
+                else if (Options.Instance.UseInternetExplorerProxy)
+                {
+                    WebRequest.DefaultWebProxy = WebRequest.GetSystemWebProxy();
+                    //Use default credentials if no proxy credentials
+                    if (WebRequest.DefaultWebProxy.Credentials == null)
+                        WebRequest.DefaultWebProxy.Credentials = CredentialCache.DefaultCredentials;
+                }
+                else
+                {
+                    WebRequest.DefaultWebProxy = null;
                 }
             }
-            else if (Options.Instance.UseInternetExplorerProxy)
-            {
-                WebRequest.DefaultWebProxy = WebRequest.GetSystemWebProxy();
-                //Use default credentials if no proxy credentials
-                if (WebRequest.DefaultWebProxy.Credentials == null)
-                    WebRequest.DefaultWebProxy.Credentials = CredentialCache.DefaultCredentials;
-            }
-            else
+            catch
             {
-                WebRequest.DefaultWebProxy = null;
+                // Ignore any error
             }
         }
     }
diff --git a/XrmToolBox/New/NewForm.cs b/XrmToolBox/New/NewForm.cs
index ad947346d..ca25b4eb7 100644
--- a/XrmToolBox/New/NewForm.cs
+++ b/XrmToolBox/New/NewForm.cs
@@ -475,7 +475,10 @@ private async void NewForm_Load(object sender, System.EventArgs e)
 
             try
             {
-                await CheckForConnectionControlsUpdate();
+                if (!hasANewXtbVersion)
+                {
+                    await CheckForConnectionControlsUpdate();
+                }
 
                 if (store.PluginsCount == 0)
                 {
@@ -726,7 +729,6 @@ private UserControl DisplayPluginControl(Lazy<IXrmToolBoxPlugin, IPluginMetadata
                 return null;
             }
 
-            Guid pluginControlInstanceId = Guid.NewGuid();
             UserControl pluginControl = null;
             try
             {
@@ -737,7 +739,6 @@ private UserControl DisplayPluginControl(Lazy<IXrmToolBoxPlugin, IPluginMetadata
                 };
 
                 pluginControl = (UserControl)plugin.Value.GetControl();
-                pluginControl.Tag = pluginControlInstanceId;
 
                 if (pluginControl is PluginControlBase pcb)
                 {
@@ -1614,8 +1615,12 @@ void Mi()
 
         #region Check for update
 
+        private bool hasANewXtbVersion = false;
+
         private Task LaunchVersionCheck()
         {
+            hasANewXtbVersion = false;
+
             return new Task(() =>
             {
                 if (Options.Instance.DoNotCheckForUpdates || new ItSecurityChecker().IsCheckForUpdateDisabled())
@@ -1653,6 +1658,8 @@ private Task LaunchVersionCheck()
                         if (lastReleaseVersion > currentVersion &&
                             Options.Instance.LastUpdateCheck.Date != DateTime.Now.Date)
                         {
+                            hasANewXtbVersion = true;
+
                             var release =
                             releases.Items.FirstOrDefault(r => r.Version == lastReleaseVersion.ToString());
 
@@ -1699,7 +1706,7 @@ private void ApplyActiveContentDisplay()
                         {
                             ccsb.SetConnectionStatus(pcb.ConnectionDetail != null, pcb.ConnectionDetail);
                             connectionDetail = pcb.ConnectionDetail;
-                            service = pcb.ConnectionDetail.GetCrmServiceClient();
+                            service = pcb.ConnectionDetail?.GetCrmServiceClient();
                             pluginsForm.ConnectionDetail = pcb.ConnectionDetail;
                         }
                     }
@@ -1768,6 +1775,8 @@ private void checkForUpdateToolStripMenuItem_Click(object sender, System.EventAr
                 return;
             }
 
+            hasANewXtbVersion = false;
+
             var worker = new BackgroundWorker();
             worker.DoWork += (s, evt) =>
             {
@@ -1796,6 +1805,8 @@ private void checkForUpdateToolStripMenuItem_Click(object sender, System.EventAr
                     var currentVersion = Assembly.GetExecutingAssembly().GetName().Version;
                     if (lastReleaseVersion > currentVersion)
                     {
+                        hasANewXtbVersion = true;
+
                         var release = releases.Items.FirstOrDefault(r => r.Version == lastReleaseVersion.ToString());
 
                         Invoke(new Action(() =>
diff --git a/XrmToolBox/New/PluginForm.Designer.cs b/XrmToolBox/New/PluginForm.Designer.cs
index 0b7d698ad..b44545147 100644
--- a/XrmToolBox/New/PluginForm.Designer.cs
+++ b/XrmToolBox/New/PluginForm.Designer.cs
@@ -41,6 +41,7 @@ private void InitializeComponent()
             this.btnResetImpersonate = new System.Windows.Forms.Button();
             this.pbImpersonate = new System.Windows.Forms.PictureBox();
             this.pnlMain = new System.Windows.Forms.Panel();
+            this.NotifControlTop = new XrmToolBox.Extensibility.UserControls.NotificationControl();
             this.tlpHighlight = new System.Windows.Forms.TableLayoutPanel();
             this.lblTargetConnections = new System.Windows.Forms.Label();
             this.lblSourceConnection = new System.Windows.Forms.Label();
@@ -62,10 +63,10 @@ private void InitializeComponent()
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabel,
             this.toolStripProgressBar});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 483);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 386);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 21, 0);
-            this.statusStrip1.Size = new System.Drawing.Size(938, 34);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 19, 0);
+            this.statusStrip1.Size = new System.Drawing.Size(834, 27);
             this.statusStrip1.TabIndex = 1;
             this.statusStrip1.Text = "statusStrip";
             this.statusStrip1.Visible = false;
@@ -73,14 +74,14 @@ private void InitializeComponent()
             // toolStripStatusLabel
             // 
             this.toolStripStatusLabel.Name = "toolStripStatusLabel";
-            this.toolStripStatusLabel.Size = new System.Drawing.Size(915, 27);
+            this.toolStripStatusLabel.Size = new System.Drawing.Size(678, 21);
             this.toolStripStatusLabel.Spring = true;
             this.toolStripStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // toolStripProgressBar
             // 
             this.toolStripProgressBar.Name = "toolStripProgressBar";
-            this.toolStripProgressBar.Size = new System.Drawing.Size(150, 26);
+            this.toolStripProgressBar.Size = new System.Drawing.Size(133, 19);
             this.toolStripProgressBar.Visible = false;
             // 
             // lblEnvInfo
@@ -88,10 +89,10 @@ private void InitializeComponent()
             this.lblEnvInfo.Dock = System.Windows.Forms.DockStyle.Top;
             this.lblEnvInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblEnvInfo.ForeColor = System.Drawing.Color.White;
-            this.lblEnvInfo.Location = new System.Drawing.Point(8, 42);
+            this.lblEnvInfo.Location = new System.Drawing.Point(7, 34);
             this.lblEnvInfo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblEnvInfo.Name = "lblEnvInfo";
-            this.lblEnvInfo.Size = new System.Drawing.Size(972, 42);
+            this.lblEnvInfo.Size = new System.Drawing.Size(864, 34);
             this.lblEnvInfo.TabIndex = 3;
             this.lblEnvInfo.Text = "!!! PRODUCTION !!!";
             this.lblEnvInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -101,10 +102,10 @@ private void InitializeComponent()
             this.NotifPanel.BackColor = System.Drawing.SystemColors.Info;
             this.NotifPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.NotifPanel.Dock = System.Windows.Forms.DockStyle.Top;
-            this.NotifPanel.Location = new System.Drawing.Point(0, 0);
+            this.NotifPanel.Location = new System.Drawing.Point(0, 36);
             this.NotifPanel.Margin = new System.Windows.Forms.Padding(2);
             this.NotifPanel.Name = "NotifPanel";
-            this.NotifPanel.Size = new System.Drawing.Size(972, 47);
+            this.NotifPanel.Size = new System.Drawing.Size(864, 38);
             this.NotifPanel.TabIndex = 1;
             this.NotifPanel.Visible = false;
             // 
@@ -116,21 +117,21 @@ private void InitializeComponent()
             this.pnlImpersonate.Controls.Add(this.btnResetImpersonate);
             this.pnlImpersonate.Controls.Add(this.pbImpersonate);
             this.pnlImpersonate.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pnlImpersonate.Location = new System.Drawing.Point(0, 47);
+            this.pnlImpersonate.Location = new System.Drawing.Point(0, 74);
             this.pnlImpersonate.Margin = new System.Windows.Forms.Padding(2);
             this.pnlImpersonate.Name = "pnlImpersonate";
-            this.pnlImpersonate.Padding = new System.Windows.Forms.Padding(4);
-            this.pnlImpersonate.Size = new System.Drawing.Size(972, 47);
+            this.pnlImpersonate.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.pnlImpersonate.Size = new System.Drawing.Size(864, 38);
             this.pnlImpersonate.TabIndex = 2;
             this.pnlImpersonate.Visible = false;
             // 
             // lblImpersonation
             // 
             this.lblImpersonation.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lblImpersonation.Location = new System.Drawing.Point(38, 4);
+            this.lblImpersonation.Location = new System.Drawing.Point(34, 3);
             this.lblImpersonation.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblImpersonation.Name = "lblImpersonation";
-            this.lblImpersonation.Size = new System.Drawing.Size(733, 37);
+            this.lblImpersonation.Size = new System.Drawing.Size(651, 30);
             this.lblImpersonation.TabIndex = 2;
             this.lblImpersonation.Tag = "You are currently impersonated as user {0} ({1})";
             this.lblImpersonation.Text = "You are currently impersonated as user {0} ({1})";
@@ -139,10 +140,10 @@ private void InitializeComponent()
             // btnResetImpersonate
             // 
             this.btnResetImpersonate.Dock = System.Windows.Forms.DockStyle.Right;
-            this.btnResetImpersonate.Location = new System.Drawing.Point(771, 4);
+            this.btnResetImpersonate.Location = new System.Drawing.Point(685, 3);
             this.btnResetImpersonate.Margin = new System.Windows.Forms.Padding(2);
             this.btnResetImpersonate.Name = "btnResetImpersonate";
-            this.btnResetImpersonate.Size = new System.Drawing.Size(195, 37);
+            this.btnResetImpersonate.Size = new System.Drawing.Size(173, 30);
             this.btnResetImpersonate.TabIndex = 1;
             this.btnResetImpersonate.Text = "Cancel Impersonation";
             this.btnResetImpersonate.UseVisualStyleBackColor = true;
@@ -153,10 +154,10 @@ private void InitializeComponent()
             this.pbImpersonate.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.pbImpersonate.Dock = System.Windows.Forms.DockStyle.Left;
             this.pbImpersonate.Image = global::XrmToolBox.Properties.Resources.mask;
-            this.pbImpersonate.Location = new System.Drawing.Point(4, 4);
+            this.pbImpersonate.Location = new System.Drawing.Point(4, 3);
             this.pbImpersonate.Margin = new System.Windows.Forms.Padding(2);
             this.pbImpersonate.Name = "pbImpersonate";
-            this.pbImpersonate.Size = new System.Drawing.Size(34, 37);
+            this.pbImpersonate.Size = new System.Drawing.Size(30, 30);
             this.pbImpersonate.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pbImpersonate.TabIndex = 0;
             this.pbImpersonate.TabStop = false;
@@ -166,13 +167,29 @@ private void InitializeComponent()
             this.pnlMain.BackColor = System.Drawing.Color.WhiteSmoke;
             this.pnlMain.Controls.Add(this.pnlImpersonate);
             this.pnlMain.Controls.Add(this.NotifPanel);
+            this.pnlMain.Controls.Add(this.NotifControlTop);
             this.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pnlMain.Location = new System.Drawing.Point(8, 143);
+            this.pnlMain.Location = new System.Drawing.Point(7, 115);
             this.pnlMain.Margin = new System.Windows.Forms.Padding(2);
             this.pnlMain.Name = "pnlMain";
-            this.pnlMain.Size = new System.Drawing.Size(972, 366);
+            this.pnlMain.Size = new System.Drawing.Size(864, 293);
             this.pnlMain.TabIndex = 4;
             // 
+            // NotifControlTop
+            // 
+            this.NotifControlTop.Action = XrmToolBox.Extensibility.UserControls.NotificationAction.None;
+            this.NotifControlTop.ButtonText = "Action";
+            this.NotifControlTop.CanBeClosed = true;
+            this.NotifControlTop.Dock = System.Windows.Forms.DockStyle.Top;
+            this.NotifControlTop.LinkText = "Learn more";
+            this.NotifControlTop.Location = new System.Drawing.Point(0, 0);
+            this.NotifControlTop.Message = "Message";
+            this.NotifControlTop.Name = "NotifControlTop";
+            this.NotifControlTop.Padding = new System.Windows.Forms.Padding(4);
+            this.NotifControlTop.Size = new System.Drawing.Size(864, 36);
+            this.NotifControlTop.TabIndex = 3;
+            this.NotifControlTop.Type = XrmToolBox.Extensibility.UserControls.NotificationType.Info;
+            // 
             // tlpHighlight
             // 
             this.tlpHighlight.ColumnCount = 2;
@@ -181,11 +198,12 @@ private void InitializeComponent()
             this.tlpHighlight.Controls.Add(this.lblTargetConnections, 1, 0);
             this.tlpHighlight.Controls.Add(this.lblSourceConnection, 0, 0);
             this.tlpHighlight.Dock = System.Windows.Forms.DockStyle.Top;
-            this.tlpHighlight.Location = new System.Drawing.Point(8, 0);
+            this.tlpHighlight.Location = new System.Drawing.Point(7, 0);
+            this.tlpHighlight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tlpHighlight.Name = "tlpHighlight";
             this.tlpHighlight.RowCount = 1;
             this.tlpHighlight.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tlpHighlight.Size = new System.Drawing.Size(972, 42);
+            this.tlpHighlight.Size = new System.Drawing.Size(864, 34);
             this.tlpHighlight.TabIndex = 6;
             this.tlpHighlight.Visible = false;
             // 
@@ -193,9 +211,9 @@ private void InitializeComponent()
             // 
             this.lblTargetConnections.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lblTargetConnections.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblTargetConnections.Location = new System.Drawing.Point(489, 0);
+            this.lblTargetConnections.Location = new System.Drawing.Point(435, 0);
             this.lblTargetConnections.Name = "lblTargetConnections";
-            this.lblTargetConnections.Size = new System.Drawing.Size(480, 42);
+            this.lblTargetConnections.Size = new System.Drawing.Size(426, 34);
             this.lblTargetConnections.TabIndex = 0;
             this.lblTargetConnections.Text = "Target connections";
             this.lblTargetConnections.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -206,7 +224,7 @@ private void InitializeComponent()
             this.lblSourceConnection.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblSourceConnection.Location = new System.Drawing.Point(3, 0);
             this.lblSourceConnection.Name = "lblSourceConnection";
-            this.lblSourceConnection.Size = new System.Drawing.Size(480, 42);
+            this.lblSourceConnection.Size = new System.Drawing.Size(426, 34);
             this.lblSourceConnection.TabIndex = 1;
             this.lblSourceConnection.Text = "Source connection";
             this.lblSourceConnection.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -216,9 +234,10 @@ private void InitializeComponent()
             this.pnlHighlight.Controls.Add(this.lblEnvName);
             this.pnlHighlight.Controls.Add(this.pbEnvLogo);
             this.pnlHighlight.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pnlHighlight.Location = new System.Drawing.Point(8, 84);
+            this.pnlHighlight.Location = new System.Drawing.Point(7, 68);
+            this.pnlHighlight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pnlHighlight.Name = "pnlHighlight";
-            this.pnlHighlight.Size = new System.Drawing.Size(972, 59);
+            this.pnlHighlight.Size = new System.Drawing.Size(864, 47);
             this.pnlHighlight.TabIndex = 7;
             this.pnlHighlight.Visible = false;
             // 
@@ -228,7 +247,7 @@ private void InitializeComponent()
             this.lblEnvName.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblEnvName.Location = new System.Drawing.Point(62, 0);
             this.lblEnvName.Name = "lblEnvName";
-            this.lblEnvName.Size = new System.Drawing.Size(910, 59);
+            this.lblEnvName.Size = new System.Drawing.Size(802, 47);
             this.lblEnvName.TabIndex = 1;
             this.lblEnvName.Text = "Env";
             this.lblEnvName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -238,25 +257,27 @@ private void InitializeComponent()
             this.pbEnvLogo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbEnvLogo.Dock = System.Windows.Forms.DockStyle.Left;
             this.pbEnvLogo.Location = new System.Drawing.Point(0, 0);
+            this.pbEnvLogo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pbEnvLogo.Name = "pbEnvLogo";
-            this.pbEnvLogo.Size = new System.Drawing.Size(62, 59);
+            this.pbEnvLogo.Size = new System.Drawing.Size(62, 47);
             this.pbEnvLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pbEnvLogo.TabIndex = 0;
             this.pbEnvLogo.TabStop = false;
             // 
             // PluginForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(988, 517);
+            this.ClientSize = new System.Drawing.Size(878, 414);
             this.Controls.Add(this.pnlMain);
             this.Controls.Add(this.pnlHighlight);
             this.Controls.Add(this.lblEnvInfo);
             this.Controls.Add(this.tlpHighlight);
             this.Controls.Add(this.statusStrip1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "PluginForm";
-            this.Padding = new System.Windows.Forms.Padding(8, 0, 8, 8);
+            this.Padding = new System.Windows.Forms.Padding(7, 0, 7, 6);
             this.Text = "Tool Form";
             this.DockStateChanged += new System.EventHandler(this.PluginForm_DockStateChanged);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PluginForm_FormClosing);
@@ -292,5 +313,6 @@ private void InitializeComponent()
         private Panel pnlHighlight;
         private Label lblEnvName;
         private PictureBox pbEnvLogo;
+        private Extensibility.UserControls.NotificationControl NotifControlTop;
     }
 }
\ No newline at end of file
diff --git a/XrmToolBox/Options.cs b/XrmToolBox/Options.cs
index 11a94d5fc..c0afb2e70 100644
--- a/XrmToolBox/Options.cs
+++ b/XrmToolBox/Options.cs
@@ -124,7 +124,7 @@ public void ApplyFormSize(Form form)
         }
     }
 
-    public class Options : ICloneable, IToolLibrarySettings, IConnectionControlSettings
+    public class Options : ICloneable, IToolLibrarySettings, IConnectionControlSettings2
     {
         private static Options innerOptions;
 
@@ -418,6 +418,12 @@ public bool UseDetailsViewForConnectionSelector
             }
         }
 
+        [Category("Connection controls")]
+        [DisplayName("Use filter for additional connections")]
+        [Description("Indicates if connection selector should display the connection from the same file when adding an additionnal connection")]
+        [PropertyOrder(10)]
+        public bool UseFilterForAdditionalConnection { get; set; } = true;
+
         #endregion Connection controls
 
         #region Display
diff --git a/XrmToolBox/Program.cs b/XrmToolBox/Program.cs
index 5439548b6..b108b71ed 100644
--- a/XrmToolBox/Program.cs
+++ b/XrmToolBox/Program.cs
@@ -320,6 +320,7 @@ private static void Main(string[] args)
             RedirectAssembly("ScintillaNET");
             RedirectAssembly("Microsoft.Web.WebView2.Core");
             RedirectAssembly("Microsoft.Web.WebView2.WinForms");
+            RedirectAssembly("Microsoft.Toolkit.Uwp.Notifications");
 
             OptimizeConnectionSettings();
             SetProxy();
@@ -490,7 +491,14 @@ private static void RunCommandIfAny()
 
         private static void SetProxy()
         {
-            WebProxyHelper.ApplyProxy();
+            try
+            {
+                WebProxyHelper.ApplyProxy();
+            }
+            catch
+            {
+                // Ignore any error
+            }
         }
 
         private static void TryWaitingForOldProcess(int previousProcessId)
diff --git a/XrmToolBox/Properties/AssemblyInfo.cs b/XrmToolBox/Properties/AssemblyInfo.cs
index bd1c5d3fe..09a52bcd1 100644
--- a/XrmToolBox/Properties/AssemblyInfo.cs
+++ b/XrmToolBox/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2025.10.72")]
-[assembly: AssemblyFileVersion("1.2025.10.72")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2025.10.74")]
+[assembly: AssemblyFileVersion("1.2025.10.74")]
\ No newline at end of file
diff --git a/XrmToolBox/XrmToolBox.csproj b/XrmToolBox/XrmToolBox.csproj
index 1ccba3cf7..a101f4f32 100644
--- a/XrmToolBox/XrmToolBox.csproj
+++ b/XrmToolBox/XrmToolBox.csproj
@@ -78,11 +78,11 @@
     <Reference Include="McTools.StopAdvertisement">
       <HintPath>..\LicenseChecker\McTools.StopAdvertisement.dll</HintPath>
     </Reference>
-    <Reference Include="McTools.Xrm.Connection, Version=1.2025.7.63, Culture=neutral, PublicKeyToken=96037217801d9658, processorArchitecture=MSIL">
-      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.7.63\lib\net48\McTools.Xrm.Connection.dll</HintPath>
+    <Reference Include="McTools.Xrm.Connection, Version=1.2025.9.64, Culture=neutral, PublicKeyToken=96037217801d9658, processorArchitecture=MSIL">
+      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.9.64\lib\net48\McTools.Xrm.Connection.dll</HintPath>
     </Reference>
-    <Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2025.7.63, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
-      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.7.63\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
+    <Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2025.9.64, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
+      <HintPath>..\packages\MscrmTools.Xrm.Connection.1.2025.9.64\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -875,7 +875,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.YearStamp.MonthStamp.DayStamp" BuildVersion_ConfigurationName="Release" />
+      <UserProperties BuildVersion_ConfigurationName="Release" BuildVersion_BuildVersioningStyle="None.YearStamp.MonthStamp.DayStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
diff --git a/XrmToolBox/packages.config b/XrmToolBox/packages.config
index d069af331..0818e005a 100644
--- a/XrmToolBox/packages.config
+++ b/XrmToolBox/packages.config
@@ -22,7 +22,7 @@
   <package id="Microsoft.Rest.ClientRuntime" version="2.3.24" targetFramework="net462" />
   <package id="Microsoft.Web.WebView2" version="1.0.3351.48" targetFramework="net48" />
   <package id="Microsoft.Web.Xdt" version="3.1.0" targetFramework="net462" />
-  <package id="MscrmTools.Xrm.Connection" version="1.2025.7.63" targetFramework="net48" />
+  <package id="MscrmTools.Xrm.Connection" version="1.2025.9.64" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
   <package id="System.Diagnostics.DiagnosticSource" version="9.0.7" targetFramework="net48" />

Package Id	Version
Microsoft.CrmSdk.CoreAssemblies	+ v9.0.2.59
Microsoft.CrmSdk.Workflow	+ v9.0.2.59
Microsoft.Extensions.AI	+ v9.7.1
Microsoft.Extensions.Caching.Abstractions	+ v9.0.7
Microsoft.Extensions.Logging.Abstractions	+ v9.0.7
Microsoft.NETCore.Platforms	+ v7.0.4
Microsoft.NETCore.Targets	+ v5.0.0
Microsoft.Toolkit.Uwp.Notifications	+ v7.1.3
Microsoft.Web.Xdt	+ v7.0.0-preview.22423.2
MscrmTools.Xrm.Connection	+ v1.2025.9.64
Newtonsoft.Json	+ v13.0.3
System.Memory	+ v4.6.3
System.Runtime	+ v4.3.1
System.Runtime.CompilerServices.Unsafe	+ v7.0.0-preview.2.22152.2
System.Security.Cryptography.Algorithms	+ v4.3.1
System.Security.Cryptography.X509Certificates	+ v4.3.2
System.ServiceModel.Http	+ v8.1.2
System.ServiceModel.Primitives	+ v8.1.2
System.Text.Json	+ v9.0.7
System.Threading.Channels	+ v9.0.7
System.Threading.Tasks.Extensions	+ v4.6.3
System.ValueTuple	+ v4.6.1
Package Id	Version
Microsoft.Bcl.AsyncInterfaces	+ v9.0.7
Microsoft.CrmSdk.Deployment	+ v9.0.2.34
Microsoft.CrmSdk.XrmTooling.CoreAssembly	+ v9.1.1.65
Microsoft.CrmSdk.XrmTooling.WpfControls	+ v9.1.1.65
Microsoft.Extensions.AI.Abstractions	+ v9.7.1
Microsoft.Extensions.DependencyInjection.Abstractions	+ v9.0.7
Microsoft.Extensions.Primitives	+ v9.0.7
Microsoft.IdentityModel.Clients.ActiveDirectory	+ v5.3.0
Microsoft.NETFramework.ReferenceAssemblies	+ v1.0.0
Microsoft.NETFramework.ReferenceAssemblies.net48	+ v1.0.0
Microsoft.Rest.ClientRuntime	+ v2.3.24
Microsoft.Windows.SDK.Contracts	+ v10.0.19041.1
System.Buffers	+ v4.6.1
System.Diagnostics.DiagnosticSource	+ v9.0.7
System.IO	+ v4.3.0
System.IO.Pipelines	+ v9.0.7
System.Net.Http	+ v4.3.4
System.Numerics.Vectors	+ v4.6.1
System.Private.Uri	+ v4.3.2
System.Runtime.WindowsRuntime	+ v4.6.0
System.Runtime.WindowsRuntime.UI.Xaml	+ v4.6.0
System.Security.Cryptography.Encoding	+ v4.3.0
System.Security.Cryptography.Primitives	+ v4.3.0
System.Text.Encodings.Web	+ v9.0.7