Merged PR 1004: Migrate to .net 6, add installer for x64

Related work items: #1787
4tecture · Dec 14, 2021 · 78a1b1f · 78a1b1f
1 parent 7a1445c
commit 78a1b1f
Show file tree

Hide file tree

Showing 11 changed files with 198 additions and 91 deletions.
diff --git a/CustomSSDTMigrationScripts/CustomSSDTMigrationScripts.csproj b/CustomSSDTMigrationScripts/CustomSSDTMigrationScripts.csproj
@@ -12,7 +12,7 @@
   <PropertyGroup>
     <Authors>4tecture GmbH</Authors>
     <Company>4tecture GmbH</Company>
-    <Copyright>Copyright 2020 (c) 4tecture GmbH. All rights reserved.</Copyright>
+    <Copyright>Copyright 2022 (c) 4tecture GmbH. All rights reserved.</Copyright>
     <PackageId>4tecture.CustomSSDTMigrationScripts</PackageId>
     <PackageProjectUrl>https://github.com/4tecture/SSDTDataMigration</PackageProjectUrl>
     <RepositoryUrl>https://github.com/4tecture/SSDTDataMigration.git</RepositoryUrl>
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.8.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Installer/CustomSSDTMigrationScripts.Setup/CustomSSDTMigrationScripts.Setup.wixproj b/Installer/CustomSSDTMigrationScripts.Setup/CustomSSDTMigrationScripts.Setup.wixproj
@@ -13,10 +13,23 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
+    <OutputName>4tecture.CustomSSDTMigrationScripts.x86</OutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <OutputName>4tecture.CustomSSDTMigrationScripts.x86</OutputName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+    <OutputName>4tecture.CustomSSDTMigrationScripts.x64</OutputName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <OutputName>4tecture.CustomSSDTMigrationScripts.x64</OutputName>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />

diff --git a/Installer/CustomSSDTMigrationScripts.Setup/Product.wxs b/Installer/CustomSSDTMigrationScripts.Setup/Product.wxs
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <!-- http://alekdavis.blogspot.com/2011/05/build-32-and-64-bit-installers-using.html -->
+  <?define ProductName = "Custom SSDT Migration Scripts" ?>
+  <?define ProductVersion = "!(bind.FileVersion.fil84945FCEFCEAA15D6BE23F57282BD221)" ?>
+  <?define ProductAuthor = "4tecture GmbH" ?>
+
+  <?if $(var.Platform) = x64 ?>
+    <?define ProductDisplayName = "$(var.ProductName) 64-bit" ?>
+    <?define ProductUpgradeCode = "9e8529d2-4bf0-4bcc-95a4-eaf2af18d844" ?>
+    <?define Win64 = "yes" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+  <?else ?>
+    <?define ProductDisplayName = "$(var.ProductName)" ?>
+    <?define ProductUpgradeCode = "eefeb90d-3a51-4584-abd5-498f823716ad" ?>
+    <?define Win64 = "no" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+  <?endif ?>
+
   <Product Id="*"
-           Name="Custom SSDT Migration Scripts !(bind.FileVersion.fil84945FCEFCEAA15D6BE23F57282BD221)"
+           Name="$(var.ProductDisplayName) (v$(var.ProductVersion))"
            Language="1033"
-           Version="!(bind.FileVersion.fil84945FCEFCEAA15D6BE23F57282BD221)"
-           Manufacturer="4tecture GmbH"
-           UpgradeCode="eefeb90d-3a51-4584-abd5-498f823716ad">
+           Version="$(var.ProductVersion)"
+           Manufacturer="$(var.ProductAuthor)"
+           UpgradeCode="$(var.ProductUpgradeCode)">
 
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
@@ -48,7 +65,7 @@
   <Fragment>
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
+      <Directory Id="$(var.PlatformProgramFilesFolder)">
         <Directory Id="MSBUILDFOLDER" Name="MSBuild">
           <Directory Id="INSTALLFOLDER" Name="4tecture">
             <Directory Id="BUILD" Name="build" />
