Skip to content

Commit 1083cf6

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20211029.1 (#2345)
[main] Update dependencies from dotnet/arcade
1 parent a5f8466 commit 1083cf6

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21524.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21529.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>0cdef445272ad6a7374dfed71496c5affef90305</Sha>
8+
<Sha>0558f85d950fee2838bf02b9ba1f20d67f00b504</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21524.1">
11+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21529.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>0cdef445272ad6a7374dfed71496c5affef90305</Sha>
13+
<Sha>0558f85d950fee2838bf02b9ba1f20d67f00b504</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-alpha.1.21524.4">
1616
<Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
1919
<MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion>
2020
<MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion>
21-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21524.1</MicrosoftDotNetApiCompatVersion>
21+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21529.1</MicrosoftDotNetApiCompatVersion>
2222
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion>
2323
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
2424
<MicrosoftCodeAnalysisVersion>3.10.0-2.final</MicrosoftCodeAnalysisVersion>

eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ jobs:
6060
- name: GuardianPackagesConfigFile
6161
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
6262
pool:
63-
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
64-
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
65-
name: Hosted VS2017
66-
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
67-
vmImage: windows-2019
63+
vmImage: windows-2019
6864
steps:
6965
- checkout: self
7066
clean: true

eng/common/templates/job/onelocbuild.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ parameters:
44

55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
66
pool:
7-
vmImage: vs2017-win2016
7+
vmImage: 'windows-2019'
88

99
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
1010
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1111

1212
SourcesDirectory: $(Build.SourcesDirectory)
1313
CreatePr: true
1414
AutoCompletePr: false
15+
ReusePr: true
1516
UseLfLineEndings: true
1617
UseCheckedInLocProjectJson: false
1718
LanguageSet: VS_Main_Languages
@@ -64,6 +65,8 @@ jobs:
6465
${{ if eq(parameters.CreatePr, true) }}:
6566
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
6667
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
68+
${{ if eq(parameters.RepoType, 'gitHub') }}:
69+
isShouldReusePrSelected: ${{ parameters.ReusePr }}
6770
packageSourceAuth: patAuth
6871
patVariable: ${{ parameters.CeapexPat }}
6972
${{ if eq(parameters.RepoType, 'gitHub') }}:

eng/common/templates/job/source-index-stage1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
preSteps: []
77
binlogPath: artifacts/log/Debug/Build.binlog
88
pool:
9-
vmImage: vs2017-win2016
9+
vmImage: 'windows-2019'
1010
condition: ''
1111
dependsOn: ''
1212

eng/common/templates/jobs/jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- ${{ if eq(parameters.enableSourceBuild, true) }}:
8484
- Source_Build_Complete
8585
pool:
86-
vmImage: vs2017-win2016
86+
vmImage: 'windows-2019'
8787
runAsPublic: ${{ parameters.runAsPublic }}
8888
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
8989
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -96,4 +96,4 @@ jobs:
9696
dependsOn:
9797
- Asset_Registry_Publish
9898
pool:
99-
vmImage: vs2017-win2016
99+
vmImage: 'windows-2019'

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "6.0.100-rc.1.21430.12"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21524.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21529.1",
77
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
88
"Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21524.4"
99
}

0 commit comments

Comments
 (0)