Skip to content

[main] Update dependencies from dotnet/arcade #7266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Dec 17, 2024
Merged

[main] Update dependencies from dotnet/arcade #7266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cdbd259
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 10, 2024
ad20608
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 14, 2024
29ac993
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 21, 2024
3a4b79e
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 28, 2024
d6b55c4
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 4, 2024
5801e31
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 11, 2024
d0c9c10
Merge branch 'main' into darc-main-e96ea06d-c1bc-4ba1-b01f-b06f5866e18b
ericstj Nov 14, 2024
46421b0
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 18, 2024
c09121b
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 25, 2024
da7cb8d
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 2, 2024
15c61aa
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 9, 2024
92bb6df
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 16, 2024
23f36e5
Merge branch 'main' into darc-main-e96ea06d-c1bc-4ba1-b01f-b06f5866e18b
ericstj Dec 16, 2024
ad8e000
Merge branch 'main' into darc-main-e96ea06d-c1bc-4ba1-b01f-b06f5866e18b
ericstj Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20241… 
…206.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24606.6
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Dec 9, 2024
commit 15c61aaa5879b22f5ce57df50eedfb47374c804f
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,38 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24578.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24578.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24578.2">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24578.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<!-- Stay on package 8.0 until we stop testing for net6.0
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
</Dependency> -->
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.24578.2">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24578.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24578.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24578.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24606.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>8.0.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ steps:

portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
fi

${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
Expand Down
8 changes: 4 additions & 4 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="13.3-RELEASE"
__FreeBSDPkg="1.17.0"
__FreeBSDBase="13.4-RELEASE"
__FreeBSDPkg="1.21.3"
__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu"
Expand Down Expand Up @@ -371,7 +371,7 @@ while :; do
;;
freebsd14)
__CodeName=freebsd
__FreeBSDBase="14.0-RELEASE"
__FreeBSDBase="14.2-RELEASE"
__FreeBSDABI="14"
__SkipUnmount=1
;;
Expand Down Expand Up @@ -574,7 +574,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
fi
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
mkdir -p "$__RootfsDir"/tmp
# get and build package manager
if [[ "$__hasWget" == 1 ]]; then
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100",
"dotnet": "10.0.100-alpha.1.24573.1",
"runtimes": {
"dotnet": [
"$(DotNetRuntime60Version)",
Expand All @@ -13,8 +13,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24578.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24578.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24606.6",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.2.0"
}
Expand Down
Loading