Skip to content

Commit 7d20fca

Browse files
[main] Source code updates from dotnet/dotnet (#2740)
* Update dependencies from https://github.com/dotnet/dotnet build 291132 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25563.103 -> 11.0.0-beta.25567.106) * Update dependencies from https://github.com/dotnet/dotnet build 291345 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25567.106 -> 11.0.0-beta.25568.110) * Update dependencies from https://github.com/dotnet/dotnet build 291548 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25568.110 -> 11.0.0-beta.25569.110) * Update dependencies from https://github.com/dotnet/dotnet build 291616 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25569.110 -> 11.0.0-beta.25570.101) * Backflow from https://github.com/dotnet/dotnet / cc7f6e8 build 291900 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 291900 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25570.101 -> 11.0.0-beta.25571.109) * Update dependencies from https://github.com/dotnet/dotnet build 292184 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25571.109 -> 11.0.0-beta.25574.108) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent cf5fd8d commit 7d20fca

9 files changed

Lines changed: 40 additions & 18 deletions

File tree

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25563.103</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="679ec822750ef4a645af43de164852f3c7ed9fdc" BarId="290847" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="d119b40e8ff3b88f87ad60b04c807233a159b197" BarId="292184" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25563.103">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25574.108">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>679ec822750ef4a645af43de164852f3c7ed9fdc</Sha>
9+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

eng/Versions.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<Project>
2+
23
<Import Project="Version.Details.props" />
3-
<!-- Repo Version Information -->
4+
45
<PropertyGroup>
56
<VersionPrefix>3.0.0</VersionPrefix>
67
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
78
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
89
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
9-
<DotNetFinalVersionKind>
10-
</DotNetFinalVersionKind>
10+
<DotNetFinalVersionKind></DotNetFinalVersionKind>
1111
</PropertyGroup>
12+
1213
</Project>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ jobs:
122122

123123
# Populate internal runtime variables.
124124
- template: /eng/common/templates/steps/enable-internal-sources.yml
125-
parameters:
126-
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
125+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126+
parameters:
127+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127128

128129
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129130

eng/common/core-templates/job/source-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals build.ubuntu.2004.amd64
63+
demands: ImageOverride -equals build.ubuntu.2204.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: 1es-mariner-2
66+
image: 1es-azurelinux-3
6767
os: linux
6868
${{ else }}:
6969
pool:

eng/common/core-templates/post-build/post-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,9 @@ stages:
305305
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
306306
is1ESPipeline: ${{ parameters.is1ESPipeline }}
307307

308-
- task: NuGetAuthenticate@1 # Populate internal runtime variables.
308+
- task: NuGetAuthenticate@1
309309

310+
# Populate internal runtime variables.
310311
- template: /eng/common/templates/steps/enable-internal-sources.yml
311312
parameters:
312313
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)

eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ parameters:
1313
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1414
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1515
microbuildUseESRP: true
16-
# Location of the MicroBuild output folder
17-
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
18-
microBuildOutputFolder: '$(Build.SourcesDirectory)'
16+
# Microbuild installation directory
17+
microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild
1918
# Microbuild version
2019
microbuildPluginVersion: 'latest'
2120

@@ -30,8 +29,27 @@ steps:
3029
inputs:
3130
packageType: sdk
3231
version: 8.0.x
33-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
34-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
32+
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild
33+
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
34+
35+
- script: |
36+
set -euo pipefail
37+
38+
# UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly
39+
version=$(dotnet --version)
40+
cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json
41+
{
42+
"sdk": {
43+
"version": "$version",
44+
"paths": [
45+
"${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild"
46+
],
47+
"errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin."
48+
}
49+
}
50+
EOF
51+
displayName: 'Add global.json to MicroBuild Installation path'
52+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
3553
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3654
3755
- script: |
@@ -85,6 +103,7 @@ steps:
85103
zipSources: false
86104
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
87105
version: ${{ parameters.microbuildPluginVersion }}
106+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
88107
${{ if eq(parameters.microbuildUseESRP, true) }}:
89108
ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
90109
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:

eng/common/generate-sbom-prep.sh

100755100644
File mode changed.

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25563.103"
16+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25574.108"
1717
}
1818
}

0 commit comments

Comments
 (0)