From 7e1712be49e854c2a38f534f1d3694095eb5967a Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Mon, 29 Apr 2024 10:35:49 -0700
Subject: [PATCH 1/9] Move netstandard2.0

---
 .vscode/tasks.json                                  | 13 +++++++++++++
 NuGet.config                                        |  3 +++
 eng/Directory.Packages.props                        |  2 +-
 .../AnalyzerFileReferenceAppDomainTests.cs          |  6 +++---
 .../AnalyzerConsistencyCheckerTests.cs              | 10 +++++-----
 src/Compilers/Test/Core/AssemblyLoadTestFixture.cs  |  6 +++---
 .../Test/Core/Platform/Desktop/TestHelpers.cs       |  6 +++---
 src/Compilers/Test/Core/TargetFrameworkUtil.cs      |  2 +-
 8 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index f85f5cc650b82..ca796b609eafa 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -67,6 +67,19 @@
         "problemMatcher": "$msCompile",
         "group": "build"
     },
+    {
+        "label": "build Roslyn.sln",
+        "command": "dotnet",
+        "type": "shell",
+        "args": [
+          "build",
+          "-p:RunAnalyzersDuringBuild=false",
+          "-p:GenerateFullPaths=true",
+          "Roslyn.sln"
+        ],
+        "problemMatcher": "$msCompile",
+        "group": "build"
+    },
     {
         "label": "build current project",
         "type": "shell",
diff --git a/NuGet.config b/NuGet.config
index 26a2f6f90d445..8a33f50805b36 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -21,6 +21,9 @@
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="vs-impl-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json" />
     <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
+
+    <!-- TODO DO NOT MERGE -->
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index d9970c400f1f0..098f2674ae4c6 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -293,7 +293,7 @@
     <PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="$(ILAsmPackageVersion)" />
     <PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.ILAsm" Version="$(ILAsmPackageVersion)" />
     <PackageVersion Include="Basic.CompilerLog.Util" Version="0.6.1" />
-    <PackageVersion Include="Basic.Reference.Assemblies.NetStandard20" Version="1.2.4" />
+    <PackageVersion Include="Basic.Reference.Assemblies.NetStandard20" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net50" Version="1.2.4" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net60" Version="1.2.4" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net70" Version="1.3.0" />
diff --git a/src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceAppDomainTests.cs b/src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceAppDomainTests.cs
index 7d679f73ad6e9..f79eaa292b2c4 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceAppDomainTests.cs
+++ b/src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceAppDomainTests.cs
@@ -94,9 +94,9 @@ public class TestAnalyzer : DiagnosticAnalyzer
                 new SyntaxTree[] { CSharp.SyntaxFactory.ParseSyntaxTree(analyzerSource) },
                 new MetadataReference[]
                 {
-                    NetStandard20.mscorlib,
-                    NetStandard20.netstandard,
-                    NetStandard20.SystemRuntime,
+                    NetStandard20.References.mscorlib,
+                    NetStandard20.References.netstandard,
+                    NetStandard20.References.SystemRuntime,
                     MetadataReference.CreateFromFile(immutable.Path),
                     MetadataReference.CreateFromFile(analyzer.Path)
                 },
diff --git a/src/Compilers/Server/VBCSCompilerTests/AnalyzerConsistencyCheckerTests.cs b/src/Compilers/Server/VBCSCompilerTests/AnalyzerConsistencyCheckerTests.cs
index 7cdf7cc9c9287..d5d7eeb2fef99 100644
--- a/src/Compilers/Server/VBCSCompilerTests/AnalyzerConsistencyCheckerTests.cs
+++ b/src/Compilers/Server/VBCSCompilerTests/AnalyzerConsistencyCheckerTests.cs
@@ -65,7 +65,7 @@ private TempFile CreateNetStandardDll(TempDirectory directory, string assemblyNa
             var comp = CSharpCompilation.Create(
                 assemblyName,
                 sources,
-                references: NetStandard20.All,
+                references: NetStandard20.References.All,
                 options: options);
 
             var file = directory.CreateFile($"{assemblyName}.dll");
@@ -112,7 +112,7 @@ public void DifferingMvidsDifferentDirectory()
             var directory = Temp.CreateDirectory();
             var assemblyLoader = DefaultAnalyzerAssemblyLoader.CreateNonLockingLoader(directory.CreateDirectory("shadow").Path);
 
-            var key = NetStandard20.netstandard.GetAssemblyIdentity().PublicKey;
+            var key = NetStandard20.References.netstandard.GetAssemblyIdentity().PublicKey;
             var mvidAlpha1 = CreateNetStandardDll(directory.CreateDirectory("mvid1"), "MvidAlpha", "1.0.0.0", key, "class C { }");
             var mvidAlpha2 = CreateNetStandardDll(directory.CreateDirectory("mvid2"), "MvidAlpha", "1.0.0.0", key, "class D { }");
 
@@ -137,7 +137,7 @@ public void DifferingMvidsSameDirectory()
             var directory = Temp.CreateDirectory();
             var assemblyLoader = DefaultAnalyzerAssemblyLoader.CreateNonLockingLoader(directory.CreateDirectory("shadow").Path);
 
-            var key = NetStandard20.netstandard.GetAssemblyIdentity().PublicKey;
+            var key = NetStandard20.References.netstandard.GetAssemblyIdentity().PublicKey;
             var mvidAlpha1 = CreateNetStandardDll(directory, "MvidAlpha", "1.0.0.0", key, "class C { }");
 
             var result = AnalyzerConsistencyChecker.Check(
@@ -168,7 +168,7 @@ public void DifferingMvidsSameDirectory()
         public void LoadingLibraryFromCompiler()
         {
             var directory = Temp.CreateDirectory();
-            _ = CreateNetStandardDll(directory, "System.Memory", "2.0.0.0", NetStandard20.netstandard.GetAssemblyIdentity().PublicKey);
+            _ = CreateNetStandardDll(directory, "System.Memory", "2.0.0.0", NetStandard20.References.netstandard.GetAssemblyIdentity().PublicKey);
 
             // This test must use the DefaultAnalyzerAssemblyLoader as we want assembly binding redirects
             // to take affect here.
@@ -226,7 +226,7 @@ public void AssemblyLoadException()
         public void LoadingSimpleLibrary()
         {
             var directory = Temp.CreateDirectory();
-            var key = NetStandard20.netstandard.GetAssemblyIdentity().PublicKey;
+            var key = NetStandard20.References.netstandard.GetAssemblyIdentity().PublicKey;
             var compFile = CreateNetStandardDll(directory, "netstandardRef", "1.0.0.0", key);
 
             var analyzerReferences = ImmutableArray.Create(new CommandLineAnalyzerReference(compFile.Path));
diff --git a/src/Compilers/Test/Core/AssemblyLoadTestFixture.cs b/src/Compilers/Test/Core/AssemblyLoadTestFixture.cs
index 1dc56963a68c2..b86840383740d 100644
--- a/src/Compilers/Test/Core/AssemblyLoadTestFixture.cs
+++ b/src/Compilers/Test/Core/AssemblyLoadTestFixture.cs
@@ -522,9 +522,9 @@ private static string GenerateDll(string assemblyName, TempDirectory directory,
                 syntaxTrees: new SyntaxTree[] { SyntaxFactory.ParseSyntaxTree(SourceText.From(csSource, encoding: null, SourceHashAlgorithms.Default)) },
                 references: (new MetadataReference[]
                 {
-                    NetStandard20.mscorlib,
-                    NetStandard20.netstandard,
-                    NetStandard20.SystemRuntime
+                    NetStandard20.References.mscorlib,
+                    NetStandard20.References.netstandard,
+                    NetStandard20.References.SystemRuntime
                 }).Concat(additionalReferences),
                 options: options);
 
diff --git a/src/Compilers/Test/Core/Platform/Desktop/TestHelpers.cs b/src/Compilers/Test/Core/Platform/Desktop/TestHelpers.cs
index fc864457cf320..c00cc71683579 100644
--- a/src/Compilers/Test/Core/Platform/Desktop/TestHelpers.cs
+++ b/src/Compilers/Test/Core/Platform/Desktop/TestHelpers.cs
@@ -83,9 +83,9 @@ public class TestAnalyzer : DiagnosticAnalyzer
                 new SyntaxTree[] { SyntaxFactory.ParseSyntaxTree(SourceText.From(analyzerSource, encoding: null, SourceHashAlgorithms.Default)) },
                 new MetadataReference[]
                 {
-                    NetStandard20.mscorlib,
-                    NetStandard20.netstandard,
-                    NetStandard20.SystemRuntime,
+                    NetStandard20.References.mscorlib,
+                    NetStandard20.References.netstandard,
+                    NetStandard20.References.SystemRuntime,
                     MetadataReference.CreateFromFile(immutable.Path),
                     MetadataReference.CreateFromFile(analyzer.Path)
                 },
diff --git a/src/Compilers/Test/Core/TargetFrameworkUtil.cs b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
index 6f9ea4264263a..eb05dad9d0519 100644
--- a/src/Compilers/Test/Core/TargetFrameworkUtil.cs
+++ b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
@@ -181,7 +181,7 @@ public static class TargetFrameworkUtil
         public static ImmutableArray<MetadataReference> Mscorlib46ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.mscorlib, Net461.System, Net461.SystemCore, TestBase.ValueTupleRef, Net461.SystemRuntime);
         public static ImmutableArray<MetadataReference> Mscorlib461References => ImmutableArray.Create<MetadataReference>(Net461.mscorlib);
         public static ImmutableArray<MetadataReference> Mscorlib461ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.mscorlib, Net461.System, Net461.SystemCore, NetFx.ValueTuple.tuplelib, Net461.SystemRuntime);
-        public static ImmutableArray<MetadataReference> NetStandard20References => ImmutableArray.Create<MetadataReference>(NetStandard20.netstandard, NetStandard20.mscorlib, NetStandard20.SystemRuntime, NetStandard20.SystemCore, NetStandard20.SystemDynamicRuntime, NetStandard20.SystemLinq, NetStandard20.SystemLinqExpressions);
+        public static ImmutableArray<MetadataReference> NetStandard20References => ImmutableArray.Create<MetadataReference>(NetStandard20.References.netstandard, NetStandard20.References.mscorlib, NetStandard20.References.SystemRuntime, NetStandard20.References.SystemCore, NetStandard20.References.SystemDynamicRuntime, NetStandard20.References.SystemLinq, NetStandard20.References.SystemLinqExpressions);
         public static ImmutableArray<MetadataReference> WinRTReferences => ImmutableArray.Create(TestBase.WinRtRefs);
         public static ImmutableArray<MetadataReference> DefaultVbReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.SystemCore, Net451.MicrosoftVisualBasic);
         public static ImmutableArray<MetadataReference> MinimalReferences => ImmutableArray.Create(TestBase.MinCorlibRef);

From ef47bc5beb39ac2d9b7aab27e3c537f315178ba3 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Mon, 29 Apr 2024 10:41:45 -0700
Subject: [PATCH 2/9] Move net50

---
 eng/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 098f2674ae4c6..3270c51b29bc2 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -294,7 +294,7 @@
     <PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.ILAsm" Version="$(ILAsmPackageVersion)" />
     <PackageVersion Include="Basic.CompilerLog.Util" Version="0.6.1" />
     <PackageVersion Include="Basic.Reference.Assemblies.NetStandard20" Version="1.6.0" />
-    <PackageVersion Include="Basic.Reference.Assemblies.Net50" Version="1.2.4" />
+    <PackageVersion Include="Basic.Reference.Assemblies.Net50" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net60" Version="1.2.4" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net70" Version="1.3.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.4.5" />

From 890653ea8554b92a93a5145ff55ad57f6a15c2d1 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Mon, 29 Apr 2024 10:47:21 -0700
Subject: [PATCH 3/9] Move net60

---
 eng/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 3270c51b29bc2..93e868dd0408e 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -295,7 +295,7 @@
     <PackageVersion Include="Basic.CompilerLog.Util" Version="0.6.1" />
     <PackageVersion Include="Basic.Reference.Assemblies.NetStandard20" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net50" Version="1.6.0" />
-    <PackageVersion Include="Basic.Reference.Assemblies.Net60" Version="1.2.4" />
+    <PackageVersion Include="Basic.Reference.Assemblies.Net60" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net70" Version="1.3.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.4.5" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net461" Version="1.3.0" />

From 2fa57e052f2b981b3deb8fb6bb650df6c4b02499 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Mon, 29 Apr 2024 11:08:26 -0700
Subject: [PATCH 4/9] Move net461

---
 eng/Directory.Packages.props                  |  2 +-
 .../Test/CommandLine/CommandLineTestBase.cs   |  2 +-
 .../DefaultInterfaceImplementationTests.cs    |  4 +--
 .../Test/Core/TargetFrameworkUtil.cs          | 34 +++++++++----------
 src/Compilers/Test/Core/TestBase.cs           |  6 ++--
 .../Test/Utilities/CSharp/CSharpTestBase.cs   |  2 +-
 .../Semantics/RequiredMembersTests.vb         |  4 +--
 .../AbstractMetadataAsSourceTests.cs          |  6 ++--
 .../Test/ExpressionCompiler/LocalsTests.cs    |  2 +-
 9 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 93e868dd0408e..ccc242a52e89a 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -298,7 +298,7 @@
     <PackageVersion Include="Basic.Reference.Assemblies.Net60" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net70" Version="1.3.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.4.5" />
-    <PackageVersion Include="Basic.Reference.Assemblies.Net461" Version="1.3.0" />
+    <PackageVersion Include="Basic.Reference.Assemblies.Net461" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.NetStandard13" Version="1.2.4" />
     <PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.232.0-preview" />
     <!--
diff --git a/src/Compilers/CSharp/Test/CommandLine/CommandLineTestBase.cs b/src/Compilers/CSharp/Test/CommandLine/CommandLineTestBase.cs
index 50e51c9e3b42d..e6ddad5f5b487 100644
--- a/src/Compilers/CSharp/Test/CommandLine/CommandLineTestBase.cs
+++ b/src/Compilers/CSharp/Test/CommandLine/CommandLineTestBase.cs
@@ -39,7 +39,7 @@ string getSdkDirectory(TempRoot temp)
                 if (ExecutionConditionUtil.IsCoreClr)
                 {
                     var dir = temp.CreateDirectory();
-                    File.WriteAllBytes(Path.Combine(dir.Path, "mscorlib.dll"), Net461.References.mscorlib.ImageBytes);
+                    File.WriteAllBytes(Path.Combine(dir.Path, "mscorlib.dll"), Net461.ReferenceInfos.mscorlib.ImageBytes);
                     return dir.Path;
                 }
 
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
index bf23e1d535416..494fe385b06ab 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
@@ -49419,7 +49419,7 @@ static explicit operator byte(I1 x)
         public void RuntimeFeature_01()
         {
             var compilation1 = CreateCompilation("", options: TestOptions.DebugDll,
-                                                 references: new[] { Net461.mscorlib },
+                                                 references: new[] { Net461.References.mscorlib },
                                                  targetFramework: TargetFramework.Empty);
 
             Assert.False(compilation1.Assembly.RuntimeSupportsDefaultInterfaceImplementation);
@@ -49730,7 +49730,7 @@ public static class RuntimeFeature
 ";
 
             var compilation1 = CreateCompilation(source, options: TestOptions.DebugDll,
-                                                 references: new[] { Net461.mscorlib },
+                                                 references: new[] { Net461.References.mscorlib },
                                                  targetFramework: TargetFramework.Empty);
 
             Assert.False(compilation1.Assembly.RuntimeSupportsDefaultInterfaceImplementation);
diff --git a/src/Compilers/Test/Core/TargetFrameworkUtil.cs b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
index eb05dad9d0519..17a9167facc12 100644
--- a/src/Compilers/Test/Core/TargetFrameworkUtil.cs
+++ b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
@@ -124,7 +124,7 @@ public static class NetFramework
         /// </remarks>
         public static ImmutableArray<MetadataReference> References { get; } =
             ImmutableArray
-                .CreateRange<MetadataReference>(Net461.All)
+                .CreateRange<MetadataReference>(Net461.References.All)
                 .Add(NetFx.ValueTuple.tuplelib);
 
         /// <summary>
@@ -136,19 +136,19 @@ public static class NetFramework
         /// </remarks>
         public static ImmutableArray<MetadataReference> Standard { get; } =
             ImmutableArray.Create<MetadataReference>(
-                Net461.mscorlib,
-                Net461.System,
-                Net461.SystemCore,
+                Net461.References.mscorlib,
+                Net461.References.System,
+                Net461.References.SystemCore,
                 NetFx.ValueTuple.tuplelib,
-                Net461.SystemRuntime);
-
-        public static PortableExecutableReference mscorlib { get; } = Net461.mscorlib;
-        public static PortableExecutableReference System { get; } = Net461.System;
-        public static PortableExecutableReference SystemRuntime { get; } = Net461.SystemRuntime;
-        public static PortableExecutableReference SystemCore { get; } = Net461.SystemCore;
-        public static PortableExecutableReference SystemThreadingTasks { get; } = Net461.SystemThreadingTasks;
-        public static PortableExecutableReference MicrosoftCSharp { get; } = Net461.MicrosoftCSharp;
-        public static PortableExecutableReference MicrosoftVisualBasic { get; } = Net461.MicrosoftVisualBasic;
+                Net461.References.SystemRuntime);
+
+        public static PortableExecutableReference mscorlib { get; } = Net461.References.mscorlib;
+        public static PortableExecutableReference System { get; } = Net461.References.System;
+        public static PortableExecutableReference SystemRuntime { get; } = Net461.References.SystemRuntime;
+        public static PortableExecutableReference SystemCore { get; } = Net461.References.SystemCore;
+        public static PortableExecutableReference SystemThreadingTasks { get; } = Net461.References.SystemThreadingTasks;
+        public static PortableExecutableReference MicrosoftCSharp { get; } = Net461.References.MicrosoftCSharp;
+        public static PortableExecutableReference MicrosoftVisualBasic { get; } = Net461.References.MicrosoftVisualBasic;
     }
 
     public static class TargetFrameworkUtil
@@ -177,10 +177,10 @@ public static class TargetFrameworkUtil
         public static ImmutableArray<MetadataReference> Mscorlib45ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.SystemCore, TestBase.ValueTupleRef, Net451.SystemRuntime);
         public static ImmutableArray<MetadataReference> Mscorlib45AndCSharpReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.SystemCore, Net451.MicrosoftCSharp);
         public static ImmutableArray<MetadataReference> Mscorlib45AndVBRuntimeReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.MicrosoftVisualBasic);
