Skip to content

[main] Update dependencies from dotnet/arcade #103279

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 4 commits into from
Jun 12, 2024
Merged

[main] Update dependencies from dotnet/arcade #103279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18fbbff
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 11, 2024
d19db56
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 12, 2024
f0385a4
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jun 12, 2024
bed2ef0
Fix BasicEventSourceTest
akoeplinger Jun 12, 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
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,87 +92,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24306.4">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.8.1-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24306.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.8.1-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24277.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>914dd73b3622741590db173b5dd6eac1aa9cc553</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24306.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24311.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
<Sha>ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
<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 @@ -83,22 +83,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.6.24277.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24306.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24306.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24306.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24306.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24306.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24306.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24306.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24306.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24306.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24306.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24306.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24306.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24306.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24306.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24306.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24306.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24311.10</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24311.10</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24311.10</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.8.1-beta.24311.10</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24311.10</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.8.1-beta.24311.10</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24311.10</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24311.10</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24311.10</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24311.10</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/publish-using-darc.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ try {
--azdev-pat $AzdoToken `
--bar-uri $MaestroApiEndPoint `
--password $MaestroToken `
--disable-interactive-auth `
--ci `
@optionalParams

if ($LastExitCode -ne 0) {
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ function GetNuGetPackageCachePath() {
$env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\'
} else {
$env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\'
$env:RESTORENOCACHE = $true
$env:RESTORENOHTTPCACHE = $true
}
}

Expand Down
8 changes: 4 additions & 4 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,14 +347,14 @@ function InitializeBuildTool {
fi
}

# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116
function GetNuGetPackageCachePath {
if [[ -z ${NUGET_PACKAGES:-} ]]; then
if [[ "$use_global_nuget_cache" == true ]]; then
export NUGET_PACKAGES="$HOME/.nuget/packages"
export NUGET_PACKAGES="$HOME/.nuget/packages/"
else
export NUGET_PACKAGES="$repo_root/.packages"
export RESTORENOCACHE=true
export NUGET_PACKAGES="$repo_root/.packages/"
export RESTORENOHTTPCACHE=true
fi
fi

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": "9.0.100-preview.4.24267.66"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24306.4",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24306.4",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24306.4",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.10",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.10",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24311.10",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24275.1"
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public static void CheckNoEventSourcesRunning(string message = "")
eventSource.Name != "Microsoft-Windows-DotNETRuntime" &&
eventSource.Name != "System.Runtime" &&

// event source from xunit runner
eventSource.Name != "xUnit.TestEventSource" &&

// These event sources show up when hosted in the VS test runner
eventSource.Name != "System.Net.Sockets" &&
eventSource.Name != "Private.InternalDiagnostics.System.Net.Sockets" &&
Expand Down