diff --git a/SDK/Macro Samples/GetTimeElapsed_CSharp/Source/GetTimeElapsed_CSharp/GetTimeElapsed_CSharp.csproj b/SDK/Macro Samples/GetTimeElapsed_CSharp/Source/GetTimeElapsed_CSharp/GetTimeElapsed_CSharp.csproj
index 994338e2..05782b35 100644
--- a/SDK/Macro Samples/GetTimeElapsed_CSharp/Source/GetTimeElapsed_CSharp/GetTimeElapsed_CSharp.csproj	
+++ b/SDK/Macro Samples/GetTimeElapsed_CSharp/Source/GetTimeElapsed_CSharp/GetTimeElapsed_CSharp.csproj	
@@ -1,4 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- This section defines project-level properties.
        
@@ -132,4 +138,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Macro Samples/GetTimeElapsed_VBNet/Source/GetTimeElapsed_VBNet/GetTimeElapsed_VBNet.vbproj b/SDK/Macro Samples/GetTimeElapsed_VBNet/Source/GetTimeElapsed_VBNet/GetTimeElapsed_VBNet.vbproj
index 785aad28..1179537f 100644
--- a/SDK/Macro Samples/GetTimeElapsed_VBNet/Source/GetTimeElapsed_VBNet/GetTimeElapsed_VBNet.vbproj	
+++ b/SDK/Macro Samples/GetTimeElapsed_VBNet/Source/GetTimeElapsed_VBNet/GetTimeElapsed_VBNet.vbproj	
@@ -1,4 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- This section defines project-level properties.
        
