Merge branch 'release/6.0'

mseada94 · Feb 13, 2022 · 1bf1ef0 · 1bf1ef0
2 parents 802d4c5 + baeae44
commit 1bf1ef0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -4,6 +4,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-839cdfb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-839cdfb0/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -18,7 +19,11 @@
   </packageSources>
   <disabledPackageSources>
     <clear />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-839cdfb" value="true" />
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
+    <add key="darc-int-dotnet-runtime-cd08c36" value="true" />
     <add key="darc-int-dotnet-runtime-cb5f173" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
   </disabledPackageSources>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -47,13 +47,23 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
+<<<<<<< HEAD
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
+=======
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
+>>>>>>> release/6.0
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
@@ -1,19 +1,19 @@
 {
   "tools": {
-    "dotnet": "6.0.101",
+    "dotnet": "6.0.102",
     "runtimes": {
       "dotnet": [
         "3.1.22",
-        "5.0.13"
+        "5.0.14"
       ],
       "aspnetcore": [
         "3.1.22",
-        "5.0.13"
+        "5.0.14"
       ]
     }
   },
   "sdk": {
-    "version": "6.0.101",
+    "version": "6.0.102",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   },

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpRuntimeModelCodeGeneratorTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpRuntimeModelCodeGeneratorTest.cs
@@ -3664,6 +3664,18 @@ public class IdentityUser : TestModels.AspNetIdentity.IdentityUser
     }
 
 
+    public class SelfReferentialEntity
+    {
+        public long Id { get; set; }
+
+        public SelfReferentialProperty Collection { get; set; }
+    }
+
+    public class SelfReferentialProperty : List<SelfReferentialProperty>
+    {
+    }
+
+
     public class SelfReferentialEntity
     {
         public long Id { get; set; }