Skip to content

Commit 61d0234

Browse files
[main] Update dependencies from dotnet/arcade (#2279)
[main] Update dependencies from dotnet/arcade - Fix StringConcatTests
1 parent 1426561 commit 61d0234

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24416.2">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24421.2">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
6+
<Sha>9b24668b7196b9639e60770465683cf81465d89a</Sha>
77
<SourceBuildId>6471</SourceBuildId>
88
</Dependency>
99
</ToolsetDependencies>

eng/common/SetupNugetSources.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8')
160+
$dotnetVersions = @('5','6','7','8','9')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

eng/common/SetupNugetSources.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8')
102+
DotNetVersions=('5' '6' '7' '8' '9')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.5.24307.3"
3+
"dotnet": "9.0.100-preview.7.24407.12"
44
},
55
"sdk": {
6-
"version": "9.0.100-preview.5.24307.3",
6+
"version": "9.0.100-preview.7.24407.12",
77
"allowPrerelease": true,
88
"rollForward": "latestMajor"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24416.2"
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.2"
1212
}
1313
}

test/FunctionalTests/Query/LinqToEntities/StringConcatTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ public void Issue1904_StringConcatMethod_can_handle_constant_values_of_object_ty
569569
using (var db = new StringConcatContext())
570570
{
571571
var actualSql = db.Entities.Select(
572-
e => string.Concat(3, SomeEnum.SomeA, "xyz", e.DateTimeProp, (short)42)).ToString();
572+
e => string.Concat(new object[] { 3, SomeEnum.SomeA, "xyz", e.DateTimeProp, (short)42 })).ToString();
573573

574574
Assert.Equal(@"SELECT
575575
CAST( 3 AS nvarchar(max)) + N'SomeA' + N'xyz' + CAST( [Extent1].[DateTimeProp] AS nvarchar(max)) + CAST( cast(42 as smallint) AS nvarchar(max)) AS [C1]
@@ -583,7 +583,7 @@ public void Issue2075_StringConcatMethod_can_handle_constant_values_of_string_ty
583583
using (var db = new StringConcatContext())
584584
{
585585
var actualSql = db.Entities.Select(
586-
e => string.Concat("3", "SomeEnum.SomeA", "xyz", e.StringProp, "abc", e.StringProp)).ToString();
586+
e => string.Concat(new string[] { "3", "SomeEnum.SomeA", "xyz", e.StringProp, "abc", e.StringProp })).ToString();
587587

588588
Assert.Equal(@"SELECT
589589
N'3' + N'SomeEnum.SomeA' + N'xyz' + CASE WHEN ([Extent1].[StringProp] IS NULL) THEN N'' ELSE [Extent1].[StringProp] END + N'abc' + CASE WHEN ([Extent1].[StringProp] IS NULL) THEN N'' ELSE [Extent1].[StringProp] END AS [C1]
@@ -646,7 +646,7 @@ public void Issue1904_StringConcat_generates_correct_sql()
646646
.Select(
647647
b => new
648648
{
649-
ConcatMethod = string.Concat(b.StringProp, b.BoolProp, b.EnumProp, b.GuidProp),
649+
ConcatMethod = string.Concat(new object[] { b.StringProp, b.BoolProp, b.EnumProp, b.GuidProp }),
650650
ConcatPlus = b.StringProp + b.BoolProp + b.EnumProp + b.GuidProp,
651651
});
652652

@@ -668,7 +668,7 @@ public void Issue2075_StringConcat_generates_correct_sql_for_string_only_args()
668668
.Select(
669669
b => new
670670
{
671-
ConcatMethod = string.Concat(b.StringProp, b.StringProp, b.StringProp, "x", b.StringProp),
671+
ConcatMethod = string.Concat(new string[] { b.StringProp, b.StringProp, b.StringProp, "x", b.StringProp }),
672672
ConcatPlus = b.StringProp + b.StringProp + b.StringProp + "x" + b.StringProp,
673673
});
674674

0 commit comments

Comments
 (0)