[main] Update dependencies from dotnet/runtime dotnet/efcore (#36328)

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


 - Update TFM to net7.0

 - Fixup

 - Update src/Shared/CodeAnalysis/DynamicallyAccessedMembersAttribute.cs

Co-authored-by: Chris Ross <[email protected]>

 - Update src/Shared/CodeAnalysis/DynamicallyAccessedMemberTypes.cs

Co-authored-by: Chris Ross <[email protected]>

 - Update netfx to 462

 - Update more to net462

 - Fix workaround

 - Update ifdefs

 - Add workaround for KnownRuntimePack

 - Merge branch 'darc-main-c944b2c3-1c63-49a3-b9dd-98cda1a942e3' of https://github.com/dotnet/aspnetcore into darc-main-c944b2c3-1c63-49a3-b9dd-98cda1a942e3

 - Merge branch 'main' into darc-main-c944b2c3-1c63-49a3-b9dd-98cda1a942e3

 - Add SiteExtensions versions

 - Fix RepoTasks assembly dir

 - Update CreateFrameworkListFile to account for new analyzer path format introduced with https://github.com/dotnet/sdk/issues/20355

 - Don't target latest runtime in razor tests

 - Update Dependencies.props

 - Update Helix.targets

 - Fixup

 - Move FrameworkReference update to GenerateFiles

 - Have Helix tests import directory.build files

 - Keep RunTests at net6

 - Quarantine 2 tests

 - revert spa-templates submodule downgrade

.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/Dependencies.props

@@ -116,6 +116,8 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x86" />
     <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x64" />
     <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" />
+    <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" />
+    <LatestPackageReference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" />
     <LatestPackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
     <LatestPackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport" />
     <LatestPackageReference Include="Microsoft.Bcl.AsyncInterfaces" />

eng/Version.Details.xml

@@ -9,292 +9,292 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="dotnet-ef" Version="7.0.0-alpha.1.21458.26">
+    <Dependency Name="dotnet-ef" Version="7.0.0-alpha.1.21470.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>afab3dc9025790510de52805e007f3f73cccece5</Sha>
+      <Sha>29230f22c1f938e52133cc11e7e82668788a4697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0-alpha.1.21458.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0-alpha.1.21470.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>afab3dc9025790510de52805e007f3f73cccece5</Sha>
+      <Sha>29230f22c1f938e52133cc11e7e82668788a4697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0-alpha.1.21458.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0-alpha.1.21470.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>afab3dc9025790510de52805e007f3f73cccece5</Sha>
+      <Sha>29230f22c1f938e52133cc11e7e82668788a4697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-alpha.1.21458.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-alpha.1.21470.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>afab3dc9025790510de52805e007f3f73cccece5</Sha>
+      <Sha>29230f22c1f938e52133cc11e7e82668788a4697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-alpha.1.21458.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-alpha.1.21470.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>afab3dc9025790510de52805e007f3f73cccece5</Sha>
+      <Sha>29230f22c1f938e52133cc11e7e82668788a4697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-alpha.1.21458.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-alpha.1.21470.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>afab3dc9025790510de52805e007f3f73cccece5</Sha>
+      <Sha>29230f22c1f938e52133cc11e7e82668788a4697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.0-alpha.1.21458.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.0-alpha.1.21470.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>afab3dc9025790510de52805e007f3f73cccece5</Sha>
+      <Sha>29230f22c1f938e52133cc11e7e82668788a4697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-alpha.1.21458.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-alpha.1.21470.2">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>afab3dc9025790510de52805e007f3f73cccece5</Sha>
+      <Sha>29230f22c1f938e52133cc11e7e82668788a4697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Http" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Options" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.SystemEvents" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Diagnostics.EventLog" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.DirectoryServices.Protocols" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.DirectoryServices.Protocols" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Drawing.Common" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.IO.Pipelines" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.Json" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Net.Http.Json" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.WinHttpHandler" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Net.Http.WinHttpHandler" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Reflection.Metadata" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Resources.Extensions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Security.Permissions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Text.Encodings.Web" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Text.Json" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Threading.Channels" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="System.Windows.Extensions" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21457.1">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21470.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
+      <Sha>6c9921d2ad188d81af53892930a87ee5ad97c979</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21466.4">
       <Uri>https://github.com/dotnet/arcade</Uri>

eng/Versions.props

@@ -43,7 +43,7 @@
       src\Components\WebAssembly\Sdk\testassets\Directory.Build.props, and
       src\Razor\test\testassets\Directory.Build.props when this changes.
     -->
-    <DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework>
+    <DefaultNetCoreTargetFramework>net7.0</DefaultNetCoreTargetFramework>
   </PropertyGroup>
   <PropertyGroup Label="Arcade settings">
     <!-- Opt-in to Arcade tools for building VSIX projects. -->
@@ -65,78 +65,78 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftExtensionsDependencyModelVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftNETCoreAppRefVersion>7.0.0-alpha.1.21457.1</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-alpha.1.21457.1</MicrosoftNETCoreAppRuntimewinx64Version>
-    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0-alpha.1.21457.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
-    <MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0-alpha.1.21457.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
-    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0-alpha.1.21457.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
-    <MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-alpha.1.21457.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationCommandLineVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
-    <MicrosoftExtensionsConfigurationIniVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationIniVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
-    <MicrosoftExtensionsConfigurationXmlVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsConfigurationXmlVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
-    <MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsFileProvidersCompositeVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
-    <MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsFileSystemGlobbingVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingDebugVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsLoggingDebugVersion>
-    <MicrosoftExtensionsLoggingEventSourceVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsLoggingEventSourceVersion>
-    <MicrosoftExtensionsLoggingEventLogVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsLoggingEventLogVersion>
-    <MicrosoftExtensionsLoggingVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsLoggingTraceSourceVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsLoggingTraceSourceVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
-    <MicrosoftExtensionsOptionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftExtensionsPrimitivesVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsPrimitivesVersion>
-    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-alpha.1.21457.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
-    <MicrosoftWin32SystemEventsVersion>7.0.0-alpha.1.21457.1</MicrosoftWin32SystemEventsVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>7.0.0-alpha.1.21457.1</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsEventLogVersion>7.0.0-alpha.1.21457.1</SystemDiagnosticsEventLogVersion>
-    <SystemDirectoryServicesProtocolsVersion>7.0.0-alpha.1.21457.1</SystemDirectoryServicesProtocolsVersion>
-    <SystemDrawingCommonVersion>7.0.0-alpha.1.21457.1</SystemDrawingCommonVersion>
-    <SystemIOPipelinesVersion>7.0.0-alpha.1.21457.1</SystemIOPipelinesVersion>
-    <SystemNetHttpJsonVersion>7.0.0-alpha.1.21457.1</SystemNetHttpJsonVersion>
-    <SystemNetHttpWinHttpHandlerVersion>7.0.0-alpha.1.21457.1</SystemNetHttpWinHttpHandlerVersion>
-    <SystemReflectionMetadataVersion>7.0.0-alpha.1.21457.1</SystemReflectionMetadataVersion>
-    <SystemResourcesExtensionsVersion>7.0.0-alpha.1.21457.1</SystemResourcesExtensionsVersion>
-    <SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-alpha.1.21457.1</SystemRuntimeCompilerServicesUnsafeVersion>
-    <SystemSecurityCryptographyPkcsVersion>7.0.0-alpha.1.21457.1</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>7.0.0-alpha.1.21457.1</SystemSecurityCryptographyXmlVersion>
-    <SystemSecurityPermissionsVersion>7.0.0-alpha.1.21457.1</SystemSecurityPermissionsVersion>
-    <SystemServiceProcessServiceControllerVersion>7.0.0-alpha.1.21457.1</SystemServiceProcessServiceControllerVersion>
-    <SystemTextEncodingsWebVersion>7.0.0-alpha.1.21457.1</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>7.0.0-alpha.1.21457.1</SystemTextJsonVersion>
-    <SystemThreadingChannelsVersion>7.0.0-alpha.1.21457.1</SystemThreadingChannelsVersion>
-    <SystemWindowsExtensionsVersion>7.0.0-alpha.1.21457.1</SystemWindowsExtensionsVersion>
+    <MicrosoftExtensionsDependencyModelVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftNETCoreAppRefVersion>7.0.0-alpha.1.21470.1</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-alpha.1.21470.1</MicrosoftNETCoreAppRuntimewinx64Version>
+    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0-alpha.1.21470.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
+    <MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0-alpha.1.21470.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
+    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0-alpha.1.21470.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-alpha.1.21470.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationCommandLineVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
+    <MicrosoftExtensionsConfigurationIniVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationIniVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
+    <MicrosoftExtensionsConfigurationXmlVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsConfigurationXmlVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
+    <MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsFileProvidersCompositeVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
+    <MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsFileSystemGlobbingVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingDebugVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsLoggingDebugVersion>
+    <MicrosoftExtensionsLoggingEventSourceVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsLoggingEventSourceVersion>
+    <MicrosoftExtensionsLoggingEventLogVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsLoggingEventLogVersion>
+    <MicrosoftExtensionsLoggingVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsLoggingTraceSourceVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsLoggingTraceSourceVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
+    <MicrosoftExtensionsOptionsVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftExtensionsPrimitivesVersion>7.0.0-alpha.1.21470.1</MicrosoftExtensionsPrimitivesVersion>
+    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-alpha.1.21470.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
+    <MicrosoftWin32SystemEventsVersion>7.0.0-alpha.1.21470.1</MicrosoftWin32SystemEventsVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>7.0.0-alpha.1.21470.1</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsEventLogVersion>7.0.0-alpha.1.21470.1</SystemDiagnosticsEventLogVersion>
+    <SystemDirectoryServicesProtocolsVersion>7.0.0-alpha.1.21470.1</SystemDirectoryServicesProtocolsVersion>
+    <SystemDrawingCommonVersion>7.0.0-alpha.1.21470.1</SystemDrawingCommonVersion>
+    <SystemIOPipelinesVersion>7.0.0-alpha.1.21470.1</SystemIOPipelinesVersion>
+    <SystemNetHttpJsonVersion>7.0.0-alpha.1.21470.1</SystemNetHttpJsonVersion>
+    <SystemNetHttpWinHttpHandlerVersion>7.0.0-alpha.1.21470.1</SystemNetHttpWinHttpHandlerVersion>
+    <SystemReflectionMetadataVersion>7.0.0-alpha.1.21470.1</SystemReflectionMetadataVersion>
+    <SystemResourcesExtensionsVersion>7.0.0-alpha.1.21470.1</SystemResourcesExtensionsVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-alpha.1.21470.1</SystemRuntimeCompilerServicesUnsafeVersion>
+    <SystemSecurityCryptographyPkcsVersion>7.0.0-alpha.1.21470.1</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>7.0.0-alpha.1.21470.1</SystemSecurityCryptographyXmlVersion>
+    <SystemSecurityPermissionsVersion>7.0.0-alpha.1.21470.1</SystemSecurityPermissionsVersion>
+    <SystemServiceProcessServiceControllerVersion>7.0.0-alpha.1.21470.1</SystemServiceProcessServiceControllerVersion>
+    <SystemTextEncodingsWebVersion>7.0.0-alpha.1.21470.1</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>7.0.0-alpha.1.21470.1</SystemTextJsonVersion>
+    <SystemThreadingChannelsVersion>7.0.0-alpha.1.21470.1</SystemThreadingChannelsVersion>
+    <SystemWindowsExtensionsVersion>7.0.0-alpha.1.21470.1</SystemWindowsExtensionsVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsVersion>7.0.0-alpha.1.21457.1</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftNETCorePlatformsVersion>7.0.0-alpha.1.21470.1</MicrosoftNETCorePlatformsVersion>
     <!-- Packages from dotnet/efcore -->
-    <dotnetefVersion>7.0.0-alpha.1.21458.26</dotnetefVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.0-alpha.1.21458.26</MicrosoftEntityFrameworkCoreInMemoryVersion>
-    <MicrosoftEntityFrameworkCoreRelationalVersion>7.0.0-alpha.1.21458.26</MicrosoftEntityFrameworkCoreRelationalVersion>
-    <MicrosoftEntityFrameworkCoreSqliteVersion>7.0.0-alpha.1.21458.26</MicrosoftEntityFrameworkCoreSqliteVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.0-alpha.1.21458.26</MicrosoftEntityFrameworkCoreSqlServerVersion>
-    <MicrosoftEntityFrameworkCoreToolsVersion>7.0.0-alpha.1.21458.26</MicrosoftEntityFrameworkCoreToolsVersion>
-    <MicrosoftEntityFrameworkCoreVersion>7.0.0-alpha.1.21458.26</MicrosoftEntityFrameworkCoreVersion>
-    <MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-alpha.1.21458.26</MicrosoftEntityFrameworkCoreDesignVersion>
+    <dotnetefVersion>7.0.0-alpha.1.21470.2</dotnetefVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.0-alpha.1.21470.2</MicrosoftEntityFrameworkCoreInMemoryVersion>
+    <MicrosoftEntityFrameworkCoreRelationalVersion>7.0.0-alpha.1.21470.2</MicrosoftEntityFrameworkCoreRelationalVersion>
+    <MicrosoftEntityFrameworkCoreSqliteVersion>7.0.0-alpha.1.21470.2</MicrosoftEntityFrameworkCoreSqliteVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.0-alpha.1.21470.2</MicrosoftEntityFrameworkCoreSqlServerVersion>
+    <MicrosoftEntityFrameworkCoreToolsVersion>7.0.0-alpha.1.21470.2</MicrosoftEntityFrameworkCoreToolsVersion>
+    <MicrosoftEntityFrameworkCoreVersion>7.0.0-alpha.1.21470.2</MicrosoftEntityFrameworkCoreVersion>
+    <MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-alpha.1.21470.2</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
     <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21466.4</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.21466.4</MicrosoftDotNetBuildTasksTemplatingVersion>
@@ -225,6 +225,9 @@
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.10-servicing-21410-22</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
+    <MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.0-rc-1-21452-15</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
+    <MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>
+    <MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>
     <!-- 3rd party dependencies -->
     <AngleSharpVersion>0.9.9</AngleSharpVersion>
     <BenchmarkDotNetVersion>0.13.0</BenchmarkDotNetVersion>

eng/Workarounds.targets

@@ -8,18 +8,6 @@
     <ProjectTargetFrameworkVersion>v$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)', 2))</ProjectTargetFrameworkVersion>
   </PropertyGroup>
 
