[release/10.0.3xx] Source code updates from dotnet/dotnet

.editorconfig

@@ -512,6 +512,9 @@ dotnet_diagnostic.IDE0040.severity = warning
 [*.txt]
 insert_final_newline = false
 
+[*.sarif]
+insert_final_newline = false
+
 # Verify settings
 [*.{received,verified}.{txt,xml,json,sh,zsh,nu,fish,ps1}]
 charset = "utf-8-bom"

NuGet.config

@@ -5,7 +5,6 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
     <add key="darc-pub-dotnet-dotnet-fad253f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-fad253f5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-dotnet-fad253f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-fad253f5/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from microsoft-testfx -->
     <!--  End: Package sources from microsoft-testfx -->

eng/Publishing.props

@@ -43,10 +43,19 @@
     <Artifact Remove="@(MsiPackages)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(PublishingWorkloadMsiInternal)' == 'true'">
+  <!-- In 2xx+ bands, MSI packages are downloaded from the 1xx build rather than built locally.
+       Mark them as Internal to avoid republishing. -->
+  <ItemGroup Condition="'$(DownloadWorkloadMsis)' == 'true'">
     <Artifact Update="$(ArtifactsShippingPackagesDir)*.Msi.*.nupkg" Visibility="Internal" />
   </ItemGroup>
 
+  <!-- In 2xx+ bands, don't publish workload manifest packages since these are versioned the same as the 1xx
+       band and would cause conflicts. -->
+  <ItemGroup Condition="'$(DotNet1xxWorkloadManifestVersion)' != ''">
+    <Artifact Update="$(ArtifactsShippingPackagesDir)Microsoft.NET.Workload.*.Manifest-*.nupkg" Visibility="Internal" />
+    <Artifact Update="$(ArtifactsNonShippingPackagesDir)Microsoft.NET.Workload.*.Manifest-*.nupkg" Visibility="Internal" />
+  </ItemGroup>
+
   <Target Name="GetNonStableProductVersion">
     <!-- Retrieve the non-stable product version. -->
     <MSBuild Projects="$(RepoRoot)src\Layout\redist\redist.csproj"

eng/Versions.props

@@ -6,7 +6,7 @@
   <PropertyGroup Label="Repo version information">
     <VersionMajor>10</VersionMajor>
     <VersionMinor>0</VersionMinor>
-    <VersionSDKMinor>2</VersionSDKMinor>
+    <VersionSDKMinor>3</VersionSDKMinor>
     <VersionFeature>00</VersionFeature>
     <!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
          It should always be the hundreds-value of the current SDK version, never any

eng/common/internal-feed-operations.ps1