@@ -147,4 +153,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Macro Samples/GetTimeElapsed_VBNet/Source/GetTimeElapsed_VBNet/GetTimeElapsed_VBNet.vbproj.bak b/SDK/Macro Samples/GetTimeElapsed_VBNet/Source/GetTimeElapsed_VBNet/GetTimeElapsed_VBNet.vbproj.bak
new file mode 100644
index 00000000..785aad28
--- /dev/null
+++ b/SDK/Macro Samples/GetTimeElapsed_VBNet/Source/GetTimeElapsed_VBNet/GetTimeElapsed_VBNet.vbproj.bak	
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- This section defines project-level properties.
+       
+       Project Type Guids - Must include {A860303F-1F3F-4691-B57E-529FC101A107};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} for a VB.NET VSTA project.
+       Configuration - Specifies whether the default configuration is Release or Debug.
+       Platform - Specifies what CPU the output of this project can run on.
+       ProductVersion - The version of Visual Studio.
+       SchemaVersion - The project file schema version.
+       OutputType - Must be "Library" for VSTA.
+       RootNamespace - In C#, this specifies the namespace given to new files.
+                       In Visual Basic, all objects are wrapped in this namespace at runtime.
+       AssemblyName - Name of the output assembly.
+       TargetFrameworkVersion - The version of the .NET Framework this project targets.
+  -->
+  <PropertyGroup>
+    <ProjectTypeGuids>{A860303F-1F3F-4691-B57E-529FC101A107};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
+    <Configuration Condition=" '$(Configuration)' == '' ">RevitVSTA</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputType>Library</OutputType>
+    <RootNamespace>GetTimeElapsed_VBNet</RootNamespace>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <OptionExplicit>On</OptionExplicit>
+    <OptionCompare>Binary</OptionCompare>
+    <OptionStrict>Off</OptionStrict>
+    <OptionInfer>On</OptionInfer>
+    <ProjectGuid>{C1499A1C-B9A0-4C5F-AC2E-E6F7C0B787D9}</ProjectGuid>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+  </PropertyGroup>
+  <!-- This section defines properties that are set when the "RevitVSTA" configuration is
+       selected.
+
+       DebugType - If full enables a debugger to be attached to a running program.
+                   If pdbonly allows source code debugging when the program is started in the debugger but will only 
+                   display assembler when the running program is attached to the debugger.
+                   If none debugging is disabled.
+       DebugSymbols - If true, create symbols (.pdb). If false, do not create symbols.
+       Optimize - If true, optimize the build output. If false, do not optimize.
+       OutputPath - Output path of the project relative to the project file.
+       DefineDebug - If true, defines the DEBUG. If false, DEBUG is not defined.
+       DefineTrace - If true, defines the TRACE. If false, TRACE is not defined.
+       NoWarn - Listed warning numbers will be ignored.
+  -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RevitVSTA|AnyCPU' ">
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <Optimize>True</Optimize>
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+    <DefineConstants>TRACE=1</DefineConstants>
+    <OutputPath>..\..\Addin\</OutputPath>
+    <AssemblyName>GetTimeElapsed_VBNet</AssemblyName>
+  </PropertyGroup>
+  <!-- This sections specifies references for the project. -->
+  <ItemGroup>
+    <Reference Include="RevitAPIUI, Version=2011.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Program Files\Autodesk\Revit 2021\RevitAPIUI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.AddIn">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="RevitAPI">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Program Files\Autodesk\Revit 2021\RevitAPI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <!-- Visual Basic supports Importing namespaces (equivalent to using statements in C#).-->
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+  </ItemGroup>
+  <!-- This section defines the user source files that are part of the
+       project.
+
+       Compile - Specifies a source file to compile.
+       EmbeddedResource - Specifies a .resx file for embedded resources.
+       None - Specifies a file that is not to be passed to the compiler (for instance,
+              a text file or XML file).
+  -->
+  <ItemGroup>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="ThisApplication.designer.vb">
+      <DependentUpon>ThisApplication.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ThisApplication.vb">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <!-- Include the build rules for a VB project.-->
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.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>
+  -->
+  <!-- This section defines VSTA properties that describe the host-changable project properties. -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A860303F-1F3F-4691-B57E-529FC101A107}">
+        <ProjectProperties HostName="VSTAHostName" HostPackage="{C1B21C64-9E6F-4923-A89D-9F958503C1CE}" ApplicationType="usd" Language="vb" TemplatesPath="" />
+        <Host Name="Architecture2011">
+          <HostItem Name="ThisApplication" Code="ThisApplication.vb" CanonicalName="ThisApplication" DisplayName="ThisApplication" Blueprint="ThisApplication.Designer.xml" GeneratedCode="ThisApplication.designer.vb" />
+        </Host>
+        <ProjectClient>
+          <HostIdentifier>MEP2011</HostIdentifier>
+          <InProcHost>{f2d1070d-feff-4610-9403-9476ff28253d}</InProcHost>
+        </ProjectClient>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/SDK/Macro Samples/Rooms/Source/Rooms/Rooms.csproj b/SDK/Macro Samples/Rooms/Source/Rooms/Rooms.csproj
index 76b87608..8b31018f 100644
--- a/SDK/Macro Samples/Rooms/Source/Rooms/Rooms.csproj	
+++ b/SDK/Macro Samples/Rooms/Source/Rooms/Rooms.csproj	
@@ -1,4 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- This section defines project-level properties.
        