-        public static ImmutableArray<MetadataReference> Mscorlib46References => ImmutableArray.Create<MetadataReference>(Net461.mscorlib);
-        public static ImmutableArray<MetadataReference> Mscorlib46ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.mscorlib, Net461.System, Net461.SystemCore, TestBase.ValueTupleRef, Net461.SystemRuntime);
-        public static ImmutableArray<MetadataReference> Mscorlib461References => ImmutableArray.Create<MetadataReference>(Net461.mscorlib);
-        public static ImmutableArray<MetadataReference> Mscorlib461ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.mscorlib, Net461.System, Net461.SystemCore, NetFx.ValueTuple.tuplelib, Net461.SystemRuntime);
+        public static ImmutableArray<MetadataReference> Mscorlib46References => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib);
+        public static ImmutableArray<MetadataReference> Mscorlib46ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib, Net461.References.System, Net461.References.SystemCore, TestBase.ValueTupleRef, Net461.References.SystemRuntime);
+        public static ImmutableArray<MetadataReference> Mscorlib461References => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib);
+        public static ImmutableArray<MetadataReference> Mscorlib461ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib, Net461.References.System, Net461.References.SystemCore, NetFx.ValueTuple.tuplelib, Net461.References.SystemRuntime);
         public static ImmutableArray<MetadataReference> NetStandard20References => ImmutableArray.Create<MetadataReference>(NetStandard20.References.netstandard, NetStandard20.References.mscorlib, NetStandard20.References.SystemRuntime, NetStandard20.References.SystemCore, NetStandard20.References.SystemDynamicRuntime, NetStandard20.References.SystemLinq, NetStandard20.References.SystemLinqExpressions);
         public static ImmutableArray<MetadataReference> WinRTReferences => ImmutableArray.Create(TestBase.WinRtRefs);
         public static ImmutableArray<MetadataReference> DefaultVbReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.SystemCore, Net451.MicrosoftVisualBasic);
