Skip to content
Merged
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
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,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-8639c3b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-8639c3b2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-d14d02d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-d14d02dd/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 All @@ -21,7 +21,7 @@
</packageSources>
<packageSourceMapping>
<clear />
<packageSource key="darc-pub-dotnet-dotnet-8639c3b">
<packageSource key="darc-pub-dotnet-dotnet-d14d02d">
<package pattern="Microsoft.*" />
<package pattern="runtime.*" />
<package pattern="System.*" />
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.26209.115</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetCMakeSdkPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.26210.105</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftNETSdkILPackageVersion>10.0.7</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.7</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.7</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.7-servicing.26209.115</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.7-servicing.26210.105</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.7</MicrosoftWin32SystemEventsPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.7</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.7</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
Expand Down
68 changes: 34 additions & 34 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
-->
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="8639c3b28a6eac36e38a59c9cae67aa52b1b06a8" BarId="309770" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="d14d02dd9f70268be43db2ae722433f7d4461fb8" BarId="309867" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.7-servicing.26209.115">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.7-servicing.26210.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.7">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26209.115">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26210.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.26209.115">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.26210.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.26209.115">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.26210.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26209.115">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26210.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26209.115">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.26210.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26209.115">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.26210.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26209.115">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26210.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8639c3b28a6eac36e38a59c9cae67aa52b1b06a8</Sha>
<Sha>d14d02dd9f70268be43db2ae722433f7d4461fb8</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
5 changes: 1 addition & 4 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ parameters:
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishing: false
enableBuildRetry: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
name: ''
componentGovernanceSteps: []
preSteps: []
artifactPublishSteps: []
runAsPublic: false
Expand Down Expand Up @@ -146,9 +146,6 @@ jobs:
- ${{ each step in parameters.steps }}:
- ${{ step }}

- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
parameters:
Expand Down
14 changes: 8 additions & 6 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,18 @@ jobs:
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
artifactName: AssetManifests
displayName: 'Publish Merged Manifest'
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
retryCountOnTaskFailure: 10 # for any files being locked
isProduction: false # just metadata for publishing

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish ReleaseConfigs Artifact
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
publishLocation: Container
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
artifactName: ReleaseConfigs
retryCountOnTaskFailure: 10 # for any files being locked
isProduction: false # just metadata for publishing

- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
Expand Down Expand Up @@ -218,4 +219,5 @@ jobs:
- template: /eng/common/core-templates/steps/publish-logs.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
JobLabel: 'Publish_Artifacts_Logs'
StageLabel: 'BuildAssetRegistry'
JobLabel: 'Publish_Artifacts_Logs'
5 changes: 5 additions & 0 deletions eng/common/core-templates/jobs/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ parameters:

artifacts: {}
is1ESPipeline: ''

# Publishing version w/default.
publishingVersion: 3

repositoryAlias: self
officialBuildId: ''

Expand Down Expand Up @@ -102,6 +106,7 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
continueOnError: ${{ parameters.continueOnError }}
publishingVersion: ${{ parameters.publishingVersion }}
dependsOn:
- ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
- ${{ each job in parameters.publishBuildAssetsDependsOn }}:
Expand Down
Loading