[main] Update dependencies from dotnet/runtime dotnet/efcore

.devcontainer/devcontainer.json

@@ -5,8 +5,8 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			// Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
-			"VARIANT": "5.0",
+			// Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0, 6.0, 7.0
+			"VARIANT": "7.0",
 			// Options
 			"INSTALL_NODE": "true",
 			"NODE_VERSION": "lts/*"
@@ -31,7 +31,7 @@
 	"remoteEnv": {
 		"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
 		"DOTNET_MULTILEVEL_LOOKUP": "0",
-		"TARGET": "net6.0"
+		"TARGET": "net7.0"
 	},
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

Directory.Build.props

@@ -104,7 +104,7 @@
     <NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
 
     <IncludeSymbols>true</IncludeSymbols>
-    <DefaultNetFxTargetFramework>net461</DefaultNetFxTargetFramework>
+    <DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
   </PropertyGroup>
 
   <!-- Warnings and errors -->

docs/DailyBuilds.md

@@ -12,7 +12,7 @@ If you want to download the latest daily build and use it in a project, then you
   <configuration>
       <packageSources>
           <clear />
-          <add key="aspnetcore" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
+          <add key="aspnetcore" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
           <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
       </packageSources>
   </configuration>

eng/Workarounds.targets

@@ -11,7 +11,7 @@
   <ItemGroup>
     <!--
       Reference base shared framework at incoming dependency flow version, not bundled sdk version.
-      Apply this to all projects that target the default tfm (e.g. net6.0) or a rid-based variant of it (e.g. net6.0-windows)
+      Apply this to all projects that target the default tfm (e.g. net7.0) or a rid-based variant of it (e.g. net7.0-windows)
     -->
     <FrameworkReference
       Update="Microsoft.NETCore.App"

eng/helix/content/RunTests/RunTests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <DefineConstants Condition=" '$(InstallPlaywright)' == 'true' ">$(DefineConstants);INSTALLPLAYWRIGHT</DefineConstants>
   </PropertyGroup>
 

eng/tools/GenerateFiles/Directory.Build.targets.in

@@ -14,6 +14,11 @@
       TargetFramework="${DefaultNetCoreTargetFramework}"
       Condition="@(KnownAppHostPack->Count()) != '0' AND
         !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
+    <KnownRuntimePack
+      Include="@(KnownRuntimePack->WithMetadataValue('TargetFramework', 'net6.0'))"
+      TargetFramework="${DefaultNetCoreTargetFramework}"
+      Condition="@(KnownRuntimePack->Count()) != '0' AND
+        !(@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
     <KnownFrameworkReference
       Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'net6.0'))"
       TargetFramework="${DefaultNetCoreTargetFramework}"

eng/tools/RepoTasks/CreateFrameworkListFile.cs

@@ -73,15 +73,19 @@ public override bool Execute()
 
                     var pathParts = path.Split('/');
 
-                    if (pathParts.Length < 3 || !pathParts[1].Equals("dotnet", StringComparison.Ordinal) || pathParts.Length > 4)
+                    if (pathParts.Length < 3 || !pathParts[1].Equals("dotnet", StringComparison.Ordinal) || pathParts.Length > 5)
                     {
-                        Log.LogError($"Unexpected analyzer path format {path}.  Expected  'analyzers/dotnet(/language)/analyzer.dll");
+                        Log.LogError($"Unexpected analyzer path format {path}.  Expected  'analyzers/dotnet(/roslyn<version>)(/language)/analyzer.dll");
                     }
 
-                    // Check if we have enough parts for language directory and include it
-                    if (pathParts.Length > 3)
+                    // Check if we have enough parts for language directory and include it.
+                    // There could be a roslyn<version> folder before the language folder. Check for it.
+                    bool hasRoslynVersion = pathParts[2].StartsWith("roslyn", StringComparison.Ordinal);
+                    int languageLengthCheck = hasRoslynVersion ? 4 : 3;
+                    int potentialLanguageIndex = hasRoslynVersion ? 3 : 2;
+                    if (pathParts.Length > languageLengthCheck)
                     {
-                        element.Add(new XAttribute("Language", pathParts[2]));
+                        element.Add(new XAttribute("Language", pathParts[potentialLanguageIndex]));
                     }
                 }
 

eng/tools/RepoTasks/RepoTasks.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <!-- Keep this project at net6.0 until there is an SDK with net7.0 runtimes -->
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
     <DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(DefineConstants);BUILD_MSI_TASKS</DefineConstants>
     <Optimize>false</Optimize>
