Skip to content

[main] Source code updates from dotnet/dotnet #11238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+93 −83
Open

[main] Source code updates from dotnet/dotnet #11238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae34219
Backflow from https://github.com/dotnet/dotnet / 77ee357 build 289869
dotnet-maestro[bot] Nov 7, 2025
c9fe388
Merge main into darc-main-a47906db-efa1-4e47-9ed9-9e48bda400e1
dotnet-maestro[bot] Nov 7, 2025
8d94dfc
Update dependencies from https://github.com/dotnet/dotnet build 289869
dotnet-maestro[bot] Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@ This file should be imported by eng/Versions.props
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25555.103</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25555.103</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.3.25556.111</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25556.111</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25556.111</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.3.25556.111</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25555.103</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25555.103</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25555.103</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25555.103</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25555.103</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25555.103</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25555.103</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25555.103</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25555.103</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25555.103</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25555.103</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25555.103</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25555.103</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25555.103</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.3.25556.111</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25556.111</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.3.25556.111</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.3.25556.111</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.3.25556.111</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25556.111</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.3.25556.111</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.3.25556.111</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25556.111</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25556.111</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25556.111</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.3.25556.111</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.3.25556.111</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25556.111</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25552.1</MicrosoftDotNetWpfDncEngPackageVersion>
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25513.8</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
94 changes: 47 additions & 47 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="54c879632fdf0197d517d80e4b90861e2bd5d03e" BarId="289655" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="77ee357638bcd8fa66a1c16fa588dcd5818068d2" BarId="289869" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25552.1">
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25513.8">
Copy link
Member

@ViktorHofer ViktorHofer Nov 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this dependency now gets updated because of this line when building wpf inside the VMR internally:

wpf/eng/WpfArcadeSdk/tools/Packaging.props

Lines 48 to 49 in 42f7d5d

<!-- Built out of internal repo -->
<PackageName Condition="'$(RepoLocation)'=='Internal'">$(DncEngTransportPackageName)</PackageName>

@mmitche for a second pair of eyes.

I'm not sure why this only shows up now but if I'm reading things correctly this races between the internal VMR build and the internal wpf-int build.

Copy link
Member

@ViktorHofer ViktorHofer Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not 100% sure, this stuff is confusing

<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>fbf3653d46ee940938937f6d8ad095e7aacbd921</Sha>
<Sha>6ae9d774864ecf3dde943c58647257f250505fd9</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,21 +84,21 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25555.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25555.103">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25555.103">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25555.103">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
Expand All @@ -109,9 +109,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
</Dependency>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25555.103">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<!--
Set assembly version to align with major and minor version, as for the patches and revisions should be manually
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,11 @@ jobs:
BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
is1ESPipeline: ${{ parameters.is1ESPipeline }}

# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
Expand Down
4 changes: 4 additions & 0 deletions eng/common/core-templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ stages:

- template: /eng/common/templates/steps/enable-internal-runtimes.yml

- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
inputs:
Expand Down
6 changes: 3 additions & 3 deletions eng/common/core-templates/steps/install-microbuild-impl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ parameters:
steps:
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
- task: MicroBuildSigningPluginPreview@4
displayName: Install Preview MicroBuild plugin (Windows)
displayName: Install Preview MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
env: ${{ parameters.microbuildEnv }}
continueOnError: ${{ parameters.continueOnError }}
condition: ${{ parameters.condition }}
- ${{ else }}:
- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin (Windows)
displayName: Install MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
env: ${{ parameters.microbuildEnv }}
continueOnError: ${{ parameters.continueOnError }}
condition: ${{ parameters.condition }}
condition: ${{ parameters.condition }}
15 changes: 8 additions & 7 deletions eng/common/core-templates/steps/install-microbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ parameters:
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
microbuildUseESRP: true
# Location of the MicroBuild output folder
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
microBuildOutputFolder: '$(Build.SourcesDirectory)'
# Microbuild version
microbuildPluginVersion: 'latest'

Expand All @@ -21,16 +24,14 @@ parameters:
steps:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
- task: UseDotNet@2
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
inputs:
packageType: sdk
version: 8.0.x
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
workingDirectory: ${{ parameters.microBuildOutputFolder }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))

- script: |
Expand Down Expand Up @@ -70,7 +71,7 @@ steps:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
microbuildEnv:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
Expand All @@ -92,7 +93,7 @@ steps:
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
microbuildEnv:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.103",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25555.103",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25556.111",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down