-  <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)
-    -->
-    <FrameworkReference
-      Update="Microsoft.NETCore.App"
-      Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '$(DefaultNetCoreTargetFrameworkIdentifier)') AND '$(DefaultNetCoreTargetFrameworkVersion)' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
-      RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)"
-      TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
-  </ItemGroup>
-
   <!--
     Workaround https://github.com/dotnet/aspnetcore/issues/4257.
     The web sdk adds an implicit framework reference. This removes it until we can update our build to use framework references.

eng/targets/Helix.props

@@ -21,8 +21,9 @@
     <HelixTestName>$(MSBuildProjectName)--$(TargetFramework)</HelixTestName>
     <LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">false</LoggingTestingDisableFileLogging>
     <NodeVersion>14.17.6</NodeVersion>
-    <TestDependsOnAspNetPackages>false</TestDependsOnAspNetPackages>
-    <TestDependsOnAspNetRuntime>false</TestDependsOnAspNetRuntime>
+    <!-- Have all tests depend on the latest runtimes until we get a net7.0 SDK -->
+    <TestDependsOnAspNetPackages>true</TestDependsOnAspNetPackages>
+    <TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

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}"
@@ -21,6 +26,18 @@
         !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
   </ItemGroup>
 
+  <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. net7.0) or a rid-based variant of it (e.g. net7.0-windows)
+    -->
+    <FrameworkReference
+      Update="Microsoft.NETCore.App"
+      Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
+      RuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}"
+      TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- Use the same NETCore shared framework as repo built against except when building product code in servicing. -->
     <KnownFrameworkReference

