Upgrade to VS2017

Remove dependency on gateway build and instead use Nuget package
Azure-Samples · Jun 29, 2017 · 0f796e5 · 0f796e5
1 parent a0246ed
commit 0f796e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/...storian.Module.Tests/Proficy.Historian.Module.Tests/Proficy.Historian.Module.Tests.csproj b/...storian.Module.Tests/Proficy.Historian.Module.Tests/Proficy.Historian.Module.Tests.csproj
@@ -16,6 +16,8 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,12 +37,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.IoT.Gateway">
-      <HintPath>..\..\..\src\deps\Microsoft.Azure.IoT.Gateway.dll</HintPath>
+    <Reference Include="Microsoft.Azure.IoT.Gateway, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Azure.IoT.Gateway.Module.1.0.6\lib\net40\Microsoft.Azure.IoT.Gateway.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Proficy.Historian.ClientAccess.API">
       <HintPath>..\..\..\src\deps\Proficy.Historian.ClientAccess.API.dll</HintPath>
@@ -100,6 +101,13 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Microsoft.Azure.Devices.Gateway.Native.Windows.x64.1.1.3\build\Microsoft.Azure.Devices.Gateway.Native.Windows.x64.targets" Condition="Exists('..\packages\Microsoft.Azure.Devices.Gateway.Native.Windows.x64.1.1.3\build\Microsoft.Azure.Devices.Gateway.Native.Windows.x64.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Azure.Devices.Gateway.Native.Windows.x64.1.1.3\build\Microsoft.Azure.Devices.Gateway.Native.Windows.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.Devices.Gateway.Native.Windows.x64.1.1.3\build\Microsoft.Azure.Devices.Gateway.Native.Windows.x64.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/tests/Proficy.Historian.Module.Tests/Proficy.Historian.Module.Tests/packages.config b/tests/Proficy.Historian.Module.Tests/Proficy.Historian.Module.Tests/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
+  <package id="Microsoft.Azure.Devices.Gateway.Native.Windows.x64" version="1.1.3" targetFramework="net452" />
+  <package id="Microsoft.Azure.IoT.Gateway.Module" version="1.0.6" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
 </packages>