Skip to content

[main] Update dependencies from dotnet/arcade #5633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2021
Merged

[main] Update dependencies from dotnet/arcade #5633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21553.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21554.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0c6a8fa272455f7f363d986d4077455353e5fe7c</Sha>
<Sha>670231b2034b040c42af651d4c34d679784f0318</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.21553.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.21554.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0c6a8fa272455f7f363d986d4077455353e5fe7c</Sha>
<Sha>670231b2034b040c42af651d4c34d679784f0318</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21553.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21554.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0c6a8fa272455f7f363d986d4077455353e5fe7c</Sha>
<Sha>670231b2034b040c42af651d4c34d679784f0318</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21553.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21554.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0c6a8fa272455f7f363d986d4077455353e5fe7c</Sha>
<Sha>670231b2034b040c42af651d4c34d679784f0318</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21553.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21554.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0c6a8fa272455f7f363d986d4077455353e5fe7c</Sha>
<Sha>670231b2034b040c42af651d4c34d679784f0318</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21553.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.21553.3</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.21553.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21554.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.21554.4</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.21554.4</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
Expand Down
15 changes: 9 additions & 6 deletions eng/common/templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ parameters:
# container and pool.
platform: {}

# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
# source-build builds run in Docker, including the default managed platform.
defaultContainerHostPool:
vmImage: ubuntu-20.04

jobs:
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
displayName: Source-Build (${{ parameters.platform.name }})
Expand All @@ -47,7 +42,15 @@ jobs:
container: ${{ parameters.platform.container }}

${{ if eq(parameters.platform.pool, '') }}:
pool: ${{ parameters.defaultContainerHostPool }}
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
# source-build builds run in Docker, including the default managed platform.
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}

Expand Down
10 changes: 7 additions & 3 deletions eng/common/templates/job/source-index-stage1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ parameters:
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
pool:
vmImage: 'windows-2019'
condition: ''
dependsOn: ''

Expand All @@ -24,7 +22,13 @@ jobs:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: source-dot-net stage1 variables

pool: ${{ parameters.pool }}
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- ${{ each preStep in parameters.preSteps }}:
- ${{ preStep }}
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21553.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21553.3"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21554.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21554.4"
},
"sdk": {
"version": "6.0.100-rc.1.21430.12"
Expand Down