eng/tools/RepoTasks/CreateFrameworkListFile.cs

@@ -73,15 +73,19 @@ namespace RepoTasks
 
                     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 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2
 
         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 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation
             }
 
             // 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 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation
             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 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation
             // 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 @@ namespace Microsoft.AspNetCore.DataProtection.Managed
         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 @@ namespace Microsoft.AspNetCore.Tests
             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 @@ namespace Microsoft.AspNetCore.Tests
         {
             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/Framework/test/TestData.cs

@@ -234,55 +234,55 @@ namespace Microsoft.AspNetCore
                 { "Microsoft.AspNetCore.StaticFiles", "7.0.0.0" },
                 { "Microsoft.AspNetCore.WebSockets", "7.0.0.0" },
                 { "Microsoft.AspNetCore.WebUtilities", "7.0.0.0" },
-                { "Microsoft.Extensions.Caching.Abstractions", "6.0.0.0" },
-                { "Microsoft.Extensions.Caching.Memory", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration.Abstractions", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration.Binder", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration.CommandLine", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration.EnvironmentVariables", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration.FileExtensions", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration.Ini", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration.Json", "6.0.0.0" },
+                { "Microsoft.Extensions.Caching.Abstractions", "7.0.0.0" },
+                { "Microsoft.Extensions.Caching.Memory", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Abstractions", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Binder", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration.CommandLine", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration.EnvironmentVariables", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration.FileExtensions", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Ini", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Json", "7.0.0.0" },
                 { "Microsoft.Extensions.Configuration.KeyPerFile", "7.0.0.0" },
-                { "Microsoft.Extensions.Configuration.UserSecrets", "6.0.0.0" },
-                { "Microsoft.Extensions.Configuration.Xml", "6.0.0.0" },
-                { "Microsoft.Extensions.DependencyInjection", "6.0.0.0" },
-                { "Microsoft.Extensions.DependencyInjection.Abstractions", "6.0.0.0" },
+                { "Microsoft.Extensions.Configuration.UserSecrets", "7.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Xml", "7.0.0.0" },
+                { "Microsoft.Extensions.DependencyInjection", "7.0.0.0" },
+                { "Microsoft.Extensions.DependencyInjection.Abstractions", "7.0.0.0" },
                 { "Microsoft.Extensions.Diagnostics.HealthChecks", "7.0.0.0" },
                 { "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "7.0.0.0" },
-                { "Microsoft.Extensions.FileProviders.Abstractions", "6.0.0.0" },
-                { "Microsoft.Extensions.FileProviders.Composite", "6.0.0.0" },
+                { "Microsoft.Extensions.FileProviders.Abstractions", "7.0.0.0" },
+                { "Microsoft.Extensions.FileProviders.Composite", "7.0.0.0" },
                 { "Microsoft.Extensions.FileProviders.Embedded", "7.0.0.0" },
-                { "Microsoft.Extensions.FileProviders.Physical", "6.0.0.0" },
-                { "Microsoft.Extensions.FileSystemGlobbing", "6.0.0.0" },
+                { "Microsoft.Extensions.FileProviders.Physical", "7.0.0.0" },
+                { "Microsoft.Extensions.FileSystemGlobbing", "7.0.0.0" },
                 { "Microsoft.Extensions.Features", "7.0.0.0" },
-                { "Microsoft.Extensions.Hosting", "6.0.0.0" },
-                { "Microsoft.Extensions.Hosting.Abstractions", "6.0.0.0" },
-                { "Microsoft.Extensions.Http", "6.0.0.0" },
+                { "Microsoft.Extensions.Hosting", "7.0.0.0" },
+                { "Microsoft.Extensions.Hosting.Abstractions", "7.0.0.0" },
+                { "Microsoft.Extensions.Http", "7.0.0.0" },
                 { "Microsoft.Extensions.Identity.Core", "7.0.0.0" },
                 { "Microsoft.Extensions.Identity.Stores", "7.0.0.0" },
                 { "Microsoft.Extensions.Localization", "7.0.0.0" },
                 { "Microsoft.Extensions.Localization.Abstractions", "7.0.0.0" },
-                { "Microsoft.Extensions.Logging", "6.0.0.0" },
-                { "Microsoft.Extensions.Logging.Abstractions", "6.0.0.0" },
-                { "Microsoft.Extensions.Logging.Configuration", "6.0.0.0" },
-                { "Microsoft.Extensions.Logging.Console", "6.0.0.0" },
-                { "Microsoft.Extensions.Logging.Debug", "6.0.0.0" },
-                { "Microsoft.Extensions.Logging.EventLog", "6.0.0.0" },
-                { "Microsoft.Extensions.Logging.EventSource", "6.0.0.0" },
-                { "Microsoft.Extensions.Logging.TraceSource", "6.0.0.0" },
+                { "Microsoft.Extensions.Logging", "7.0.0.0" },
+                { "Microsoft.Extensions.Logging.Abstractions", "7.0.0.0" },
+                { "Microsoft.Extensions.Logging.Configuration", "7.0.0.0" },
+                { "Microsoft.Extensions.Logging.Console", "7.0.0.0" },
+                { "Microsoft.Extensions.Logging.Debug", "7.0.0.0" },
+                { "Microsoft.Extensions.Logging.EventLog", "7.0.0.0" },
+                { "Microsoft.Extensions.Logging.EventSource", "7.0.0.0" },
+                { "Microsoft.Extensions.Logging.TraceSource", "7.0.0.0" },
                 { "Microsoft.Extensions.ObjectPool", "7.0.0.0" },
-                { "Microsoft.Extensions.Options", "6.0.0.0" },
-                { "Microsoft.Extensions.Options.ConfigurationExtensions", "6.0.0.0" },
-                { "Microsoft.Extensions.Options.DataAnnotations", "6.0.0.0" },
-                { "Microsoft.Extensions.Primitives", "6.0.0.0" },
+                { "Microsoft.Extensions.Options", "7.0.0.0" },
+                { "Microsoft.Extensions.Options.ConfigurationExtensions", "7.0.0.0" },
+                { "Microsoft.Extensions.Options.DataAnnotations", "7.0.0.0" },
+                { "Microsoft.Extensions.Primitives", "7.0.0.0" },
                 { "Microsoft.Extensions.WebEncoders", "7.0.0.0" },
                 { "Microsoft.JSInterop", "7.0.0.0" },
                 { "Microsoft.Net.Http.Headers", "7.0.0.0" },
-                { "System.Diagnostics.EventLog", "6.0.0.0" },
-                { "System.IO.Pipelines", "6.0.0.0" },
-                { "System.Security.Cryptography.Xml", "6.0.0.0" },
+                { "System.Diagnostics.EventLog", "7.0.0.0" },
+                { "System.IO.Pipelines", "7.0.0.0" },
+                { "System.Security.Cryptography.Xml", "7.0.0.0" },
             };
 
             if (!VerifyAncmBinary())

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

@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
         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,7 +7,7 @@ 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";
@@ -15,7 +15,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
         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 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
 
         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 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                     // 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 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
             {
                 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 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
         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 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
             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 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                 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 @@ namespace Microsoft.AspNetCore.Identity
             _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 @@ namespace Microsoft.AspNetCore.Identity
 
             // 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 @@ namespace Microsoft.AspNetCore.Identity
 
                 // 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);

src/Identity/Extensions.Core/src/Rfc6238AuthenticationService.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Identity
     {
         private static readonly TimeSpan _timestep = TimeSpan.FromMinutes(3);
         private static readonly Encoding _encoding = new UTF8Encoding(false, true);
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
         private static readonly DateTime _unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
         private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 #endif
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Identity
         public static byte[] GenerateRandomKey()
         {
             byte[] bytes = new byte[20];
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
             _rng.GetBytes(bytes);
 #else
             RandomNumberGenerator.Fill(bytes);
@@ -68,7 +68,7 @@ namespace Microsoft.AspNetCore.Identity
         // More info: https://tools.ietf.org/html/rfc6238#section-4
         private static ulong GetCurrentTimeStepNumber()
         {
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
             var delta = DateTime.UtcNow - _unixEpoch;
 #else
             var delta = DateTimeOffset.UtcNow - DateTimeOffset.UnixEpoch;

src/Identity/Extensions.Core/src/UserManager.cs

@@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Identity
             new Dictionary<string, IUserTwoFactorTokenProvider<TUser>>();
 
         private bool _disposed;
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
         private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 #endif
         private readonly IServiceProvider _services;
@@ -2429,7 +2429,7 @@ namespace Microsoft.AspNetCore.Identity
         private static string NewSecurityStamp()
         {
             byte[] bytes = new byte[20];
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
             _rng.GetBytes(bytes);
 #else
             RandomNumberGenerator.Fill(bytes);

src/Middleware/Spa/SpaServices.Extensions/src/Proxying/SpaProxy.cs

@@ -241,7 +241,7 @@ namespace Microsoft.AspNetCore.SpaServices.Extensions.Proxy
                         }
                         catch (ArgumentException)
                         {
-                            // On net461, certain header names are reserved and can't be set.
+                            // On net462, certain header names are reserved and can't be set.
                             // We filter out the known ones via the test above, but there could
                             // be others arbitrarily set by the client. It's not helpful to
                             // consider it an error, so just skip non-forwardable headers.

src/Middleware/WebSockets/samples/AutobahnTestAppAspNet4/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net461" />
-  <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net461" developmentDependency="true" />
-</packages>
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net462" />
+  <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net462" developmentDependency="true" />
+</packages>

src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs

@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn
             {
                 Scheme = (ssl ? Uri.UriSchemeHttps : Uri.UriSchemeHttp),
                 ApplicationType = ApplicationType.Portable,
-                TargetFramework = "Net6.0",
+                TargetFramework = "Net7.0",
                 EnvironmentName = environment,
                 SiteName = "HttpTestSite", // This is configured in the Http.config
                 ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText(configPath) : null,

src/Mvc/Mvc.TagHelpers/test/CacheTagHelperTest.cs

@@ -485,6 +485,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
         }
 
         [Fact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/36765")]
         public async Task ProcessAsync_FlowsEntryLinkThatAllowsAddingTriggersToAddedEntry()
         {
             // Arrange

src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets

@@ -1,5 +1,3 @@
 <Project>
-
-  <Import Project="..\..\build\net6.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
-
+  <Import Project="..\..\build\net7.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
 </Project>

src/Mvc/perf/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs

@@ -13,7 +13,7 @@ namespace BasicApi.Migrations
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET461
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
@@ -31,7 +31,7 @@ namespace BasicApi.Migrations
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET461
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
@@ -59,7 +59,7 @@ namespace BasicApi.Migrations
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET461
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
@@ -84,7 +84,7 @@ namespace BasicApi.Migrations
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET461
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)

src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs

@@ -64,7 +64,7 @@ namespace BasicApi
 
             switch (databaseType.ToUpperInvariant())
             {
-#if !NET461
+#if !NETFRAMEWORK
                 case "MYSQL":
                     services
                         .AddEntityFrameworkMySql()

src/Mvc/perf/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs

@@ -14,7 +14,7 @@ namespace BasicViews.Migrations
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-#if !NET461
+#if !NETFRAMEWORK
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn)
 #endif
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)

src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs

@@ -45,7 +45,7 @@ namespace BasicViews
 
             switch (databaseType.ToUpperInvariant())
             {
-#if !NET461
+#if !NETFRAMEWORK
                 case "MYSQL":
                     services
                         .AddEntityFrameworkMySql()

src/Mvc/test/Mvc.FunctionalTests/HtmlGenerationTest.cs

@@ -526,6 +526,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
         }
 
         [Fact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/36765")]
         public async Task CacheTagHelper_BubblesExpirationOfNestedTagHelpers()
         {
             // Arrange & Act - 1

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json

@@ -439,12 +439,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json

@@ -286,12 +286,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "HostIdentifier": {
       "type": "bind",

src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json

@@ -130,12 +130,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json

@@ -126,12 +126,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json

@@ -41,11 +41,11 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "defaultValue": "net6.0"
+      "defaultValue": "net7.0"
     },
     "ExcludeLaunchSettings": {
       "type": "parameter",

src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json

@@ -48,11 +48,11 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "defaultValue": "net6.0"
+      "defaultValue": "net7.0"
     },
     "HostIdentifier": {
       "type": "bind",

src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json

@@ -361,12 +361,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json

@@ -351,12 +351,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json

@@ -131,12 +131,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json

@@ -299,12 +299,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json

@@ -126,12 +126,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json

@@ -47,12 +47,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json

@@ -47,12 +47,12 @@
       "datatype": "choice",
       "choices": [
         {
-          "choice": "net6.0",
-          "description": "Target net6.0"
+          "choice": "net7.0",
+          "description": "Target net7.0"
         }
       ],
-      "replaces": "net6.0",
-      "defaultValue": "net6.0"
+      "replaces": "net7.0",
+      "defaultValue": "net7.0"
     },
     "copyrightYear": {
       "type": "generated",

src/ProjectTemplates/scripts/Test-Template.ps1

@@ -47,10 +47,10 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isBlazorWa
         foreach ($projPath in $proj) {
             $projContent = Get-Content -Path $projPath -Raw
             if ($isBlazorWasmHosted) {
-                $importPath = "$PSScriptRoot/../test/bin/Debug/net6.0/TestTemplates"
+                $importPath = "$PSScriptRoot/../test/bin/Debug/net7.0/TestTemplates"
             }
             else {
-                $importPath = "$PSScriptRoot/../test/bin/Debug/net6.0/TestTemplates"
+                $importPath = "$PSScriptRoot/../test/bin/Debug/net7.0/TestTemplates"
             }
             $projContent = $projContent -replace ('(?:<Project Sdk="Microsoft.NET.(?<SdkSuffix>Sdk\.\w+)">)', ('<Project Sdk="Microsoft.NET.${SdkSuffix}">
                 <Import Project="' + $importPath + '/Directory.Build.props" />
@@ -66,7 +66,7 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isBlazorWa
         }
         dotnet.exe ef migrations add mvc
         dotnet.exe publish --configuration Release
-        Set-Location .\bin\Release\net6.0\publish
+        Set-Location .\bin\Release\net7.0\publish
         if ($isBlazorWasm -eq $false) {
             Invoke-Expression "./$templateName.exe"
         }

src/Razor/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj

@@ -8,8 +8,6 @@
 
     <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
     <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
-    <!-- Temporarily target the previous runtime until https://github.com/dotnet/sdk/pull/14574 is merged. -->
-    <TargetLatestDotNetRuntime>false</TargetLatestDotNetRuntime>
 
     <!-- Tests do not work on Helix yet -->
     <BuildHelixPayload>false</BuildHelixPayload>

src/Shared/BenchmarkRunner/DefaultCoreConfig.cs

@@ -38,6 +38,8 @@ namespace BenchmarkDotNet.Attributes
                 .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net5.0", null, ".NET Core 5.0")))
 #elif NET6_0
                 .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net6.0", null, ".NET Core 6.0")))
+#elif NET7_0
+                .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net7.0", null, ".NET Core 7.0")))
 #else
 #error Target frameworks need to be updated.
 #endif

src/Shared/CodeAnalysis/DynamicallyAccessedMemberTypes.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if !NET5_0 && !NET6_0
+#if !NET5_0_OR_GREATER
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 

src/Shared/CodeAnalysis/DynamicallyAccessedMembersAttribute.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if !NET5_0 && !NET6_0
+#if !NET5_0_OR_GREATER
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 

src/Shared/CommandLineUtils/Utilities/DotNetMuxer.cs

@@ -4,7 +4,7 @@
 // System.AppContext.GetData is not available in these frameworks
 #nullable enable
 
-#if !NET451 && !NET452 && !NET46 && !NET461
+#if !NETFRAMEWORK
 
 using System;
 using System.Diagnostics;

src/Shared/ErrorPage/GeneratePage.ps1

@@ -1,5 +1,5 @@
 $RepoRoot = Resolve-Path "$PSScriptRoot\..\..\.."
-$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net6.0\dotnet-razorpagegenerator.exe"
+$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net7.0\dotnet-razorpagegenerator.exe"
 
 if (!(Test-Path "$ToolPath")) {
     throw "Unable to find razor page generator tool at $ToolPath"

src/Shared/OperatingSystem.cs

@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore
 {
     internal sealed class OperatingSystem
     {
-#if NET461
+#if NETFRAMEWORK
         private const bool _isBrowser = false;
 #else
         private static readonly bool _isBrowser = RuntimeInformation.IsOSPlatform(OSPlatform.Create("browser"));

src/Shared/test/Shared.Tests/PropertyHelperTest.cs

@@ -164,7 +164,7 @@ namespace Microsoft.Extensions.Internal
             var helper = Assert.Single(PropertyHelper.GetProperties(obj.GetType().GetTypeInfo()));
             Assert.Equal("Prop5", helper.Name);
         }
-#elif NET46 || NET461
+#elif NETFRAMEWORK
 #else
 #error Unknown TFM - update the set of TFMs where we test for ref structs
 #endif
@@ -746,7 +746,7 @@ namespace Microsoft.Extensions.Internal
         private readonly ref struct MyRefStruct
         {
         }
-#elif NET46 || NET461
+#elif NETFRAMEWORK
 #else
 #error Unknown TFM - update the set of TFMs where we test for ref structs
 #endif

src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs

@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
             {
                 // Full Framework will throw when trying to set the User-Agent header
                 // So avoid setting it in netstandard2.0 and only set it in netstandard2.1 and higher
-#if !NETSTANDARD2_0 && !NET461
+#if !NETSTANDARD2_0 && !NETFRAMEWORK
                 webSocket.Options.SetRequestHeader("User-Agent", Constants.UserAgentHeader.ToString());
 #else
                 // Set an alternative user agent header on Full framework
@@ -276,7 +276,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
 #if NETSTANDARD2_1 || NETCOREAPP
                     // Because we checked the CloseStatus from the 0 byte read above, we don't need to check again after reading
                     var receiveResult = await socket.ReceiveAsync(memory, CancellationToken.None);
-#elif NETSTANDARD2_0 || NET461
+#elif NETSTANDARD2_0 || NETFRAMEWORK
                     var isArray = MemoryMarshal.TryGetArray<byte>(memory, out var arraySegment);
                     Debug.Assert(isArray);
 

src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts

@@ -245,7 +245,7 @@ function runJest(httpsUrl: string, httpUrl: string) {
 
 (async () => {
     try {
-        const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "net6.0", "SignalR.Client.FunctionalTestApp.dll");
+        const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "net7.0", "SignalR.Client.FunctionalTestApp.dll");
 
         debug(`Launching Functional Test Server: ${serverPath}`);
         let desiredServerUrl = "https://127.0.0.1:0;http://127.0.0.1:0";

src/SignalR/publish-apps.ps1

@@ -1,4 +1,4 @@
-param($RootDirectory = (Get-Location), $Framework = "net6.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber)
+param($RootDirectory = (Get-Location), $Framework = "net7.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber)
 
 # De-Powershell the path
 $RootDirectory = (Convert-Path $RootDirectory)

src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj

@@ -34,6 +34,8 @@
     <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.1.x86" PrivateAssets="All" />
     <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x64" PrivateAssets="All" />
     <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.5.0.x86" PrivateAssets="All" />
+    <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x64" PrivateAssets="All" />
+    <Reference Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.6.0.x86" PrivateAssets="All" />
     <!--
       Bundle the just-built LB.csproj package content into this one the easy way. See
       UpdateLatestPackageReferences for the hard way.

src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
     <PackageType>AzureSiteExtension</PackageType>
     <ContentTargetFolders>content</ContentTargetFolders>
 
@@ -22,8 +22,8 @@
     <Content Include="applicationHost.xdt" />
     <Content Include="scmApplicationHost.xdt" />
     <Content Include="install.cmd" />
-    <Content Include="$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net461\Microsoft.Web.Xdt.Extensions.dll"
-        Condition="EXISTS('$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net461\Microsoft.Web.Xdt.Extensions.dll')"
+    <Content Include="$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll"
+        Condition="EXISTS('$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll')"
         PackagePath="content" />
   </ItemGroup>
 

src/Testing/src/xunit/FrameworkSkipConditionAttribute.cs

@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Testing
                 return true;
             }
 
-#if NET461 || NET46
+#if NETFRAMEWORK
             if (excludedFrameworks.HasFlag(RuntimeFrameworks.Mono) &&
                 TestPlatformHelper.IsMono)
             {

src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec

@@ -9,8 +9,8 @@
     <file src="build\*" target="build" />
     <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
     <file src="$artifactsBinDir$\dotnet-getdocument\$configuration$\netcoreapp2.1\publish\*.*" target="tools" />
-    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net461\*.*" target="tools\net461" />
-    <file src="$artifactsBinDir$\GetDocument.Insider\x86\$configuration$\net461\*.*" target="tools\net461-x86" />
+    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net462\*.*" target="tools\net462" />
+    <file src="$artifactsBinDir$\GetDocument.Insider\x86\$configuration$\net462\*.*" target="tools\net462-x86" />
     <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\netcoreapp2.1\publish\*.*" target="tools\netcoreapp2.1" />
   </files>
 </package>

src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommand.cs

@@ -88,7 +88,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                 return loadContext.LoadFromAssemblyPath(assemblyPath);
             };
 
-#elif NET461
+#elif NETFRAMEWORK
             AppDomain.CurrentDomain.AssemblyResolve += (source, eventArgs) =>
             {
                 var assemblyName = new AssemblyName(eventArgs.Name);

src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs

@@ -17,7 +17,7 @@ namespace Microsoft.DotNet.OpenApi.Tests
         protected readonly TextWriter _output = new StringWriter();
         protected readonly TextWriter _error = new StringWriter();
         protected readonly ITestOutputHelper _outputHelper;
-        protected const string TestTFM = "net6.0";
+        protected const string TestTFM = "net7.0";
 
         protected const string Content = @"{""x-generator"": ""NSwag""}";
         protected const string ActualUrl = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v3.0/api-with-examples.yaml";

src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs

@@ -59,7 +59,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                         cleanupExecutable = true;
                         toolsDirectory = Path.Combine(
                             thisPath,
-                            _projectOptions.Platform.Value() == "x86" ? "net461-x86" : "net461");
+                            _projectOptions.Platform.Value() == "x86" ? "net462-x86" : "net462");
 
                         var executableSource = Path.Combine(toolsDirectory, InsideManName + ".exe");
                         executable = Path.Combine(targetDirectory, InsideManName + ".exe");

src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs

@@ -36,7 +36,7 @@ namespace Microsoft.Extensions.Configuration.UserSecrets.Tests
         private const string ProjectTemplate = @"<Project ToolsVersion=""15.0"" Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     {0}
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>

startvscode.cmd

@@ -14,7 +14,7 @@ SET DOTNET_MULTILEVEL_LOOKUP=0
 SET PATH=%DOTNET_ROOT%;%PATH%
 
 :: Sets TFW for Visual Studio Code usage
-SET TARGET=net6.0
+SET TARGET=net7.0
 
 SET folder=%~1
 
@@ -29,4 +29,4 @@ IF "%folder%"=="" (
     code "%folder%"
 )
 
-exit /b 1
+exit /b 1

startvscode.sh

@@ -13,7 +13,7 @@ export DOTNET_MULTILEVEL_LOOKUP=0
 export PATH="$DOTNET_ROOT:$PATH"
 
 # Sets TFW for Visual Studio Code usage
-export TARGET=net6.0
+export TARGET=net7.0
 
 if [ ! -f "$DOTNET_ROOT/dotnet" ]; then
     echo ".NET Core has not yet been installed. Run `./restore.sh` to install tools."
@@ -26,4 +26,4 @@ else
   code $1
 fi
 
-exit 1
+exit 1