@@ -19,7 +20,8 @@
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
+  <!-- Change this back to '$(DefaultNetCoreTargetFramework)' once we have an SDK with net7.0 runtimes -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTaskCoreVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />

eng/tools/RepoTasks/RepoTasks.tasks

@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <!-- Keep this project at net6.0 until there is an SDK with net7.0 runtimes -->
     <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net6.0</_RepoTaskAssemblyFolder>
     <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder>
     <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly>

src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     $CommonMetadataElements$
     <dependencies>
-      <group targetFramework=".net6.0">
+      <group targetFramework=".net7.0">
         <dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$componentAnalyzerVersion$" />
         <dependency id="Microsoft.AspNetCore.Authorization" version="$authorizationVersion$" exclude="Build,Analyzers" />
       </group>

src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in

@@ -1,6 +1,6 @@
 {
   "runtimeOptions": {
-    "tfm": "net6.0",
+    "tfm": "net7.0",
     "framework": {
       "name": "Microsoft.AspNetCore.App",
       "version": "${SharedFxVersion}"

src/Components/benchmarkapps/Wasm.Performance/local.dockerfile

@@ -3,7 +3,7 @@ FROM selenium/standalone-chrome:latest as final
 ENV StressRunDuration=0
 
 WORKDIR /app
-COPY ./Driver/bin/Release/net6.0/linux-x64/publish ./
+COPY ./Driver/bin/Release/net7.0/linux-x64/publish ./
 COPY ./exec.sh ./
 
 ENTRYPOINT [ "bash", "./exec.sh" ]

src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs

@@ -14,7 +14,7 @@ internal static class Pbkdf2Util
 
         private static IPbkdf2Provider GetPbkdf2Provider()
         {
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
             // In priority order, our three implementations are Win8, Win7, and "other".
             if (OSVersionUtil.IsWindows8OrLater())
             {

src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs

@@ -37,7 +37,7 @@ public void RunTest_Normal_NetCore(string password, KeyDerivationPrf prf, int it
             }
 
             // Act & assert
-#if NET461
+#if NETFRAMEWORK
             TestProvider<ManagedPbkdf2Provider>(password, salt, prf, iterationCount, numBytesRequested, expectedValueAsBase64);
 #elif NETCOREAPP
             TestProvider<NetCorePbkdf2Provider>(password, salt, prf, iterationCount, numBytesRequested, expectedValueAsBase64);
@@ -53,7 +53,7 @@ public void RunTest_WithLongPassword_NetCore_FallbackToManaged()
             byte[] salt = Encoding.UTF8.GetBytes("salt");
             const string expectedDerivedKeyBase64 = "Sc+V/c3fiZq5Z5qH3iavAiojTsW97FAp2eBNmCQAwCNzA8hfhFFYyQLIMK65qPnBFHOHXQPwAxNQNhaEAH9hzfiaNBSRJpF9V4rpl02d5ZpI6cZbsQFF7TJW7XJzQVpYoPDgJlg0xVmYLhn1E9qMtUVUuXsBjOOdd7K1M+ZI00c=";
 
-#if NET461
+#if NETFRAMEWORK
             RunTest_WithLongPassword_Impl<ManagedPbkdf2Provider>(salt, expectedDerivedKeyBase64);
 #elif NETCOREAPP
             RunTest_WithLongPassword_Impl<NetCorePbkdf2Provider>(salt, expectedDerivedKeyBase64);
@@ -68,7 +68,7 @@ public void RunTest_WithLongPassword_NetCore()
             // salt longer than 8 bytes
             var salt = Encoding.UTF8.GetBytes("abcdefghijkl");
 
-#if NET461
+#if NETFRAMEWORK
             RunTest_WithLongPassword_Impl<ManagedPbkdf2Provider>(salt, "NGJtFzYUaaSxu+3ZsMeZO5d/qPJDUYW4caLkFlaY0cLSYdh1PN4+nHUVp4pUUubJWu3UeXNMnHKNDfnn8GMfnDVrAGTv1lldszsvUJ0JQ6p4+daQEYBc//Tj/ejuB3luwW0IinyE7U/ViOQKbfi5pCZFMQ0FFx9I+eXRlyT+I74=");
 #elif NETCOREAPP
             RunTest_WithLongPassword_Impl<NetCorePbkdf2Provider>(salt, "NGJtFzYUaaSxu+3ZsMeZO5d/qPJDUYW4caLkFlaY0cLSYdh1PN4+nHUVp4pUUubJWu3UeXNMnHKNDfnn8GMfnDVrAGTv1lldszsvUJ0JQ6p4+daQEYBc//Tj/ejuB3luwW0IinyE7U/ViOQKbfi5pCZFMQ0FFx9I+eXRlyT+I74=");

src/DataProtection/DataProtection/src/Managed/ManagedGenRandomImpl.cs

@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.DataProtection.Managed
 {
     internal sealed unsafe class ManagedGenRandomImpl : IManagedGenRandom
     {
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
         private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 #endif
         public static readonly ManagedGenRandomImpl Instance = new ManagedGenRandomImpl();
@@ -20,7 +20,7 @@ private ManagedGenRandomImpl()
         public byte[] GenRandom(int numBytes)
         {
             var bytes = new byte[numBytes];
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
             _rng.GetBytes(bytes);
 #else
             RandomNumberGenerator.Fill(bytes);

src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs

@@ -159,7 +159,7 @@ public async Task RunsInIISExpressInProcess()
             var applicationName = "CreateDefaultBuilderApp";
             var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
             {
-                TargetFramework = "net6.0",
+                TargetFramework = "net7.0",
                 HostingModel =  HostingModel.InProcess
             };
 
@@ -214,7 +214,7 @@ private async Task ExecuteTestApp(string applicationName,
         {
             var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
             {
-                TargetFramework = "net6.0",
+                TargetFramework = "net7.0",
             };
 
             if (setTestEnvVars)

src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     $CommonMetadataElements$
     <dependencies>
-      <group targetFramework=".net6.0">
+      <group targetFramework=".net7.0">
         <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsVersion$" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETStandard2.0">

src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     $CommonMetadataElements$
     <dependencies>
-      <group targetFramework=".net6.0">
+      <group targetFramework=".net7.0">
         <dependency id="Microsoft.Extensions.FileProviders.Abstractions" version="$AbstractionsVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>

src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj

@@ -74,7 +74,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
 
     <!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
          It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
-         but not required in net6.0 since the types required exist in System.Security.AccessControl. -->
+         but not required in net7.0 since the types required exist in System.Security.AccessControl. -->
     <Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
     <Reference Include="System.Drawing.Common" ExcludeAssets="All" />
     <Reference Include="System.Security.Permissions" ExcludeAssets="All" />

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

@@ -123,7 +123,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
 
     <!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
          It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
-         but not required in net6.0 since the types required exist in System.Security.AccessControl. -->
+         but not required in net7.0 since the types required exist in System.Security.AccessControl. -->
     <Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
     <Reference Include="System.Drawing.Common" ExcludeAssets="All" />
     <Reference Include="System.Security.Permissions" ExcludeAssets="All" />

src/Hosting/Server.IntegrationTesting/src/Common/ApplicationType.cs

@@ -11,7 +11,7 @@ public enum ApplicationType
         Portable,
 
         /// <summary>
-        /// All dlls are published with the app for x-copy deploy. Net461 requires this because ASP.NET Core is not in the GAC.
+        /// All dlls are published with the app for x-copy deploy. Net462 requires this because ASP.NET Core is not in the GAC.
         /// </summary>
         Standalone
     }

src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs

@@ -7,15 +7,16 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
     public static class Tfm
     {
-        public const string Net461 = "net461";
+        public const string Net462 = "net462";
         public const string NetCoreApp20 = "netcoreapp2.0";
         public const string NetCoreApp21 = "netcoreapp2.1";
         public const string NetCoreApp22 = "netcoreapp2.2";
         public const string NetCoreApp30 = "netcoreapp3.0";
         public const string NetCoreApp31 = "netcoreapp3.1";
         public const string Net50 = "net5.0";
         public const string Net60 = "net6.0";
-        public const string Default = Net60;
+        public const string Net70 = "net7.0";
+        public const string Default = Net70;
 
         public static bool Matches(string tfm1, string tfm2)
         {

src/Hosting/Server.IntegrationTesting/src/Deployers/ApplicationDeployer.cs

@@ -66,7 +66,7 @@ private void ValidateParameters()
 
         private RuntimeFlavor GetRuntimeFlavor(string tfm)
         {
-            if (Tfm.Matches(Tfm.Net461, tfm))
+            if (Tfm.Matches(Tfm.Net462, tfm))
             {
                 return RuntimeFlavor.Clr;
             }

src/Hosting/Server.IntegrationTesting/src/Deployers/SelfHostDeployer.cs

@@ -98,7 +98,7 @@ public override async Task<DeploymentResult> DeployAsync()
                     // Core+Standalone always publishes. This must be Clr+Standalone or Core+Portable.
                     // Run from the pre-built bin/{config}/{tfm} directory.
                     var targetFramework = DeploymentParameters.TargetFramework
-                        ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? Tfm.Net461 : Tfm.NetCoreApp22);
+                        ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? Tfm.Net462 : Tfm.NetCoreApp22);
                     workingDirectory = Path.Combine(DeploymentParameters.ApplicationPath, "bin", DeploymentParameters.Configuration, targetFramework);
                     // CurrentDirectory will point to bin/{config}/{tfm}, but the config and static files aren't copied, point to the app base instead.
                     DeploymentParameters.EnvironmentVariables["ASPNETCORE_CONTENTROOT"] = DeploymentParameters.ApplicationPath;

src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs

@@ -177,7 +177,7 @@ private void VaryByTfm(List<TestVariant> variants, ServerType server, string ski
             {
                 if (!CheckTfmIsSupportedForServer(tfm, server))
                 {
-                    // Don't generate net461 variations for nginx server.
+                    // Don't generate net462 variations for nginx server.
                     continue;
                 }
 
@@ -190,12 +190,12 @@ private void VaryByTfm(List<TestVariant> variants, ServerType server, string ski
         private bool CheckTfmIsSupportedForServer(string tfm, ServerType server)
         {
             // Not a combination we test
-            return !(Tfm.Matches(Tfm.Net461, tfm) && ServerType.Nginx == server);
+            return !(Tfm.Matches(Tfm.Net462, tfm) && ServerType.Nginx == server);
         }
 
         private static string SkipIfTfmIsNotSupportedOnThisOS(string tfm)
         {
-            if (Tfm.Matches(Tfm.Net461, tfm) && !OperatingSystem.IsWindows())
+            if (Tfm.Matches(Tfm.Net462, tfm) && !OperatingSystem.IsWindows())
             {
                 return "This TFM is not supported on this operating system.";
             }
@@ -208,7 +208,7 @@ private void VaryByApplicationType(List<TestVariant> variants, ServerType server
             foreach (var t in ApplicationTypes)
             {
                 var type = t;
-                if (Tfm.Matches(Tfm.Net461, tfm) && type == ApplicationType.Portable)
+                if (Tfm.Matches(Tfm.Net462, tfm) && type == ApplicationType.Portable)
                 {
                     if (ApplicationTypes.Count == 1)
                     {
@@ -280,7 +280,7 @@ private void VaryByAncmHostingModel(IList<TestVariant> variants, ServerType serv
                 if (hostingModel == HostingModel.InProcess)
                 {
                     // Not supported
-                    if (Tfm.Matches(Tfm.Net461, tfm) || Tfm.Matches(Tfm.NetCoreApp20, tfm))
+                    if (Tfm.Matches(Tfm.Net462, tfm) || Tfm.Matches(Tfm.NetCoreApp20, tfm))
                     {
                         continue;
                     }

src/Http/samples/MinimalSampleFSharp/MinimalSampleFSharp.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Identity/Extensions.Core/src/PasswordHasher.cs

@@ -65,7 +65,7 @@ public PasswordHasher(IOptions<PasswordHasherOptions> optionsAccessor = null)
             _rng = options.Rng;
         }
 
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
         // Compares two byte arrays for equality. The method is specifically written so that the loop is not optimized.
         [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
         private static bool ByteArraysEqual(byte[] a, byte[] b)
@@ -244,7 +244,7 @@ private static bool VerifyHashedPasswordV2(byte[] hashedPassword, string passwor
 
             // Hash the incoming password and verify it
             byte[] actualSubkey = KeyDerivation.Pbkdf2(password, salt, Pbkdf2Prf, Pbkdf2IterCount, Pbkdf2SubkeyLength);
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
             return ByteArraysEqual(actualSubkey, expectedSubkey);
 #elif NETCOREAPP
             return CryptographicOperations.FixedTimeEquals(actualSubkey, expectedSubkey);
@@ -283,7 +283,7 @@ private static bool VerifyHashedPasswordV3(byte[] hashedPassword, string passwor
 
                 // Hash the incoming password and verify it
                 byte[] actualSubkey = KeyDerivation.Pbkdf2(password, salt, prf, iterCount, subkeyLength);
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
                 return ByteArraysEqual(actualSubkey, expectedSubkey);
 #elif NETCOREAPP
                 return CryptographicOperations.FixedTimeEquals(actualSubkey, expectedSubkey);