diff --git a/README.md b/README.md
index 3f69212..99d0641 100644
--- a/README.md
+++ b/README.md
@@ -97,12 +97,12 @@ std::for_each(std::begin(answers), std::end(answers), [](int answer) {
 
 [![Build status](https://ci.appveyor.com/api/projects/status/github/olegsych/simply.collections?branch=master)](https://ci.appveyor.com/project/olegsych/simply-collections/branch/master)
 
-From [Visual Studio 2015](https://www.visualstudio.com/downloads):
+From [Visual Studio 2017](https://www.visualstudio.com/downloads):
 - Open `simply.collections.sln`
 - Select _Build Solution_ from the _Build_ menu
 - To switch build between `x86` and `x64` platforms, select _Configuration Manager_ from the _Build_ menu and change the _Active Solution Configuration_
 
-From [Developer Command Prompt for VS2015](https://msdn.microsoft.com/en-us/library/ms229859.aspx):
+From [Developer Command Prompt for VS2017](https://docs.microsoft.com/en-us/dotnet/framework/tools/developer-command-prompt-for-vs):
 ```
 msbuild simply.collections.sln /p:Platform=x86
 msbuild simply.collections.sln /p:Platform=x64
@@ -110,11 +110,11 @@ msbuild simply.collections.sln /p:Platform=x64
 
 ## test
 
-From Visual Studio 2015:
+From Visual Studio 2017:
 - Select _Run_ / _All Tests_ from the _Test_ menu
 - To switch test execution between `x86` and `x64` platform, select _Test Settings_ from the _Test_ menu and change the _Default Processor Architecture_.
 
-From Developer Command Prompt for VS2015:
+From Developer Command Prompt for VS2017:
 ```
 vstest.console bin\Win32\test.dll /Platform:x86
 vstest.console bin\x64\test.dll /Platform:x64 /inIsolation
diff --git a/appveyor.yml b/appveyor.yml
index a576802..eb0469d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,10 +12,9 @@ branches:
 
 skip_tags: true
 
-os: Visual Studio 2015
+image: Visual Studio 2017
 
 build_script:
-- set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
 - nuget restore
 - msbuild simply.collections.sln /m /p:Platform=x86 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 - msbuild simply.collections.sln /m /p:Platform=x64 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -33,11 +32,11 @@ artifacts:
 deploy:
 - provider: NuGet
   api_key:
-    secure: MllAarE5OQzLPrMNz2oSYIv2A197InquS37HPJ37FyFqrS7WQ1IroGaKol+LCBLG
+    secure: 236NXQ/p6GSTraxqHTtmNVFcDJlTwDjwxzbdJIcDpk8Lu7hAkz1ThK6eqeVeTMz6
   skip_symbols: true
 - provider: GitHub
   auth_token:
-    secure: 2jrhsfBWvcjqAsyB5QdvDKXHdpnY0VjOej29DqzjrheWsTcToI3cn5ZOACfC17FP
+    secure: 0odiqbMNXJj+DNBK/pFP5to5mGxy1JfdSpA6dUA233dNgQitI78fjDm5vgmafgpR
   artifact: /.*\.nupkg/
 
 nuget:
diff --git a/src/src.vcxproj b/src/src.vcxproj
index d46848b..8785621 100644
--- a/src/src.vcxproj
+++ b/src/src.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -11,12 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="simply\collections.h" />
-    <ClInclude Include="simply\collections\enumerable.h" />
-    <ClInclude Include="simply\collections\enumerator.h" />
-    <ClInclude Include="simply\collections\iterator.h" />
-    <ClInclude Include="simply\collections\iterator_position.h" />
-    <ClInclude Include="simply\collections\range.h" />
+    <ClInclude Include="**\*.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="simply.collections.nuspec" />
@@ -26,10 +21,10 @@
     <ProjectGuid>{F99792FC-9EE5-4540-8D22-84AB92910790}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>src</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/test/packages.config b/test/packages.config
index f398b7b..661dd5c 100644
--- a/test/packages.config
+++ b/test/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="simply.assert" version="0.1.48" targetFramework="native" />
-  <package id="simply.random" version="0.1.2" targetFramework="native" />
+  <package id="simply.assert" version="0.1.50" targetFramework="native" />
+  <package id="simply.random" version="0.1.3" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/test/test.vcxproj b/test/test.vcxproj
index 2e74c9f..91d1602 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,10 +14,10 @@
     <ProjectGuid>{863ED068-C319-4F18-90E6-FF9F282576CA}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>test</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
     <LinkIncremental>true</LinkIncremental>
@@ -41,13 +41,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="stub_enumerable.h" />
-    <ClInclude Include="stub_enumerator.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="iterator_test.cpp" />
-    <ClCompile Include="range_test.cpp" />
-    <ClCompile Include="scenario_test.cpp" />
+    <ClInclude Include="*.h" />
+    <ClCompile Include="*.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -55,14 +50,14 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\src\simply.collections.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\simply.random.0.1.2\build\native\simply.random.targets" Condition="Exists('..\packages\simply.random.0.1.2\build\native\simply.random.targets')" />
-    <Import Project="..\packages\simply.assert.0.1.48\build\native\simply.assert.targets" Condition="Exists('..\packages\simply.assert.0.1.48\build\native\simply.assert.targets')" />
+    <Import Project="..\packages\simply.assert.0.1.50\build\native\simply.assert.targets" Condition="Exists('..\packages\simply.assert.0.1.50\build\native\simply.assert.targets')" />
+    <Import Project="..\packages\simply.random.0.1.3\build\native\simply.random.targets" Condition="Exists('..\packages\simply.random.0.1.3\build\native\simply.random.targets')" />
   </ImportGroup>
   <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\simply.random.0.1.2\build\native\simply.random.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\simply.random.0.1.2\build\native\simply.random.targets'))" />
-    <Error Condition="!Exists('..\packages\simply.assert.0.1.48\build\native\simply.assert.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\simply.assert.0.1.48\build\native\simply.assert.targets'))" />
+    <Error Condition="!Exists('..\packages\simply.assert.0.1.50\build\native\simply.assert.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\simply.assert.0.1.50\build\native\simply.assert.targets'))" />
+    <Error Condition="!Exists('..\packages\simply.random.0.1.3\build\native\simply.random.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\simply.random.0.1.3\build\native\simply.random.targets'))" />
   </Target>
 </Project>
\ No newline at end of file