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/runtime #33821

Merged
merged 10 commits into from
May 29, 2024
Merged

[main] Update dependencies from dotnet/runtime #33821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8190f80
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] May 27, 2024
2a78508
Consume the live runtime bits
ericstj May 28, 2024
774efbb
Workaround params span overload chosen in expression
ericstj May 28, 2024
2266134
Make sure helix installs runtime needed for tests
ericstj May 28, 2024
4276613
Capture a binlog during PR builds
ericstj May 28, 2024
aaffdd5
Adjust binlog path
ericstj May 28, 2024
822fe85
skip sqlite tests on macos
maumar May 28, 2024
6b3b928
Disable broken test
AndriySvyryd May 28, 2024
01f9053
Update to MacOS 12 for build and helix machines
ericstj May 28, 2024
09d85a0
Add OSX Arm64 helix queue
ericstj May 28, 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
12 changes: 6 additions & 6 deletions azure-pipelines-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ stages:
- script: "echo ##vso[build.addbuildtag]CodeQL3000"
displayName: 'Set CI CodeQL3000 tag'
condition: ne(variables.CODEQL_DIST,'')
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_InternalBuildArgs)
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine /bl:artifacts\log\$(_BuildConfig)\Build.binlog $(_InternalBuildArgs)
Copy link
Member

Choose a reason for hiding this comment

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

Curious, why was this necessary? AFAIK this should already be the default when calling into the cibuild.cmd/sh script.

$(_InternalRuntimeDownloadArgs) $(_AdditionalBuildArgs)
env:
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
Expand All @@ -138,12 +138,12 @@ stages:
- job: macOS
enablePublishTestResults: true
pool:
vmImage: macOS-11
vmImage: macOS-12
variables:
# Rely on task Arcade injects, not auto-injected build step.
- skipComponentGovernanceDetection: true
steps:
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine /bl:artifacts/log/$(_BuildConfig)/Build.binlog $(_InternalRuntimeDownloadArgs)
env:
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
COMPlus_EnableWriteXorExecute: 0 # Work-around for https://github.com/dotnet/runtime/issues/70758
Expand All @@ -168,7 +168,7 @@ stages:
# Rely on task Arcade injects, not auto-injected build step.
- skipComponentGovernanceDetection: true
steps:
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine /bl:artifacts/log/$(_BuildConfig)/Build.binlog $(_InternalRuntimeDownloadArgs)
env:
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
Test__Cosmos__AuthToken: $(_CosmosToken)
Expand All @@ -194,7 +194,7 @@ stages:
- name: _HelixBuildConfig
value: $(_BuildConfig)
- name: HelixTargetQueues
value: OSX.1100.Amd64.Open;(Ubuntu.2004.Amd64.SqlServer)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64
value: OSX.1200.Amd64.Open;OSX.1200.ARM64.Open;(Ubuntu.2004.Amd64.SqlServer)Ubuntu.2004.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64
- name: _HelixAccessToken
value: '' # Needed for public queues
steps:
Expand All @@ -206,7 +206,7 @@ stages:
arguments: 'locals all -clear'
- script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs)
displayName: Restore packages
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
displayName: Send job to helix
env:
HelixAccessToken: $(_HelixAccessToken)
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ extends:
- job: macOS
pool:
name: Azure Pipelines
image: macOS-11
image: macOS-12
os: macOS
variables:
# Rely on task Arcade injects, not auto-injected build step.
Expand Down Expand Up @@ -224,7 +224,7 @@ extends:
- name: _HelixBuildConfig
value: $(_BuildConfig)
- name: HelixTargetQueues
value: OSX.1100.Amd64;(Ubuntu.2004.Amd64.SqlServer)Ubuntu.2004.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64
value: OSX.1200.Amd64;OSX.1200.ARM64;(Ubuntu.2004.Amd64.SqlServer)Ubuntu.2004.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64
- name: _HelixAccessToken
# Needed for internal queues
value: $(HelixApiAccessToken)
Expand Down
52 changes: 32 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="9.0.0-preview.5.24262.2">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>073e35e7e32624e0f841d94364d2f28c73662ff7</Sha>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="9.0.0-preview.5.24275.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>35e4aad602ee3c28330e94746cfd4e0d4569b66f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
22 changes: 12 additions & 10 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,18 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.5.24262.2</MicrosoftExtensionsLoggingVersion>
<SystemTextJsonVersion>9.0.0-preview.5.24262.2</SystemTextJsonVersion>
<MicrosoftExtensionsCachingMemoryVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.5.24275.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>9.0.0-preview.5.24275.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.5.24275.1</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemTextJsonVersion>9.0.0-preview.5.24275.1</SystemTextJsonVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down
6 changes: 5 additions & 1 deletion eng/helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<PropertyGroup Condition = "'$(SYSTEM_ACCESSTOKEN)' == ''">
<!-- Local build outside of Azure Pipeline -->
<HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;Ubuntu.1804.Amd64.Open;OSX.1100.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64</HelixTargetQueues>
<HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;Ubuntu.1804.Amd64.Open;OSX.1200.Amd64.Open;OSX.1200.ARM64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64</HelixTargetQueues>
<EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
<HelixSource>efcore/localbuild/</HelixSource>
<HelixBuild>t001</HelixBuild>
Expand All @@ -29,6 +29,10 @@
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
</AdditionalDotNetPackageFeed>

