diff options
| author | Doug Bunting (AAPT) <dougbu@microsoft.com> | 2021-11-30 05:18:25 +0300 |
|---|---|---|
| committer | Doug Bunting (AAPT) <dougbu@microsoft.com> | 2021-11-30 05:18:25 +0300 |
| commit | 143958757dfd09e8ffd752086707e6326b81c710 (patch) | |
| tree | 186c664a633cdc90d974f7d312c02b4e1a255400 /.azure | |
| parent | 220d4d14e05e15b4cd8a19a0da23c88a90ccd37d (diff) | |
Build w/ VS 2019 (#20104)v2.1.31
- should clean up `restore` of RepoTasks.csproj
- change `demands` for our Windows jobs
- widen `versionRange` and update `requiredWorkloads` in main and Windows Installers builds
- avoid F# projects for now
- until VS 2019 build issues are resolved or we remove the project entirely
- apparently, no tests reference the F# web site
- add `$(TargetFrameworkMoniker)` setting for *.wixproj projects
- remove `$(TargetFramework)` property; `$(TargetFrameworkMoniker)` should be enough
Diffstat (limited to '.azure')
| -rw-r--r-- | .azure/pipelines/ci.yml | 8 | ||||
| -rw-r--r-- | .azure/pipelines/jobs/default-build.yml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 0c403746bc..2fec4e6547 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -71,7 +71,7 @@ jobs: clean: all pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2017 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: _SignType: real JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk @@ -356,7 +356,7 @@ jobs: clean: all pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2017 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: _SignType: real JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk @@ -434,7 +434,7 @@ jobs: clean: all pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2017 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: _SignType: real JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk @@ -586,7 +586,7 @@ jobs: clean: all pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2017 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: _SignType: real JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index dedb4a5756..abfc90bccd 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -79,10 +79,10 @@ jobs: ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2017.Open + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2017 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: AgentOsName: ${{ parameters.agentOs }} BuildScriptArgs: ${{ parameters.buildArgs }} |