fix: add x86 build, update azure build agent and platform toolset (#60)
* update windows build environment * use windows 2019 build agent * Update azure-pipelines.yml for Azure Pipelines * use windows-2019 image * rerun failed tempts to catch transient failures * update windows sdk version * update to windows 2022 build agent and 10.0 sdk * revert to Windows 2019 agent * add x86 build job * fix build platform * restore component governance task * update readme build status badge Co-authored-by: Ian King'ori <iakingor@microsoft.com>
This commit is contained in:
Родитель
a3881a5716
Коммит
886f60b9b0
|
@ -23,7 +23,7 @@
|
|||
<ProjectGuid>{83EC485E-DF62-445A-B5DC-6AE352552B93}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>LogMonitorTests</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
<ProjectSubType>NativeUnitTestProject</ProjectSubType>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
|
@ -45,14 +45,14 @@
|
|||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
|
|
|
@ -23,32 +23,32 @@
|
|||
<ProjectGuid>{87A330AC-84A1-40B3-A596-1BAED16B828F}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>LogMonitor</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[![Build Status](https://dev.azure.com/ms/windows-container-tools/_apis/build/status/microsoft.windows-container-tools?branchName=master)](https://dev.azure.com/ms/windows-container-tools/_build/latest?definitionId=265&branchName=master) [![Join the chat at https://gitter.im/Microsoft/windows-containers-tools](https://badges.gitter.im/Microsoft/windows-containers-tools.svg)](https://gitter.im/Microsoft/windows-containers-tools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
[![Build Status](https://dev.azure.com/ms/windows-container-tools/_apis/build/status/microsoft.windows-container-tools?branchName=main)](https://dev.azure.com/ms/windows-container-tools/_build/latest?definitionId=265&branchName=main) [![Join the chat at https://gitter.im/Microsoft/windows-containers-tools](https://badges.gitter.im/Microsoft/windows-containers-tools.svg)](https://gitter.im/Microsoft/windows-containers-tools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
|
||||
|
||||
# Overview
|
||||
|
|
|
@ -2,7 +2,7 @@ trigger:
|
|||
- main
|
||||
|
||||
pool:
|
||||
name: 'Hosted VS2017' # name of the pool to run this job in
|
||||
vmImage: 'windows-2022' # name of the pool to run this job in
|
||||
demands:
|
||||
- msbuild
|
||||
- visualstudio
|
||||
|
@ -13,28 +13,61 @@ variables:
|
|||
buildPlatform: 'x86|x64|ARM'
|
||||
buildConfiguration: 'Release'
|
||||
|
||||
steps:
|
||||
- task: VSBuild@1
|
||||
inputs:
|
||||
platform: 'x64'
|
||||
solution: '$(solution)'
|
||||
configuration: '$(buildConfiguration)'
|
||||
jobs:
|
||||
- job: x64_build
|
||||
steps:
|
||||
- task: VSBuild@1
|
||||
inputs:
|
||||
platform: 'x64'
|
||||
solution: '$(solution)'
|
||||
configuration: '$(buildConfiguration)'
|
||||
|
||||
- task: ComponentGovernanceComponentDetection@0
|
||||
inputs:
|
||||
scanType: 'LogOnly'
|
||||
verbosity: 'Verbose'
|
||||
alertWarningLevel: 'High'
|
||||
- task: ComponentGovernanceComponentDetection@0
|
||||
inputs:
|
||||
scanType: 'LogOnly'
|
||||
verbosity: 'Verbose'
|
||||
alertWarningLevel: 'High'
|
||||
|
||||
- task: VisualStudioTestPlatformInstaller@1
|
||||
inputs:
|
||||
packageFeedSelector: 'nugetOrg'
|
||||
versionSelector: 'latestPreRelease'
|
||||
- task: VisualStudioTestPlatformInstaller@1
|
||||
inputs:
|
||||
packageFeedSelector: 'nugetOrg'
|
||||
versionSelector: 'latestPreRelease'
|
||||
|
||||
- task: VSTest@2
|
||||
inputs:
|
||||
testSelector: 'testAssemblies'
|
||||
testAssemblyVer2: '**\*test*.dll'
|
||||
searchFolder: '$(System.DefaultWorkingDirectory)'
|
||||
runOnlyImpactedTests: false
|
||||
runInParallel: false
|
||||
- task: VSTest@2
|
||||
inputs:
|
||||
testSelector: 'testAssemblies'
|
||||
testAssemblyVer2: '**\*test*.dll'
|
||||
searchFolder: '$(System.DefaultWorkingDirectory)'
|
||||
runOnlyImpactedTests: false
|
||||
runInParallel: false
|
||||
rerunFailedTests: true
|
||||
rerunMaxAttempts: 3
|
||||
|
||||
- job: x86_build
|
||||
steps:
|
||||
- task: VSBuild@1
|
||||
inputs:
|
||||
platform: 'x86'
|
||||
solution: '$(solution)'
|
||||
configuration: '$(buildConfiguration)'
|
||||
|
||||
- task: ComponentGovernanceComponentDetection@0
|
||||
inputs:
|
||||
scanType: 'LogOnly'
|
||||
verbosity: 'Verbose'
|
||||
alertWarningLevel: 'High'
|
||||
|
||||
- task: VisualStudioTestPlatformInstaller@1
|
||||
inputs:
|
||||
packageFeedSelector: 'nugetOrg'
|
||||
versionSelector: 'latestPreRelease'
|
||||
|
||||
- task: VSTest@2
|
||||
inputs:
|
||||
testSelector: 'testAssemblies'
|
||||
testAssemblyVer2: '**\*test*.dll'
|
||||
searchFolder: '$(System.DefaultWorkingDirectory)'
|
||||
runOnlyImpactedTests: false
|
||||
runInParallel: false
|
||||
rerunFailedTests: true
|
||||
rerunMaxAttempts: 3
|
||||
|
|
Загрузка…
Ссылка в новой задаче