@@ -26,7 +26,7 @@ function SetupCredProvider {
   $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'
 
   Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
-  Invoke-WebRequest $url -OutFile installcredprovider.ps1
+  Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1
 
   Write-Host 'Installing plugin...'
   .\installcredprovider.ps1 -Force

eng/common/post-build/nuget-verification.ps1

@@ -65,7 +65,7 @@ if ($NuGetExePath) {
         Write-Host "Downloading nuget.exe from $nugetExeUrl..."
         $ProgressPreference = 'SilentlyContinue'
         try {
-            Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
+            Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
             $ProgressPreference = 'Continue'
         } catch {
             $ProgressPreference = 'Continue'

eng/common/tools.ps1

@@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
 
     Retry({
       Write-Host "GET $uri"
-      Invoke-WebRequest $uri -OutFile $installScript
+      Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
     })
   }
 
@@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
     Write-Host "Downloading $packageName $packageVersion"
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
     Retry({
-      Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
+      Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath
     })
 
     if (!(Test-Path $packagePath)) {
@@ -556,7 +556,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
     Write-Host "Downloading vswhere $vswhereVersion"
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
     Retry({
-      Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
+      Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
     })
   }
 

global.json

@@ -7,7 +7,7 @@
     "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
   },
   "tools": {
-    "dotnet": "10.0.100",
+    "dotnet": "10.0.101",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.3",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.3",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.108",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.108",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"

src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif

@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.CSharp.NetAnalyzers",
-        "version": "10.0.200",
+        "version": "10.0.300",
         "language": "en-US"
       },
       "rules": {
@@ -708,7 +708,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.NetAnalyzers",
-        "version": "10.0.200",
+        "version": "10.0.300",
         "language": "en-US"
       },
       "rules": {
@@ -6503,7 +6503,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers",
-        "version": "10.0.200",
+        "version": "10.0.300",
         "language": "en-US"
       },
       "rules": {

src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs

@@ -8197,8 +8197,8 @@ class B : IDisposable
 {
     public void Dispose()
     {
-        A x = new A();{|CS1525:|}
-        = x{|CS1002:|}
+        A x = new A();
+        {|CS1525:=|} x{|CS1002:|}
     }
 }
 ");

src/RazorSdk/Tool/DiscoverCommand.cs

@@ -171,13 +171,14 @@ private int ExecuteCore(RazorConfiguration configuration, string projectDirector
 
                 b.Features.Add(new DefaultMetadataReferenceFeature() { References = metadataReferences });
                 b.Features.Add(new CompilationTagHelperFeature());
-                b.Features.Add(new DefaultTagHelperDescriptorProvider());
+
+                b.RegisterDefaultTagHelperProducer();
 
                 CompilerFeatures.Register(b);
             });
 
             var feature = engine.Engine.Features.OfType<ITagHelperFeature>().Single();
-            var tagHelpers = feature.GetDescriptors();
+            var tagHelpers = feature.GetTagHelpers();
 
             using (var stream = new MemoryStream())
             {

src/RazorSdk/Tool/GenerateCommand.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Threading;
 using Microsoft.AspNetCore.Razor.Language;
@@ -190,7 +191,7 @@ private int ExecuteCore(
             {
                 b.RegisterExtensions();
 
-                b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, });
+                b.Features.Add(new StaticTagHelperFeature(tagHelpers));
 
                 b.ConfigureCodeGenerationOptions(b =>
                 {
@@ -297,11 +298,11 @@ private VirtualRazorProjectFileSystem GetVirtualRazorProjectSystem(SourceItem[]
             return project;
         }
 
-        private IReadOnlyList<TagHelperDescriptor> GetTagHelpers(string tagHelperManifest)
+        private static TagHelperCollection GetTagHelpers(string tagHelperManifest)
         {
             if (!File.Exists(tagHelperManifest))
             {
-                return Array.Empty<TagHelperDescriptor>();
+                return [];
             }
 
             using (var stream = File.OpenRead(tagHelperManifest))
@@ -311,8 +312,9 @@ private IReadOnlyList<TagHelperDescriptor> GetTagHelpers(string tagHelperManifes
                 var serializer = new JsonSerializer();
                 serializer.Converters.Add(TagHelperDescriptorJsonConverter.Instance);
 
-                var descriptors = serializer.Deserialize<IReadOnlyList<TagHelperDescriptor>>(reader);
-                return descriptors;
+                var tagHelpers = serializer.Deserialize<IReadOnlyList<TagHelperDescriptor>>(reader);
+
+                return TagHelperCollection.Create(tagHelpers);
             }
         }
 
@@ -430,12 +432,9 @@ public SourceItem(string sourcePath, string outputPath, string physicalRelativeP
             public string CssScope { get; }
         }
 
-        private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature
+        private sealed class StaticTagHelperFeature(TagHelperCollection tagHelpers) : RazorEngineFeatureBase, ITagHelperFeature
         {
-            public IReadOnlyList<TagHelperDescriptor> TagHelpers { get; set; }
-
-            public IReadOnlyList<TagHelperDescriptor> GetDescriptors(CancellationToken cancellationToken) => TagHelpers;
-            public IReadOnlyList<TagHelperDescriptor> GetDescriptors() => TagHelpers;
+            public TagHelperCollection GetTagHelpers(CancellationToken cancellationToken) => tagHelpers;
         }
     }
 }

src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs

@@ -101,6 +101,13 @@ public void It_does_not_error_on_duplicate_package_names()
       `net5.0`: {
         `targetAlias`: `net5.0`
       }
+    },
+    `restore`: {
+      `frameworks`: {
+        `net5.0`: {
+          `targetAlias`: `net5.0`
+        }
+      }
     }
   }
 }".Replace('`', '"');
@@ -139,6 +146,13 @@ private static string AssetsFileWithInvalidLocale(string tfm, string locale) =>
       `{tfm}`: {
         `targetAlias`: `{tfm}`
       }
+    },
+    `restore`: {
+        `frameworks`: {
+          `{tfm}`: {
+            `targetAlias`: `{tfm}`
+          }
+        }
     }
   }
 }".Replace("`", "\"").Replace("{tfm}", tfm).Replace("{locale}", locale);

src/Workloads/Manifests/Directory.Build.props

@@ -12,6 +12,7 @@
     <IsShipping Condition="'$(MSBuildProjectName)' == 'Microsoft.NET.Workload.Emscripten.Current.Transport.Manifest'">false</IsShipping>
     <IsShippingPackage>$(IsShipping)</IsShippingPackage>
     <IncludeSymbols>false</IncludeSymbols>
+    <PackageVersion Condition="'$(DotNet1xxWorkloadManifestVersion)' != ''">$(DotNet1xxWorkloadManifestVersion)</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>

src/Workloads/Manifests/manifest-packages.csproj

@@ -5,9 +5,14 @@
   </ItemGroup>
 
   <Target Name="LayoutBuiltinManifests">
+
+    <PropertyGroup>
+      <_VersionOverride Condition="'$(DotNet1xxWorkloadManifestVersion)' != ''">Version=$(DotNet1xxWorkloadManifestVersion)</_VersionOverride>
+    </PropertyGroup>
+
     <MSBuild Projects="@(ProjectReference)"
              Targets="LayoutManifest"
-             Properties="ManifestDirectory=$(ManifestDirectory)" />
+             Properties="ManifestDirectory=$(ManifestDirectory);$(_VersionOverride)" />
   </Target>
 
 </Project>