10000 [main] Update dependencies from dotnet/arcade (#337) · dotnet/wpf-test@c19a7f8 · GitHub
[go: up one dir, main page]
Skip to content

Commit c19a7f8

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#337)
[main] Update dependencies from dotnet/arcade
1 parent 59f4222 commit c19a7f8

File tree

15 files changed

+151
-126
lines changed

15 files changed

+151
-126
lines changed

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24414.3">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24475.5">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68</Sha>
6+
<Sha>de17e59d54ed3a4f62fa8c556257570687506aa1</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.DotNet.Arcade.Wpf.Sdk" Version="6.0.0-preview.5.21220.1">
99
<Uri>https://github.com/dotnet/wpf</Uri>

‎eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8')
160+
$dotnetVersions = @('5','6','7','8','9')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8')
102+
DotNetVersions=('5' '6' '7' '8' '9')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

‎eng/common/core-templates/job/job.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ parameters:
3333
artifactPublishSteps: []
3434
runAsPublic: false
3535

36-
# Sbom related params
37-
enableSbom: true
38-
PackageVersion: 9.0.0
39-
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
40-
4136
# 1es specific parameters
4237
is1ESPipeline: ''
4338

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

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
5-
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
63
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
74
preSteps: []
85
binlogPath: artifacts/log/Debug/Build.binlog
@@ -16,12 +13,6 @@ jobs:
1613
dependsOn: ${{ parameters.dependsOn }}
1714
condition: ${{ parameters.condition }}
1815
variables:
19-
- name: SourceIndexUploadPackageVersion
20-
value: ${{ parameters.sourceIndexUploadPackageVersion }}
21-
- name: SourceIndexProcessBinlogPackageVersion
22-
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
23-
- name: SourceIndexPackageSource
24-
value: ${{ parameters.sourceIndexPackageSource }}
2516
- name: BinlogPath
2617
value: ${{ parameters.binlogPath }}
2718
- template: /eng/common/core-templates/variables/pool-providers.yml
@@ -34,48 +25,20 @@ jobs:
3425
pool:
3526
${{ if eq(variables['System.TeamProject'], 'public') }}:
3627
name: $(DncEngPublicBuildPool)
37-
image: 1es-windows-2022-open
38-
os: windows
28+
image: windows.vs2022.amd64.open
3929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
4030
name: $(DncEngInternalBuildPool)
41-
image: 1es-windows-2022
42-
os: windows
31+
image: windows.vs2022.amd64
4332

4433
steps:
4534
- ${{ if eq(parameters.is1ESPipeline, '') }}:
4635
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
4736

4837
- ${{ each preStep in parameters.preSteps }}:
4938
- ${{ preStep }}
50-
51-
- task: UseDotNet@2
52-
displayName: Use .NET 8 SDK
53-
inputs:
54-
packageType: sdk
55-
version: 8.0.x
56-
installationPath: $(Agent.TempDirectory)/dotnet
57-
workingDirectory: $(Agent.TempDirectory)
58-
59-
- script: |
60-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
61-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
62-
displayName: Download Tools
63-
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
64-
workingDirectory: $(Agent.TempDirectory)
65-
6639
- script: ${{ parameters.sourceIndexBuildCommand }}
6740
displayName: Build Repository
6841

69-
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
70-
displayName: Process Binlog into indexable sln
71-
72-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
73-
- task: AzureCLI@2
74-
displayName: Log in to Azure and upload stage1 artifacts to source index
75-
inputs:
76-
azureSubscription: 'SourceDotNet Stage1 Publish'
77-
addSpnToEnvironment: true
78-
scriptType: 'ps'
79-
scriptLocation: 'inlineScript'
80-
inlineScript: |
81-
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
42+
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
43+
parameters:
44+
binLogPath: ${{ parameters.binLogPath }}

‎eng/common/core-templates/steps/publish-logs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ steps:
3434
'$(akams-client-id)'
3535
'$(microsoft-symbol-server-pat)'
3636
'$(symweb-symbol-server-pat)'
37+
'$(dnceng-symbol-server-pat)'
3738
'$(dn-bot-all-orgs-build-rw-code-rw)'
39+
'$(System.AccessToken)'
3840
${{parameters.CustomSensitiveDataList}}
3941
continueOnError: true
4042
condition: always()
@@ -45,6 +47,7 @@ steps:
4547
SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs'
4648
Contents: '**'
4749
TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs'
50+
condition: always()
4851

4952
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
5053
parameters:

‎eng/common/core-templates/steps/source-index-stage1-publish.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
parameters:
2+
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
4+
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
5+
binlogPath: artifacts/log/Debug/Build.binlog
6+
7+
steps:
8+
- task: UseDotNet@2
9+
displayName: "Source Index: Use .NET 8 SDK"
10+
inputs:
11+
packageType: sdk
12+
version: 8.0.x
13+
installationPath: $(Agent.TempDirectory)/dotnet
14+
workingDirectory: $(Agent.TempDirectory)
15+
16+
- script: |
17+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
19+
displayName: "Source Index: Download netsourceindex Tools"
20+
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
21+
workingDirectory: $(Agent.TempDirectory)
22+
23+
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
24+
displayName: "Source Index: Process Binlog into indexable sln"
25+
26+
- ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
27+
- task: AzureCLI@2
28+
741A displayName: "Source Index: Upload Source Index stage1 artifacts to Azure"
29+
inputs:
30+
azureSubscription: 'SourceDotNet Stage1 Publish'
31+
addSpnToEnvironment: true
32+
scriptType: 'ps'
33+
scriptLocation: 'inlineScript'
34+
inlineScript: |
35+
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1

‎eng/common/cross/build-rootfs.sh

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@ __HaikuPackages="gcc_syslibs"
9191
__HaikuPackages+=" gcc_syslibs_devel"
9292
__HaikuPackages+=" gmp"
9393
__HaikuPackages+=" gmp_devel"
94-
__HaikuPackages+=" icu66"
95-
__HaikuPackages+=" icu66_devel"
94+
__HaikuPackages+=" icu[0-9]+"
95+
__HaikuPackages+=" icu[0-9]*_devel"
9696
__HaikuPa F438 ckages+=" krb5"
9797
__HaikuPackages+=" krb5_devel"
9898
__HaikuPackages+=" libiconv"
9999
__HaikuPackages+=" libiconv_devel"
100-
__HaikuPackages+=" llvm12_libunwind"
101-
__HaikuPackages+=" llvm12_libunwind_devel"
100+
__HaikuPackages+=" llvm[0-9]*_libunwind"
101+
__HaikuPackages+=" llvm[0-9]*_libunwind_devel"
102102
__HaikuPackages+=" mpfr"
103103
__HaikuPackages+=" mpfr_devel"
104-
__HaikuPackages+=" openssl"
105-
__HaikuPackages+=" openssl_devel"
104+
__HaikuPackages+=" openssl3"
105+
__HaikuPackages+=" openssl3_devel"
106106
__HaikuPackages+=" zlib"
107107
__HaikuPackages+=" zlib_devel"
108108

@@ -496,7 +496,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
496496
arch="$(uname -m)"
497497

498498
ensureDownloadTool
499-
499+
500500
if [[ "$__hasWget" == 1 ]]; then
501501
wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static"
502502
else
@@ -681,7 +681,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then
681681

682682
ensureDownloadTool
683683

684-
echo "Downloading Haiku package tool"
684+
echo "Downloading Haiku package tools"
685685
git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script"
686686
if [[ "$__hasWget" == 1 ]]; then
687687
wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)"
@@ -691,34 +691,42 @@ elif [[ "$__CodeName" == "haiku" ]]; then
691691