<AdditionalDotNetPackage Include="$(MicrosoftNETCoreAppRuntimewinx64Version)">
<PackageType>runtime</PackageType>
</AdditionalDotNetPackage>
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 6 additions & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
"rollForward": "latestMajor"
},
"tools": {
"dotnet": "9.0.100-preview.3.24204.13"
"dotnet": "9.0.100-preview.3.24204.13",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimewinx64Version)"
]
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24266.1",
Expand Down
6 changes: 3 additions & 3 deletions test/EFCore.Specification.Tests/Query/NorthwindFunctionsQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,7 @@ public virtual Task TrimStart_with_char_argument_in_predicate(bool async)
public virtual Task TrimStart_with_char_array_argument_in_predicate(bool async)
=> AssertQuery(
async,
ss => ss.Set<Customer>().Where(c => c.ContactTitle.TrimStart('O', 'w') == "ner"));
ss => ss.Set<Customer>().Where(c => c.ContactTitle.TrimStart(new [] {'O', 'w'}) == "ner"));
Copy link
Contributor

Choose a reason for hiding this comment

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

@AndriySvyryd Is this break going to hit our customers? Should it not be fixed in the runtime/BCL?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, dotnet/roslyn#73743


[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
Expand All @@ -1719,7 +1719,7 @@ public virtual Task TrimEnd_with_char_argument_in_predicate(bool async)
public virtual Task TrimEnd_with_char_array_argument_in_predicate(bool async)
=> AssertQuery(
async,
ss => ss.Set<Customer>().Where(c => c.ContactTitle.TrimEnd('e', 'r') == "Own"));
ss => ss.Set<Customer>().Where(c => c.ContactTitle.TrimEnd(new [] {'e', 'r'}) == "Own"));

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
Expand All @@ -1740,7 +1740,7 @@ public virtual Task Trim_with_char_argument_in_predicate(bool async)
public virtual Task Trim_with_char_array_argument_in_predicate(bool async)
=> AssertQuery(
async,
ss => ss.Set<Customer>().Where(c => c.ContactTitle.Trim('O', 'r') == "wne"));
ss => ss.Set<Customer>().Where(c => c.ContactTitle.Trim(new [] {'O', 'r'}) == "wne"));

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
Expand Down
17 changes: 9 additions & 8 deletions test/EFCore.Specification.Tests/Scaffolding/CompiledModelTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,14 +586,15 @@ public virtual Task ComplexTypes()
AssertComplexTypes,
c =>
{
c.Set<PrincipalDerived<DependentBase<byte?>>>().Add(
new PrincipalDerived<DependentBase<byte?>>
{
Id = 1,
AlternateId = new Guid(),
Dependent = new DependentBase<byte?>(1),
Owned = new OwnedType(c) { Principal = new PrincipalBase() }
});
// #33828
//c.Set<PrincipalDerived<DependentBase<byte?>>>().Add(
// new PrincipalDerived<DependentBase<byte?>>
// {
// Id = 1,
// AlternateId = new Guid(),
// Dependent = new DependentBase<byte?>(1),
// Owned = new OwnedType(c) { Principal = new PrincipalBase() }
// });

//c.SaveChanges();

Expand Down
6 changes: 6 additions & 0 deletions test/EFCore.Sqlite.FunctionalTests/Properties/TestAssemblyConditions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

[assembly: PlatformSkipCondition(TestPlatform.Mac, SkipReason = "#33785")]
Loading