Merge branch 'release/8.0'

ajcvickers · ajcvickers · commit 9e87c02b1106 · 2023-08-20T13:39:58.000+01:00
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -56,17 +56,17 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23417.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
+      <Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23415.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23417.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
+      <Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23417.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
+      <Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -31,7 +31,7 @@
     <MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-rc.1.23419.8</MicrosoftNETCoreBrowserDebugHostTransportVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/arcade">
-    <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23415.4</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23417.3</MicrosoftDotNetBuildTasksTemplatingVersion>
   </PropertyGroup>
   <PropertyGroup Label="Other dependencies">
     <!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
     # Set default versions
     if [ -z "$majorVersion" ]; then
         # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
-        if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
+        if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
         elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
 
         for version in $versions; do
diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1
@@ -25,7 +25,7 @@ function Install-VersionTools-Cli {
   Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
   $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
 
-  $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
+  $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed")
   Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
 }
 
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
@@ -105,6 +105,11 @@ jobs:
         downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
         checkDownloadedFiles: true
 
+  - powershell: eng/common/sdl/trim-assets-version.ps1
+      -InputPath $(Build.ArtifactStagingDirectory)\artifacts
+    displayName: Trim the version from the NuGet packages
+    continueOnError: ${{ parameters.sdlContinueOnError }}
+
   - powershell: eng/common/sdl/extract-artifact-packages.ps1
       -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
       -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
diff --git a/global.json b/global.json
@@ -13,7 +13,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23417.3"
   }
 }
diff --git a/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs b/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs
@@ -1571,6 +1571,14 @@ public InternalEntityEntry PrepareToSave()
 
                     throw new InvalidOperationException(CoreStrings.UnknownKeyValue(entityType.DisplayName(), property.Name));
                 }
+
+                if (property.GetElementType() != null
+                    && !property.IsNullable
+                    && GetCurrentValue(property) == null)
+                {
+                    throw new InvalidOperationException(
+                        CoreStrings.NullRequiredPrimitiveCollection(EntityType.DisplayName(), property.Name));
+                }
             }
         }
         else if (EntityState == EntityState.Modified)
diff --git a/src/EFCore/Properties/CoreStrings.Designer.cs b/src/EFCore/Properties/CoreStrings.Designer.cs
diff --git a/src/EFCore/Properties/CoreStrings.resx b/src/EFCore/Properties/CoreStrings.resx
@@ -1246,6 +1246,9 @@
   <data name="NullableKey" xml:space="preserve">
     <value>A key on entity type '{entityType}' cannot contain the property '{property}' because it is nullable/optional. All properties on which a key is declared must be marked as non-nullable/required.</value>
   </data>
+  <data name="NullRequiredPrimitiveCollection" xml:space="preserve">
+    <value>The primitive collection property '{type}.{property}' is configured as required (non-nullable) but has a null value when saving changes. Either mark the property as optional (nullable) or set a non-null value.</value>
+  </data>
   <data name="ObjectRemovedFromModel" xml:space="preserve">
     <value>The object has been removed from the model.</value>
   </data>
diff --git a/src/EFCore/Storage/Json/JsonSignedEnumReaderWriter.cs b/src/EFCore/Storage/Json/JsonSignedEnumReaderWriter.cs
@@ -9,6 +9,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.Json;
 ///     Reads and writes JSON for <see langword="enum" /> values backed by a signed integer.
 /// </summary>
 public sealed class JsonSignedEnumReaderWriter<TEnum> : JsonValueReaderWriter<TEnum>