692692
unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin"
693693

694-
DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg"
695-
HpkgBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current"
694+
HaikuBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current"
695+
HaikuPortsBaseUrl="https://eu.hpkg.haiku-os.org/haikuports/master/$__HaikuArch/current"
696+
697+
echo "Downloading HaikuPorts package repository index..."
698+
if [[ "$__hasWget" == 1 ]]; then
699+
wget -P "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo"
700+
else
701+
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo"
702+
fi
696703

697-
# Download Haiku packages
698704
echo "Downloading Haiku packages"
699705
read -ra array <<<"$__HaikuPackages"
700706
for package in "${array[@]}"; do
701707
echo "Downloading $package..."
702-
# API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60
703-
# The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598
708+
hpkgFilename="$(LD_LIBRARY_PATH="$__RootfsDir/tmp/bin" "$__RootfsDir/tmp/bin/package_repo" list -f "$__RootfsDir/tmp/download/repo" |
709+
grep -E "${package}-" | sort -V | tail -n 1 | xargs)"
710+
if [ -z "$hpkgFilename" ]; then
711+
>&2 echo "ERROR: package $package missing."
712+
exit 1
713+
fi
714+
echo "Resolved filename: $hpkgFilename..."
715+
hpkgDownloadUrl="$HaikuPortsBaseUrl/packages/$hpkgFilename"
704716
if [[ "$__hasWget" == 1 ]]; then
705-
hpkgDownloadUrl="$(wget -qO- --post-data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \
706-
--header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')"
707717
wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
708718
else
709-
hpkgDownloadUrl="$(curl -sSL -XPOST --data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \
710-
--header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')"
711719
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
712720
fi
713721
done
714722
for package in haiku haiku_devel; do
715723
echo "Downloading $package..."
716724
if [[ "$__hasWget" == 1 ]]; then
717-
hpkgVersion="$(wget -qO- "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
718-
wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
725+
hpkgVersion="$(wget -qO- "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
726+
wget -P "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
719727
else
720-
hpkgVersion="$(curl -sSL "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
721-
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
728+
hpkgVersion="$(curl -sSL "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
729+
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
722730
fi
723731
done
724732

‎eng/common/internal/Tools.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<TargetFramework>net472</TargetFramework>
66
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
7+
<BuildWithNetFrameworkHostedCompiler>false</BuildWithNetFrameworkHostedCompiler>
78
</PropertyGroup>
89
<ItemGroup>
910
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->

‎eng/common/template-guidance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extends:
5757
5858
Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
5959

60-
# Development notes
60+
## Development notes
6161

6262
**Folder / file structure**
6363

0 commit comments

Comments
 (0)
0