Merge main

Author: joeloff

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.25312.2",
+      "version": "1.1.0-beta.25317.2",
       "commands": [
         "darc"
       ]

CODEOWNERS

@@ -65,12 +65,9 @@
 # ILLink and ReadyToRun targets and tasks owned by runtime team
 # Area-ILLink Area-ReadyToRun
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets @dotnet/illink
-/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @dotnet/area-type-system-and-startup 
-/src/Tasks/Microsoft.NET.Build.Tasks/RunReadyToRunCompiler.cs @dotnet/area-type-system-and-startup 
 /test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @dotnet/illink
-/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs @dotnet/area-type-system-and-startup
 # Publish.targets related to ILLink and ReadyToRun is own by both runtime and SDK team
-/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @dotnet/illink @dotnet/area-type-system-and-startup @dotnet/dotnet-cli
+/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @dotnet/illink @dotnet/dotnet-cli
 # Area-ClickOnce
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
 

documentation/general/dotnet-run-file.md

@@ -65,7 +65,11 @@ For example, the remaining command-line arguments after the first argument (the
 (except for the arguments recognized by `dotnet run` unless they are after the `--` separator)
 and working directory is not changed (e.g., `cd /x/ && dotnet run /y/file.cs` runs the program in directory `/x/`).
 
-`dotnet path.cs` is a shortcut for `dotnet run path.cs` provided that `path.cs` is a valid [target path](#target-path).
+If a dash (`-`) is given instead of the target path (i.e., `dotnet run -`), the C# file to be executed is read from the standard input.
+In this case, the current working directory is not used to search for other files (launch profiles, other sources in case of multi-file apps);
+the compilation consists solely of the single file read from the standard input.
+
+`dotnet path.cs` is a shortcut for `dotnet run path.cs` provided that `path.cs` is a valid [target path](#target-path) (`dotnet -` is currently not supported).
 
 ### Other commands
 
@@ -247,10 +251,6 @@ This section outlines potential future enhancements and alternatives considered.
 
 We could allow folders as the target path in the future (e.g., `dotnet run ./my-app/`).
 
-An option like `dotnet run --cs-from-stdin` could read the C# file from standard input.
-In this case, the current working directory would not be used to search for project or other C# files;
-the compilation would consist solely of the single file read from standard input.
-
 Similarly, it could be possible to specify the whole C# source text in a command-line argument
 like `dotnet run --cs-code 'Console.WriteLine("Hi")'`.
 

eng/Version.Details.xml

@@ -67,7 +67,10 @@
     <Dependency Name="Microsoft.NET.Runtime.Emscripten.Sdk.Internal" Version="10.0.0-preview.6.25316.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>20343176cfd35b56036dc4ca9d9ddd2a201a4e92</Sha>
-      <SourceBuild RepoName="emsdk" ManagedOnly="true" />
+    </Dependency>
+    <Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64" Version="10.0.0-preview.6.25316.103">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>20343176cfd35b56036dc4ca9d9ddd2a201a4e92</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.15.0-preview-25316-103">
       <Uri>https://github.com/dotnet/dotnet</Uri>
@@ -538,21 +541,21 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>20343176cfd35b56036dc4ca9d9ddd2a201a4e92</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25312.2">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25317.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>ddbab8acf544cc1762d5552f6f7e4eaf20429e9b</Sha>
+      <Sha>ae710fac68a8b1eb7ddf3f3579b0c372e2e01feb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25312.2">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25317.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>ddbab8acf544cc1762d5552f6f7e4eaf20429e9b</Sha>
+      <Sha>ae710fac68a8b1eb7ddf3f3579b0c372e2e01feb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25316.7">
+    <Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25318.4">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>256bc4dd4a1a1e1358c66295f959cc266652d82c</Sha>
+      <Sha>0138b4a65787965df7e592b83d32a237b9e65b26</Sha>
     </Dependency>
-    <Dependency Name="MSTest" Version="3.10.0-preview.25316.7">
+    <Dependency Name="MSTest" Version="3.10.0-preview.25318.4">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>256bc4dd4a1a1e1358c66295f959cc266652d82c</Sha>
+      <Sha>0138b4a65787965df7e592b83d32a237b9e65b26</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.6.25316.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>

eng/Versions.props

@@ -22,15 +22,15 @@
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">6</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">7</PreReleaseVersionIteration>
     <!-- In source-build the version of the compiler must be same or newer than the version of the
          compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
          in that build mode analyzer assemblies always target the live compiler API. -->
     <UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
     <UsingToolVSSDK>true</UsingToolVSSDK>
     <FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
     <!-- This property is only used in the dotnet test integration tests. -->
-    <MicrosoftTestingPlatformVersion>1.8.0-preview.25316.7</MicrosoftTestingPlatformVersion>
+    <MicrosoftTestingPlatformVersion>1.8.0-preview.25318.4</MicrosoftTestingPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Label="Servicing version information">
     <VersionFeature21>30</VersionFeature21>
@@ -39,8 +39,8 @@
     <VersionFeature60>36</VersionFeature60>
     <VersionFeature70>20</VersionFeature70>
     <!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
-    <VersionFeature80>15</VersionFeature80>
-    <VersionFeature90>4</VersionFeature90>
+    <VersionFeature80>16</VersionFeature80>
+    <VersionFeature90>5</VersionFeature90>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -89,7 +89,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.25312.2</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.25317.2</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/aspire -->
@@ -274,6 +274,7 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/emsdk -->
     <MicrosoftNETRuntimeEmscriptenSdkInternalVersion>10.0.0-preview.6.25316.103</MicrosoftNETRuntimeEmscriptenSdkInternalVersion>
+    <MicrosoftNETRuntimeEmscripten3156Cachewinx64Version>10.0.0-preview.6.25316.103</MicrosoftNETRuntimeEmscripten3156Cachewinx64Version>
     <!-- emscripten versions, these are are included in package IDs and need to be kept in sync with emsdk -->
     <EmscriptenVersionCurrent>3.1.56</EmscriptenVersionCurrent>
     <EmscriptenVersionNet9>3.1.56</EmscriptenVersionNet9>
@@ -325,20 +326,20 @@
     <AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
     <AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
-    <MSTestVersion>3.10.0-preview.25316.7</MSTestVersion>
+    <MSTestVersion>3.10.0-preview.25318.4</MSTestVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Workload manifest package versions">
     <AspireFeatureBand>8.0.100</AspireFeatureBand>
     <MicrosoftNETSdkAspireManifest80100PackageVersion>8.2.2</MicrosoftNETSdkAspireManifest80100PackageVersion>
-    <MauiFeatureBand>10.0.100-preview.3</MauiFeatureBand>
-    <MauiWorkloadManifestVersion>10.0.0-preview.3.25208.1</MauiWorkloadManifestVersion>
-    <XamarinAndroidWorkloadManifestVersion>36.0.0-preview.3.22</XamarinAndroidWorkloadManifestVersion>
-    <XamarinIOSWorkloadManifestVersion>18.2.10695-net10-p3</XamarinIOSWorkloadManifestVersion>
-    <XamarinMacCatalystWorkloadManifestVersion>18.2.10695-net10-p3</XamarinMacCatalystWorkloadManifestVersion>
-    <XamarinMacOSWorkloadManifestVersion>15.2.10695-net10-p3</XamarinMacOSWorkloadManifestVersion>
-    <XamarinTvOSWorkloadManifestVersion>18.2.10695-net10-p3</XamarinTvOSWorkloadManifestVersion>
+    <MauiFeatureBand>10.0.100-preview.5</MauiFeatureBand>
+    <MauiWorkloadManifestVersion>10.0.0-preview.5.25306.5</MauiWorkloadManifestVersion>
+    <XamarinAndroidWorkloadManifestVersion>36.0.0-preview.5.116</XamarinAndroidWorkloadManifestVersion>
+    <XamarinIOSWorkloadManifestVersion>18.4.10622-net10-p5</XamarinIOSWorkloadManifestVersion>
+    <XamarinMacCatalystWorkloadManifestVersion>18.4.10622-net10-p5</XamarinMacCatalystWorkloadManifestVersion>
+    <XamarinMacOSWorkloadManifestVersion>15.4.10622-net10-p5</XamarinMacOSWorkloadManifestVersion>
+    <XamarinTvOSWorkloadManifestVersion>18.4.10622-net10-p5</XamarinTvOSWorkloadManifestVersion>
   </PropertyGroup>
   <PropertyGroup Label="Pinned dependency">
     <!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

eng/pipelines/templates/jobs/sdk-build.yml

@@ -58,7 +58,7 @@ jobs:
     templateContext:
       sdl:
         binskim:
-          analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;
+          analyzeTargetGlob: +:f|eng\**\*.props;+:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;-:f|artifacts\bin\**\msdia140.dll;-:f|artifacts\bin\**\pgort140.dll;-:f|artifacts\bin\*Tests\**;-:f|**\Microsoft.NET.Runtime.Emscripten**\tools\**;-:f|**\CodeCoverage\**;
 
     steps:
     ############## PREP ###############

src/Cli/Microsoft.TemplateEngine.Cli/Help/HelpBuilder.cs

@@ -43,11 +43,6 @@ public virtual void Write(HelpContext context)
             throw new ArgumentNullException(nameof(context));
         }
 
-        if (context.Command.Hidden)
-        {
-            return;
-        }
-
         foreach (var writeSection in GetLayout(context))
         {
             if (writeSection(context))

src/Cli/Microsoft.TemplateEngine.Cli/LocalizableStrings.Designer.cs

@@ -809,7 +809,7 @@ The header is followed by the list of parameters and their errors (might be seve
     <comment>{0} is the exit code</comment>
   </data>
   <data name="TemplateCommand_DisplayConstraintResults_Error" xml:space="preserve">
-    <value>Failed to instatiate template '{0}', the following constraints are not met:</value>
+    <value>Failed to instantiate template '{0}', the following constraints are not met:</value>
     <comment>{0} - template name (user friendly)</comment>
   </data>
   <data name="TemplateCommand_DisplayConstraintResults_Hint" xml:space="preserve">