@@ -61,43 +61,53 @@ jobs:
61
61
displayName : Build and Test on Windows
62
62
timeoutInMinutes : 300
63
63
64
+ variables :
65
+ - name : project_file
66
+ value : Microsoft.WindowsAzure.Storage\tests\Microsoft.WindowsAzure.Storage.UnitTests.v141.vcxproj
67
+
64
68
strategy :
65
69
maxParallel : 16
66
70
matrix :
67
- WIN1803_VS2017 :
68
- container_image : win1803_vs2017:cpprestsdk_$(cpp_rest_sdk_version)
69
- project_file : Microsoft.WindowsAzure.Storage\tests\Microsoft.WindowsAzure.Storage.UnitTests.v141.vcxproj
70
- ms_build_location : C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe
71
+ VS2017 :
72
+ vm_image : vs2017-win2016
71
73
platform : x64
72
74
configuration : Release
73
- WIN1803_VS2017_DEBUG :
74
- container_image : win1803_vs2017:cpprestsdk_$(cpp_rest_sdk_version)
75
- project_file : Microsoft.WindowsAzure.Storage\tests\Microsoft.WindowsAzure.Storage.UnitTests.v141.vcxproj
76
- ms_build_location : C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe
75
+ toolset : v141
76
+ VS2017_DEBUG :
77
+ vm_image : vs2017-win2016
77
78
platform : x64
78
79
configuration : Debug
79
- WIN1803_VS2017_WIN32 :
80
- container_image : win1803_vs2017:cpprestsdk_$(cpp_rest_sdk_version)
81
- project_file : Microsoft.WindowsAzure.Storage\tests\Microsoft.WindowsAzure.Storage.UnitTests.v141.vcxproj
82
- ms_build_location : C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe
80
+ toolset : v141
81
+ VS2017_WIN32 :
82
+ vm_image : vs2017-win2016
83
83
platform : Win32
84
84
configuration : Release
85
+ toolset : v141
86
+ VS2019 :
87
+ vm_image : windows-2019
88
+ platform : x64
89
+ configuration : Release
90
+ toolset : v142
85
91
86
92
pool :
87
- vmImage : ' win1803'
88
-
89
- container :
90
- image : azurecppsdkpipeline.azurecr.io/$(container_image)
91
- endpoint : azure_docker_registry_connection
93
+ vmImage : $(vm_image)
92
94
93
95
steps :
96
+ - powershell : |
97
+ Invoke-WebRequest -Uri https://codeload.github.com/microsoft/vcpkg/zip/master -OutFile vcpkg-master.zip
98
+ Add-Type -AssemblyName System.IO.Compression.FileSystem
99
+ [System.IO.Compression.ZipFile]::ExtractToDirectory("vcpkg-master.zip", "C:\")
100
+ cd C:\vcpkg-master
101
+ .\bootstrap-vcpkg.bat
102
+ .\vcpkg install cpprestsdk[core]:x86-windows cpprestsdk[core]:x64-windows unittest-cpp:x86-windows unittest-cpp:x64-windows
103
+ .\vcpkg integrate install
104
+ displayName: Install Dependencies
105
+
94
106
- task : MSBUILD@1
95
107
displayName : Build
96
108
inputs :
97
109
solution : $(project_file)
98
- msbuildLocationMethod : location
99
- msbuildLocation : $(ms_build_location)
100
- msbuildArguments : /p:OutDir=$(Build.BinariesDirectory)\
110
+ msbuildArguments : /p:OutDir=$(Build.BinariesDirectory)\ /p:PlatformToolset=$(toolset)
101
111
platform : $(platform)
102
112
configuration : $(configuration)
103
113
0 commit comments