File tree 8 files changed +44
-17
lines changed
8 files changed +44
-17
lines changed Original file line number Diff line number Diff line change 9
9
</Dependency >
10
10
</ProductDependencies >
11
11
<ToolsetDependencies >
12
- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 9.0.0-beta.24306.4 " >
12
+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 9.0.0-beta.24314.1 " >
13
13
<Uri >https://github.com/dotnet/arcade</Uri >
14
- <Sha >7507f80c8db285bbc9939c1dff522a761cf4edc0 </Sha >
14
+ <Sha >92a725aa4d9d6c13dc5229597b51b0b165b8b535 </Sha >
15
15
</Dependency >
16
- <Dependency Name =" Microsoft.DotNet.XliffTasks" Version =" 9.0.0-beta.24306.4 " >
16
+ <Dependency Name =" Microsoft.DotNet.XliffTasks" Version =" 9.0.0-beta.24314.1 " >
17
17
<Uri >https://github.com/dotnet/arcade</Uri >
18
- <Sha >7507f80c8db285bbc9939c1dff522a761cf4edc0 </Sha >
18
+ <Sha >92a725aa4d9d6c13dc5229597b51b0b165b8b535 </Sha >
19
19
</Dependency >
20
20
<!-- Intermediate is necessary for source build. -->
21
- <Dependency Name =" Microsoft.SourceBuild.Intermediate.arcade" Version =" 9.0.0-beta.24306.4 " >
21
+ <Dependency Name =" Microsoft.SourceBuild.Intermediate.arcade" Version =" 9.0.0-beta.24314.1 " >
22
22
<Uri >https://github.com/dotnet/arcade</Uri >
23
- <Sha >7507f80c8db285bbc9939c1dff522a761cf4edc0 </Sha >
23
+ <Sha >92a725aa4d9d6c13dc5229597b51b0b165b8b535 </Sha >
24
24
<SourceBuild RepoName =" arcade" ManagedOnly =" true" />
25
25
</Dependency >
26
26
</ToolsetDependencies >
Original file line number Diff line number Diff line change @@ -131,6 +131,7 @@ __AlpineKeys='
131
131
__Keyring=
132
132
__SkipSigCheck=0
133
133
__UseMirror=0
134
+ __UseDeb822Format=0
134
135
135
136
__UnprocessedBuildArgs=
136
137
while : ; do
@@ -181,7 +182,6 @@ while :; do
181
182
__AlpinePackages=" ${__AlpinePackages// lldb-dev/ } "
182
183
__QEMUArch=riscv64
183
184
__UbuntuArch=riscv64
184
- __UbuntuRepo=" http://deb.debian.org/debian"
185
185
__UbuntuPackages=" ${__UbuntuPackages// libunwind8-dev/ } "
186
186
unset __LLDB_Package
187
187
@@ -288,6 +288,12 @@ while :; do
288
288
__CodeName=jammy
289
289
fi
290
290
;;
291
+ noble) # Ubuntu 24.04
292
+ if [[ " $__CodeName " != " jessie" ]]; then
293
+ __CodeName=noble
294
+ fi
295
+ __UseDeb822Format=1
296
+ ;;
291
297
jessie) # Debian 8
292
298
__CodeName=jessie
293
299
@@ -732,8 +738,11 @@ elif [[ -n "$__CodeName" ]]; then
732
738
fi
733
739
734
740
# shellcheck disable=SC2086
741
+ echo running debootstrap " --variant=minbase" $__Keyring --arch " $__UbuntuArch " " $__CodeName " " $__RootfsDir " " $__UbuntuRepo "
735
742
debootstrap " --variant=minbase" $__Keyring --arch " $__UbuntuArch " " $__CodeName " " $__RootfsDir " " $__UbuntuRepo "
736
- cp " $__CrossDir /$__BuildArch /sources.list.$__CodeName " " $__RootfsDir /etc/apt/sources.list"
743
+ mkdir -p " $__RootfsDir /etc/apt/sources.list.d/"
744
+ grep -q " Types:" " $__CrossDir /$__BuildArch /sources.list.$__CodeName " && filename=" $__CodeName .sources" || filename=" $__CodeName .list"
745
+ cp " $__CrossDir /$__BuildArch /sources.list.$__CodeName " " $__RootfsDir /etc/apt/sources.list.d/$filename "
737
746
chroot " $__RootfsDir " apt-get update
738
747
chroot " $__RootfsDir " apt-get -f -y install
739
748
# shellcheck disable=SC2086
Original file line number Diff line number Diff line change
1
+ Types: deb
2
+ URIs: http://ports.ubuntu.com/ubuntu-ports/
3
+ Suites: noble noble-updates noble-backports
4
+ Components: main universe restricted multiverse
5
+ Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
6
+
7
+ Types: deb
8
+ URIs: http://ports.ubuntu.com/ubuntu-ports/
9
+ Suites: noble-security
10
+ Components: main universe restricted multiverse
11
+ Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
Original file line number Diff line number Diff line change 5
5
[Parameter (Mandatory = $true )][string ] $PackagesPath # Path to where the packages to be validated are
6
6
)
7
7
8
+ # `tools.ps1` checks $ci to perform some actions. Since the post-build
9
+ # scripts don't necessarily execute in the same agent that run the
10
+ # build.ps1/sh script this variable isn't automatically set.
11
+ $ci = $true
12
+ $disableConfigureToolsetImport = $true
13
+ . $PSScriptRoot \..\tools.ps1
14
+
8
15
try {
9
16
& $PSScriptRoot \nuget- verification.ps1 ${PackagesPath} \* .nupkg
10
17
}
Original file line number Diff line number Diff line change 43
43
-- azdev- pat $AzdoToken `
44
44
-- bar- uri $MaestroApiEndPoint `
45
45
-- password $MaestroToken `
46
- -- disable-interactive - auth `
46
+ -- ci `
47
47
@optionalParams
48
48
49
49
if ($LastExitCode -ne 0 ) {
Original file line number Diff line number Diff line change @@ -653,7 +653,7 @@ function GetNuGetPackageCachePath() {
653
653
$env: NUGET_PACKAGES = Join-Path $env: UserProfile ' .nuget\packages\'
654
654
} else {
655
655
$env: NUGET_PACKAGES = Join-Path $RepoRoot ' .packages\'
656
- $env: RESTORENOCACHE = $true
656
+ $env: RESTORENOHTTPCACHE = $true
657
657
}
658
658
}
659
659
Original file line number Diff line number Diff line change @@ -347,14 +347,14 @@ function InitializeBuildTool {
347
347
fi
348
348
}
349
349
350
- # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
350
+ # Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
351
351
function GetNuGetPackageCachePath {
352
352
if [[ -z ${NUGET_PACKAGES:- } ]]; then
353
353
if [[ " $use_global_nuget_cache " == true ]]; then
354
- export NUGET_PACKAGES=" $HOME /.nuget/packages"
354
+ export NUGET_PACKAGES=" $HOME /.nuget/packages/ "
355
355
else
356
- export NUGET_PACKAGES=" $repo_root /.packages"
357
- export RESTORENOCACHE =true
356
+ export NUGET_PACKAGES=" $repo_root /.packages/ "
357
+ export RESTORENOHTTPCACHE =true
358
358
fi
359
359
fi
360
360
Original file line number Diff line number Diff line change 1
1
{
2
2
"sdk" : {
3
- "version" : " 9.0.100-preview.4.24267.66 " ,
3
+ "version" : " 9.0.100-preview.5.24307.3 " ,
4
4
"allowPrerelease" : true ,
5
5
"rollForward" : " patch"
6
6
},
7
7
"tools" : {
8
- "dotnet" : " 9.0.100-preview.4.24267.66 " ,
8
+ "dotnet" : " 9.0.100-preview.5.24307.3 " ,
9
9
"runtimes" : {
10
10
"dotnet/x64" : [
11
11
" 7.0.7" ,
18
18
}
19
19
},
20
20
"msbuild-sdks" : {
21
- "Microsoft.DotNet.Arcade.Sdk" : " 9.0.0-beta.24306.4 " ,
21
+ "Microsoft.DotNet.Arcade.Sdk" : " 9.0.0-beta.24314.1 " ,
22
22
"MSTest.Sdk" : " 3.3.1"
23
23
}
24
24
}
You can’t perform that action at this time.
0 commit comments