diff --git a/src/Compilers/Test/Core/TestBase.cs b/src/Compilers/Test/Core/TestBase.cs
index d4de9c7e3d829..fe864fc970d5f 100644
--- a/src/Compilers/Test/Core/TestBase.cs
+++ b/src/Compilers/Test/Core/TestBase.cs
@@ -163,7 +163,7 @@ public virtual void Dispose()
         public static MetadataReference SystemRuntimeSerializationRef_v4_0_30319_17929 => s_systemRuntimeSerializationRef_v4_0_30319_17929.Value;
 
         private static readonly Lazy<MetadataReference> s_systemCoreRef_v46 = new Lazy<MetadataReference>(
-            () => AssemblyMetadata.CreateFromImage(Net461.References.SystemCore.ImageBytes).GetReference(display: "System.Core.v4_6_1038_0.dll"),
+            () => AssemblyMetadata.CreateFromImage(Net461.ReferenceInfos.SystemCore.ImageBytes).GetReference(display: "System.Core.v4_6_1038_0.dll"),
             LazyThreadSafetyMode.PublicationOnly);
         public static MetadataReference SystemCoreRef_v46 => s_systemCoreRef_v4_0_30319_17929.Value;
 
@@ -220,7 +220,7 @@ public virtual void Dispose()
         public static MetadataReference MscorlibRef_v4_0_30316_17626 => Net451.mscorlib;
 
         private static readonly Lazy<MetadataReference> s_mscorlibRef_v46 = new Lazy<MetadataReference>(
-            () => AssemblyMetadata.CreateFromImage(Net461.References.mscorlib.ImageBytes).GetReference(display: "mscorlib.v4_6_1038_0.dll", filePath: @"Z:\FxReferenceAssembliesUri"),
+            () => AssemblyMetadata.CreateFromImage(Net461.ReferenceInfos.mscorlib.ImageBytes).GetReference(display: "mscorlib.v4_6_1038_0.dll", filePath: @"Z:\FxReferenceAssembliesUri"),
             LazyThreadSafetyMode.PublicationOnly);
         public static MetadataReference MscorlibRef_v46 => s_mscorlibRef_v46.Value;
 
