Merge branch 'main' into darc-main-df148418-dc42-4fd5-b2b0-1748e6e2663f

Author: nagilson

CODEOWNERS

@@ -1,5 +1,6 @@
 # This is a comment.
 # Each line is a file pattern followed by one or more owners.
+# Syntax: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax
 
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
@@ -100,14 +101,20 @@
 /test/Microsoft.DotNet.GenAPI/ @dotnet/area-infrastructure-libraries
 /test/Microsoft.DotNet.ApiSymbolExtensions.Tests/ @dotnet/area-infrastructure-libraries
 
-# Area: dotnet containers
+# Area-Containers
 /src/Cli/Containers @dotnet/sdk-container-builds-maintainers
 /test/containerize.UnitTests @dotnet/sdk-container-builds-maintainers
 /test/Microsoft.NET.Build.Containers.IntegrationTests @dotnet/sdk-container-builds-maintainers
 /test/Microsoft.NET.Build.Containers.UnitTests @dotnet/sdk-container-builds-maintainers
 
-# dotnet-format
+# Area-Format
 /src/BuiltInTools/dotnet-format @dotnet/roslyn-ide
 /test/dotnet-format.UnitTests @dotnet/roslyn-ide
 
-/src/Microsoft.CodeAnalysis.NetAnalyzers @dotnet/dotnet-analyzers
+# Area-Microsoft.CodeAnalysis.NetAnalyzers
+/src/Microsoft.CodeAnalysis.NetAnalyzers @dotnet/dotnet-analyzers
+
+# Area-Infrastructure
+.vsts-ci.yml @MiYanni
+.vsts-pr.yml @MiYanni
+/eng/pipelines @MiYanni

src/Layout/redist/targets/GeneratePackagePruneData.targets

@@ -30,13 +30,12 @@
     </MSBuild>
   </Target>
 
-  <!-- TODO: Remove conditions from UsingTask and target when a new SDK with the CollatePackageDownload task built-in is consumed. -->
-  <UsingTask TaskName="Microsoft.NET.Build.Tasks.CollatePackageDownloads" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" Condition="'$(MaxNetVersion)' != '$(TargetingPackPruneVersion)'" />
+  <UsingTask TaskName="Microsoft.NET.Build.Tasks.CollatePackageDownloads" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
   <Target Name="AddTargetingPacksForPruneDataAsPackageDownloads"
           BeforeTargets="CollectPackageDownloads"
-          DependsOnTargets="GetTargetingPacksForPruneData"
-          Condition="'$(MaxNetVersion)' != '$(TargetingPackPruneVersion)'">
-    <CollatePackageDownloads Packages="@(TargetingPackForPruneData->Metadata('PackageName'))">
+          DependsOnTargets="GetTargetingPacksForPruneData">
+    <CollatePackageDownloads Packages="@(TargetingPackForPruneData->Metadata('PackageName'))"
+                             Condition="'@(TargetingPackForPruneData)' != ''">
       <Output TaskParameter="PackageDownloads" ItemName="PackageDownload" />
     </CollatePackageDownloads>
   </Target>

src/Tasks/sdk-tasks/sdk-tasks.InTree.targets

@@ -13,7 +13,6 @@
   <UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="CalculateTemplateVersions" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
-  <UsingTask TaskName="CollatePackageDownloads" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="Crossgen" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="ExtractArchiveToDirectory" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />
   <UsingTask TaskName="GenerateDefaultRuntimeFrameworkVersion" AssemblyFile="$(SdkTasksAssembly)" TaskFactory="TaskHostFactory" />

template_feed/Microsoft.DotNet.Common.ItemTemplates/content/EditorConfig/Dotnet/.editorconfig

@@ -9,7 +9,7 @@ indent_style = space
 indent_size = 2
 
 # Xml project files
-[*.{csproj,fsproj,vbproj,proj}]
+[*.{csproj,fsproj,vbproj,proj,slnx}]
 indent_size = 2
 
 # Xml config files

test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#EditorConfig-file#-n#item.verified/EditorConfig-file/.editorconfig

@@ -9,7 +9,7 @@ indent_style = space
 indent_size = 2
 
 # Xml project files
-[*.{csproj,fsproj,vbproj,proj}]
+[*.{csproj,fsproj,vbproj,proj,slnx}]
 indent_size = 2
 
 # Xml config files