diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index db48150d3f..e5ce5723df 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,13 +3,13 @@ name: .NET Build and Publish
 on:
   push:
     branches: ["main", "dev", "dui3/alpha"]
-  pull_request: 
+  pull_request:
     branches:
       - dui3/alpha
 
 jobs:
   build-and-publish:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
@@ -26,34 +26,31 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}      
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
 
-      - name : Install GitVersion
+      - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v1.1.1
         with:
-          versionSpec: '5.x'
+          versionSpec: "5.x"
 
       - name: Determine Version
         id: version
         uses: gittools/actions/gitversion/execute@v1.1.1
 
       - name: Format
-        run: ./build.ps1 format
+        run: ./build.sh format
 
       - name: Restore
-        run: ./build.ps1 restore
-
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+        run: ./build.sh restore
 
       - name: Build
         env:
           VERSION: ${{ env.fullSemVer }}
           FILE_VERSION: ${{ env.assemblySemFileVer }}
-        run: ./build.ps1 build
+        run: ./build.sh build
 
       - name: Pack
-        run: ./build.ps1 zip
+        run: ./build.sh zip
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -61,6 +58,6 @@ jobs:
           name: output-${{ env.fullSemVer }}
           path: output/*.*
           compression-level: 0 # no compression
-  
+
       - name: Trigger Build Installers
-        run: ./build.ps1 build-installers ${{ secrets.CONNECTORS_GH_TOKEN }} ${{ github.run_id }} ${{ env.fullSemVer }}
+        run: ./build.sh build-installers ${{ secrets.CONNECTORS_GH_TOKEN }} ${{ github.run_id }} ${{ env.fullSemVer }}
diff --git a/Build/Program.cs b/Build/Program.cs
index df88496f33..d30d0d0b39 100644
--- a/Build/Program.cs
+++ b/Build/Program.cs
@@ -89,8 +89,8 @@ void RemoveDirectory(string d)
     var fileVersion = Environment.GetEnvironmentVariable("FILE_VERSION");
     Console.WriteLine($"Version: {version} & {fileVersion}");
     Run(
-      "msbuild",
-      $"{s} /p:Configuration=Release /p:RestoreLockedMode=true /p:IsDesktopBuild=false /p:NuGetRestorePackages=false /p:Version={version} /p:FileVersion={fileVersion} -v:m"
+      "dotnet",
+      $"build {s} --no-restore -c Release -p:IsDesktopBuild=false -p:Version={version} -p:FileVersion={fileVersion} -v:m"
     );
   }
 );
diff --git a/Core/Tests/Speckle.Core.Tests.Performance/packages.lock.json b/Core/Tests/Speckle.Core.Tests.Performance/packages.lock.json
index 96a50343ba..fb9afc6739 100644
--- a/Core/Tests/Speckle.Core.Tests.Performance/packages.lock.json
+++ b/Core/Tests/Speckle.Core.Tests.Performance/packages.lock.json
@@ -25,6 +25,15 @@
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "BenchmarkDotNet.Annotations": {
         "type": "Transitive",
         "resolved": "0.13.12",
@@ -232,6 +241,11 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.1"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Microsoft.Win32.Registry": {
         "type": "Transitive",
         "resolved": "5.0.0",
@@ -573,58 +587,6 @@
           "Speckle.Core": "[2.0.999-local, )"
         }
       }
-    },
-    ".NETFramework,Version=v4.8/win7-x86": {
-      "Gee.External.Capstone": {
-        "type": "Transitive",
-        "resolved": "2.3.0",
-        "contentHash": "2ap/rYmjtzCOT8hxrnEW/QeiOt+paD8iRrIcdKX0cxVwWLFa1e+JDBNeECakmccXrSFeBQuu5AV8SNkipFMMMw=="
-      },
-      "Microsoft.Win32.Registry": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
-        "dependencies": {
-          "System.Security.AccessControl": "5.0.0",
-          "System.Security.Principal.Windows": "5.0.0"
-        }
-      },
-      "SQLitePCLRaw.lib.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      },
-      "System.Management": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "MF1CHaRcC+MLFdnDthv4/bKWBZnlnSpkGqa87pKukQefgEdwtb9zFW6zs0GjPp73qtpYYg4q6PEKbzJbxCpKfw=="
-      },
-      "System.Runtime.InteropServices.RuntimeInformation": {
-        "type": "Transitive",
-        "resolved": "4.3.0",
-        "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw=="
-      },
-      "System.Security.AccessControl": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
-        "dependencies": {
-          "System.Security.Principal.Windows": "5.0.0"
-        }
-      },
-      "System.Security.Principal.Windows": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
-      },
-      "System.Text.Encoding.CodePages": {
-        "type": "Transitive",
-        "resolved": "4.5.1",
-        "contentHash": "4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==",
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
-        }
-      }
     }
   }
 }
\ No newline at end of file
diff --git a/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets b/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets
new file mode 100644
index 0000000000..a25abf1d91
--- /dev/null
+++ b/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project>
+  <!-- Code to zip up the files-->
+
+  <UsingTask TaskName="PackageAddIn" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <ZipIntermediatePath ParameterType="System.String" Required="true" />
+      <PackageType ParameterType="System.String" Required="true" />
+      <TargetFolder ParameterType="System.String" Required="true" />
+      <TargetFileName ParameterType="System.String" Required="true" />
+      <RootNamespace ParameterType="System.String" Required="true" />
+      <PackageOutputPath ParameterType="System.String" Output="true"/>
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System"/>
+      <Using Namespace="System.IO"/>
+      <Using Namespace="System.Xml.Linq"/>
+      <Using Namespace="System.Linq"/>
+      <Using Namespace="System.IO.Compression"/>
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+      Success = false;
+      string ConfigNotFound = "{0} was not found. File must be present in the root of the project and its build action set to AddInContent.";
+	  string ZipIntermediatePathNotFound = "{0} was not found.";
+      string DefaultAssemblyDoesNotMatch = "Your value of '{0}' for the '{1}' attribute in the {2} does not match the assembly name '{3}' set for your project.";
+      string DefaultNSDoesNotMatch = "Your value of '{0}' for the '{1}' attribute in the {2} does not match the default namespace '{3}' set for your project.";
+      //Create the name of the Config File and extension
+      string extension = "";
+      string config = "";
+      string attrib_asm = "";
+      string attrib_ns = "";
+      var assemblyValMissing = "";
+      var nsValMissing = "";
+      if (PackageType.ToLower() == "plugin")
+      {
+        Log.LogMessage(MessageImportance.Low, "This is an plugin");
+        config = "Config.xml";
+        extension = ".esriPlugin";
+        attrib_asm = "library";
+        attrib_ns = "namespace";
+        assemblyValMissing = "AddIn element 'library' attribute not found";
+        nsValMissing = "AddIn element 'namespace' attribute not found";
+      }
+      else if (PackageType.ToLower() == "configuration")
+      {
+        Log.LogMessage(MessageImportance.Low, "This is an configuration");
+        config = "Config.daml";
+        extension = ".proConfigX";
+        attrib_asm = "defaultAssembly";
+        attrib_ns = "defaultNamespace";
+        assemblyValMissing = "ArcGIS element 'defaultAssembly' attribute not found";
+        nsValMissing = "ArcGIS element 'defaultNamespace' attribute not found";
+      }
+      else
+      {
+        Log.LogMessage(MessageImportance.Low, "This is an addin");
+		config = "Config.daml";
+		bool proSDKProject = File.Exists(Path.Combine(ZipIntermediatePath, config));	
+		if (!proSDKProject) //This might be a class library that uses the Pro references only
+		      return true; 
+        extension = ".esriAddinX";
+        attrib_asm = "defaultAssembly";
+        attrib_ns = "defaultNamespace";
+        assemblyValMissing = "ArcGIS element 'defaultAssembly' attribute not found";
+        nsValMissing = "ArcGIS element 'defaultNamespace' attribute not found";
+      }
+      // Check if Config.daml exists in ZipFolder
+      ZipIntermediatePath = Path.GetFullPath(ZipIntermediatePath);
+      if (!Directory.Exists(ZipIntermediatePath))
+	  {
+	    Log.LogError(ZipIntermediatePathNotFound, ZipIntermediatePath);
+		return false;
+	  }       
+      var addInXML = Path.Combine(ZipIntermediatePath, config);
+      Log.LogMessage(MessageImportance.Low, "addInXML: " + addInXML);
+      Log.LogMessage(MessageImportance.High, "PackageType: " + PackageType);
+      if (!File.Exists(addInXML))
+      {
+        Log.LogError(ConfigNotFound, config);
+        return false;
+      }
+      //Verfiy that an assembly with the name defined in the Config.daml
+      //matches the default assembly set in the project. Ditto for the
+      //namespace
+      string DefaultAssembly = "";
+      string DefaultNamespace = "";
+      XDocument xdoc = XDocument.Load(addInXML);
+      XNamespace DefaultNS = "http://schemas.esri.com/DADF/Registry";
+      if (PackageType.ToLower() == "plugin")
+      {
+        var addin = xdoc.Root.Element(DefaultNS + "AddIn");
+        if (addin != null)
+        {
+          var val = addin.Attribute("library");
+          if (val != null)
+            DefaultAssembly = val.Value;
+          val = addin.Attribute("namespace");
+          if (val != null)
+            DefaultNamespace = val.Value;
+        }
+      }
+      else
+      {
+        var val = xdoc.Root.Attribute("defaultAssembly");
+        if (val != null)
+          DefaultAssembly = val.Value;
+        val = xdoc.Root.Attribute("defaultNamespace");
+        if (val != null)
+          DefaultNamespace = val.Value;
+      }
+      if (string.IsNullOrEmpty(DefaultAssembly))
+      {
+        Log.LogError(assemblyValMissing);
+        return false;
+      }
+      if (string.IsNullOrEmpty(DefaultNamespace))
+      {
+        Log.LogError(nsValMissing);
+        return false;
+      }
+
+      //check that the addin assembly and default assembly names match
+      if (DefaultAssembly.ToLower() != TargetFileName.ToLower())
+      {
+        Log.LogWarning(DefaultAssemblyDoesNotMatch, DefaultAssembly, attrib_asm, config, TargetFileName);
+      }
+      //Ditto for namespace
+      if (DefaultNamespace.ToLower() != RootNamespace.ToLower())
+      {
+        Log.LogWarning(DefaultNSDoesNotMatch, DefaultNamespace, attrib_ns, config, RootNamespace);
+      }
+
+      if (!Directory.Exists(TargetFolder))
+      {
+        Directory.CreateDirectory(TargetFolder);
+      }
+
+      string addInAssembly = System.IO.Path.GetFileNameWithoutExtension(DefaultAssembly);
+      string archiveName = addInAssembly + extension;
+      try
+      {
+        string file = Path.Combine(TargetFolder, archiveName);
+        if (File.Exists(file))
+          File.Delete(file);
+        System.IO.Compression.ZipFile.CreateFromDirectory(ZipIntermediatePath, file);
+        PackageOutputPath = Path.GetFullPath(file);
+        Success = true;
+      }
+      catch (Exception ex)
+      {
+        Log.LogErrorFromException(ex);
+        return false;
+      }
+      return Success;
+    ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+  <!-- Code to find relative path-->
+  <UsingTask TaskName="ConvertToRelativePath" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <RelativeTo ParameterType="System.String" Required="true"/>
+      <Paths ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
+      <RelativePaths ParameterType="Microsoft.Build.Framework.ITaskItem[]" Output="true"/>
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System"/>
+      <Using Namespace="System.IO"/>
+      <Using Namespace="System.Linq"/>
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+			var result = new List<ITaskItem>();
+            System.Uri relativeTo = new Uri(this.RelativeTo);
+            foreach (var i in Paths) {
+                try {
+                    System.Uri itemFullPath = new Uri(i.GetMetadata("FullPath"));
+                    var relativeUri = relativeTo.MakeRelativeUri(itemFullPath);
+
+                    result.Add(new TaskItem(Uri.UnescapeDataString(relativeUri.ToString())));
+                }
+                catch {
+                    return false;
+                }
+            }
+            RelativePaths = result.ToArray();
+			foreach (var i in RelativePaths)
+            {
+                Log.LogMessage(MessageImportance.Low, "RelativePaths: " + i.ToString());
+            }
+            return true;
+			 ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+  <UsingTask TaskName="CleanAddIn" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <ProjectDir ParameterType="System.String" Required="true"/>
+      <AssemblyName ParameterType="System.String" Required="true"/>
+      <PackageType ParameterType="System.String" Required="true"/>
+      <!--<ArcGISFolder ParameterType="System.String" Output="true" /> -->
+      <CleanInfo ParameterType="System.String" Output="true"/>
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System"/>
+      <Using Namespace="System.IO"/>
+      <Using Namespace="System.Xml.Linq"/>
+      <Using Namespace="System.Linq"/>
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+	  Success = false;
+      string ConfigNotFound = "{0} was not found. File must be present in the root of the project and its build action set to AddInContent.";
+
+      //Create the name of the Config File and extension
+      string extension = "";
+      string config = "";
+
+      if (PackageType.ToLower() == "plugin")
+      {
+        config = "Config.xml";
+        extension = ".esriPlugin";
+      }
+      else if (PackageType.ToLower() == "configuration")
+      {
+        config = "Config.daml";
+        extension = ".proConfigX";
+      }
+      else
+      {
+        config = "Config.daml";
+		    bool proSDKProject = File.Exists(Path.Combine(ProjectDir, config));
+		    if (!proSDKProject) //This might be a class library that uses the Pro references only
+		       return true;
+        extension = ".esriAddinX";
+      }
+
+      var addInXML = Path.Combine(ProjectDir, config);
+      if (!File.Exists(addInXML))
+      {
+        Log.LogError(ConfigNotFound, config);
+        return false;
+      }
+
+      //Get the add-in id
+      XDocument xdoc = XDocument.Load(addInXML);
+      XNamespace DefaultNS = "http://schemas.esri.com/DADF/Registry";
+      if (PackageType.ToLower() == "plugin")
+      {
+        Log.LogMessage("process plugin");
+        var addInID = xdoc.Root.Element(DefaultNS + "AddInID");
+        CleanInfo = addInID.Value;//let it error if it's missing
+      }
+      else if (PackageType.ToLower() == "addin")
+      {
+        Log.LogMessage("process addin");
+        var addinInfo = xdoc.Root.Element(DefaultNS + "AddInInfo");
+        CleanInfo = addinInfo.Attribute("id").Value;//let it error if it's missing
+      }
+      else
+      {
+        Log.LogMessage("process configuration");
+        CleanInfo = AssemblyName + extension;
+      }
+      Success = true;
+      return Success;
+	]]>
+      </Code>
+    </Task>
+  </UsingTask>
+  <!-- Define additional BuildAction option -->
+  <!-- Set up default zip properties -->
+  <PropertyGroup>
+    <PackageType Condition="'$(PackageType)' == ''">Addin</PackageType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ArcGISFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\ESRI\ArcGISPro', 'InstallDir', null, RegistryView.Registry64))</ArcGISFolder>
+    <ArcGISFolder Condition="'$(ArcGISFolder)' == ''">$(registry:HKEY_CURRENT_USER\SOFTWARE\ESRI\ArcGISPro@InstallDir)</ArcGISFolder>
+  </PropertyGroup>
+  <Target Name="ArcGISInstallOutput" AfterTargets="Build">
+    <Message Text="IntermediateOutputPath Name: $(IntermediateOutputPath)..." Importance="High"/>
+    <Message Text="CleanFile Name: $(CleanFile)..." Importance="High"/>
+    <Message Text="ProjectDir Name: $(ProjectDir)..." Importance="High"/>
+    <Message Text="AssemblyName Name: $(AssemblyName)..." Importance="High"/>
+    <Message Text="TargetFileName Name: $(TargetFileName)..." Importance="High"/>
+    <Message Text="RootNamespace: $(RootNamespace)..." Importance="High"/>
+    <Message Text="TargetFolder Name: $(OutDir)..." Importance="High"/>
+    <Message Text="PackageType Name: $(PackageType)..." Importance="High"/>
+    <Message Text="Install dir: $(ArcGISFolder)" Importance="High"/>
+    <!-- Get a list of project outputs from the cache file and FileWritesXXX item, 
+         excluding those in intermediate output directory  -->
+    <!-- Note clean file may miss listing CopyLocal reference -->
+    <ReadLinesFromFile File="$(IntermediateOutputPath)$(CleanFile)">
+      <Output TaskParameter="Lines" ItemName="CacheOutputFiles" />
+    </ReadLinesFromFile>
+    <FindUnderPath Files="@(CacheOutputFiles)" Path="$(OutDir)">
+      <Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
+    </FindUnderPath>
+    <FindUnderPath Files="@(FileWrites->'%(FullPath)')" Path="$(OutDir)">
+      <Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
+    </FindUnderPath>
+    <FindUnderPath Files="@(FileWritesShareable->'%(FullPath)')" Path="$(OutDir)">
+      <Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
+    </FindUnderPath>
+    <RemoveDuplicates Inputs="@(PackageOutputFiles)">
+      <Output TaskParameter="Filtered" ItemName="FilteredPackageOutputFiles" />
+    </RemoveDuplicates>
+    <ConvertToRelativePath Paths="@(FilteredPackageOutputFiles)" RelativeTo="$(TargetDir)">
+      <Output TaskParameter="RelativePaths" ItemName="ConfigBinaries" />
+    </ConvertToRelativePath>
+    <Message Text="ConvertToRelativePath Task, TargetDir: $(TargetDir) " Importance="High"/>
+  </Target>
+  <Target Name="PackageArcGISContents" AfterTargets="ArcGISInstallOutput">
+    <Message Text="Running PackageArcGISContents..." Importance="High"/>
+    <RemoveDir Condition="Exists('$(ZipIntermediatePath)')" Directories="$(ZipIntermediatePath)" />
+    <Message Text="ZipIntermediatePath: $(ZipIntermediatePath)Install..." Importance="High"/>
+    <!-- Copy project output files, preserving folder structure -->
+    <Copy SourceFiles="@(ConfigBinaries->'$(OutDir)%(Identity)')" ContinueOnError="true" DestinationFolder="$(IntermediateOutputPath)temp_archive\Install\%(RelativeDir)" />
+    <!-- Copy items marked with Content as BuildAction, preserving folder structure & handling linked items -->
+    <!-- Only include items that have CopyToOutputDirectory as Never -->
+    <Copy SourceFiles="@(Content)" Condition="'%(Content.Link)' == '' And ('%(Content.CopyToOutputDirectory)' == 'Never' Or '%(Content.CopyToOutputDirectory)' == '')" DestinationFolder="$(IntermediateOutputPath)temp_archive\%(RelativeDir)" ContinueOnError="true" />
+    <Copy SourceFiles="@(Content)" Condition="'%(Content.Link)' != '' And ('%(Content.CopyToOutputDirectory)' == 'Never' Or '%(Content.CopyToOutputDirectory)' == '')" DestinationFiles="$(IntermediateOutputPath)temp_archive\%(Content.Link)" ContinueOnError="true"/>
+    <!-- Zipping up add-in resources -->
+    <PackageAddIn ZipIntermediatePath="$(IntermediateOutputPath)temp_archive\"
+                  PackageType="$(PackageType)"
+                  TargetFolder="$(OutDir)"
+                  TargetFileName="$(TargetFileName)"
+                  RootNamespace="$(RootNamespace)">
+      <Output TaskParameter="PackageOutputPath" PropertyName="PackageFile" />
+    </PackageAddIn>
+    <!-- Shell out to RegisterAddIn.exe to install the package -->
+    <Message Text="Deploying $(PackageType)..." Importance="High"/>
+    <Message Text="ArcGISFolder Name: $(ArcGISFolder)..." Importance="High"/>
+    <Message Text="Unable to execute RegisterAddIn.exe. ArcGIS Pro is not installed." Importance="High" Condition="'$(ArcGISFolder)' == ''"/>
+    <Message Text="Execute RegisterAddIn.exe &quot;$(PackageFile)&quot; /s..." Importance="High" Condition="'$(ArcGISFolder)' != ''"/>
+    <Exec IgnoreExitCode="true" WorkingDirectory="$(ArcGISFolder)bin" Command="RegisterAddIn.exe &quot;$(PackageFile)&quot; /s" Condition="'$(ArcGISFolder)' != '' AND $(PackageFile) != '' ">
+      <Output TaskParameter="ExitCode" PropertyName="ESRIRegAddinExitCode" />
+    </Exec>
+    <RemoveDir Condition="Exists('$(ZipIntermediatePath)')" Directories="$(ZipIntermediatePath)" />
+  </Target>
+  <Target Name="CleanArcGISContents" AfterTargets="Clean">
+    <CleanAddIn ProjectDir="$(ProjectDir)"
+                AssemblyName="$(AssemblyName)"
+                PackageType="$(PackageType)">
+      <Output TaskParameter="CleanInfo" PropertyName="CleanInfo" />
+    </CleanAddIn>
+    <Message Text="Clean $(PackageType)..." Importance="High"/>
+    <Message Text="Execute RegisterAddIn.exe &quot;$(CleanInfo)&quot; /u..." Importance="High" Condition="'$(ArcGISFolder)' != ''"/>
+    <Message Text="Unable to execute RegisterAddIn.exe. ArcGIS Pro is not installed." Importance="High" Condition="'$(ArcGISFolder)' == ''"/>
+    <Exec IgnoreExitCode="true" WorkingDirectory="$(ArcGISFolder)bin" Command="RegisterAddIn.exe &quot;$(CleanInfo)&quot; /u /s" Condition="'$(ArcGISFolder)' != '' AND $(CleanInfo) != ''">
+      <Output TaskParameter="ExitCode" PropertyName="ESRIRegAddinExitCode" />
+    </Exec>
+  </Target>
+</Project>
diff --git a/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Speckle.Connectors.ArcGIS3.csproj b/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Speckle.Connectors.ArcGIS3.csproj
index 564c8deb96..fac5d336e3 100644
--- a/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Speckle.Connectors.ArcGIS3.csproj
+++ b/DUI3-DX/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Speckle.Connectors.ArcGIS3.csproj
@@ -7,6 +7,7 @@
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <RootNameSpace>Speckle.Connectors.ArcGIS</RootNameSpace>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
   
@@ -19,7 +20,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Esri.ArcGISPro.Extensions30" Version="3.2.0.49743" />
+    <PackageReference Include="Esri.ArcGISPro.Extensions30" Version="3.2.0.49743" IncludeAssets="compile"/>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
   </ItemGroup>
   
@@ -28,4 +29,6 @@
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
     <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
   </ItemGroup>
+  
+  <Import Project="Esri.ArcGISPro.Extensions30.Speckle.targets"/>
 </Project>
diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
index eb62f482fe..029acbced4 100644
--- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
+++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
@@ -12,6 +12,15 @@
           "System.Memory": "4.5.5"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -151,6 +160,11 @@
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Microsoft.Web.WebView2": {
         "type": "Transitive",
         "resolved": "1.0.1823.32",
diff --git a/DUI3-DX/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/DUI3-DX/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json
index 7577734df0..f7f14f3cc4 100644
--- a/DUI3-DX/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json
+++ b/DUI3-DX/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json
@@ -11,6 +11,15 @@
           "CefSharp.Common": "[92.0.260]"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -176,6 +185,11 @@
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Polly": {
         "type": "Transitive",
         "resolved": "7.2.3",
diff --git a/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj b/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj
index eddc6f5826..fd2cd8a098 100644
--- a/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj
+++ b/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj
@@ -4,6 +4,7 @@
     <TargetExt>.rhp</TargetExt>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
   
   <ItemGroup>
@@ -14,6 +15,7 @@
   <ItemGroup>
     <PackageReference Include="RhinoCommon" Version="7.13.21348.13001" IncludeAssets="compile;build" />
     <PackageReference Include="RhinoWindows" Version="7.13.21348.13001" IncludeAssets="compile;build" />
+    <PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json
index 2ea7f573c7..80ab7e387f 100644
--- a/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json
+++ b/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json
@@ -2,6 +2,15 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -29,6 +38,15 @@
         "resolved": "0.9.4",
         "contentHash": "QfeKjhXq5Qc9CMdUxluK7x0jhNWwyqqGDfVcEXgiObJLTHTa1MBuJLN5LEWa8FYgB6iyjk3nCAYYtIfJbk1qUg=="
       },
+      "System.Resources.Extensions": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "psnQ6GRQOvt+evda5C4nD5EuV49mz2Tv0DD2JDVDEbE/TKoMukxSkGJcsBJ0pajpPuFRr67syFYlkJ4Wj6A5Zw==",
+        "dependencies": {
+          "System.Memory": "4.5.5"
+        }
+      },
       "GraphQL.Client": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -151,6 +169,11 @@
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Microsoft.Web.WebView2": {
         "type": "Transitive",
         "resolved": "1.0.1823.32",
diff --git a/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Speckle.Converters.ArcGIS3.csproj b/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Speckle.Converters.ArcGIS3.csproj
index 2a8254afd0..704937a908 100644
--- a/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Speckle.Converters.ArcGIS3.csproj
+++ b/DUI3-DX/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Speckle.Converters.ArcGIS3.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2023.DependencyInjection/packages.lock.json b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2023.DependencyInjection/packages.lock.json
index 942bc2222e..ec024ab72b 100644
--- a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2023.DependencyInjection/packages.lock.json
+++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2023.DependencyInjection/packages.lock.json
@@ -11,6 +11,15 @@
           "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -94,6 +103,11 @@
           "System.Memory": "4.5.5"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Polly": {
         "type": "Transitive",
         "resolved": "7.2.3",
diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json
index 548e39341c..9b156361ac 100644
--- a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json
+++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json
@@ -2,6 +2,15 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -91,6 +100,11 @@
           "System.Memory": "4.5.5"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Polly": {
         "type": "Transitive",
         "resolved": "7.2.3",
diff --git a/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/packages.lock.json b/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/packages.lock.json
index e899ccc151..f74b095265 100644
--- a/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/packages.lock.json
+++ b/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/packages.lock.json
@@ -2,6 +2,15 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -85,6 +94,11 @@
           "System.Memory": "4.5.5"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Polly": {
         "type": "Transitive",
         "resolved": "7.2.3",
diff --git a/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json
index ee8232c5d3..d682bdb299 100644
--- a/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json
+++ b/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json
@@ -2,6 +2,15 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -91,6 +100,11 @@
           "System.Memory": "4.5.5"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Polly": {
         "type": "Transitive",
         "resolved": "7.2.3",
diff --git a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json
index 1e32fa1cc0..4ee4ebdc7d 100644
--- a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json
+++ b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json
@@ -2,6 +2,15 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -91,6 +100,11 @@
           "System.Memory": "4.5.5"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Polly": {
         "type": "Transitive",
         "resolved": "7.2.3",
diff --git a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json
index 16f15b3b5e..a7a1c5c102 100644
--- a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json
+++ b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json
@@ -2,6 +2,15 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -91,6 +100,11 @@
           "System.Memory": "4.5.5"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Polly": {
         "type": "Transitive",
         "resolved": "7.2.3",
diff --git a/DUI3-DX/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj b/DUI3-DX/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj
index 689ceb67c4..977ef2e2ae 100644
--- a/DUI3-DX/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj
+++ b/DUI3-DX/DUI3/Speckle.Connectors.DUI.WebView/Speckle.Connectors.DUI.WebView.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net4.8;net6.0-windows</TargetFrameworks>
     <UseWpf>true</UseWpf>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DUI3-DX/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json b/DUI3-DX/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json
index 37ffc4d2b4..58aa057473 100644
--- a/DUI3-DX/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json
+++ b/DUI3-DX/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json
@@ -2,6 +2,15 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
+        }
+      },
       "Microsoft.Web.WebView2": {
         "type": "Direct",
         "requested": "[1.0.1823.32, )",
@@ -142,6 +151,11 @@
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
       "Polly": {
         "type": "Transitive",
         "resolved": "7.2.3",