@@ -267,7 +267,7 @@ public virtual void Dispose()
         public static MetadataReference SystemRef => s_systemRef.Value;
 
         private static readonly Lazy<MetadataReference> s_systemRef_v46 = new Lazy<MetadataReference>(
-            () => AssemblyMetadata.CreateFromImage(Net461.References.System.ImageBytes).GetReference(display: "System.v4_6_1038_0.dll"),
+            () => AssemblyMetadata.CreateFromImage(Net461.ReferenceInfos.System.ImageBytes).GetReference(display: "System.v4_6_1038_0.dll"),
             LazyThreadSafetyMode.PublicationOnly);
         public static MetadataReference SystemRef_v46 => s_systemRef_v46.Value;
 
diff --git a/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs b/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs
index 7e37c631b3766..8388968457fb4 100644
--- a/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs
+++ b/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs
@@ -1204,7 +1204,7 @@ public static CSharpCompilation CreateCompilationWithTasksExtensions(
             else
             {
                 allReferences = TargetFrameworkUtil.Mscorlib461ExtendedReferences;
-                allReferences = allReferences.Concat(new[] { Net461.SystemThreadingTasks, SystemThreadingTasksExtensions.PortableLib });
+                allReferences = allReferences.Concat(new[] { Net461.References.SystemThreadingTasks, SystemThreadingTasksExtensions.PortableLib });
             }
 
             if (references != null)
diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/RequiredMembersTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/RequiredMembersTests.vb
index d71521c1d7937..ec06d5b09eee5 100644
--- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/RequiredMembersTests.vb
+++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/RequiredMembersTests.vb
@@ -1952,7 +1952,7 @@ namespace System
         }
     }
 }
-", referencedAssemblies:=Basic.Reference.Assemblies.Net461.All)
+", referencedAssemblies:=Basic.Reference.Assemblies.Net461.References.All)
             Dim csharpCompReference As MetadataReference = csharpComp.EmitToImageReference()
 
             ' Using Net461 to get a framework without ValueTuple
@@ -2143,7 +2143,7 @@ namespace System
         }
     }
 }
-", referencedAssemblies:=Basic.Reference.Assemblies.Net461.All)
+", referencedAssemblies:=Basic.Reference.Assemblies.Net461.References.All)
 
             ' Using Net461 to get a framework without ValueTuple
 
