Minor typos

eng/common/cross/toolchain.cmake

@@ -19,7 +19,9 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
-  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf)
+    set(TOOLCHAIN "armv7-alpine-linux-musleabihf")
+  elseif(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
     set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
   else()
     set(TOOLCHAIN "arm-linux-gnueabihf")

eng/common/templates/post-build/post-build.yml

@@ -39,14 +39,14 @@ parameters:
   NetEngLatestChannelId: 2
   NetEngValidationChannelId: 9
   NetDev5ChannelId: 131
+  NetDev6ChannelId: 1296
   GeneralTestingChannelId: 529
   NETCoreToolingDevChannelId: 548
   NETCoreToolingReleaseChannelId: 549
   NETInternalToolingChannelId: 551
   NETCoreExperimentalChannelId: 562
   NetEngServicesIntChannelId: 678
   NetEngServicesProdChannelId: 679
-  Net5Preview7ChannelId: 1065
   Net5Preview8ChannelId: 1155
   Net5RC1ChannelId: 1157
   NetCoreSDK313xxChannelId: 759
@@ -115,7 +115,7 @@ stages:
           inputs:
             filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
             arguments: -PromoteToChannels "$(TargetChannels)"
-              -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
+              -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
 
     - job:
       displayName: NuGet Validation
@@ -276,13 +276,13 @@ stages:
       dependsOn: ${{ parameters.publishDependsOn }}
       publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
       symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net5_Preview7_Publish'
-      channelName: '.NET 5 Preview 7'
-      akaMSChannelName: 'net5/preview7'
-      channelId: ${{ parameters.Net5Preview7ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
+      stageName: 'NetCore_Dev6_Publish'
+      channelName: '.NET 6 Dev'
+      akaMSChannelName: 'net6/dev'
+      channelId: ${{ parameters.NetDev6ChannelId }}
+      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
+      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
+      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
 
   - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
     parameters:
@@ -298,7 +298,7 @@ stages:
       shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
       symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
 
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
+  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
     parameters:
       artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
       dependsOn: ${{ parameters.publishDependsOn }}
@@ -308,9 +308,9 @@ stages:
       channelName: '.NET 5 RC 1'
       akaMSChannelName: 'net5/rc1'
       channelId: ${{ parameters.Net5RC1ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
+      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
+      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
+      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
 
   - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
     parameters:

global.json

@@ -30,7 +30,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20411.8",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20411.8"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20417.6"
   }
 }

src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs

@@ -37,7 +37,7 @@ public class WeatherForecastController : ControllerBase
 
         private readonly ILogger<WeatherForecastController> _logger;
 
-        // The Web API will only accept tokens 1) for users, and 2) having the access_as_user scope for this API
+        // The Web API will only accept tokens 1) for users, and 2) having the api-scope scope for this API
         static readonly string[] scopeRequiredByApi = new string[] { "api-scope" };
 
 #if (GenerateApi)
@@ -75,7 +75,7 @@ public WeatherForecastController(ILogger<WeatherForecastController> logger,
         {
              _logger = logger;
             _graphServiceClient = graphServiceClient;
-       }
+        }
 
         [HttpGet]
         public async Task<IEnumerable<WeatherForecast>> Get()

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html

@@ -1 +1 @@
-                         
+~~~~~~~~~~ ~~~~~~~~~~~~~~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html

@@ -1,9 +1,9 @@
-                       
-<div class="                ">
+~~~~~~~~~~~ ~~~~~~~~~~~
+<div class="~~~~~~~~~~~~~~~~">
     Hello world
-                                  
+    ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 </div>
 
-            
-                                 
- 
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~
+~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html

@@ -1,8 +1,8 @@
-<div class="                ">
+<div class="~~~~~~~~~~~~~~~~">
     Hello world
-                                  
+    ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 </div>
-   
-                    
- 
-<p class="                         " />
+~~ 
+    ~~~ ~~~ ~ ~~~~~~
+~
+<p class="~~~~~~~ ~~ ~~~~~ ~ ~~~~ ~" />

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html

@@ -1,15 +1,15 @@
-                                                                                   
+~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~
 
-     
-      
-      "
+~~~~~
+~~~~~ 
+~~~~~ "
 
-      
-       
+~~~~~~
+~~~~~~ 
 
-       
-        
-                         
+~~~~~~~
+~~~~~~~ 
+~~~~~~~ ~~~~~~~~~~~~~~~~~
 
-          
-           
+~~~~~~~~~~
+~~~~~~~~~~ 

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html

@@ -1,2 +1,2 @@
-                                    
-              
+~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html

@@ -1,2 +1,2 @@
-     
-              
+~~~~~
+~~~~~~ ~~~~~~~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html

@@ -1,3 +1,3 @@
-              
-                            
-                              
+~~~~~~ ~~~~~~~
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html

@@ -1,5 +1,5 @@
-              
-                                
-                                 
-                                  
-                                    
+~~~~~~ ~~~~~~~
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~   
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~  
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~  ~  
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~  ~  

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html

@@ -1 +1 @@
-                            
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html

@@ -1 +1 @@
-           Test.
+~~~~~~~~~~ Test.

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html

@@ -1,4 +1,4 @@
-      "foo
+~~~~~ "foo
 
 <h1>About Us</h1>
 <p>We are awesome.</p>

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html

@@ -1,6 +1,6 @@
-               
+~~~~~~ ~~~~~~~~
 
-                                           
+~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 
-<input-test for="    " />
-<input-test for="      " />
+<input-test for="~~~~" />
+<input-test for="~~~~~~" />

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html

@@ -1 +1 @@
-                                     
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html

@@ -1,2 +1,2 @@
-                            
-                                     
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html

@@ -1,3 +1,3 @@
-     
-                         
+~~~~~
+~~~~~~~~~~ ~~~~~~~~~~~~~~
 <h1>Hi There!</h1>

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html

@@ -1,2 +1,2 @@
 <div>Some text here.</div>
-     
+~~~~~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html

@@ -1,13 +1,13 @@
-              
+~~~~~ ~~~~~~~~
 
-               
-                                          
+~~~~~~ ~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                                     
-     
-                                        
-     
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
 
-<h1>New Customer            </h1>
+<h1>New Customer ~~~~~~~~~~~</h1>

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html

@@ -1,28 +1,28 @@
-     
+~~~~~
 
-                          
-                                          
+~~~~~~~~~~~~~ ~~~ ~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                                                  
-     
-                             
-                                                         
-     
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~~~~~~~~~
+    ~
+        ~~~~ ~ ~~~~~~~~~~~~~~
+        ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~
 
-                                    
+    ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
 
-                         
-     
-                                        
-     
- 
+    ~~~~~~ ~~~~~ ~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
 
 <h1>New Customer</h1>
 <form method="post" class="form-horizontal">
     <div class="text-danger"></div>
     <div class="form-group">
-        <label class="col-md-2 control-label">     </label>
+        <label class="col-md-2 control-label">~~~~~</label>
         <div class="col-md-10">
             <input class="form-control" />
             <span class="text-danger"></span>

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html

@@ -1,32 +1,32 @@
-     
+~~~~~
 
-               
-                          
-                                          
+~~~~~~ ~~~~~~~~
+~~~~~~~~~~~~~ ~~~ ~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                                     
-     
-                                                      
-         
-                                 
-                                                             
-         
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~~~~~~~~~
+        ~
+            ~~~~ ~ ~~~~~~~~~~~~~~
+            ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~
 
-                                        
-     
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
 
-                         
-     
-                                        
-     
- 
+    ~~~~~~ ~~~~~ ~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
 
 <h1>New Customer</h1>
 <form method="post" class="form-horizontal" >
     <div class="text-danger"></div>
     <div class="form-group">
-        <label class="col-md-2 control-label">           </label>
+        <label class="col-md-2 control-label">~~~~~~~~~~~</label>
         <div class="col-md-10">
             <input class="form-control" />
             <span class="text-danger"></span>

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html

@@ -1,14 +1,14 @@
-               
+~~~~~~ ~~~~~~~~
 
-                                           
+~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 
-   
-                                         
- 
+~~ 
+    ~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
 <div>Some body</div>
 
-                   
+~~~~~~~~ ~~~~~~~~ ~
     <div>This is in Section 1</div>
-    <input-test for="    " />
- 
+    <input-test for="~~~~" />
+~

src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html

@@ -1,4 +1,4 @@
-                            
-                         
-             
-             
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~
+~~~~~~ ~~~~~~