@@ -59,7 +76,7 @@
     </Directory>
 
     <ComponentGroup Id="ProductBuildComponents" Directory="BUILD">
-      <Component Id="cmp774A2AD939D243C9802A333720E42D8A" Guid="*">
+      <Component Id="cmp774A2AD939D243C9802A333720E42D8A" Guid="*" Win64="$(var.Win64)">
         <File Id="fil46FBAD698A452030E313928987D44B71" KeyPath="yes" Source="$(var.CustomSSDTMigrationScripts.TargetDir)\CustomSSDTMigrationScripts.props" />
       </Component>
     </ComponentGroup>

diff --git a/Installer/CustomSSDTMigrationScripts.Setup/ToolComponents.wxs b/Installer/CustomSSDTMigrationScripts.Setup/ToolComponents.wxs
diff --git a/SSDTDataMigration.sln b/SSDTDataMigration.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30413.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomSSDTMigrationScripts", "CustomSSDTMigrationScripts\CustomSSDTMigrationScripts.csproj", "{0032D2D5-1950-4A66-8C07-0CD222EA5968}"
 EndProject
@@ -38,73 +38,107 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Debug|x64.Build.0 = Debug|Any CPU
 		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Debug|x86.Build.0 = Debug|Any CPU
 		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Release|x64.ActiveCfg = Release|Any CPU
+		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Release|x64.Build.0 = Release|Any CPU
 		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Release|x86.ActiveCfg = Release|Any CPU
 		{0032D2D5-1950-4A66-8C07-0CD222EA5968}.Release|x86.Build.0 = Release|Any CPU
 		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Debug|Any CPU.Build.0 = Debug|x86
+		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Debug|x64.ActiveCfg = Debug|x64
+		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Debug|x64.Build.0 = Debug|x64
 		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Debug|x86.ActiveCfg = Debug|x86
 		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Debug|x86.Build.0 = Debug|x86
 		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Release|Any CPU.ActiveCfg = Release|x86
 		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Release|Any CPU.Build.0 = Release|x86
+		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Release|x64.ActiveCfg = Release|x64
+		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Release|x64.Build.0 = Release|x64
 		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Release|x86.ActiveCfg = Release|x86
 		{0D60CA91-A34B-44AD-B143-264F7FDA7E77}.Release|x86.Build.0 = Release|x86
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|x64.Build.0 = Debug|Any CPU
+		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|x64.Deploy.0 = Debug|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|x86.Build.0 = Debug|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Debug|x86.Deploy.0 = Debug|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|x64.ActiveCfg = Release|Any CPU
+		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|x64.Build.0 = Release|Any CPU
+		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|x64.Deploy.0 = Release|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|x86.ActiveCfg = Release|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|x86.Build.0 = Release|Any CPU
 		{EAC8CD49-8002-4C64-BE16-36D4F67F3165}.Release|x86.Deploy.0 = Release|Any CPU
 		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Debug|x86.Build.0 = Debug|Any CPU
 		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Release|x64.ActiveCfg = Release|Any CPU
+		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Release|x64.Build.0 = Release|Any CPU
 		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Release|x86.ActiveCfg = Release|Any CPU
 		{844A4571-2BEB-4E93-A30E-A26F7EDFB8B3}.Release|x86.Build.0 = Release|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|x64.Build.0 = Debug|Any CPU
+		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|x64.Deploy.0 = Debug|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|x86.Build.0 = Debug|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Debug|x86.Deploy.0 = Debug|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|x64.ActiveCfg = Release|Any CPU
+		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|x64.Build.0 = Release|Any CPU
+		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|x64.Deploy.0 = Release|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|x86.ActiveCfg = Release|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|x86.Build.0 = Release|Any CPU
 		{75B16C31-4EE5-4D1A-A40D-76CF72E64292}.Release|x86.Deploy.0 = Release|Any CPU
 		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Debug|x86.Build.0 = Debug|Any CPU
 		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Release|x64.ActiveCfg = Release|Any CPU