diff --git a/src/EditorFeatures/Test/MetadataAsSource/AbstractMetadataAsSourceTests.cs b/src/EditorFeatures/Test/MetadataAsSource/AbstractMetadataAsSourceTests.cs
index 65be22a0e3a3c..8ec8dcaf5894b 100644
--- a/src/EditorFeatures/Test/MetadataAsSource/AbstractMetadataAsSourceTests.cs
+++ b/src/EditorFeatures/Test/MetadataAsSource/AbstractMetadataAsSourceTests.cs
@@ -25,9 +25,9 @@ public abstract partial class AbstractMetadataAsSourceTests : IAsyncLifetime
 
         public virtual Task InitializeAsync()
         {
-            AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.MscorlibRef_v46, "mscorlib.v4_6_1038_0.dll", ImmutableArray.Create(Net461.References.mscorlib.ImageBytes));
-            AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.SystemRef_v46, "System.v4_6_1038_0.dll", ImmutableArray.Create(Net461.References.System.ImageBytes));
-            AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.SystemCoreRef_v46, "System.Core.v4_6_1038_0.dll", ImmutableArray.Create(Net461.References.SystemCore.ImageBytes));
+            AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.MscorlibRef_v46, "mscorlib.v4_6_1038_0.dll", ImmutableArray.Create(Net461.ReferenceInfos.mscorlib.ImageBytes));
+            AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.SystemRef_v46, "System.v4_6_1038_0.dll", ImmutableArray.Create(Net461.ReferenceInfos.System.ImageBytes));
+            AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.SystemCoreRef_v46, "System.Core.v4_6_1038_0.dll", ImmutableArray.Create(Net461.ReferenceInfos.SystemCore.ImageBytes));
             AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.ValueTupleRef, "System.ValueTuple.dll", ImmutableArray.Create(TestResources.NetFX.ValueTuple.tuplelib));
             AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.SystemRuntimeFacadeRef, "System.Runtime.dll", ImmutableArray.Create(TestMetadata.ResourcesNet451.SystemRuntime));
             AssemblyResolver.TestAccessor.AddInMemoryImage(TestBase.MsvbRef, "Microsoft.VisualBasic.dll", ImmutableArray.Create(TestMetadata.ResourcesNet451.MicrosoftVisualBasic));
diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
index 2e64dded07bb1..6648928c9825f 100644
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
@@ -3906,7 +3906,7 @@ static void DummySequencePoint()
     {
     }
 }";
-            var references = TargetFrameworkUtil.Mscorlib461ExtendedReferences.Concat(new[] { Net461.SystemThreadingTasks, TestMetadata.SystemThreadingTasksExtensions.PortableLib });
+            var references = TargetFrameworkUtil.Mscorlib461ExtendedReferences.Concat(new[] { Net461.References.SystemThreadingTasks, TestMetadata.SystemThreadingTasksExtensions.PortableLib });
             var comp = CreateEmptyCompilation(new[] { source, AsyncStreamsTypes }, references: references);
             WithRuntimeInstance(comp, references, runtime =>
             {

From a5dc67a07324082bdc8d6079187ae4e1790c2976 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Mon, 29 Apr 2024 11:15:48 -0700
Subject: [PATCH 5/9] Move netstandard1.3

---
 eng/Directory.Packages.props                              | 2 +-
 src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs | 6 +++---
 src/Scripting/CSharpTest/InteractiveSessionTests.cs       | 6 +++---
 src/Scripting/CoreTestUtilities/TestCompilationFactory.cs | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index ccc242a52e89a..070a50f49bfca 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -299,7 +299,7 @@
     <PackageVersion Include="Basic.Reference.Assemblies.Net70" Version="1.3.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.4.5" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net461" Version="1.6.0" />
-    <PackageVersion Include="Basic.Reference.Assemblies.NetStandard13" Version="1.2.4" />
+    <PackageVersion Include="Basic.Reference.Assemblies.NetStandard13" Version="1.6.0" />
     <PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.232.0-preview" />
     <!--
     Microsoft.TeamFoundationServer.Client is referencing System.Data.SqlClient causing CG alert
diff --git a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
index 63c7e533907ee..42e41f11b1b02 100644
--- a/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
+++ b/src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
@@ -11986,7 +11986,7 @@ public sealed class DiagnosticDescriptor
             var minSystemCollectionsImmutableImage = CSharpCompilation.Create(
                 "System.Collections.Immutable",
                 new[] { SyntaxFactory.ParseSyntaxTree(minSystemCollectionsImmutableSource) },
-                new MetadataReference[] { NetStandard13.SystemRuntime },
+                new MetadataReference[] { NetStandard13.References.SystemRuntime },
                 new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, cryptoPublicKey: TestResources.TestKeys.PublicKey_b03f5f7f11d50a3a)).EmitToArray();
 
             var minSystemCollectionsImmutableRef = MetadataReference.CreateFromImage(minSystemCollectionsImmutableImage);
@@ -11996,7 +11996,7 @@ public sealed class DiagnosticDescriptor
                 new[] { SyntaxFactory.ParseSyntaxTree(minCodeAnalysisSource) },
                 new MetadataReference[]
                 {
-                    NetStandard13.SystemRuntime,
+                    NetStandard13.References.SystemRuntime,
                     minSystemCollectionsImmutableRef
                 },
                 new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, cryptoPublicKey: TestResources.TestKeys.PublicKey_31bf3856ad364e35)).EmitToArray();
@@ -12087,7 +12087,7 @@ public override void Initialize(AnalysisContext context)
                     minCodeAnalysisRef,
                     minSystemCollectionsImmutableRef
                 };
-            references = references.Concat(NetStandard13.All).ToArray();
+            references = references.Concat(NetStandard13.References.All).ToArray();
 
             var analyzerImage = CSharpCompilation.Create(
                 analyzerAssemblyName,
diff --git a/src/Scripting/CSharpTest/InteractiveSessionTests.cs b/src/Scripting/CSharpTest/InteractiveSessionTests.cs
index 10c6016032737..24e7362698c70 100644
--- a/src/Scripting/CSharpTest/InteractiveSessionTests.cs
+++ b/src/Scripting/CSharpTest/InteractiveSessionTests.cs
@@ -1215,7 +1215,7 @@ public interface I
 public class C : I
 {
     public int F() => 1;
-}", new MetadataReference[] { NetStandard13.SystemRuntime, lib1.ToMetadataReference() });
+}", new MetadataReference[] { NetStandard13.References.SystemRuntime, lib1.ToMetadataReference() });
 
             lib2.Emit(file2.Path);
 
@@ -1277,7 +1277,7 @@ public void ExtensionPriority1()
 
             var main = CreateCSharpCompilation(
                 @"public static class M { public static readonly C X = new C(); }",
-                new MetadataReference[] { NetStandard13.SystemRuntime, libExe.ToMetadataReference() },
+                new MetadataReference[] { NetStandard13.References.SystemRuntime, libExe.ToMetadataReference() },
                 mainName);
 
             var exeImage = libExe.EmitToArray();
