Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<clear />
<!--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-c7ac883" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-c7ac883e/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-2c07be8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-2c07be8a/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props
<!-- dotnet-dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26426.122</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26426.122</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26426.122</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26426.122</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.13-servicing.26426.122</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26427.124</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26427.124</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.26427.124</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26427.124</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.13-servicing.26427.124</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.13</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.13-servicing.26426.122</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.13-servicing.26426.122</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.13-servicing.26427.124</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.13-servicing.26427.124</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.13</SystemCodeDomPackageVersion>
Expand All @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props
<SystemDrawingCommonPackageVersion>10.0.13</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.13</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.13</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.13-servicing.26426.122</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.13-servicing.26427.124</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.13</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.13</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.13</SystemRuntimeSerializationFormattersPackageVersion>
Expand Down
62 changes: 31 additions & 31 deletions eng/Version.Details.xml
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="c7ac883e69867495da925d6c0757b1662241fe1e" BarId="328888" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="2c07be8ab38eb69e43aedf74ed288079c839b1dc" BarId="329108" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.13-servicing.26426.122">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.13-servicing.26427.124">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.13-servicing.26426.122">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.13-servicing.26427.124">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.13-servicing.26426.122">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.13-servicing.26427.124">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.7-servicing.26425.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>df599ed1ef81f6ac833e1a6da8001f4609a5006f</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.13">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,25 +84,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.13-servicing.26426.122">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.13-servicing.26427.124">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26426.122">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26427.124">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26426.122">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26427.124">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26426.122">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26427.124">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26426.122">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.26427.124">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c7ac883e69867495da925d6c0757b1662241fe1e</Sha>
<Sha>2c07be8ab38eb69e43aedf74ed288079c839b1dc</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 Down
14 changes: 6 additions & 8 deletions eng/common/core-templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ parameters:
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

# Service connection for WIF-based Entra authentication to ceapex feeds (replaces CeapexPat).
# When set, dnceng/internal builds acquire a federated Entra token instead of using a PAT.
# All other projects (e.g. DevDiv, public), where this dnceng-scoped service connection does not
# exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter.
# The `internal` and `DevDiv` System.TeamProject values have same-named, project-scoped
# connections. Other values, and any pipeline that sets this to '', use the CeapexPat parameter.
CeapexServiceConnection: 'dnceng-onelocbuild-ceapex'

# GitHub App authentication for the OneLoc check-in PR.
Expand Down Expand Up @@ -89,9 +88,8 @@ jobs:
displayName: Generate LocProject.json
condition: ${{ parameters.condition }}

# Acquire an Entra token for ceapex feed access via WIF (dnceng/internal only).
# All other projects use PAT-based auth, since the ceapex service connection is scoped to dnceng/internal.
- ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}:
# Acquire an Entra token when System.TeamProject is `internal` or `DevDiv`.
- ${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}:
- template: /eng/common/templates/steps/get-federated-access-token.yml
parameters:
federatedServiceConnection: ${{ parameters.CeapexServiceConnection }}
Expand Down Expand Up @@ -130,9 +128,9 @@ jobs:
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
isShouldReusePrSelected: ${{ parameters.ReusePr }}
packageSourceAuth: patAuth
${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}:
${{ if and(ne(parameters.CeapexServiceConnection, ''), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'))) }}:
patVariable: $(CeapexEntraToken)
${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}:
${{ if or(eq(parameters.CeapexServiceConnection, ''), and(ne(variables['System.TeamProject'], 'internal'), ne(variables['System.TeamProject'], 'DevDiv'))) }}:
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26426.122",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26426.122",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26427.124",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26427.124",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down