Skip to content

Commit 7a8dce6

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250507.2 (#5773)
[main] Update dependencies from dotnet/arcade
1 parent fecc5f1 commit 7a8dce6

File tree

157 files changed

+7850
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+7850
-306
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24626.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25257.2">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
9+
<Sha>48c22bf560e40ae692a9098d29466539aa6c2e14</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24626.1">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25257.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
13+
<Sha>48c22bf560e40ae692a9098d29466539aa6c2e14</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24626.1">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25257.2">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
17+
<Sha>48c22bf560e40ae692a9098d29466539aa6c2e14</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24626.1">
19+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25257.2">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>ae8d2a08f1021624ae37cdd5b65f6c05e58a051b</Sha>
21+
<Sha>48c22bf560e40ae692a9098d29466539aa6c2e14</Sha>
2222
</Dependency>
2323
</ToolsetDependencies>
2424
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121
<!-- Arcade dependencies -->
2222
<PropertyGroup>
23-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetGenFacadesPackageVersion>
24-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
25-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.24626.1</MicrosoftDotNetGenAPIPackageVersion>
23+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25257.2</MicrosoftDotNetGenFacadesPackageVersion>
24+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25257.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
25+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25257.2</MicrosoftDotNetGenAPIPackageVersion>
2626
</PropertyGroup>
2727
<!-- Additional dependencies -->
2828
<PropertyGroup>

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

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ steps:
1919
set -x
2020
df -h
2121
22-
# If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo.
23-
internalRestoreArgs=
24-
if ! git diff --quiet; then
25-
internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
26-
# The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
27-
# This only works if there is a username/email configured, which won't be the case in most CI runs.
28-
git config --get user.email
29-
if [ $? -ne 0 ]; then
30-
git config user.email [email protected]
31-
git config user.name dn-bot
32-
fi
33-
fi
34-
3522
# If building on the internal project, the internal storage variable may be available (usually only if needed)
3623
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
3724
# in the default public locations.
@@ -46,11 +33,6 @@ steps:
4633
buildConfig='$(_BuildConfig)'
4734
fi
4835
49-
officialBuildArgs=
50-
if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then
51-
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
52-
fi
53-
5436
targetRidArgs=
5537
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
5638
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -66,68 +48,31 @@ steps:
6648
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
6749
fi
6850
69-
publishArgs=
70-
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
71-
publishArgs='--publish'
72-
fi
73-
74-
assetManifestFileName=SourceBuild_RidSpecific.xml
75-
if [ '${{ parameters.platform.name }}' != '' ]; then
76-
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
77-
fi
78-
7951
portableBuildArgs=
8052
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
8153
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8254
fi
8355
8456
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8557
--configuration $buildConfig \
86-
--restore --build --pack $publishArgs -bl \
87-
$officialBuildArgs \
58+
--restore --build --pack -bl \
59+
${{ parameters.platform.buildArguments }} \
8860
$internalRuntimeDownloadArgs \
89-
$internalRestoreArgs \
9061
$targetRidArgs \
9162
$runtimeOsArgs \
9263
$baseOsArgs \
9364
$portableBuildArgs \
9465
/p:DotNetBuildSourceOnly=true \
9566
/p:DotNetBuildRepo=true \
96-
/p:AssetManifestFileName=$assetManifestFileName
9767
displayName: Build
9868

99-
# Upload build logs for diagnosis.
100-
- task: CopyFiles@2
101-
displayName: Prepare BuildLogs staging directory
102-
inputs:
103-
SourceFolder: '$(Build.SourcesDirectory)'
104-
Contents: |
105-
**/*.log
106-
**/*.binlog
107-
artifacts/sb/prebuilt-report/**
108-
TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
109-
CleanTargetFolder: true
110-
continueOnError: true
111-
condition: succeededOrFailed()
112-
11369
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
11470
parameters:
11571
is1ESPipeline: ${{ parameters.is1ESPipeline }}
11672
args:
11773
displayName: Publish BuildLogs
118-
targetPath: '$(Build.StagingDirectory)/BuildLogs'
74+
targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }}
11975
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
12076
continueOnError: true
12177
condition: succeededOrFailed()
12278
sbomEnabled: false # we don't need SBOM for logs
123-
124-
# Manually inject component detection so that we can ignore the source build upstream cache, which contains
125-
# a nupkg cache of input packages (a local feed).
126-
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
127-
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
128-
- template: /eng/common/core-templates/steps/component-governance.yml
129-
parameters:
130-
displayName: Component Detection (Exclude upstream cache)
131-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
132-
componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
133-
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}

eng/common/cross/armel/armel.jessie.patch

Lines changed: 0 additions & 43 deletions
This file was deleted.

eng/common/generate-sbom-prep.ps1

Lines changed: 0 additions & 21 deletions
This file was deleted.

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-alpha.1.24573.1",
3+
"dotnet": "10.0.100-preview.3.25201.16",
44
"runtimes": {
55
"aspnetcore": [
66
"3.1.5",
@@ -11,10 +11,10 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "10.0.100-alpha.1.24573.1"
14+
"version": "10.0.100-preview.3.25201.16"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24626.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.2",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"RetryCountLimit": 1,
3+
"RetryByAnyError": false
4+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@{
2+
IncludeRules=@('PSAvoidUsingCmdletAliases',
3+
'PSAvoidUsingWMICmdlet',
4+
'PSAvoidUsingPositionalParameters',
5+
'PSAvoidUsingInvokeExpression',
6+
'PSUseDeclaredVarsMoreThanAssignments',
7+
'PSUseCmdletCorrectly',
8+
'PSStandardDSCFunctionsInResource',
9+
'PSUseIdenticalMandatoryParametersForDSC',
10+
'PSUseIdenticalParametersForDSC')
11+
}

src/arcade/eng/common/README.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Don't touch this folder
2+
3+
uuuuuuuuuuuuuuuuuuuu
4+
u" uuuuuuuuuuuuuuuuuu "u
5+
u" u$$$$$$$$$$$$$$$$$$$$u "u
6+
u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u
7+
u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
8+
u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
9+
u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
10+
$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
11+
$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
12+
$ $$$" ... "$... ...$" ... "$$$ ... "$$$ $
13+
$ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $
14+
$ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $
15+
$ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $
16+
$ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $
17+
$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
18+
"u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
19+
"u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
20+
"u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
21+
"u "$$$$$$$$$$$$$$$$$$$$$$$$" u"
22+
"u "$$$$$$$$$$$$$$$$$$$$" u"
23+
"u """""""""""""""""" u"
24+
""""""""""""""""""""
25+
26+
!!! Changes made in this directory are subject to being overwritten by automation !!!
27+
28+
The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first.

0 commit comments

Comments
 (0)