+		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Release|x64.Build.0 = Release|Any CPU
 		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Release|x86.ActiveCfg = Release|Any CPU
 		{EBDAAAF5-E3E0-4A13-AE41-04C97058738F}.Release|x86.Build.0 = Release|Any CPU
 		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Debug|x64.Build.0 = Debug|Any CPU
 		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Debug|x86.Build.0 = Debug|Any CPU
 		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Release|x64.ActiveCfg = Release|Any CPU
+		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Release|x64.Build.0 = Release|Any CPU
 		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Release|x86.ActiveCfg = Release|Any CPU
 		{71DE3775-A4E7-470F-A92F-3B60EAD50ECB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection

diff --git a/...es/CustomSSDTMigrationScripts.Sample.Build/CustomSSDTMigrationScripts.Sample.Build.csproj b/...es/CustomSSDTMigrationScripts.Sample.Build/CustomSSDTMigrationScripts.Sample.Build.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="MSBuild.Sdk.SqlProj/1.11.3">
+<Project Sdk="MSBuild.Sdk.SqlProj/2.0.0-beta.1">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <SqlServerVersion>Sql130</SqlServerVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="4tecture.CustomSSDTMigrationScripts" Version="1.2.1">
+    <PackageReference Include="4tecture.CustomSSDTMigrationScripts" Version="1.2.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Samples/CustomSSDTMigrationScripts.Sample/Scripts.targets b/Samples/CustomSSDTMigrationScripts.Sample/Scripts.targets
@@ -4,5 +4,5 @@
     <Message Text="Deleting $(ProjectDir)Scripts\Run*Generated.sql" />
     <Delete Files="$(ProjectDir)Scripts\Run*Generated.sql" />
   </Target>
-  <Import Project="$(MSBuildExtensionsPath)\4tecture\build\CustomSSDTMigrationScripts.props" Condition="Exists('$(MSBuildExtensionsPath)\4tecture\build\CustomSSDTMigrationScripts.props')" />
+  <Import Project="$(MSBuildExtensionsPath64)\4tecture\build\CustomSSDTMigrationScripts.props" Condition="Exists('$(MSBuildExtensionsPath64)\4tecture\build\CustomSSDTMigrationScripts.props')" />
 </Project>
diff --git a/...Scripts.Integration.Tests.Build/CustomSSDTMigrationScripts.Integration.Tests.Build.csproj b/...Scripts.Integration.Tests.Build/CustomSSDTMigrationScripts.Integration.Tests.Build.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="MSBuild.Sdk.SqlProj/1.11.3">
+<Project Sdk="MSBuild.Sdk.SqlProj/2.0.0-beta.1">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <SqlServerVersion>Sql130</SqlServerVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="4tecture.CustomSSDTMigrationScripts" Version="1.2.1">
+    <PackageReference Include="4tecture.CustomSSDTMigrationScripts" Version="1.2.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Tests/CustomSSDTMigrationScripts.Integration.Tests/Scripts.targets b/Tests/CustomSSDTMigrationScripts.Integration.Tests/Scripts.targets
@@ -4,5 +4,5 @@
     <Message Text="Deleting $(ProjectDir)Scripts\Run*Generated.sql" />
     <Delete Files="$(ProjectDir)Scripts\Run*Generated.sql" />
   </Target>
-  <Import Project="$(MSBuildExtensionsPath)\4tecture\build\CustomSSDTMigrationScripts.props" Condition="Exists('$(MSBuildExtensionsPath)\4tecture\build\CustomSSDTMigrationScripts.props')" />
+  <Import Project="$(MSBuildExtensionsPath64)\4tecture\build\CustomSSDTMigrationScripts.props" Condition="Exists('$(MSBuildExtensionsPath64)\4tecture\build\CustomSSDTMigrationScripts.props')" />
 </Project>
diff --git a/Tests/CustomSSDTMigrationScripts.Unit.Tests/CustomSSDTMigrationScripts.Unit.Tests.csproj b/Tests/CustomSSDTMigrationScripts.Unit.Tests/CustomSSDTMigrationScripts.Unit.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="coverlet.collector" Version="3.0.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>