Skip to content

Commit dede5f6

Browse files
authored
Fix build scripts to support CntOS8 and Windows build with VS2019 (any) (#1006)
* Changes for MIP * VCToolsVersion
1 parent 1221ce3 commit dede5f6

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

Solutions/build.MIP.props

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
</ItemDefinitionGroup>
1111
<PropertyGroup>
1212
<DisableWinRT>true</DisableWinRT>
13+
<PlatformToolset>v141</PlatformToolset>
14+
<VCToolsVersion>14.1</VCToolsVersion>
1315
</PropertyGroup>
1416
<PropertyGroup Condition="'$(RootNamespace)'=='ClientTelemetry'">
1517
<TargetName>mip_ClientTelemetry</TargetName>

build-win.ps1

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ param (
55
[string]$enableWin10 = "true",
66
[string]$enableMini = "true",
77
[string]$enableTests = "true",
8-
[string]$customProps = ""
8+
[string]$customProps = "",
9+
[string]$vsDevCmdBat = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
910
)
1011

11-
$vsDevCmdBat = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
12-
1312
$solution = "Solutions\MSTelemetrySDK.sln"
1413
$cpuCount = $env:NUMBER_OF_PROCESSORS
1514

docker/centos8/Dockerfile

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
FROM centos:centos8
2-
3-
USER 0
4-
5-
# Package installation
6-
RUN yum update -y
7-
8-
## Common packages for linux build environment
9-
RUN yum -y group install "Development Tools"
10-
RUN yum install -y curl libcurl-devel zlib-devel clang python38 pkg-config git bzip2 unzip make wget sudo cmake
11-
RUN yum --enablerepo=powertools install -y zlib-static gmock gtest
12-
1+
FROM centos:centos8
2+
3+
USER 0
4+
5+
6+
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* &&\
7+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-*
8+
9+
# Package installation
10+
RUN yum update -y
11+
12+
## Common packages for linux build environment
13+
RUN yum -y group install "Development Tools"
14+
RUN yum install -y curl libcurl-devel zlib-devel clang python38 pkg-config git bzip2 unzip make wget sudo cmake
15+
RUN yum --enablerepo=powertools install -y zlib-static gmock gtest
16+
1317
CMD /bin/bash

0 commit comments

Comments
 (0)