@@ -168,4 +174,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/ContentGeneratorWPF/ContentGeneratorWPF/ContentGeneratorWPF.csproj b/SDK/REX SDK/Samples/ContentGeneratorWPF/ContentGeneratorWPF/ContentGeneratorWPF.csproj
index b21891ec..731ec400 100644
--- a/SDK/REX SDK/Samples/ContentGeneratorWPF/ContentGeneratorWPF/ContentGeneratorWPF.csproj	
+++ b/SDK/REX SDK/Samples/ContentGeneratorWPF/ContentGeneratorWPF/ContentGeneratorWPF.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -337,4 +343,4 @@ xcopy "$(ProjectDir)Additional\*.addin" "R:\Autodesk\Revit\Addins\2018" /S /R /K
 
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/DRevitFreezeDrawing/DRevitFreezeDrawing/DRevitFreezeDrawing.csproj b/SDK/REX SDK/Samples/DRevitFreezeDrawing/DRevitFreezeDrawing/DRevitFreezeDrawing.csproj
index 5006a551..c4bf36da 100644
--- a/SDK/REX SDK/Samples/DRevitFreezeDrawing/DRevitFreezeDrawing/DRevitFreezeDrawing.csproj	
+++ b/SDK/REX SDK/Samples/DRevitFreezeDrawing/DRevitFreezeDrawing/DRevitFreezeDrawing.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -739,4 +745,4 @@ xcopy "$(ProjectDir)Additional\*.addin" "R:\Autodesk\Revit\Addins\2018" /S /R /K
 
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/ElementReportHTML/ElementReportHTML/ElementReportHTML.csproj b/SDK/REX SDK/Samples/ElementReportHTML/ElementReportHTML/ElementReportHTML.csproj
index 4fbdd6fe..98d1b6f5 100644
--- a/SDK/REX SDK/Samples/ElementReportHTML/ElementReportHTML/ElementReportHTML.csproj	
+++ b/SDK/REX SDK/Samples/ElementReportHTML/ElementReportHTML/ElementReportHTML.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -290,4 +296,4 @@ xcopy "$(ProjectDir)Additional\*.addin" "R:\Autodesk\Revit\Addins\2018" /S /R /K
 
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/ExtensionRevitLauncher/ExtensionRevitLauncher/ExtensionRevitLauncher.csproj b/SDK/REX SDK/Samples/ExtensionRevitLauncher/ExtensionRevitLauncher/ExtensionRevitLauncher.csproj
index 501cd871..1165cb36 100644
--- a/SDK/REX SDK/Samples/ExtensionRevitLauncher/ExtensionRevitLauncher/ExtensionRevitLauncher.csproj	
+++ b/SDK/REX SDK/Samples/ExtensionRevitLauncher/ExtensionRevitLauncher/ExtensionRevitLauncher.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -91,4 +97,4 @@ xcopy "$(ProjectDir)\*.addin" "R:\Autodesk\Revit\Addins\2018" /S /R /K /V /I /F
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/FrameGenerator/FrameGenerator/FrameGenerator.csproj b/SDK/REX SDK/Samples/FrameGenerator/FrameGenerator/FrameGenerator.csproj
index 9cd32d0c..50e65ef8 100644
--- a/SDK/REX SDK/Samples/FrameGenerator/FrameGenerator/FrameGenerator.csproj	
+++ b/SDK/REX SDK/Samples/FrameGenerator/FrameGenerator/FrameGenerator.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -252,4 +258,4 @@ if exist "$(ProjectDir)Additional\buildevents.bat" call "$(ProjectDir)Additional
 xcopy "$(ProjectDir)Additional\*.addin" "R:\Autodesk\Revit\Addins\2018" /S /R /K /V /I /F /C /Y    
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/PyramidGenerator/PyramidGenerator/Additional/AREXStart/PyramidGeneratorStart.csproj b/SDK/REX SDK/Samples/PyramidGenerator/PyramidGenerator/Additional/AREXStart/PyramidGeneratorStart.csproj
index 61f7f8ed..ef2cb653 100644
--- a/SDK/REX SDK/Samples/PyramidGenerator/PyramidGenerator/Additional/AREXStart/PyramidGeneratorStart.csproj	
+++ b/SDK/REX SDK/Samples/PyramidGenerator/PyramidGenerator/Additional/AREXStart/PyramidGeneratorStart.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -137,4 +143,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/PyramidGenerator/PyramidGenerator/PyramidGenerator.csproj b/SDK/REX SDK/Samples/PyramidGenerator/PyramidGenerator/PyramidGenerator.csproj
index 59c8d1f7..8ba220a7 100644
--- a/SDK/REX SDK/Samples/PyramidGenerator/PyramidGenerator/PyramidGenerator.csproj	
+++ b/SDK/REX SDK/Samples/PyramidGenerator/PyramidGenerator/PyramidGenerator.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -285,4 +291,4 @@ xcopy "$(ProjectDir)Additional\*.addin" "R:\Autodesk\Revit\Addins\2018" /S /R /K
 
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/Serialization/Serialization/Serialization.csproj b/SDK/REX SDK/Samples/Serialization/Serialization/Serialization.csproj
index bea8fff6..07ad4ef4 100644
--- a/SDK/REX SDK/Samples/Serialization/Serialization/Serialization.csproj	
+++ b/SDK/REX SDK/Samples/Serialization/Serialization/Serialization.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -252,4 +258,4 @@ if exist "$(ProjectDir)Additional\buildevents.bat" call "$(ProjectDir)Additional
 xcopy "$(ProjectDir)Additional\*.addin" "R:\Autodesk\Revit\Addins\2018" /S /R /K /V /I /F /C /Y    
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/REX SDK/Samples/Unit/Unit/Unit.csproj b/SDK/REX SDK/Samples/Unit/Unit/Unit.csproj
index 44c14b05..d530c9e9 100644
--- a/SDK/REX SDK/Samples/Unit/Unit/Unit.csproj	
+++ b/SDK/REX SDK/Samples/Unit/Unit/Unit.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -245,4 +251,4 @@ if exist "$(ProjectDir)Additional\buildevents.bat" call "$(ProjectDir)Additional
 xcopy "$(ProjectDir)Additional\*.addin" "R:\Autodesk\Revit\Addins\2018" /S /R /K /V /I /F /C /Y    
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/AppearanceAssetEditing/CS/AppearanceAssetEditing.csproj b/SDK/Samples/AppearanceAssetEditing/CS/AppearanceAssetEditing.csproj
index 2d9cb7e5..6c1fc994 100644
--- a/SDK/Samples/AppearanceAssetEditing/CS/AppearanceAssetEditing.csproj
+++ b/SDK/Samples/AppearanceAssetEditing/CS/AppearanceAssetEditing.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -96,4 +102,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/AttachedDetailGroup/CS/AttachedDetailGroup.csproj b/SDK/Samples/AttachedDetailGroup/CS/AttachedDetailGroup.csproj
index 2b2f97a2..b8a9c4b4 100644
--- a/SDK/Samples/AttachedDetailGroup/CS/AttachedDetailGroup.csproj
+++ b/SDK/Samples/AttachedDetailGroup/CS/AttachedDetailGroup.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -86,4 +92,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/CapitalizeAllTextNotes/CS/CapitalizeAllTextNotes.csproj b/SDK/Samples/CapitalizeAllTextNotes/CS/CapitalizeAllTextNotes.csproj
index 3d7bf008..eb5a34c8 100644
--- a/SDK/Samples/CapitalizeAllTextNotes/CS/CapitalizeAllTextNotes.csproj
+++ b/SDK/Samples/CapitalizeAllTextNotes/CS/CapitalizeAllTextNotes.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -86,4 +92,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/CivilAlignments/CS/CivilAlignments.csproj b/SDK/Samples/CivilAlignments/CS/CivilAlignments.csproj
index 9a02b937..53a19f2c 100644
--- a/SDK/Samples/CivilAlignments/CS/CivilAlignments.csproj
+++ b/SDK/Samples/CivilAlignments/CS/CivilAlignments.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -87,4 +93,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/CreateTrianglesTopography/CS/CreateTrianglesTopography.csproj b/SDK/Samples/CreateTrianglesTopography/CS/CreateTrianglesTopography.csproj
index a32eb6b0..a30322a0 100644
--- a/SDK/Samples/CreateTrianglesTopography/CS/CreateTrianglesTopography.csproj
+++ b/SDK/Samples/CreateTrianglesTopography/CS/CreateTrianglesTopography.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -74,4 +80,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/DatumsModification/CS/DatumsModification.csproj b/SDK/Samples/DatumsModification/CS/DatumsModification.csproj
index 9dbd42e5..f8972952 100644
--- a/SDK/Samples/DatumsModification/CS/DatumsModification.csproj
+++ b/SDK/Samples/DatumsModification/CS/DatumsModification.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -127,4 +133,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/DimensionLeaderEnd/CS/DimensionLeaderEnd.csproj b/SDK/Samples/DimensionLeaderEnd/CS/DimensionLeaderEnd.csproj
index 39e1e626..4ef6b266 100644
--- a/SDK/Samples/DimensionLeaderEnd/CS/DimensionLeaderEnd.csproj
+++ b/SDK/Samples/DimensionLeaderEnd/CS/DimensionLeaderEnd.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -86,4 +92,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/DuplicateGraphics/CS/DuplicateGraphics.csproj b/SDK/Samples/DuplicateGraphics/CS/DuplicateGraphics.csproj
index ec21c24e..83832630 100644
--- a/SDK/Samples/DuplicateGraphics/CS/DuplicateGraphics.csproj
+++ b/SDK/Samples/DuplicateGraphics/CS/DuplicateGraphics.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -67,4 +73,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/FabricationPartLayout/CS/FabricationPartLayout.csproj b/SDK/Samples/FabricationPartLayout/CS/FabricationPartLayout.csproj
index f69e497a..221f07c6 100644
--- a/SDK/Samples/FabricationPartLayout/CS/FabricationPartLayout.csproj
+++ b/SDK/Samples/FabricationPartLayout/CS/FabricationPartLayout.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -103,4 +109,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/GenericStructuralConnection/CS/GenericStructuralConnection.csproj b/SDK/Samples/GenericStructuralConnection/CS/GenericStructuralConnection.csproj
index d12ed815..bb747015 100644
--- a/SDK/Samples/GenericStructuralConnection/CS/GenericStructuralConnection.csproj
+++ b/SDK/Samples/GenericStructuralConnection/CS/GenericStructuralConnection.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -102,4 +108,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/GeometryAPI/BRepBuilderExample/CS/BRepBuilderExample.csproj b/SDK/Samples/GeometryAPI/BRepBuilderExample/CS/BRepBuilderExample.csproj
index 954a0c84..fb40a8d7 100644
--- a/SDK/Samples/GeometryAPI/BRepBuilderExample/CS/BRepBuilderExample.csproj
+++ b/SDK/Samples/GeometryAPI/BRepBuilderExample/CS/BRepBuilderExample.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -93,4 +99,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/PlacementOptions/CS/PlacementOptions.csproj b/SDK/Samples/PlacementOptions/CS/PlacementOptions.csproj
index 66399b4a..308dec79 100644
--- a/SDK/Samples/PlacementOptions/CS/PlacementOptions.csproj
+++ b/SDK/Samples/PlacementOptions/CS/PlacementOptions.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -115,4 +121,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/RebarFreeForm/CS/RebarFreeForm.csproj b/SDK/Samples/RebarFreeForm/CS/RebarFreeForm.csproj
index 7f8b4d7e..e9eaf35f 100644
--- a/SDK/Samples/RebarFreeForm/CS/RebarFreeForm.csproj
+++ b/SDK/Samples/RebarFreeForm/CS/RebarFreeForm.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -68,4 +74,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Samples/SampleCommandsSteelElements/CS/SampleCommandsSteelElements.csproj b/SDK/Samples/SampleCommandsSteelElements/CS/SampleCommandsSteelElements.csproj
index adae8c26..9573425f 100644
--- a/SDK/Samples/SampleCommandsSteelElements/CS/SampleCommandsSteelElements.csproj
+++ b/SDK/Samples/SampleCommandsSteelElements/CS/SampleCommandsSteelElements.csproj
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -43,6 +48,22 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ASCADLinkMgd">
+      <HintPath>C:\Program Files\Autodesk\Revit 2021\AddIns\SteelConnections\ASCADLinkMgd.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ASGeometryMgd">
+      <HintPath>C:\Program Files\Autodesk\Revit 2021\AddIns\SteelConnections\ASGeometryMgd.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ASObjectsMgd">
+      <HintPath>C:\Program Files\Autodesk\Revit 2021\AddIns\SteelConnections\ASObjectsMgd.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Autodesk.SteelConnectionsDB">
+      <HintPath>C:\Program Files\Autodesk\Revit 2021\AddIns\SteelConnections\Autodesk.SteelConnectionsDB.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
diff --git a/SDK/Samples/ViewTemplateCreation/CS/ViewTemplateCreation.csproj b/SDK/Samples/ViewTemplateCreation/CS/ViewTemplateCreation.csproj
index 3c2266af..ccaa400e 100644
--- a/SDK/Samples/ViewTemplateCreation/CS/ViewTemplateCreation.csproj
+++ b/SDK/Samples/ViewTemplateCreation/CS/ViewTemplateCreation.csproj
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -75,4 +81,4 @@
     <PostBuildEvent>set FILEFORSAMPLEREG="$(SolutionDir)..\..\..\..\Regression\API\SDKSamples\UpdateSampleDllForRegression.pl"
 if exist %25FILEFORSAMPLEREG%25 perl %25FILEFORSAMPLEREG%25 $(ProjectExt) "$(ProjectPath)" "$(TargetPath)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Structural Analysis SDK/Examples/ASCE-7-10/ASCE-7-10.csproj b/SDK/Structural Analysis SDK/Examples/ASCE-7-10/ASCE-7-10.csproj
