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
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,87 +84,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25206.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25206.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25178.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d1967403f5b12406763c666f41e3358bb542ced</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25126.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -348,9 +348,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>132fdfbd9c8f09f8c51179c1e7742f048f94734c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25206.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25214.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
<Sha>5af24911dd2de348e66143167d66d05eb55a9db6</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25171.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand DownExpand Up@@ -402,9 +402,9 @@
<Sha>65ce1f581703f0c34f81937dcb3dc080bc169c81</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.3.25173.9">
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.4.25211.22">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5ebd5267376b61d01b4afc9d4cf9c832488312b2</Sha>
<Sha>a081488f32ee97b730ac15197a1b0044a89a3995</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25171.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,24 +83,24 @@
<PropertyGroup>
<StaticCsVersion>0.2.0</StaticCsVersion>
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.3.25173.9</MicrosoftDotNetApiCompatTaskVersion>
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.4.25211.22</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25206.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25206.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25206.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25206.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25206.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25206.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25206.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25206.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25214.8</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25214.8</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25214.8</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25214.8</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25214.8</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25214.8</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25214.8</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25214.8</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25178.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25206.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25214.8</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
24 changes: 15 additions & 9 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ parameters:

is1ESPipeline: ''

# Optional: 🌤️ or not the build has assets it wants to publish to BAR
isAssetlessBuild: false

jobs:
- job: Asset_Registry_Publish

Expand DownExpand Up@@ -72,14 +75,15 @@ jobs:
- checkout: self
fetchDepth: 3
clean: true

- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
artifactName: AssetManifests
targetPath: '$(Build.StagingDirectory)/AssetManifests'
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
artifactName: AssetManifests
targetPath: '$(Build.StagingDirectory)/AssetManifests'
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- task: NuGetAuthenticate@1

Expand All@@ -92,6 +96,7 @@ jobs:
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:OfficialBuildId=$(Build.BuildNumber)
condition: ${{ parameters.condition }}
Expand DownExpand Up@@ -124,7 +129,7 @@ jobs:
publishLocation: Container
artifactName: ReleaseConfigs

- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
BARBuildId: ${{ parameters.BARBuildId }}
Expand All@@ -145,6 +150,7 @@ jobs:
-WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'

- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
- template: /eng/common/core-templates/steps/publish-logs.yml
Expand Down
6 changes: 6 additions & 0 deletions eng/common/core-templates/post-build/post-build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ parameters:
artifactNames: ''
downloadArtifacts: true

- name: isAssetlessBuild
type: boolean
displayName: Is Assetless Build
default: false

# These parameters let the user customize the call to sdk-task.ps1 for publishing
# symbols & general artifacts as well as for signing validation
- name: symbolPublishingAdditionalParameters
Expand DownExpand Up@@ -320,3 +325,4 @@ stages:
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
7 changes: 6 additions & 1 deletion eng/common/post-build/publish-using-darc.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,8 @@ param(
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
[Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
)

try {
Expand DownExpand Up@@ -39,6 +40,10 @@ try {
$optionalParams.Add("--default-channels-required") | Out-Null
}

if ("true" -eq $SkipAssetsPublishing) {
$optionalParams.Add("--skip-assets-publishing") | Out-Null
}

& $darc add-build-to-channel `
--id $buildId `
--publishing-infra-version $PublishingInfraVersion `
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdl/packages.config
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
</packages>
10 changes: 5 additions & 5 deletions global.json
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "10.0.100-preview.3.25167.3",
"version": "10.0.100-preview.3.25201.16",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "10.0.100-preview.3.25167.3"
"dotnet": "10.0.100-preview.3.25201.16"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25206.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25206.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25206.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25214.8",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25214.8",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-preview.3.25152.4"
Expand Down