Merge branch 'main' into dev/mabdullah/disable-logging-in-loading-projects-api

Author: mariam-abdulla

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>
@@ -546,13 +549,13 @@
       <Uri>https://github.com/dotnet/arcade-services</Uri>
       <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.25317.2">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>256bc4dd4a1a1e1358c66295f959cc266652d82c</Sha>
+      <Sha>7bf53d17d85a1e99a61130febeacc1581aff8a4c</Sha>
     </Dependency>
-    <Dependency Name="MSTest" Version="3.10.0-preview.25316.7">
+    <Dependency Name="MSTest" Version="3.10.0-preview.25317.2">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>256bc4dd4a1a1e1358c66295f959cc266652d82c</Sha>
+      <Sha>7bf53d17d85a1e99a61130febeacc1581aff8a4c</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

@@ -30,7 +30,7 @@
     <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.25317.2</MicrosoftTestingPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Label="Servicing version information">
     <VersionFeature21>30</VersionFeature21>
@@ -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>
@@ -322,7 +323,7 @@
     <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.25317.2</MSTestVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
   </PropertyGroup>

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">