[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'

eng/SourceBuildPrebuiltBaseline.xml

@@ -37,6 +37,24 @@
     <UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
     <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
 
+    <!-- (Don't include these for 9.0) Allow 8.0.2xx and higher to use any version of these packages since source build
+         is only applicable to 8.0.1xx. -->
+    <UsagePattern IdentityGlob="Microsoft.DotNet.Arcade.Sdk/*8.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*8.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.DotNet.SourceBuild.Tasks/*8.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Edge/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Orchestrator.RunnableProjects/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateEngine.Utils/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.TemplateSearch.Common/8.0.*" />
+    <UsagePattern IdentityGlob="System.Drawing.Common/8.0.*" />
+    <UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
+    <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
+    <UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
+
     <!-- Transitive dependencies from roslyn -->
     <UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />

eng/common/tools.ps1

@@ -295,7 +295,7 @@ function InstallDotNet([string] $dotnetRoot,
     if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
     if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
     $runtimePath = $runtimePath + "\" + $version
-  
+
     $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
 
     if (Test-Path $runtimePath) {
@@ -547,19 +547,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){
     })
   }
 
-  if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
+  if (!$vsRequirements) {
+    if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
+      $vsRequirements = $GlobalJson.tools.vs
+    } else {
+      $vsRequirements = $null
+    }
+  }
   $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
 
   if (!$excludePrereleaseVS) {
     $args += '-prerelease'
   }
 
-  if (Get-Member -InputObject $vsRequirements -Name 'version') {
+  if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
     $args += '-version'
     $args += $vsRequirements.version
   }
 
-  if (Get-Member -InputObject $vsRequirements -Name 'components') {
+  if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
     foreach ($component in $vsRequirements.components) {
       $args += '-requires'
       $args += $component

src/Layout/redist/targets/GenerateLayout.targets

@@ -121,6 +121,13 @@
 
     <Copy SourceFiles="@(DotnetFormatDllFiles)" DestinationFiles="@(DotnetFormatDllFiles->'$(DotnetFormatDestinationDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(DotnetFormatConfigFiles)" DestinationFiles="@(DotnetFormatConfigFiles->'$(DotnetFormatDestinationDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <!-- Overlay newer Microsoft.Build.* assemblies from SDK for version consistency
+         this does not fix deps.json inconsistencies but ensures we don't ship vulnerable packages -->
+    <Copy SourceFiles="@(SdkMicrosoftBuildFiles)"
+          DestinationFolder="$(DotnetFormatDestinationDirectory)"
+          Condition="Exists('%(FullPath)')"
+          OverwriteReadOnlyFiles="true" />
   </Target>
 
   <Target Name="PublishMSBuildExtensions"

test/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs

@@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput)
         _testOutput = testOutput;
     }
 
-    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
+    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
     public void CreateNewImage_Baseline()
     {
         DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -70,7 +70,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task)
         return new(task.GeneratedContainerConfiguration);
     }
 
-    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
+    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
     public void ParseContainerProperties_EndToEnd()
     {
         DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -133,7 +133,8 @@ public void ParseContainerProperties_EndToEnd()
     /// <summary>
     /// Creates a console app that outputs the environment variable added to the image.
     /// </summary>
-    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
+
+    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
     public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
     {
         DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -216,7 +217,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
             .And.HaveStdOut("Foo");
     }
 
-    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
+    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
     public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
     {
         const string RootlessBase = "dotnet/rootlessbase";

test/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs

@@ -17,7 +17,7 @@ public DockerRegistryTests(ITestOutputHelper testOutput)
         _loggerFactory = new TestLoggerFactory(testOutput);
     }
 
-    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
+    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
     public async Task GetFromRegistry()
     {
         var loggerFactory = new TestLoggerFactory(_testOutput);

test/Microsoft.NET.Build.Containers.IntegrationTests/DockerTestsCollection.cs

@@ -5,7 +5,9 @@ namespace Microsoft.NET.Build.Containers.IntegrationTests;
 
 [CollectionDefinition("Docker tests")]
 #pragma warning disable CA1711 // Identifiers should not have incorrect suffix
-public class DockerTestsCollection : ICollectionFixture<DockerTestsFixture>
+// TODO: skipped due to docker infra instability - need to use new ACR.
+// See https://github.com/dotnet/sdk/issues/49300
+public class DockerTestsCollection // : ICollectionFixture<DockerTestsFixture>
 #pragma warning restore CA1711 // Identifiers should not have incorrect suffix
 {
     // This class has no code, and is never created. Its purpose is simply

test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

@@ -1385,7 +1385,7 @@ public void EndToEndMultiArch_Labels()
     [DockerSupportsArchInlineData("linux/386", "linux-x86", "/app", Skip = "There's no apphost for linux-x86 so we can't execute self-contained, and there's no .NET runtime base image for linux-x86 so we can't execute framework-dependent.")]
     [DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")]
     [DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")]
-    [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
+    [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")]
     public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir)
     {
         ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs));