Skip to content

Commit fc8afa0

Browse files
dsplaisteddsplaisted
authored
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#51712)
2 parents 1dd9034 + 99d42be commit fc8afa0

File tree

7 files changed

+45
-11
lines changed

7 files changed

+45
-11
lines changed

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,24 @@
3737
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
3838
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
3939

40+
<!-- (Don't include these for 9.0) Allow 8.0.2xx and higher to use any version of these packages since source build
41+
is only applicable to 8.0.1xx. -->
42+
<UsagePattern IdentityGlob="Microsoft.DotNet.Arcade.Sdk/*8.0.0*" />
43+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*8.0.0*" />
44+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0.*" />
45+
<UsagePattern IdentityGlob="Microsoft.DotNet.SourceBuild.Tasks/*8.0.0*" />
46+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
47+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
48+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />
49+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Edge/8.0.*" />
50+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Orchestrator.RunnableProjects/8.0.*" />
51+
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Utils/8.0.*" />
52+
<UsagePattern IdentityGlob="Microsoft.TemplateSearch.Common/8.0.*" />
53+
<UsagePattern IdentityGlob="System.Drawing.Common/8.0.*" />
54+
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
55+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
56+
<UsagePattern IdentityGlob="Valleysoft.DockerCredsProvider/*" />
57+
4058
<!-- Transitive dependencies from roslyn -->
4159
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
4260
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />

‎eng/common/tools.ps1‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function InstallDotNet([string] $dotnetRoot,
295295
if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
296296
if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
297297
$runtimePath = $runtimePath + "\" + $version
298-
298+
299299
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
300300

301301
if (Test-Path $runtimePath) {
@@ -547,19 +547,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){
547547
})
548548
}
549549

550-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
550+
if (!$vsRequirements) {
551+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
552+
$vsRequirements = $GlobalJson.tools.vs
553+
} else {
554+
$vsRequirements = $null
555+
}
556+
}
551557
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
552558

553559
if (!$excludePrereleaseVS) {
554560
$args += '-prerelease'
555561
}
556562

557-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
563+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
558564
$args += '-version'
559565
$args += $vsRequirements.version
560566
}
561567

562-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
568+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
563569
foreach ($component in $vsRequirements.components) {
564570
$args += '-requires'
565571
$args += $component

‎src/Layout/redist/targets/GenerateLayout.targets‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@
121121

122122
<Copy SourceFiles="@(DotnetFormatDllFiles)" DestinationFiles="@(DotnetFormatDllFiles->'$(DotnetFormatDestinationDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
123123
<Copy SourceFiles="@(DotnetFormatConfigFiles)" DestinationFiles="@(DotnetFormatConfigFiles->'$(DotnetFormatDestinationDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
124+
125+
<!-- Overlay newer Microsoft.Build.* assemblies from SDK for version consistency
126+
this does not fix deps.json inconsistencies but ensures we don't ship vulnerable packages -->
127+
<Copy SourceFiles="@(SdkMicrosoftBuildFiles)"
128+
DestinationFolder="$(DotnetFormatDestinationDirectory)"
129+
Condition="Exists('%(FullPath)')"
130+
OverwriteReadOnlyFiles="true" />
124131
</Target>
125132

126133
<Target Name="PublishMSBuildExtensions"

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput)
2020
_testOutput = testOutput;
2121
}
2222

23-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
23+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
2424
public void CreateNewImage_Baseline()
2525
{
2626
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -70,7 +70,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task)
7070
return new(task.GeneratedContainerConfiguration);
7171
}
7272

73-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
73+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
7474
public void ParseContainerProperties_EndToEnd()
7575
{
7676
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -133,7 +133,8 @@ public void ParseContainerProperties_EndToEnd()
133133
/// <summary>
134134
/// Creates a console app that outputs the environment variable added to the image.
135135
/// </summary>
136-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
136+
137+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
137138
public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
138139
{
139140
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -216,7 +217,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
216217
.And.HaveStdOut("Foo");
217218
}
218219

219-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
220+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
220221
public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
221222
{
222223
const string RootlessBase = "dotnet/rootlessbase";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public DockerRegistryTests(ITestOutputHelper testOutput)
1717
_loggerFactory = new TestLoggerFactory(testOutput);
1818
}
1919

20-
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
20+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
2121
public async Task GetFromRegistry()
2222
{
2323
var loggerFactory = new TestLoggerFactory(_testOutput);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ namespace Microsoft.NET.Build.Containers.IntegrationTests;
55

66
[CollectionDefinition("Docker tests")]
77
#pragma warning disable CA1711 // Identifiers should not have incorrect suffix
8-
public class DockerTestsCollection : ICollectionFixture<DockerTestsFixture>
8+
// TODO: skipped due to docker infra instability - need to use new ACR.
9+
// See https://github.com/dotnet/sdk/issues/49300
10+
public class DockerTestsCollection // : ICollectionFixture<DockerTestsFixture>
911
#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
1012
{
1113
// This class has no code, and is never created. Its purpose is simply

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ public void EndToEndMultiArch_Labels()
13851385
[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.")]
13861386
[DockerSupportsArchInlineData("windows/amd64", "win-x64", "C:\\app")]
13871387
[DockerSupportsArchInlineData("linux/amd64", "linux-x64", "/app")]
1388-
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49502")]
1388+
[DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/49300")]
13891389
public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string rid, string workingDir)
13901390
{
13911391
ILogger logger = _loggerFactory.CreateLogger(nameof(CanPackageForAllSupportedContainerRIDs));

0 commit comments

Comments
 (0)