[main] Source code updates from dotnet/dotnet

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "dotnet-ef": {
-      "version": "11.0.0-rc.1.26453.108",
+      "version": "12.0.0-alpha.1.26456.103",
       "commands": [
         "dotnet-ef"
       ]
@@ -27,7 +27,7 @@
       ]
     },
     "microsoft.dotnet.helix.jobmonitor": {
-      "version": "11.0.0-beta.26453.108",
+      "version": "11.0.0-beta.26456.103",
       "commands": [
         "dotnet-helix-job-monitor"
       ]

Directory.Build.targets

@@ -131,6 +131,13 @@
       '$(Language)' == 'C#' AND
       '$(TargetFrameworkIdentifier)' != '.NETFramework' ">
     <AssemblyVersion>$(AspNetCoreMajorMinorVersion).0.0</AssemblyVersion>
+    <!-- Pin the shared-framework assembly version to the previous major during early branding.
+         The bootstrap SDK's reference packs still reference the previous major, so bumping the
+         assembly version ahead of the retargeting work breaks source-build (CS1705) when
+         source-built assemblies (e.g. Microsoft.AspNetCore.OpenApi) reference the shared framework
+         at the new major while the resolved reference pack is still the previous major. Unpin to
+         $(AspNetCoreMajorMinorVersion).0.0 when the stack is retargeted to net12.0. -->
+    <AssemblyVersion Condition=" '$(PinAspNetCoreAssemblyVersionToPreviousMajor)' != 'false' ">11.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup>

eng/Versions.props

@@ -8,13 +8,13 @@
   <Import Project="Version.Details.props" />
 
   <PropertyGroup Label="Version settings">
-    <AspNetCoreMajorVersion>11</AspNetCoreMajorVersion>
+    <AspNetCoreMajorVersion>12</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">8.19.2</IdentityModelVersion>
     <IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">*-*</IdentityModelVersion>
-    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
     <DotNetFinalVersionKind></DotNetFinalVersionKind>
     <!--

eng/common/init-tools-native.sh

@@ -60,8 +60,8 @@ while (($# > 0)); do
       echo "                                          - (default) %USERPROFILE%/.netcoreeng/native"
       echo ""
       echo "  --clean                             Switch specifying not to install anything, but cleanup native asset folders"
-      echo "  --donotabortonfailure               Switch specifiying whether to abort native tools installation on failure"
-      echo "  --donotdisplaywarnings              Switch specifiying whether to display warnings during native tools installation on failure"
+      echo "  --donotabortonfailure               Switch specifying whether to abort native tools installation on failure"
+      echo "  --donotdisplaywarnings              Switch specifying whether to display warnings during native tools installation on failure"
       echo "  --force                             Clean and then install tools"
       echo "  --help                              Print help and exit"
       echo ""
@@ -83,7 +83,7 @@ function ReadGlobalJsonNativeTools {
     #   KEY="<entry-key>" VALUE="<entry-value>"
     # followed by a null byte.
     #
-    # bash: read line with null byte delimeter and push to array (for later `eval`uation).
+    # bash: read line with null byte delimiter and push to array (for later `eval`uation).
 
     while IFS= read -rd '' line; do
       native_assets+=("$line")

eng/common/loc/P22DotNetHtmlLocalization.lss

@@ -16,7 +16,7 @@
       <optionSet id="Espresso" displayName="Espresso"/>
       <optionSet id="Parsers" displayName="Parsers">
         <optionSet id="Parser 22" displayName="POMHTML Parser options" helpText="POMHTML Parser options for Localization Studio.">
-          <option id="SetCharsetInfo" displayName="Set or add Charset information when Generating" helpText="Add Charset information to the Generated file. This is in the format &lt;META HTTP-EQUIV=&quot;Content-Type&quot; CONTENT=&quot;text/html; charset=windows-1252&quot;&gt;. This is based on the Project Target Langauge. If the dir attribute value in the HTML tag i.e. &lt;HTML dir=&quot;ltr&quot;&gt; is not localizable or is missing, its value will be set automatically on Generate if the reading order of the target language is different from the source language.">
+          <option id="SetCharsetInfo" displayName="Set or add Charset information when Generating" helpText="Add Charset information to the Generated file. This is in the format &lt;META HTTP-EQUIV=&quot;Content-Type&quot; CONTENT=&quot;text/html; charset=windows-1252&quot;&gt;. This is based on the Project Target Language. If the dir attribute value in the HTML tag i.e. &lt;HTML dir=&quot;ltr&quot;&gt; is not localizable or is missing, its value will be set automatically on Generate if the reading order of the target language is different from the source language.">
             <boolean defaultValue="1" currentValue="0"/>
           </option>
           <option id="IncTermNoResId" displayName="Include Terms which have no Resource Identifier" helpText="Include Terms which have no Resource Identifier. Terms without Resource Identifiers cannot be Updated or Uploaded if they change.">

eng/common/post-build/nuget-verification.ps1

@@ -17,10 +17,10 @@
     Arguments that will be passed to the verification tool.
 .EXAMPLE
     PS> .\verify.ps1 *.nupkg
-    Verifies the metadata of all .nupkg files in the currect working directory.
+    Verifies the metadata of all .nupkg files in the current working directory.
 .EXAMPLE
     PS> .\verify.ps1 --help
-    Displays the help text of the downloaded verifiction tool.
+    Displays the help text of the downloaded verification tool.
 .LINK
     https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md
 #>

eng/common/templates-official/variables/pool-providers.yml

@@ -4,7 +4,7 @@
 # Motivation: 
 #   Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
 #   (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
-#   (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS.
+#   (allowing release builds and main PR builds to not interfere with each other) and billing (required for COGS.
 #   Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services 
 #   team needs to move resources around and create new and potentially differently-named pools. Using this template 
 #   file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.

eng/common/templates/variables/pool-providers.yml

@@ -4,7 +4,7 @@
 # Motivation:
 #   Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
 #   (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
-#   (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS.
+#   (allowing release builds and main PR builds to not interfere with each other) and billing (required for COGS.
 #   Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services
 #   team needs to move resources around and create new and potentially differently-named pools. Using this template
 #   file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.

global.json

@@ -22,9 +22,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26453.108",
-    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26453.108",
-    "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26453.108",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26456.103",
+    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26456.103",
+    "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26456.103",
     "Microsoft.Build.NoTargets": "3.7.134",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6"