Merge branch 'main' into trim_timezones

dotnet · Jan 9, 2025 · a850504 · a850504
2 parents 0e29af8 + 535f840
commit a850504
Show file tree

Hide file tree

Showing 13 changed files with 312 additions and 306 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
@@ -33,7 +33,6 @@ __QEMUArch=arm
 __UbuntuArch=armhf
 __UbuntuRepo=
 __UbuntuSuites="updates security backports"
-__DebianSuites=
 __LLDB_Package="liblldb-3.9-dev"
 __SkipUnmount=0
 
@@ -188,8 +187,7 @@ while :; do
             __AlpineArch=loongarch64
             __QEMUArch=loongarch64
             __UbuntuArch=loong64
-            __UbuntuSuites=
-            __DebianSuites=unreleased
+            __UbuntuSuites=unreleased
             __LLDB_Package="liblldb-19-dev"
 
             if [[ "$__CodeName" == "sid" ]]; then
@@ -782,6 +780,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then
     popd
     rm -rf "$__RootfsDir/tmp"
 elif [[ -n "$__CodeName" ]]; then
+    __Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)"
+
     if [[ "$__SkipEmulation" == "1" ]]; then
         if [[ -z "$AR" ]]; then
             if command -v ar &>/dev/null; then
@@ -794,19 +794,16 @@ elif [[ -n "$__CodeName" ]]; then
             fi
         fi
 
-        # shellcheck disable=SC2086
-        suites="$__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")"
-
         PYTHON=${PYTHON_EXECUTABLE:-python3}
 
         # shellcheck disable=SC2086,SC2046
         echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