@@ -1307,7 +1307,7 @@ public void ExtensionPriority2()
 
             var main = CreateCSharpCompilation(
                 @"public static class M { public static readonly C X = new C(); }",
-                new MetadataReference[] { NetStandard13.SystemRuntime, libExe.ToMetadataReference() },
+                new MetadataReference[] { NetStandard13.References.SystemRuntime, libExe.ToMetadataReference() },
                 mainName);
 
             var exeImage = libExe.EmitToArray();
diff --git a/src/Scripting/CoreTestUtilities/TestCompilationFactory.cs b/src/Scripting/CoreTestUtilities/TestCompilationFactory.cs
index b48f3ddb82ca7..eb729b278204d 100644
--- a/src/Scripting/CoreTestUtilities/TestCompilationFactory.cs
+++ b/src/Scripting/CoreTestUtilities/TestCompilationFactory.cs
@@ -22,7 +22,7 @@ internal static Compilation CreateCSharpCompilationWithCorlib(string source, str
             return CSharpCompilation.Create(
                 assemblyName ?? Guid.NewGuid().ToString(),
                 new[] { CSharp.SyntaxFactory.ParseSyntaxTree(SourceText.From(source, encoding: null, SourceHashAlgorithms.Default)) },
-                new[] { NetStandard13.SystemRuntime },
+                new[] { NetStandard13.References.SystemRuntime },
                 new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
         }
 
@@ -31,7 +31,7 @@ internal static Compilation CreateVisualBasicCompilationWithCorlib(string source
             return VisualBasicCompilation.Create(
                 assemblyName ?? Guid.NewGuid().ToString(),
                 new[] { VisualBasic.SyntaxFactory.ParseSyntaxTree(SourceText.From(source, encoding: null, SourceHashAlgorithms.Default)) },
-                new[] { NetStandard13.SystemRuntime },
+                new[] { NetStandard13.References.SystemRuntime },
                 new VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
         }
 

From 39e2c477a7d54ac4aa3d35dd2ab597d4f4ef9472 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Mon, 29 Apr 2024 11:30:32 -0700
Subject: [PATCH 6/9] Move net70

---
 eng/Directory.Packages.props                  |  2 +-
 .../DefaultInterfaceImplementationTests.cs    |  2 +-
 .../Test/Core/TargetFrameworkUtil.cs          | 12 +++++------
 .../Semantics/RequiredMembersTests.vb         | 20 +++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 070a50f49bfca..8adaa8740c2ac 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -296,7 +296,7 @@
     <PackageVersion Include="Basic.Reference.Assemblies.NetStandard20" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net50" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net60" Version="1.6.0" />
-    <PackageVersion Include="Basic.Reference.Assemblies.Net70" Version="1.3.0" />
+    <PackageVersion Include="Basic.Reference.Assemblies.Net70" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.4.5" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net461" Version="1.6.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.NetStandard13" Version="1.6.0" />
diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
index 494fe385b06ab..f40628bbb009d 100644
--- a/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
+++ b/src/Compilers/CSharp/Test/Symbol/Symbols/DefaultInterfaceImplementationTests.cs
@@ -49430,7 +49430,7 @@ public void RuntimeFeature_01()
         public void RuntimeFeature_02()
         {
             var compilation1 = CreateCompilation("", options: TestOptions.DebugDll,
-                                                 references: new[] { Net70.SystemRuntime },
+                                                 references: new[] { Net70.References.SystemRuntime },
                                                  targetFramework: TargetFramework.Empty);
 
             Assert.True(compilation1.Assembly.RuntimeSupportsDefaultInterfaceImplementation);
diff --git a/src/Compilers/Test/Core/TargetFrameworkUtil.cs b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
index 17a9167facc12..ded4400c730d2 100644
--- a/src/Compilers/Test/Core/TargetFrameworkUtil.cs
+++ b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
@@ -101,12 +101,12 @@ public enum TargetFramework
     /// </summary>
     public static class NetCoreApp
     {
-        public static ImmutableArray<Net70.ReferenceInfo> AllReferenceInfos { get; } = ImmutableArray.CreateRange(Net70.References.All);
-        public static ImmutableArray<MetadataReference> References { get; } = ImmutableArray.CreateRange<MetadataReference>(Net70.All);
+        public static ImmutableArray<Net70.ReferenceInfo> AllReferenceInfos { get; } = ImmutableArray.CreateRange(Net70.ReferenceInfos.All);
+        public static ImmutableArray<MetadataReference> References { get; } = ImmutableArray.CreateRange<MetadataReference>(Net70.References.All);
 
-        public static PortableExecutableReference netstandard { get; } = Net70.netstandard;
-        public static PortableExecutableReference mscorlib { get; } = Net70.mscorlib;
-        public static PortableExecutableReference SystemRuntime { get; } = Net70.SystemRuntime;
+        public static PortableExecutableReference netstandard { get; } = Net70.References.netstandard;
+        public static PortableExecutableReference mscorlib { get; } = Net70.References.mscorlib;
+        public static PortableExecutableReference SystemRuntime { get; } = Net70.References.SystemRuntime;
     }
 
     /// <summary>
@@ -206,7 +206,7 @@ static TargetFrameworkUtil()
             TargetFramework.NetStandard20 => NetStandard20References,
             TargetFramework.Net50 => ImmutableArray.CreateRange<MetadataReference>(LoadDynamicReferences("Net50")),
             TargetFramework.Net60 => ImmutableArray.CreateRange<MetadataReference>(LoadDynamicReferences("Net60")),
-            TargetFramework.NetCoreApp or TargetFramework.Net70 => ImmutableArray.CreateRange<MetadataReference>(Net70.All),
+            TargetFramework.NetCoreApp or TargetFramework.Net70 => ImmutableArray.CreateRange<MetadataReference>(Net70.References.All),
             TargetFramework.Net80 => ImmutableArray.CreateRange<MetadataReference>(LoadDynamicReferences("Net80")),
             TargetFramework.NetFramework => NetFramework.References,
             TargetFramework.NetLatest => NetLatest,
diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/RequiredMembersTests.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/RequiredMembersTests.vb
index ec06d5b09eee5..f7abc9ccd3903 100644
--- a/src/Compilers/VisualBasic/Test/Semantic/Semantics/RequiredMembersTests.vb
+++ b/src/Compilers/VisualBasic/Test/Semantic/Semantics/RequiredMembersTests.vb
@@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests
         Inherits BasicTestBase
 
         Private Function CreateCSharpCompilationWithRequiredMembers(source As String) As CSharpCompilation
-            Return CreateCSharpCompilation(source, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Return CreateCSharpCompilation(source, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
         End Function
 
         <Fact>
@@ -424,14 +424,14 @@ End Module"
         Public Sub EnforcedRequiredMembers_ThroughRetargeting_NoneSet()
             Dim retargetedCode = GetCDefinition(hasSetsRequiredMembers:=False)
 
-            Dim originalC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(1, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Dim originalC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(1, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
 
             Dim originalBasic = CreateCompilation("
 Public Class Base
     Public Property C As C
 End Class", {originalC.EmitToImageReference()})
 
-            Dim retargetedC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(2, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Dim retargetedC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(2, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
 
             Dim comp = CreateCompilation("
 Module M
@@ -455,14 +455,14 @@ BC37321: Required member 'Public Overloads Property Prop As Integer' must be set
         Public Sub EnforcedRequiredMembers_ThroughRetargeting_AllSet(<CombinatorialValues("As New Derived()", " = new Derived()")> constructor As String)
             Dim retargetedCode = GetCDefinition(hasSetsRequiredMembers:=False)
 
-            Dim originalC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(1, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Dim originalC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(1, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
 
             Dim originalBasic = CreateCompilation("
 Public Class Base
     Public Property C As C
 End Class", {originalC.EmitToImageReference()})
 
-            Dim retargetedC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(2, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Dim retargetedC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(2, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
 
             Dim comp = CreateCompilation("
 Module M
@@ -480,14 +480,14 @@ End Module", {originalBasic.ToMetadataReference(), retargetedC.EmitToImageRefere
 
             Dim retargetedCode = GetCDefinition(hasSetsRequiredMembers:=True)
 
-            Dim originalC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(1, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Dim originalC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(1, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
 
             Dim originalBasic = CreateCompilation("
 Public Class Base
     Public Property C As C
 End Class", {originalC.EmitToImageReference()})
 
-            Dim retargetedC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(2, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Dim retargetedC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(2, 0, 0, 0), isRetargetable:=True), retargetedCode, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
 
             Dim comp = CreateCompilation("
 Module M
@@ -504,14 +504,14 @@ End Module", {originalBasic.ToMetadataReference(), retargetedC.EmitToImageRefere
             Dim codeWithRequired = GetCDefinition(hasSetsRequiredMembers:=False)
             Dim codeWithoutRequired = codeWithRequired.Replace("required ", "")
 
-            Dim originalC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(1, 0, 0, 0), isRetargetable:=True), codeWithoutRequired, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Dim originalC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(1, 0, 0, 0), isRetargetable:=True), codeWithoutRequired, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
 
             Dim originalBasic = CreateCompilation("
 Public Class Derived
     Inherits C
 End Class", {originalC.EmitToImageReference()})
 
-            Dim retargetedC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(2, 0, 0, 0), isRetargetable:=True), codeWithRequired, referencedAssemblies:=Basic.Reference.Assemblies.Net70.All)
+            Dim retargetedC = CreateCSharpCompilation(New AssemblyIdentity("Ret", New Version(2, 0, 0, 0), isRetargetable:=True), codeWithRequired, referencedAssemblies:=Basic.Reference.Assemblies.Net70.References.All)
 
             Dim comp = CreateCompilation("
 Module M
@@ -543,7 +543,7 @@ End Class", targetFramework:=TargetFramework.Net70)
 public class Derived : Base
 {
     public required int Prop { get; set; }
-}", referencedAssemblies:=DirectCast(Basic.Reference.Assemblies.Net70.All, IEnumerable(Of MetadataReference)).Append(originalVbComp.EmitToImageReference()))
+}", referencedAssemblies:=DirectCast(Basic.Reference.Assemblies.Net70.References.All, IEnumerable(Of MetadataReference)).Append(originalVbComp.EmitToImageReference()))
 
             Dim comp = CreateCompilation($"
 Module M

From f8838a9090dfa111da04e3bcf2c7f140ac35b1a1 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Mon, 29 Apr 2024 11:42:09 -0700
Subject: [PATCH 7/9] Formatting changes

---
 .../Test/Core/TargetFrameworkUtil.cs          | 88 +++++++++++++++----
 1 file changed, 73 insertions(+), 15 deletions(-)

diff --git a/src/Compilers/Test/Core/TargetFrameworkUtil.cs b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
index ded4400c730d2..f3317617ea998 100644
--- a/src/Compilers/Test/Core/TargetFrameworkUtil.cs
+++ b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
@@ -168,24 +168,82 @@ public static class TargetFrameworkUtil
          * for a TypeLoadException are missing important information for resolving problems if/when they occur.
          * https://github.com/dotnet/roslyn/issues/25961
          */
-
-        public static ImmutableArray<MetadataReference> Mscorlib40References => ImmutableArray.Create<MetadataReference>(Net40.mscorlib);
-        public static ImmutableArray<MetadataReference> Mscorlib40ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net40.mscorlib, Net40.System, Net40.SystemCore);
-        public static ImmutableArray<MetadataReference> Mscorlib40andSystemCoreReferences => ImmutableArray.Create<MetadataReference>(Net40.mscorlib, Net40.SystemCore);
-        public static ImmutableArray<MetadataReference> Mscorlib40andVBRuntimeReferences => ImmutableArray.Create<MetadataReference>(Net40.mscorlib, Net40.System, Net40.MicrosoftVisualBasic);
-        public static ImmutableArray<MetadataReference> Mscorlib45References => ImmutableArray.Create<MetadataReference>(Net451.mscorlib);
-        public static ImmutableArray<MetadataReference> Mscorlib45ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.SystemCore, TestBase.ValueTupleRef, Net451.SystemRuntime);
-        public static ImmutableArray<MetadataReference> Mscorlib45AndCSharpReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.SystemCore, Net451.MicrosoftCSharp);
-        public static ImmutableArray<MetadataReference> Mscorlib45AndVBRuntimeReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.MicrosoftVisualBasic);
-        public static ImmutableArray<MetadataReference> Mscorlib46References => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib);
-        public static ImmutableArray<MetadataReference> Mscorlib46ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib, Net461.References.System, Net461.References.SystemCore, TestBase.ValueTupleRef, Net461.References.SystemRuntime);
-        public static ImmutableArray<MetadataReference> Mscorlib461References => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib);
-        public static ImmutableArray<MetadataReference> Mscorlib461ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib, Net461.References.System, Net461.References.SystemCore, NetFx.ValueTuple.tuplelib, Net461.References.SystemRuntime);
-        public static ImmutableArray<MetadataReference> NetStandard20References => ImmutableArray.Create<MetadataReference>(NetStandard20.References.netstandard, NetStandard20.References.mscorlib, NetStandard20.References.SystemRuntime, NetStandard20.References.SystemCore, NetStandard20.References.SystemDynamicRuntime, NetStandard20.References.SystemLinq, NetStandard20.References.SystemLinqExpressions);
         public static ImmutableArray<MetadataReference> WinRTReferences => ImmutableArray.Create(TestBase.WinRtRefs);
-        public static ImmutableArray<MetadataReference> DefaultVbReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.SystemCore, Net451.MicrosoftVisualBasic);
         public static ImmutableArray<MetadataReference> MinimalReferences => ImmutableArray.Create(TestBase.MinCorlibRef);
         public static ImmutableArray<MetadataReference> MinimalAsyncReferences => ImmutableArray.Create(TestBase.MinAsyncCorlibRef);
+        public static ImmutableArray<MetadataReference> Mscorlib45ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.SystemCore, TestBase.ValueTupleRef, Net451.SystemRuntime);
+        public static ImmutableArray<MetadataReference> Mscorlib46ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib, Net461.References.System, Net461.References.SystemCore, TestBase.ValueTupleRef, Net461.References.SystemRuntime);
+
+        public static ImmutableArray<MetadataReference> Mscorlib40References { get; } =
+        [
+            Net40.mscorlib
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib40ExtendedReferences { get; } =
+        [
+            Net40.mscorlib,
+            Net40.System,
+            Net40.SystemCore
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib40andSystemCoreReferences { get; } =
+        [
+            Net40.mscorlib,
+            Net40.SystemCore
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib40andVBRuntimeReferences { get; } =
+        [
+            Net40.mscorlib,
+            Net40.System,
+            Net40.MicrosoftVisualBasic
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib45References { get; } =
+        [
+            Net451.mscorlib
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib45AndCSharpReferences { get; } =
+        [
+            Net451.mscorlib,
+            Net451.SystemCore,
+            Net451.MicrosoftCSharp
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib45AndVBRuntimeReferences { get; } =
+        [
+            Net451.mscorlib,
+            Net451.System,
+            Net451.MicrosoftVisualBasic
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib46References { get; } =
+        [
+            Net461.References.mscorlib
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib461References { get; } =
+        [
+            Net461.References.mscorlib
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib461ExtendedReferences { get; } =
+        [
+            Net461.References.mscorlib,
+            Net461.References.System,
+            Net461.References.SystemCore,
+            NetFx.ValueTuple.tuplelib,
+            Net461.References.SystemRuntime
+        ];
+        public static ImmutableArray<MetadataReference> NetStandard20References { get; } =
+        [
+            NetStandard20.References.netstandard,
+            NetStandard20.References.mscorlib,
+            NetStandard20.References.SystemRuntime,
+            NetStandard20.References.SystemCore,
+            NetStandard20.References.SystemDynamicRuntime,
+            NetStandard20.References.SystemLinq,
+            NetStandard20.References.SystemLinqExpressions
+        ];
+        public static ImmutableArray<MetadataReference> DefaultVbReferences { get; } =
+        [
+            Net451.mscorlib,
+            Net451.System,
+            Net451.SystemCore,
+            Net451.MicrosoftVisualBasic
+        ];
 
 #if DEBUG
 

From c3e7e96341b5853afbf7e681884f63bd76686fc2 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Mon, 29 Apr 2024 11:42:28 -0700
Subject: [PATCH 8/9] Restore nuget.config

---
 NuGet.config | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 8a33f50805b36..26a2f6f90d445 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -21,9 +21,6 @@
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="vs-impl-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json" />
     <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
-
-    <!-- TODO DO NOT MERGE -->
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

From c4496304f317fbc4876772424063719ae2920722 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jared@paranoidcoding.org>
Date: Wed, 1 May 2024 08:20:20 -0700
Subject: [PATCH 9/9] PR feedback

---
 .../Test/Core/TargetFrameworkUtil.cs          | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/Compilers/Test/Core/TargetFrameworkUtil.cs b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
index f3317617ea998..19a0b17c34578 100644
--- a/src/Compilers/Test/Core/TargetFrameworkUtil.cs
+++ b/src/Compilers/Test/Core/TargetFrameworkUtil.cs
@@ -168,11 +168,37 @@ public static class TargetFrameworkUtil
          * for a TypeLoadException are missing important information for resolving problems if/when they occur.
          * https://github.com/dotnet/roslyn/issues/25961
          */
-        public static ImmutableArray<MetadataReference> WinRTReferences => ImmutableArray.Create(TestBase.WinRtRefs);
-        public static ImmutableArray<MetadataReference> MinimalReferences => ImmutableArray.Create(TestBase.MinCorlibRef);
-        public static ImmutableArray<MetadataReference> MinimalAsyncReferences => ImmutableArray.Create(TestBase.MinAsyncCorlibRef);
-        public static ImmutableArray<MetadataReference> Mscorlib45ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net451.mscorlib, Net451.System, Net451.SystemCore, TestBase.ValueTupleRef, Net451.SystemRuntime);
-        public static ImmutableArray<MetadataReference> Mscorlib46ExtendedReferences => ImmutableArray.Create<MetadataReference>(Net461.References.mscorlib, Net461.References.System, Net461.References.SystemCore, TestBase.ValueTupleRef, Net461.References.SystemRuntime);
+        public static ImmutableArray<MetadataReference> WinRTReferences =>
+        [
+            .. TestBase.WinRtRefs
+        ];
+        public static ImmutableArray<MetadataReference> MinimalReferences =>
+        [
+            TestBase.MinCorlibRef
+        ];
+        public static ImmutableArray<MetadataReference> MinimalAsyncReferences =>
+        [
+            TestBase.MinAsyncCorlibRef
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib45ExtendedReferences =>
+        [
+            Net451.mscorlib,
+            Net451.System,
+            Net451.SystemCore,
+            TestBase.ValueTupleRef,
+            Net451.SystemRuntime
+        ];
+        public static ImmutableArray<MetadataReference> Mscorlib46ExtendedReferences =>
+        [
+            Net461.References.mscorlib,
+            Net461.References.System,
+            Net461.References.SystemCore,
+            TestBase.ValueTupleRef,
+            Net461.References.SystemRuntime
+        ];
+        /*
+         * ⚠ Dev note ⚠: TestBase properties end here.
+         */
 
         public static ImmutableArray<MetadataReference> Mscorlib40References { get; } =
         [