Browse Source

Using Visual Studio 2017 for get C# 7.0 (for inline declaration of out variables)

Source commit: 6a9440273aa7d67f29002729fe0fe01164bcfb78
Martin Prikryl 8 years ago
parent
commit
9e25c60030
5 changed files with 7 additions and 7 deletions
  1. 1 1
      build.bat
  2. 1 1
      dotnet/WinSCPnet.csproj
  3. 3 3
      libs/puttyvs/PuTTYVS.vcxproj
  4. 1 1
      libs/puttyvs/build.bat
  5. 1 1
      readme.txt

+ 1 - 1
build.bat

@@ -3,7 +3,7 @@ rem See 'readme' file
 if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMFILES32=%ProgramFiles%
 if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set PROGRAMFILES32=%ProgramFiles(x86)%
 set BDS=%PROGRAMFILES32%\Embarcadero\Studio\14.0
-set MSBUILD=%PROGRAMFILES32%\MSBuild\14.0\Bin\MSBuild.exe
+set MSBUILD=%PROGRAMFILES32%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe
 
 set WITH_DOTNET=1
 if "%BUILD_TARGET%"=="" set BUILD_TARGET=Build

+ 1 - 1
dotnet/WinSCPnet.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+ 3 - 3
libs/puttyvs/PuTTYVS.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>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+ 1 - 1
libs/puttyvs/build.bat

@@ -4,5 +4,5 @@ if "%BUILDTOOLS_PATH%" == "" set BUILDTOOLS_PATH=..\..\buildtools
 if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMFILES32=%ProgramFiles%
 if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set PROGRAMFILES32=%ProgramFiles(x86)%
 
-"%PROGRAMFILES32%\MSBuild\14.0\Bin\MSBuild.exe" PuTTYVS.vcxproj /p:Configuration=Release
+"%PROGRAMFILES32%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" PuTTYVS.vcxproj /p:Configuration=Release
 %BUILDTOOLS_PATH%\tools\objconv.exe -fomf32 Release\PuTTYVS.lib ..\lib\PuTTYVS.lib

+ 1 - 1
readme.txt

@@ -3,7 +3,7 @@ This is the README file for source code package of WinSCP.
 To build WinSCP you need:
 - Embarcadero C++ Builder XE6 Professional.
   https://www.embarcadero.com/products/cbuilder
-- Visual Studio 2015 (for MSBuild 14.0)
+- Build Tools and Agents for Visual Studio 2017 (for C# 7.0)
   https://www.visualstudio.com/
 - nasm from http://www.nasm.us/
   (store it to buildtools/tools/nasm.exe)