Skip to content

Commit 455157c

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/8.0.4xx' into internal-merge-8.0.4xx-2025-11-11-1154
2 parents 4d4d025 + bbc050a commit 455157c

File tree

12 files changed

+44
-45
lines changed

12 files changed

+44
-45
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<add key="darc-int-dotnet-runtime-a2266c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a2266c72/nuget/v3/index.json" />
2525
<!-- End: Package sources from dotnet-runtime -->
2626
<!-- Begin: Package sources from dotnet-templating -->
27-
<add key="darc-pub-dotnet-templating-d5ddb7f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d5ddb7f6/nuget/v3/index.json" />
27+
<add key="darc-pub-dotnet-templating-98f9e64" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-98f9e648/nuget/v3/index.json" />
2828
<!-- End: Package sources from dotnet-templating -->
2929
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3030
<add key="darc-int-dotnet-windowsdesktop-4519b9f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-4519b9f0/nuget/v3/index.json" />

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535

3636
<!-- (Don't include these for 9.0) Allow 8.0.2xx and higher to use any version of these packages since source build
3737
is only applicable to 8.0.1xx. -->
38+
<UsagePattern IdentityGlob="Microsoft.DotNet.Arcade.Sdk/*8.0.0*" />
3839
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*8.0.0*" />
3940
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0.*" />
41+
<UsagePattern IdentityGlob="Microsoft.DotNet.SourceBuild.Tasks/*8.0.0*" />
4042
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Abstractions/8.0.*" />
4143
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core/8.0.*" />
4244
<UsagePattern IdentityGlob="Microsoft.TemplateEngine.Core.Contracts/8.0.*" />

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.416">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.417">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51</Sha>
6+
<Sha>98f9e6489e60d738e2bc75dd9e2d409dd3b56821</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.416-servicing.25515.10">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.417-servicing.25563.1">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51</Sha>
10+
<Sha>98f9e6489e60d738e2bc75dd9e2d409dd3b56821</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.416-servicing.25515.10">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.417-servicing.25563.1">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>d5ddb7f6ee6f52c8e8ff512eca1cce7730b38c51</Sha>
14+
<Sha>98f9e6489e60d738e2bc75dd9e2d409dd3b56821</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.22">
@@ -354,9 +354,9 @@
354354
<Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25507.1">
357+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25522.3">
358358
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
359-
<Sha>7a3266db9e2b7422e8277f04932eff9b7064b66e</Sha>
359+
<Sha>449148366d9105de8a6470ebc4ba198926e9a30a</Sha>
360360
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
361361
</Dependency>
362362
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25555.2">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25562.3">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
496+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25555.2">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25562.3">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
501+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25555.2">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25562.3">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
505+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25555.2">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25562.3">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
509+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25555.2</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25562.3</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -132,7 +132,7 @@
132132
so target one that matches the version in minimumMSBuildVersion.
133133
134134
This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
135-
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.27</MicrosoftBuildMinimumVersion>
135+
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.43</MicrosoftBuildMinimumVersion>
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
138138
<MicrosoftBuildLocalizationPackageVersion>17.11.48-servicing-25466-05</MicrosoftBuildLocalizationPackageVersion>
@@ -143,13 +143,13 @@
143143
</PropertyGroup>
144144
<PropertyGroup>
145145
<!-- Dependencies from https://github.com/dotnet/templating -->
146-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.416</MicrosoftTemplateEngineAbstractionsPackageVersion>
146+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.417</MicrosoftTemplateEngineAbstractionsPackageVersion>
147147
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
148148
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
149149
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
150150
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
151151
<!-- test dependencies -->
152-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.416-servicing.25515.10</MicrosoftTemplateEngineMocksPackageVersion>
152+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.417-servicing.25563.1</MicrosoftTemplateEngineMocksPackageVersion>
153153
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
154154
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
155155
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -215,7 +215,7 @@
215215
<PropertyGroup>
216216
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
217217
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
218-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25555.2</MicrosoftDotNetXUnitExtensionsVersion>
218+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25562.3</MicrosoftDotNetXUnitExtensionsVersion>
219219
<MoqPackageVersion>4.18.4</MoqPackageVersion>
220220
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
221221
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/tools.ps1‎

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

302302
if (Test-Path $runtimePath) {
@@ -545,25 +545,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){
545545
})
546546
}
547547

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

557551
if (!$excludePrereleaseVS) {
558552
$args += '-prerelease'
559553
}
560554

561-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
555+
if (Get-Member -InputObject $vsRequirements -Name 'version') {
562556
$args += '-version'
563557
$args += $vsRequirements.version
564558
}
565559

566-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
560+
if (Get-Member -InputObject $vsRequirements -Name 'components') {
567561
foreach ($component in $vsRequirements.components) {
568562
$args += '-requires'
569563
$args += $component

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.121",
3+
"dotnet": "8.0.122",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25555.2",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25555.2"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25562.3",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25562.3"
1919
}
2020
}

‎src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateImageIndexTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public CreateImageIndexTests(ITestOutputHelper testOutput)
2222
_testOutput = testOutput;
2323
}
2424

25-
[DockerAvailableFact]
25+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
2626
public async Task CreateImageIndex_Baseline()
2727
{
2828
DirectoryInfo newProjectDir = CreateNewProject();

‎src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs‎

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

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

72-
[DockerAvailableFact]
72+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
7373
public void ParseContainerProperties_EndToEnd()
7474
{
7575
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -132,7 +132,8 @@ public void ParseContainerProperties_EndToEnd()
132132
/// <summary>
133133
/// Creates a console app that outputs the environment variable added to the image.
134134
/// </summary>
135-
[DockerAvailableFact]
135+
136+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
136137
public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
137138
{
138139
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
@@ -215,7 +216,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
215216
.And.HaveStdOut("Foo");
216217
}
217218

218-
[DockerAvailableFact]
219+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
219220
public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
220221
{
221222
const string RootlessBase ="dotnet/rootlessbase";
@@ -296,7 +297,7 @@ public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
296297
}
297298

298299

299-
[DockerAvailableFact]
300+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49502")]
300301
public void CanOverrideContainerImageFormat()
301302
{
302303
DirectoryInfo newProjectDir = new(GetTestDirectoryName());

‎src/Tests/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]
20+
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/49300")]
2121
public async Task GetFromRegistry()
2222
{
2323
var loggerFactory = new TestLoggerFactory(_testOutput);

‎src/Tests/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

0 commit comments

Comments
 (0)