+    where TEnum : struct, Enum
 {
     /// <summary>
     ///     The singleton instance of this stateless reader/writer.
diff --git a/src/EFCore/Storage/Json/JsonUnsignedEnumReaderWriter.cs b/src/EFCore/Storage/Json/JsonUnsignedEnumReaderWriter.cs
@@ -9,6 +9,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.Json;
 ///     Reads and writes JSON for <see langword="enum" /> values backed by an unsigned integer.
 /// </summary>
 public sealed class JsonUnsignedEnumReaderWriter<TEnum> : JsonValueReaderWriter<TEnum>
+    where TEnum : struct, Enum
 {
     /// <summary>
     ///     The singleton instance of this stateless reader/writer.
diff --git a/src/EFCore/Storage/Json/JsonWarningEnumReaderWriter.cs b/src/EFCore/Storage/Json/JsonWarningEnumReaderWriter.cs
@@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.Json;
 ///     happens, a warning is generated.
 /// </summary>
 public sealed class JsonWarningEnumReaderWriter<TEnum> : JsonValueReaderWriter<TEnum>
-    where TEnum : struct
+    where TEnum : struct, Enum
 {
     /// <summary>
     ///     The singleton instance of this stateless reader/writer.
diff --git a/src/EFCore/Storage/ValueConversion/EnumToNumberConverter.cs b/src/EFCore/Storage/ValueConversion/EnumToNumberConverter.cs
@@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 ///     See <see href="https://aka.ms/efcore-docs-value-converters">EF Core value converters</see> for more information and examples.
 /// </remarks>
 public class EnumToNumberConverter<TEnum, TNumber> : ValueConverter<TEnum, TNumber>
-    where TEnum : struct
+    where TEnum : struct, Enum
     where TNumber : struct
 {
     // ReSharper disable once StaticMemberInGenericType
diff --git a/src/EFCore/Storage/ValueConversion/EnumToStringConverter.cs b/src/EFCore/Storage/ValueConversion/EnumToStringConverter.cs
@@ -12,7 +12,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 ///     See <see href="https://aka.ms/efcore-docs-value-converters">EF Core value converters</see> for more information and examples.
 /// </remarks>
 public class EnumToStringConverter<TEnum> : StringEnumConverter<TEnum, string, TEnum>
-    where TEnum : struct
+    where TEnum : struct, Enum
 {
     /// <summary>
     ///     Creates a new instance of this converter. This converter does not preserve order.
diff --git a/src/EFCore/Storage/ValueConversion/Internal/StringEnumConverter.cs b/src/EFCore/Storage/ValueConversion/Internal/StringEnumConverter.cs
@@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
 ///     doing so can result in application failures when updating to a new Entity Framework Core release.
 /// </summary>
 public class StringEnumConverter<TModel, TProvider, TEnum> : ValueConverter<TModel, TProvider>
-    where TEnum : struct
+    where TEnum : struct, Enum
 {
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
diff --git a/src/EFCore/Storage/ValueConversion/StringToEnumConverter.cs b/src/EFCore/Storage/ValueConversion/StringToEnumConverter.cs
@@ -12,7 +12,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 ///     See <see href="https://aka.ms/efcore-docs-value-converters">EF Core value converters</see> for more information and examples.
 /// </remarks>
 public class StringToEnumConverter<TEnum> : StringEnumConverter<string, TEnum, TEnum>
-    where TEnum : struct
+    where TEnum : struct, Enum
 {
     /// <summary>
     ///     Creates a new instance of this converter. This converter does not preserve order.
diff --git a/test/EFCore.Relational.Specification.Tests/TestModels/JsonQuery/JsonEntityAllTypes.cs b/test/EFCore.Relational.Specification.Tests/TestModels/JsonQuery/JsonEntityAllTypes.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Microsoft.EntityFrameworkCore.TestModels.JsonQuery;
@@ -73,7 +74,10 @@ public IList<bool> TestBooleanCollection
     }
 
     public byte[] TestByteCollection { get; set; }
+
+    [Required]
     public List<Guid> TestGuidCollection { get; set; }
+
     public IList<ushort> TestUnsignedInt16Collection { get; set; }
     public uint[] TestUnsignedInt32Collection { get; set; }
     public ObservableCollection<ulong> TestUnsignedInt64Collection { get; set; }
diff --git a/test/EFCore.Relational.Specification.Tests/Update/JsonUpdateTestBase.cs b/test/EFCore.Relational.Specification.Tests/Update/JsonUpdateTestBase.cs
@@ -2971,6 +2971,21 @@ public virtual Task Edit_single_property_relational_collection_of_nullable_enum_
                 Assert.False(result.NewCollectionSet);
             });
 
+    [ConditionalFact]
+    public virtual async Task SaveChanges_throws_when_required_primitive_collection_is_null()
+        => await TestHelpers.ExecuteWithStrategyInTransactionAsync(
+            CreateContext,
+            UseTransaction,
+            async context =>
+            {
+                var entity = new JsonEntityAllTypes { TestGuidCollection = null };
+                context.Add(entity);
+
+                Assert.Equal(
+                    CoreStrings.NullRequiredPrimitiveCollection(nameof(JsonEntityAllTypes), nameof(JsonEntityAllTypes.TestGuidCollection)),
+                    (await Assert.ThrowsAsync<InvalidOperationException>(async () => await context.SaveChangesAsync())).Message);
+            });
+
     public void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
         => facade.UseTransaction(transaction.GetDbTransaction());
 
diff --git a/test/EFCore.Tests/Storage/EnumToNumberConverterTest.cs b/test/EFCore.Tests/Storage/EnumToNumberConverterTest.cs
@@ -265,26 +265,6 @@ public void Can_convert_ulongs_to_enums()
         Assert.Equal(default, converter(0));
     }
 
-    [ConditionalFact]
-    public void Enum_to_integer_converter_throws_for_bad_types()
-    {
-        Assert.Equal(
-            CoreStrings.ConverterBadType(
-                typeof(EnumToNumberConverter<Guid, int>).ShortDisplayName(),
-                "Guid",
-                "enum types"),
-            Assert.Throws<InvalidOperationException>(
-                () => new EnumToNumberConverter<Guid, int>()).Message);
-
-        Assert.Equal(
-            CoreStrings.ConverterBadType(
-                typeof(EnumToNumberConverter<Beatles, Guid>).ShortDisplayName(),
-                "Guid",
-                "'int', 'long', 'short', 'byte', 'uint', 'ulong', 'ushort', 'sbyte', 'double', 'float', 'decimal'"),
-            Assert.Throws<InvalidOperationException>(
-                () => new EnumToNumberConverter<Beatles, Guid>()).Message);
-    }
-
     private enum Beatles
     {
         John = 7,
diff --git a/test/EFCore.Tests/Storage/EnumToStringConverterTest.cs b/test/EFCore.Tests/Storage/EnumToStringConverterTest.cs
@@ -77,16 +77,6 @@ public void Can_convert_strings_to_enums_object()
         Assert.Null(converter(null));
     }
 
-    [ConditionalFact]
-    public void Enum_to_string_converter_throws_for_bad_types()
-        => Assert.Equal(
-            CoreStrings.ConverterBadType(
-                typeof(StringEnumConverter<Guid, string, Guid>).ShortDisplayName(),
-                "Guid",
-                "enum types"),
-            Assert.Throws<InvalidOperationException>(
-                () => new EnumToStringConverter<Guid>()).Message);
-
     private enum Beatles
     {
         John = 7,
diff --git a/test/EFCore.Tests/Storage/StringToEnumConverterTest.cs b/test/EFCore.Tests/Storage/StringToEnumConverterTest.cs
@@ -78,16 +78,6 @@ public void Can_convert_enums_to_strings_object()
         Assert.Null(converter(null));
     }
 
-    [ConditionalFact]
-    public void String_to_enum_converter_throws_for_bad_types()
-        => Assert.Equal(
-            CoreStrings.ConverterBadType(
-                typeof(StringEnumConverter<string, Guid, Guid>).ShortDisplayName(),
-                "Guid",
-                "enum types"),
-            Assert.Throws<InvalidOperationException>(
-                () => new StringToEnumConverter<Guid>()).Message);
-
     private enum Beatles
     {
         John = 7,

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function Install-VersionTools-Cli {`
`25`	`25`	`Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."`
`26`	`26`	`$feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"`
`27`	`27`
`28`		`- $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")`
	`28`	`+ $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed")`
`29`	`29`	`Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`}`
`14`	`14`	`},`
`15`	`15`	`"msbuild-sdks": {`
`16`		`- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",`
`17`		`- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4"`
	`16`	`+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3",`
	`17`	`+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23417.3"`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1571,6 +1571,14 @@ public InternalEntityEntry PrepareToSave()`
`1571`	`1571`
`1572`	`1572`	`throw new InvalidOperationException(CoreStrings.UnknownKeyValue(entityType.DisplayName(), property.Name));`
`1573`	`1573`	`}`
	`1574`	`+`
	`1575`	`+ if (property.GetElementType() != null`
	`1576`	`+ && !property.IsNullable`
	`1577`	`+ && GetCurrentValue(property) == null)`
	`1578`	`+ {`
	`1579`	`+ throw new InvalidOperationException(`
	`1580`	`+ CoreStrings.NullRequiredPrimitiveCollection(EntityType.DisplayName(), property.Name));`
	`1581`	`+ }`
`1574`	`1582`	`}`
`1575`	`1583`	`}`
`1576`	`1584`	`else if (EntityState == EntityState.Modified)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace Microsoft.EntityFrameworkCore.Storage.Json;`
`9`	`9`	`/// Reads and writes JSON for <see langword="enum" /> values backed by a signed integer.`
`10`	`10`	`/// </summary>`
`11`	`11`	`public sealed class JsonSignedEnumReaderWriter<TEnum> : JsonValueReaderWriter<TEnum>`
	`12`	`+ where TEnum : struct, Enum`
`12`	`13`	`{`
`13`	`14`	`/// <summary>`
`14`	`15`	`/// The singleton instance of this stateless reader/writer.`