Fix mismatched version

Pull native components from NuGet package
EngageSoftware · Apr 17, 2024 · bf7edd9 · bf7edd9
1 parent 23a99c1
commit bf7edd9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 33 deletions.
diff --git a/src/Engage.Dnn.SqlServerTypes.csproj b/src/Engage.Dnn.SqlServerTypes.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -31,8 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.SqlServer.Types, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
-      <HintPath>..\packages\Microsoft.SqlServer.Types.14.0.1016.290\lib\net40\Microsoft.SqlServer.Types.dll</HintPath>
+    <Reference Include="Microsoft.SqlServer.Types, Version=16.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
+      <HintPath>..\packages\Microsoft.SqlServer.Types.160.1000.6\lib\net462\Microsoft.SqlServer.Types.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -50,20 +51,6 @@
     <Compile Include="SqlServerTypes\Loader.cs" />
     <Compile Include="Startup.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="SqlServerTypes\x64\msvcr120.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="SqlServerTypes\x64\SqlServerSpatial140.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="SqlServerTypes\x86\msvcr120.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="SqlServerTypes\x86\SqlServerSpatial140.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Engage.Dnn.SqlServerTypes.dnn">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -73,4 +60,5 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Microsoft.SqlServer.Types.160.1000.6\build\net462\Microsoft.SqlServer.Types.props" />
 </Project>
diff --git a/src/Engage.Dnn.SqlServerTypes.dnn b/src/Engage.Dnn.SqlServerTypes.dnn
@@ -25,24 +25,14 @@
             </assembly>
             <assembly>
               <path>bin/SqlServerTypes/x64</path>
-              <name>SqlServerSpatial140.dll</name>
+              <name>SqlServerSpatial160.dll</name>
               <version>0.0.0</version>
             </assembly>
-            <assembly>
-              <path>bin/SqlServerTypes/x64</path>
-              <name>msvcr120.dll</name>
-              <version>12.0.40649.5</version>
-            </assembly>
             <assembly>
               <path>bin/SqlServerTypes/x86</path>
-              <name>SqlServerSpatial140.dll</name>
+              <name>SqlServerSpatial160.dll</name>
               <version>0.0.0</version>
             </assembly>
-            <assembly>
-              <path>bin/SqlServerTypes/x86</path>
-              <name>msvcr120.dll</name>
-              <version>12.0.40649.5</version>
-            </assembly>
           </assemblies>
         </component>
       </components>

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -11,10 +11,10 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyCompany("Engage")]
 [assembly: AssemblyProduct("Engage.Dnn.SqlServerTypes")]
-[assembly: AssemblyVersion("14.0.1016.290")]
-[assembly: AssemblyFileVersion("14.0.1016.290")]
-[assembly: AssemblyInformationalVersion("14.0.1016.290")]
-[assembly: AssemblyCopyright("Copyright © Engage 2020")]
+[assembly: AssemblyVersion("160.1000.6")]
+[assembly: AssemblyFileVersion("160.1000.6")]
+[assembly: AssemblyInformationalVersion("160.1000.6")]
+[assembly: AssemblyCopyright("Copyright © Engage 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: ComVisible(false)]

diff --git a/src/SqlServerTypes/x64/SqlServerSpatial140.dll b/src/SqlServerTypes/x64/SqlServerSpatial140.dll
diff --git a/src/SqlServerTypes/x64/msvcr120.dll b/src/SqlServerTypes/x64/msvcr120.dll
diff --git a/src/SqlServerTypes/x86/SqlServerSpatial140.dll b/src/SqlServerTypes/x86/SqlServerSpatial140.dll
diff --git a/src/SqlServerTypes/x86/msvcr120.dll b/src/SqlServerTypes/x86/msvcr120.dll