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

Jump to bottom

[main] Update dependencies from dotnet/arcade #94554

Merged
merged 2 commits into from
Nov 9, 2023
Merged

[main] Update dependencies from dotnet/arcade #94554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18ee76e
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 9, 2023
28a494a
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 9, 2023
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
80 changes: 40 additions & 40 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,82 +107,82 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.3-beta.23531.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.3-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23530.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -329,9 +329,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e74a52e487efdf4f1dfcb7540abf5dd529ce2e4e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.23531.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.23558.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>16a344fc2ff2eecac5b03b88c96e99d7796e5125</Sha>
<Sha>f2ad2b48b7426e77e19902068b3aa38476073ab1</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-alpha.1.23551.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.23531.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23531.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.23531.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.23531.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>9.0.0-beta.23531.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23531.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.3-beta.23531.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.23531.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23531.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.23531.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.23531.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23531.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.23531.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23531.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.23531.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.23531.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23558.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.23558.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.23558.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>9.0.0-beta.23558.3</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23558.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.3-beta.23558.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.23558.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23558.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.23558.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.23558.3</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
9 changes: 7 additions & 2 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ function GetDotNetInstallScript {
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
if command -v openssl &> /dev/null; then
echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 || true
fi
echo "Will now retry the same URL with verbose logging."
with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
Expand Down Expand Up @@ -341,7 +341,12 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
_InitializeBuildToolFramework="net8.0"
# use override if it exists - commonly set by source-build
if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
_InitializeBuildToolFramework="net8.0"
else
_InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
fi
}

# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
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
Expand Up @@ -8,9 +8,9 @@
"dotnet": "8.0.100-rtm.23506.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.4",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23531.4",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23531.4",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23558.3",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23558.3",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23558.3",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23529.4"
Expand Down
Loading