-            $(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
+            $(for suite in $__Suites; do echo -n "--suite $suite "; done) \
             $__UbuntuPackages
 
         # shellcheck disable=SC2086,SC2046
         "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
-            $(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
+            $(for suite in $__Suites; do echo -n "--suite $suite "; done) \
             $__UbuntuPackages
 
         exit 0
@@ -837,7 +834,7 @@ elif [[ -n "$__CodeName" ]]; then
     cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <<EOF
 Types: deb
 URIs: $__UbuntuRepo
-Suites: $__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")
+Suites: $__Suites
 Components: main universe
 Signed-By: $__KeyringFile
 EOF

diff --git a/global.json b/global.json
@@ -17,8 +17,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25057.5",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25057.5",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
   }

diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs
@@ -253,7 +253,8 @@ private async Task<IEnumerable<ITemplateInfo>> GetCuratedListAsync(CancellationT
                 "Microsoft.Common.Console", //console
                 "Microsoft.Common.WPF", //wpf
                 "Microsoft.Common.WinForms", //winforms
-                "Microsoft.Web.Blazor" //blazor
+                "Microsoft.Web.Blazor", //blazor
+                "Microsoft.Test.MSTest" //mstest
             };
 
             IReadOnlyList<ITemplateInfo> templates = await _templatePackageManager.GetTemplatesAsync(cancellationToken).ConfigureAwait(false);

diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
@@ -31,12 +31,13 @@
     <!-- msbuild dependencies -->
     <MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
     <!-- runtime dependencies -->
-    <MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsFileSystemGlobbingVersion>9.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>9.0.0</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>
+    <!-- nuget dependencies -->
+    <NuGetProtocolVersion>6.11.0</NuGetProtocolVersion>
     <!-- external dependencies -->
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
-    <NuGetProtocolVersion>6.9.1</NuGetProtocolVersion>
     <OctokitVersion>10.0.0</OctokitVersion>
   </PropertyGroup>
 </Project>
diff --git a/test/EndToEnd.Tests/ProjectBuildTests.cs b/test/EndToEnd.Tests/ProjectBuildTests.cs
@@ -194,6 +194,7 @@ public void DotnetNewShowsCuratedListCorrectly()
 [\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+
 [\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+
 [\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+
+[\w \.\(\)]+mstest\s+\[C#\],F#,VB[\w\ \/]+
 ";
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))

diff --git a/.../Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt b/.../Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt
@@ -14,11 +14,12 @@ Generators                            Type
 The 'dotnet new' command creates a .NET project based on a template.
 
 Common templates are:
-Template Name   Short Name  Language    Tags                  
+Template Name        Short Name  Language    Tags                   
 %TABLE HEADER DELIMITER%
-Blazor Web App  blazor      [C#]        Web/Blazor/WebAssembly
-Class Library   classlib    [C#],F#,VB  Common/Library        
-Console App     console     [C#],F#,VB  Common/Console        
+Blazor Web App       blazor      [C#]        Web/Blazor/WebAssembly
+Class Library        classlib    [C#],F#,VB  Common/Library         
+Console App          console     [C#],F#,VB  Common/Console         
+MSTest Test Project  mstest      [C#],F#,VB  Test/MSTest/Desktop/Web
 
 An example would be:
    dotnet new console

diff --git a/...ts/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt b/...ts/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt
@@ -14,11 +14,12 @@ Generators                            Type
 The 'dotnet new' command creates a .NET project based on a template.
 
 Common templates are:
-Template Name   Short Name  Language    Tags                  
+Template Name        Short Name  Language    Tags                   
 %TABLE HEADER DELIMITER%
-Blazor Web App  blazor      [C#]        Web/Blazor/WebAssembly
-Class Library   classlib    [C#],F#,VB  Common/Library        
-Console App     console     [C#],F#,VB  Common/Console        
+Blazor Web App       blazor      [C#]        Web/Blazor/WebAssembly
+Class Library        classlib    [C#],F#,VB  Common/Library         
+Console App          console     [C#],F#,VB  Common/Console         
+MSTest Test Project  mstest      [C#],F#,VB  Test/MSTest/Desktop/Web
 
 An example would be:
    dotnet new console

diff --git a/...pprovals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt b/...pprovals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt
@@ -14,13 +14,14 @@ Generators                            Type
 The 'dotnet new' command creates a .NET project based on a template.
 
 Common templates are:
-Template Name      Short Name  Language    Tags                  
+Template Name        Short Name  Language    Tags                   
 %TABLE HEADER DELIMITER%
-Blazor Web App     blazor      [C#]        Web/Blazor/WebAssembly
-Class Library      classlib    [C#],F#,VB  Common/Library        
-Console App        console     [C#],F#,VB  Common/Console        
-Windows Forms App  winforms    [C#],VB     Common/WinForms       
-WPF Application    wpf         [C#],VB     Common/WPF            
+Blazor Web App       blazor      [C#]        Web/Blazor/WebAssembly
+Class Library        classlib    [C#],F#,VB  Common/Library         
+Console App          console     [C#],F#,VB  Common/Console         
+MSTest Test Project  mstest      [C#],F#,VB  Test/MSTest/Desktop/Web
+Windows Forms App    winforms    [C#],VB     Common/WinForms        
+WPF Application      wpf         [C#],VB     Common/WPF             
 
 An example would be:
    dotnet new console

diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt
@@ -1,11 +1,12 @@
 The 'dotnet new' command creates a .NET project based on a template.
 
 Common templates are:
-Template Name   Short Name  Language    Tags                  
---------------  ----------  ----------  ----------------------
-Blazor Web App  blazor      [C#]        Web/Blazor/WebAssembly
-Class Library   classlib    [C#],F#,VB  Common/Library        
-Console App     console     [C#],F#,VB  Common/Console        
+Template Name        Short Name  Language    Tags                   
+-------------------  ----------  ----------  -----------------------
+Blazor Web App       blazor      [C#]        Web/Blazor/WebAssembly 
+Class Library        classlib    [C#],F#,VB  Common/Library         
+Console App          console     [C#],F#,VB  Common/Console         
+MSTest Test Project  mstest      [C#],F#,VB  Test/MSTest/Desktop/Web
 
 An example would be:
    dotnet new console

diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt
@@ -1,11 +1,12 @@
 The 'dotnet new' command creates a .NET project based on a template.
 
 Common templates are:
-Template Name   Short Name  Language    Tags                  
---------------  ----------  ----------  ----------------------
-Blazor Web App  blazor      [C#]        Web/Blazor/WebAssembly
-Class Library   classlib    [C#],F#,VB  Common/Library        
-Console App     console     [C#],F#,VB  Common/Console        
+Template Name        Short Name  Language    Tags                   
+-------------------  ----------  ----------  -----------------------
+Blazor Web App       blazor      [C#]        Web/Blazor/WebAssembly 
+Class Library        classlib    [C#],F#,VB  Common/Library         
+Console App          console     [C#],F#,VB  Common/Console         
+MSTest Test Project  mstest      [C#],F#,VB  Test/MSTest/Desktop/Web
 
 An example would be:
    dotnet new console

diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt
@@ -1,13 +1,14 @@
 The 'dotnet new' command creates a .NET project based on a template.
 
 Common templates are:
-Template Name      Short Name  Language    Tags                  
------------------  ----------  ----------  ----------------------
-Blazor Web App     blazor      [C#]        Web/Blazor/WebAssembly
-Class Library      classlib    [C#],F#,VB  Common/Library        
-Console App        console     [C#],F#,VB  Common/Console        
-Windows Forms App  winforms    [C#],VB     Common/WinForms       
-WPF Application    wpf         [C#],VB     Common/WPF            
+Template Name        Short Name  Language    Tags                   
+-------------------  ----------  ----------  -----------------------
+Blazor Web App       blazor      [C#]        Web/Blazor/WebAssembly 
+Class Library        classlib    [C#],F#,VB  Common/Library         
+Console App          console     [C#],F#,VB  Common/Console         
+MSTest Test Project  mstest      [C#],F#,VB  Test/MSTest/Desktop/Web
+Windows Forms App    winforms    [C#],VB     Common/WinForms        
+WPF Application      wpf         [C#],VB     Common/WPF             
 
 An example would be:
    dotnet new console