Skip to content
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

[main] Update dependencies from dotnet/arcade #4258

Merged
merged 27 commits into from
Jan 9, 2025
+27 −31
Merged

[main] Update dependencies from dotnet/arcade #4258

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
91fe3df
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 6, 2024
26d1ed9
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 6, 2024
cf6ceb9
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 7, 2024
838315b
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 7, 2024
962de1a
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Dec 7, 2024
3b8e4bf
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 8, 2024
cb61ba6
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 9, 2024
33cb066
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 11, 2024
88f62e8
Merge branch 'main' into darc-main-c77118b8-778c-4f4c-94f2-e89027a72b6e
Evangelink Dec 11, 2024
4de3b39
Use dotnet10 feed
Evangelink Dec 11, 2024
f4f9a3e
Bring back dotnet9
Evangelink Dec 11, 2024
47daaa5
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 12, 2024
9a65528
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 14, 2024
2ac14d1
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 15, 2024
a032349
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 16, 2024
092dfa5
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Dec 16, 2024
9919a3f
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 17, 2024
998a30b
Update dependencies from https://github.com/microsoft/testanywhere bu…
dotnet-maestro[bot] Dec 18, 2024
ba4c938
Merge branch 'main' into darc-main-c77118b8-778c-4f4c-94f2-e89027a72b6e
Evangelink Dec 24, 2024
aa588d2
Fix IDEXXXX warnings
Evangelink Dec 24, 2024
2e10157
Merge branch 'main' into darc-main-c77118b8-778c-4f4c-94f2-e89027a72b6e
Evangelink Dec 26, 2024
ccdc3ab
Merge branch 'main' into darc-main-c77118b8-778c-4f4c-94f2-e89027a72b6e
Evangelink Dec 28, 2024
7a73df2
Merge branch 'main' into darc-main-c77118b8-778c-4f4c-94f2-e89027a72b6e
Evangelink Jan 8, 2025
94ee4b4
Update eng/Versions.props
Evangelink Jan 8, 2025
f646f54
Merge branch 'main' into darc-main-c77118b8-778c-4f4c-94f2-e89027a72b6e
Evangelink Jan 9, 2025
f8451fb
Fix tfm for dotnet test client
Evangelink Jan 9, 2025
4ed5cc9
More fixes
Evangelink Jan 9, 2025
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
4 changes: 2 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
Expand All @@ -30,7 +30,7 @@
<packageSource key="dotnet-eng">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet9">
<packageSource key="dotnet10">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24604.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24606.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.2-preview.24606.2">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
<Sha>eb105201ff904a7d5c6fac39de838a4bb6966a93</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Extensions.Retry" Version="1.5.0-preview.24608.1">
<Dependency Name="Microsoft.Testing.Extensions.Retry" Version="1.5.0-preview.24611.2">
<Uri>https://github.com/microsoft/testanywhere</Uri>
<Sha>33cb71263430f0dbe8f9ffd4edd76d837cb05259</Sha>
<Sha>fae2f77f311fda34ed2628fd7393d99f72e5f732</Sha>
</Dependency>
<Dependency Name="MSTest.Engine" Version="1.0.0-alpha.24473.2">
<Uri>https://github.com/microsoft/testanywhere</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup Label="MSTest prod dependencies - darc updated">
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.24604.4</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.24606.6</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>17.13.2-preview.24606.2</MicrosoftTestingExtensionsCodeCoverageVersion>
<!-- comment to facilitate merge conflicts -->
<MicrosoftTestingExtensionsRetryVersion>1.5.0-preview.24608.1</MicrosoftTestingExtensionsRetryVersion>
<MicrosoftTestingExtensionsRetryVersion>1.5.0-preview.24611.2</MicrosoftTestingExtensionsRetryVersion>
<MSTestEngineVersion>1.0.0-alpha.24473.2</MSTestEngineVersion>
</PropertyGroup>
</Project>
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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Evangelink Do we want to move that fast to 10.x?
I'd also assume that downgrading back to 9.0.100 will be green and avoid the current SB issue until it's investigated further.

Copy link
Member

@ViktorHofer ViktorHofer Jan 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to stay on a 9.0.100 SDK then you should change your Arcade subscription channel to ".NET 9 Eng". That said, building with a newer .NET SDK and Arcade SDK dogfoods the product and provides with valuable data. Most of our repositories build with Arcade 10 and .NET 10 SDK.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only concern is that in past some community member were complaining we were on 9 and it was impacting their ability to contribute. But let's try 10 and see how community reacts.

"runtimes": {
"dotnet": [
"3.1.32",
Expand All @@ -21,12 +21,12 @@
}
},
"sdk": {
"version": "9.0.100",
"version": "10.0.100-alpha.1.24573.1",
"allowPrerelease": true,
"rollForward": "latestFeature"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6",
"MSBuild.Sdk.Extras": "3.0.44"
}
}
Loading