Skip to content

Commit 659a39c

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250521.2 (#669)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging From Version 10.0.0-beta.25268.1 -> To Version 10.0.0-beta.25271.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 4364901 commit 659a39c

File tree

7 files changed

+8
-46
lines changed

7 files changed

+8
-46
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25268.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25271.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>35a34fa5ab9b2f97d3f7bdf48a7c2100727308b3</Sha>
8+
<Sha>12d3a9f5d6138e22270694574e73e4c58a815795</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25268.1">
10+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25271.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>35a34fa5ab9b2f97d3f7bdf48a7c2100727308b3</Sha>
12+
<Sha>12d3a9f5d6138e22270694574e73e4c58a815795</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25268.1</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25271.2</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

eng/common/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function Build {
127127
/p:Deploy=$deploy `
128128
/p:Test=$test `
129129
/p:Pack=$pack `
130-
/p:DotNetBuildRepo=$productBuild `
130+
/p:DotNetBuild=$productBuild `
131131
/p:IntegrationTest=$integrationTest `
132132
/p:PerformanceTest=$performanceTest `
133133
/p:Sign=$sign `

eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function Build {
241241
/p:RepoRoot="$repo_root" \
242242
/p:Restore=$restore \
243243
/p:Build=$build \
244-
/p:DotNetBuildRepo=$product_build \
244+
/p:DotNetBuild=$product_build \
245245
/p:DotNetBuildSourceOnly=$source_build \
246246
/p:Rebuild=$rebuild \
247247
/p:Test=$test \

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ stages:
193193
buildId: $(AzDOBuildId)
194194
artifactName: PackageArtifacts
195195
checkDownloadedFiles: true
196-
itemPattern: |
197-
**
198-
!**/Microsoft.SourceBuild.Intermediate.*.nupkg
199196

200197
# This is necessary whenever we want to publish/restore to an AzDO private feed
201198
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,3 @@ steps:
4848
eq(variables['_SignType'], 'real')
4949
)
5050
))
51-
52-
# Workaround for ESRP CLI on Linux - https://github.com/dotnet/source-build/issues/4964
53-
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
54-
- task: UseDotNet@2
55-
displayName: Install .NET 9.0 SDK for ESRP CLI Workaround
56-
inputs:
57-
packageType: sdk
58-
version: 9.0.x
59-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
60-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
61-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
62-
63-
- task: PowerShell@2
64-
displayName: Workaround for ESRP CLI on Linux
65-
inputs:
66-
targetType: 'inline'
67-
script: |
68-
Write-Host "Copying Linux Path"
69-
$MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
70-
$MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '')
71-
72-
$versionRegex = '\d+\.\d+\.\d+'
73-
$package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory |
74-
Where-Object { $_.Name -match $versionRegex }
75-
76-
if ($package.Count -ne 1) {
77-
Write-Host "There should be exactly one matching subfolder, but found $($package.Count)."
78-
exit 1
79-
}
80-
81-
$MBSIGN_APPFOLDER = $package[0].FullName + '/build'
82-
$MBSIGN_APPFOLDER | Write-Host
83-
$SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
84-
Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force
85-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25268.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25271.2",
77
"Microsoft.Build.Traversal": "3.4.0"
88
}
99
}

0 commit comments

Comments
 (0)