index 48520973..29424ddf 100644
--- a/SDK/Structural Analysis SDK/Examples/ASCE-7-10/ASCE-7-10.csproj	
+++ b/SDK/Structural Analysis SDK/Examples/ASCE-7-10/ASCE-7-10.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -114,4 +120,4 @@
   		
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Structural Analysis SDK/Examples/Concrete/CodeCheckingConcreteExample/CodeCheckingConcreteExample.csproj b/SDK/Structural Analysis SDK/Examples/Concrete/CodeCheckingConcreteExample/CodeCheckingConcreteExample.csproj
index 6acf2c6c..14816f59 100644
--- a/SDK/Structural Analysis SDK/Examples/Concrete/CodeCheckingConcreteExample/CodeCheckingConcreteExample.csproj	
+++ b/SDK/Structural Analysis SDK/Examples/Concrete/CodeCheckingConcreteExample/CodeCheckingConcreteExample.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -236,4 +242,4 @@
   		
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Structural Analysis SDK/Examples/Concrete/ConcreteCalculationsExample/ConcreteCalculationsExample.csproj b/SDK/Structural Analysis SDK/Examples/Concrete/ConcreteCalculationsExample/ConcreteCalculationsExample.csproj
index 9831e542..38ed4b18 100644
--- a/SDK/Structural Analysis SDK/Examples/Concrete/ConcreteCalculationsExample/ConcreteCalculationsExample.csproj	
+++ b/SDK/Structural Analysis SDK/Examples/Concrete/ConcreteCalculationsExample/ConcreteCalculationsExample.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -137,4 +143,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Structural Analysis SDK/Examples/ExtensibleStorageDocumentation/ExtensibleStorageDocumentation.csproj b/SDK/Structural Analysis SDK/Examples/ExtensibleStorageDocumentation/ExtensibleStorageDocumentation.csproj
index 88b4403c..c201ceb5 100644
--- a/SDK/Structural Analysis SDK/Examples/ExtensibleStorageDocumentation/ExtensibleStorageDocumentation.csproj	
+++ b/SDK/Structural Analysis SDK/Examples/ExtensibleStorageDocumentation/ExtensibleStorageDocumentation.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -107,4 +113,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Structural Analysis SDK/Examples/ExtensibleStorageUI/ExtensibleStorageUI.csproj b/SDK/Structural Analysis SDK/Examples/ExtensibleStorageUI/ExtensibleStorageUI.csproj
index 387d8cf9..06403744 100644
--- a/SDK/Structural Analysis SDK/Examples/ExtensibleStorageUI/ExtensibleStorageUI.csproj	
+++ b/SDK/Structural Analysis SDK/Examples/ExtensibleStorageUI/ExtensibleStorageUI.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -141,4 +147,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Structural Analysis SDK/Examples/ResultsInRevit/QueryingResults/QueryingResults.csproj b/SDK/Structural Analysis SDK/Examples/ResultsInRevit/QueryingResults/QueryingResults.csproj
index f7bfae22..42566e38 100644
--- a/SDK/Structural Analysis SDK/Examples/ResultsInRevit/QueryingResults/QueryingResults.csproj	
+++ b/SDK/Structural Analysis SDK/Examples/ResultsInRevit/QueryingResults/QueryingResults.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -73,4 +79,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Structural Analysis SDK/Examples/ResultsInRevit/StoringResults/StoringResults.csproj b/SDK/Structural Analysis SDK/Examples/ResultsInRevit/StoringResults/StoringResults.csproj
index 766038e2..1005f6f2 100644
--- a/SDK/Structural Analysis SDK/Examples/ResultsInRevit/StoringResults/StoringResults.csproj	
+++ b/SDK/Structural Analysis SDK/Examples/ResultsInRevit/StoringResults/StoringResults.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -73,4 +79,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/SDK/Structural Analysis SDK/Examples/SectionPropertiesExplorer/SectionPropertiesExplorer.csproj b/SDK/Structural Analysis SDK/Examples/SectionPropertiesExplorer/SectionPropertiesExplorer.csproj
index fbd44533..0498b51f 100644
--- a/SDK/Structural Analysis SDK/Examples/SectionPropertiesExplorer/SectionPropertiesExplorer.csproj	
+++ b/SDK/Structural Analysis SDK/Examples/SectionPropertiesExplorer/SectionPropertiesExplorer.csproj	
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+      None
+    </ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -164,4 +170,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>