[main] Update dependencies from dotnet/arcade#102744

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

Merged
akoeplinger merged 1 commit into from
May 28, 2024
Merged

[main] Update dependencies from dotnet/arcade #102744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
52 changes: 28 additions & 24 deletions eng/common/core-templates/job/job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,29 +200,28 @@ jobs:
publishArtifacts: false

# Publish test results
- ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
- ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
- task: PublishTestResults@2
displayName: Publish XUnit Test Results
inputs:
testResultsFormat: 'xUnit'
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
mergeTestResults: ${{ parameters.mergeTestResults }}
continueOnError: true
condition: always()
- ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
- task: PublishTestResults@2
displayName: Publish TRX Test Results
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
mergeTestResults: ${{ parameters.mergeTestResults }}
continueOnError: true
condition: always()
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
- task: PublishTestResults@2
displayName: Publish XUnit Test Results
inputs:
testResultsFormat: 'xUnit'
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
mergeTestResults: ${{ parameters.mergeTestResults }}
continueOnError: true
condition: always()
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
- task: PublishTestResults@2
displayName: Publish TRX Test Results
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
mergeTestResults: ${{ parameters.mergeTestResults }}
continueOnError: true
condition: always()

# gather artifacts
- ${{ if ne(parameters.artifacts.publish, '') }}:
Expand All@@ -246,6 +245,8 @@ jobs:
SourceFolder: 'artifacts/log'
Contents: '**'
TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
continueOnError: true
condition: always()

- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
- task: CopyFiles@2
Expand All@@ -254,13 +255,16 @@ jobs:
SourceFolder: 'artifacts/log/$(_BuildConfig)'
Contents: '**'
TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
continueOnError: true
condition: always()
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
- task: CopyFiles@2
displayName: Gather buildconfiguration for build retry
inputs:
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
Contents: '**'
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'

continueOnError: true
condition: always()
- ${{ each step in parameters.artifactPublishSteps }}:
- ${{ step }}
1 change: 1 addition & 0 deletions eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,7 @@ steps:
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
continueOnError: true
condition: succeededOrFailed()
sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/tizen-fetch.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ fi

Log()
{
if [ $VERBOSE -ge $1 ]; then
if [ $VERBOSE -ge 1 ]; then
echo ${@:2}
fi
}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/dotnet-install.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
dotnetRoot="$dotnetRoot/$architecture"
fi

InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
local exit_code=$?
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
ExitWithExitCode $exit_code
Expand Down
5 changes: 4 additions & 1 deletion eng/common/templates-official/job/job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ jobs:
displayName: 'Publish logs'
continueOnError: true
condition: always()
sbomEnabled: false # we don't need SBOM for logs

- ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
- output: buildArtifacts
Expand All@@ -32,13 +33,15 @@ jobs:
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
continueOnError: true
condition: always()
sbomEnabled: false # we don't need SBOM for logs

- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
- output: pipelineArtifact
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
artifactName: 'BuildConfiguration'
displayName: 'Publish build retry configuration'
continueOnError: true
continueOnError: true
sbomEnabled: false # we don't need SBOM for BuildConfiguration

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
- output: pipelineArtifact
Expand Down
4 changes: 3 additions & 1 deletion eng/common/templates-official/steps/publish-pipeline-artifacts.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,6 @@ steps:
${{ if parameters.args.artifactName }}:
artifactName: ${{ parameters.args.artifactName }}
${{ if parameters.args.properties }}:
properties: ${{ parameters.args.properties }}
properties: ${{ parameters.args.properties }}
${{ if parameters.args.sbomEnabled }}:
sbomEnabled: ${{ parameters.args.sbomEnabled }}
2 changes: 2 additions & 0 deletions eng/common/templates/job/job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ jobs:
displayName: 'Publish logs'
continueOnError: true
condition: always()
sbomEnabled: false # we don't need SBOM for logs

- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
Expand All@@ -59,3 +60,4 @@ jobs:
artifactName: 'BuildConfiguration'
displayName: 'Publish build retry configuration'
continueOnError: true
sbomEnabled: false # we don't need SBOM for BuildConfiguration
4 changes: 2 additions & 2 deletions eng/common/tools.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -438,7 +438,7 @@ function StopProcesses {
}

function MSBuild {
local args=$@
local args=( "$@" )
if [[ "$pipelines_log" == true ]]; then
InitializeBuildTool
InitializeToolset
Expand DownExpand Up@@ -473,7 +473,7 @@ function MSBuild {
args+=( "-logger:$selectedPath" )
fi

MSBuild-Core ${args[@]}
MSBuild-Core "${args[@]}"
}

function MSBuild-Core {
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
"dotnet": "9.0.100-preview.4.24267.66"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102744

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

 Merged

akoeplinger
merged 1 commit into

from

May 28, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies (also used in wasm build tests -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

52 changes: 28 additions & 24 deletions
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,29 +200,28 @@ jobs:
 publishArtifacts: false

 # Publish test results
 - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
 - ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()

 # gather artifacts
 - ${{ if ne(parameters.artifacts.publish, '') }}:
Expand All@@ -246,6 +245,8 @@ jobs:
 SourceFolder: 'artifacts/log'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
 continueOnError: true
 condition: always()

 - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
 - task: CopyFiles@2
Expand All@@ -254,13 +255,16 @@ jobs:
 SourceFolder: 'artifacts/log/$(_BuildConfig)'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - task: CopyFiles@2
 displayName: Gather buildconfiguration for build retry
 inputs:
 SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'

 continueOnError: true
 condition: always()
 - ${{ each step in parameters.artifactPublishSteps }}:
 - ${{ step }}

1 change: 1 addition & 0 deletions
eng/common/core-templates/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,7 @@ steps:
 artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
 continueOnError: true
 condition: succeededOrFailed()
 sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/cross/tizen-fetch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ fi

Log()
{
 if [ $VERBOSE -ge $1 ]; then
 if [ $VERBOSE -ge 1 ]; then
 echo ${@:2}
 fi
}
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/dotnet-install.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
 dotnetRoot="$dotnetRoot/$architecture"
fi

InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
 local exit_code=$?
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
 ExitWithExitCode $exit_code
Expand Down

5 changes: 4 additions & 1 deletion
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
 - output: buildArtifacts
Expand All@@ -32,13 +33,15 @@ jobs:
 ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - output: pipelineArtifact
 targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true 
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
 - output: pipelineArtifact
Expand Down

4 changes: 3 additions & 1 deletion
eng/common/templates-official/steps/publish-pipeline-artifacts.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,6 @@ steps:
 ${{ if parameters.args.artifactName }}:
 artifactName: ${{ parameters.args.artifactName }}
 ${{ if parameters.args.properties }}:
 properties: ${{ parameters.args.properties }}
 properties: ${{ parameters.args.properties }}
 ${{ if parameters.args.sbomEnabled }}:
 sbomEnabled: ${{ parameters.args.sbomEnabled }}

2 changes: 2 additions & 0 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
 - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
Expand All@@ -59,3 +60,4 @@ jobs:
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

4 changes: 2 additions & 2 deletions
eng/common/tools.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -438,7 +438,7 @@ function StopProcesses {
}

function MSBuild {
 local args=$@
 local args=( "$@" )
 if [[ "$pipelines_log" == true ]]; then
 InitializeBuildTool
 InitializeToolset
Expand DownExpand Up@@ -473,7 +473,7 @@ function MSBuild {
 args+=( "-logger:$selectedPath" )
 fi

 MSBuild-Core ${args[@]}
 MSBuild-Core "${args[@]}"
}

function MSBuild-Core {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "9.0.100-preview.4.24267.66"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102744

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

 Merged

akoeplinger
merged 1 commit into

from

May 28, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies (also used in wasm build tests -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

52 changes: 28 additions & 24 deletions
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,29 +200,28 @@ jobs:
 publishArtifacts: false

 # Publish test results
 - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
 - ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()

 # gather artifacts
 - ${{ if ne(parameters.artifacts.publish, '') }}:
Expand All@@ -246,6 +245,8 @@ jobs:
 SourceFolder: 'artifacts/log'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
 continueOnError: true
 condition: always()

 - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
 - task: CopyFiles@2
Expand All@@ -254,13 +255,16 @@ jobs:
 SourceFolder: 'artifacts/log/$(_BuildConfig)'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - task: CopyFiles@2
 displayName: Gather buildconfiguration for build retry
 inputs:
 SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'

 continueOnError: true
 condition: always()
 - ${{ each step in parameters.artifactPublishSteps }}:
 - ${{ step }}

1 change: 1 addition & 0 deletions
eng/common/core-templates/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,7 @@ steps:
 artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
 continueOnError: true
 condition: succeededOrFailed()
 sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/cross/tizen-fetch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ fi

Log()
{
 if [ $VERBOSE -ge $1 ]; then
 if [ $VERBOSE -ge 1 ]; then
 echo ${@:2}
 fi
}
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/dotnet-install.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
 dotnetRoot="$dotnetRoot/$architecture"
fi

InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
 local exit_code=$?
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
 ExitWithExitCode $exit_code
Expand Down

5 changes: 4 additions & 1 deletion
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
 - output: buildArtifacts
Expand All@@ -32,13 +33,15 @@ jobs:
 ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - output: pipelineArtifact
 targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true 
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
 - output: pipelineArtifact
Expand Down

4 changes: 3 additions & 1 deletion
eng/common/templates-official/steps/publish-pipeline-artifacts.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,6 @@ steps:
 ${{ if parameters.args.artifactName }}:
 artifactName: ${{ parameters.args.artifactName }}
 ${{ if parameters.args.properties }}:
 properties: ${{ parameters.args.properties }}
 properties: ${{ parameters.args.properties }}
 ${{ if parameters.args.sbomEnabled }}:
 sbomEnabled: ${{ parameters.args.sbomEnabled }}

2 changes: 2 additions & 0 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
 - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
Expand All@@ -59,3 +60,4 @@ jobs:
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

4 changes: 2 additions & 2 deletions
eng/common/tools.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -438,7 +438,7 @@ function StopProcesses {
}

function MSBuild {
 local args=$@
 local args=( "$@" )
 if [[ "$pipelines_log" == true ]]; then
 InitializeBuildTool
 InitializeToolset
Expand DownExpand Up@@ -473,7 +473,7 @@ function MSBuild {
 args+=( "-logger:$selectedPath" )
 fi

 MSBuild-Core ${args[@]}
 MSBuild-Core "${args[@]}"
}

function MSBuild-Core {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "9.0.100-preview.4.24267.66"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102744

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

 Merged

akoeplinger
merged 1 commit into

from

May 28, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies (also used in wasm build tests -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

52 changes: 28 additions & 24 deletions
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,29 +200,28 @@ jobs:
 publishArtifacts: false

 # Publish test results
 - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
 - ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()

 # gather artifacts
 - ${{ if ne(parameters.artifacts.publish, '') }}:
Expand All@@ -246,6 +245,8 @@ jobs:
 SourceFolder: 'artifacts/log'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
 continueOnError: true
 condition: always()

 - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
 - task: CopyFiles@2
Expand All@@ -254,13 +255,16 @@ jobs:
 SourceFolder: 'artifacts/log/$(_BuildConfig)'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - task: CopyFiles@2
 displayName: Gather buildconfiguration for build retry
 inputs:
 SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'

 continueOnError: true
 condition: always()
 - ${{ each step in parameters.artifactPublishSteps }}:
 - ${{ step }}

1 change: 1 addition & 0 deletions
eng/common/core-templates/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,7 @@ steps:
 artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
 continueOnError: true
 condition: succeededOrFailed()
 sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/cross/tizen-fetch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ fi

Log()
{
 if [ $VERBOSE -ge $1 ]; then
 if [ $VERBOSE -ge 1 ]; then
 echo ${@:2}
 fi
}
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/dotnet-install.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
 dotnetRoot="$dotnetRoot/$architecture"
fi

InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
 local exit_code=$?
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
 ExitWithExitCode $exit_code
Expand Down

5 changes: 4 additions & 1 deletion
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
 - output: buildArtifacts
Expand All@@ -32,13 +33,15 @@ jobs:
 ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - output: pipelineArtifact
 targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true 
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
 - output: pipelineArtifact
Expand Down

4 changes: 3 additions & 1 deletion
eng/common/templates-official/steps/publish-pipeline-artifacts.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,6 @@ steps:
 ${{ if parameters.args.artifactName }}:
 artifactName: ${{ parameters.args.artifactName }}
 ${{ if parameters.args.properties }}:
 properties: ${{ parameters.args.properties }}
 properties: ${{ parameters.args.properties }}
 ${{ if parameters.args.sbomEnabled }}:
 sbomEnabled: ${{ parameters.args.sbomEnabled }}

2 changes: 2 additions & 0 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
 - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
Expand All@@ -59,3 +60,4 @@ jobs:
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

4 changes: 2 additions & 2 deletions
eng/common/tools.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -438,7 +438,7 @@ function StopProcesses {
}

function MSBuild {
 local args=$@
 local args=( "$@" )
 if [[ "$pipelines_log" == true ]]; then
 InitializeBuildTool
 InitializeToolset
Expand DownExpand Up@@ -473,7 +473,7 @@ function MSBuild {
 args+=( "-logger:$selectedPath" )
 fi

 MSBuild-Core ${args[@]}
 MSBuild-Core "${args[@]}"
}

function MSBuild-Core {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "9.0.100-preview.4.24267.66"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102744

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

 Merged

akoeplinger
merged 1 commit into

from

May 28, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies (also used in wasm build tests -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

52 changes: 28 additions & 24 deletions
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,29 +200,28 @@ jobs:
 publishArtifacts: false

 # Publish test results
 - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
 - ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()

 # gather artifacts
 - ${{ if ne(parameters.artifacts.publish, '') }}:
Expand All@@ -246,6 +245,8 @@ jobs:
 SourceFolder: 'artifacts/log'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
 continueOnError: true
 condition: always()

 - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
 - task: CopyFiles@2
Expand All@@ -254,13 +255,16 @@ jobs:
 SourceFolder: 'artifacts/log/$(_BuildConfig)'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - task: CopyFiles@2
 displayName: Gather buildconfiguration for build retry
 inputs:
 SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'

 continueOnError: true
 condition: always()
 - ${{ each step in parameters.artifactPublishSteps }}:
 - ${{ step }}

1 change: 1 addition & 0 deletions
eng/common/core-templates/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,7 @@ steps:
 artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
 continueOnError: true
 condition: succeededOrFailed()
 sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/cross/tizen-fetch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ fi

Log()
{
 if [ $VERBOSE -ge $1 ]; then
 if [ $VERBOSE -ge 1 ]; then
 echo ${@:2}
 fi
}
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/dotnet-install.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
 dotnetRoot="$dotnetRoot/$architecture"
fi

InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
 local exit_code=$?
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
 ExitWithExitCode $exit_code
Expand Down

5 changes: 4 additions & 1 deletion
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
 - output: buildArtifacts
Expand All@@ -32,13 +33,15 @@ jobs:
 ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - output: pipelineArtifact
 targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true 
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
 - output: pipelineArtifact
Expand Down

4 changes: 3 additions & 1 deletion
eng/common/templates-official/steps/publish-pipeline-artifacts.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,6 @@ steps:
 ${{ if parameters.args.artifactName }}:
 artifactName: ${{ parameters.args.artifactName }}
 ${{ if parameters.args.properties }}:
 properties: ${{ parameters.args.properties }}
 properties: ${{ parameters.args.properties }}
 ${{ if parameters.args.sbomEnabled }}:
 sbomEnabled: ${{ parameters.args.sbomEnabled }}

2 changes: 2 additions & 0 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
 - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
Expand All@@ -59,3 +60,4 @@ jobs:
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

4 changes: 2 additions & 2 deletions
eng/common/tools.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -438,7 +438,7 @@ function StopProcesses {
}

function MSBuild {
 local args=$@
 local args=( "$@" )
 if [[ "$pipelines_log" == true ]]; then
 InitializeBuildTool
 InitializeToolset
Expand DownExpand Up@@ -473,7 +473,7 @@ function MSBuild {
 args+=( "-logger:$selectedPath" )
 fi

 MSBuild-Core ${args[@]}
 MSBuild-Core "${args[@]}"
}

function MSBuild-Core {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "9.0.100-preview.4.24267.66"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102744

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

 Merged

akoeplinger
merged 1 commit into

from

May 28, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies (also used in wasm build tests -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

52 changes: 28 additions & 24 deletions
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,29 +200,28 @@ jobs:
 publishArtifacts: false

 # Publish test results
 - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
 - ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()

 # gather artifacts
 - ${{ if ne(parameters.artifacts.publish, '') }}:
Expand All@@ -246,6 +245,8 @@ jobs:
 SourceFolder: 'artifacts/log'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
 continueOnError: true
 condition: always()

 - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
 - task: CopyFiles@2
Expand All@@ -254,13 +255,16 @@ jobs:
 SourceFolder: 'artifacts/log/$(_BuildConfig)'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - task: CopyFiles@2
 displayName: Gather buildconfiguration for build retry
 inputs:
 SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'

 continueOnError: true
 condition: always()
 - ${{ each step in parameters.artifactPublishSteps }}:
 - ${{ step }}

1 change: 1 addition & 0 deletions
eng/common/core-templates/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,7 @@ steps:
 artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
 continueOnError: true
 condition: succeededOrFailed()
 sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/cross/tizen-fetch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ fi

Log()
{
 if [ $VERBOSE -ge $1 ]; then
 if [ $VERBOSE -ge 1 ]; then
 echo ${@:2}
 fi
}
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/dotnet-install.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
 dotnetRoot="$dotnetRoot/$architecture"
fi

InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
 local exit_code=$?
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
 ExitWithExitCode $exit_code
Expand Down

5 changes: 4 additions & 1 deletion
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
 - output: buildArtifacts
Expand All@@ -32,13 +33,15 @@ jobs:
 ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - output: pipelineArtifact
 targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true 
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
 - output: pipelineArtifact
Expand Down

4 changes: 3 additions & 1 deletion
eng/common/templates-official/steps/publish-pipeline-artifacts.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,6 @@ steps:
 ${{ if parameters.args.artifactName }}:
 artifactName: ${{ parameters.args.artifactName }}
 ${{ if parameters.args.properties }}:
 properties: ${{ parameters.args.properties }}
 properties: ${{ parameters.args.properties }}
 ${{ if parameters.args.sbomEnabled }}:
 sbomEnabled: ${{ parameters.args.sbomEnabled }}

2 changes: 2 additions & 0 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
 - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
Expand All@@ -59,3 +60,4 @@ jobs:
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

4 changes: 2 additions & 2 deletions
eng/common/tools.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -438,7 +438,7 @@ function StopProcesses {
}

function MSBuild {
 local args=$@
 local args=( "$@" )
 if [[ "$pipelines_log" == true ]]; then
 InitializeBuildTool
 InitializeToolset
Expand DownExpand Up@@ -473,7 +473,7 @@ function MSBuild {
 args+=( "-logger:$selectedPath" )
 fi

 MSBuild-Core ${args[@]}
 MSBuild-Core "${args[@]}"
}

function MSBuild-Core {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "9.0.100-preview.4.24267.66"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102744

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

 Merged

akoeplinger
merged 1 commit into

from

May 28, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies (also used in wasm build tests -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

52 changes: 28 additions & 24 deletions
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,29 +200,28 @@ jobs:
 publishArtifacts: false

 # Publish test results
 - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
 - ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()

 # gather artifacts
 - ${{ if ne(parameters.artifacts.publish, '') }}:
Expand All@@ -246,6 +245,8 @@ jobs:
 SourceFolder: 'artifacts/log'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
 continueOnError: true
 condition: always()

 - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
 - task: CopyFiles@2
Expand All@@ -254,13 +255,16 @@ jobs:
 SourceFolder: 'artifacts/log/$(_BuildConfig)'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - task: CopyFiles@2
 displayName: Gather buildconfiguration for build retry
 inputs:
 SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'

 continueOnError: true
 condition: always()
 - ${{ each step in parameters.artifactPublishSteps }}:
 - ${{ step }}

1 change: 1 addition & 0 deletions
eng/common/core-templates/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,7 @@ steps:
 artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
 continueOnError: true
 condition: succeededOrFailed()
 sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/cross/tizen-fetch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ fi

Log()
{
 if [ $VERBOSE -ge $1 ]; then
 if [ $VERBOSE -ge 1 ]; then
 echo ${@:2}
 fi
}
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/dotnet-install.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
 dotnetRoot="$dotnetRoot/$architecture"
fi

InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
 local exit_code=$?
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
 ExitWithExitCode $exit_code
Expand Down

5 changes: 4 additions & 1 deletion
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
 - output: buildArtifacts
Expand All@@ -32,13 +33,15 @@ jobs:
 ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - output: pipelineArtifact
 targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true 
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
 - output: pipelineArtifact
Expand Down

4 changes: 3 additions & 1 deletion
eng/common/templates-official/steps/publish-pipeline-artifacts.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,6 @@ steps:
 ${{ if parameters.args.artifactName }}:
 artifactName: ${{ parameters.args.artifactName }}
 ${{ if parameters.args.properties }}:
 properties: ${{ parameters.args.properties }}
 properties: ${{ parameters.args.properties }}
 ${{ if parameters.args.sbomEnabled }}:
 sbomEnabled: ${{ parameters.args.sbomEnabled }}

2 changes: 2 additions & 0 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
 - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
Expand All@@ -59,3 +60,4 @@ jobs:
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

4 changes: 2 additions & 2 deletions
eng/common/tools.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -438,7 +438,7 @@ function StopProcesses {
}

function MSBuild {
 local args=$@
 local args=( "$@" )
 if [[ "$pipelines_log" == true ]]; then
 InitializeBuildTool
 InitializeToolset
Expand DownExpand Up@@ -473,7 +473,7 @@ function MSBuild {
 args+=( "-logger:$selectedPath" )
 fi

 MSBuild-Core ${args[@]}
 MSBuild-Core "${args[@]}"
}

function MSBuild-Core {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "9.0.100-preview.4.24267.66"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[main] Update dependencies from dotnet/arcade#102744

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

 Merged

akoeplinger
merged 1 commit into

from

May 28, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24271.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8478d1a9a531e6b1cd26fb8c86400e2efbb8f2f3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24274.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <Sha>91fdecfe881902a109205279e023037692db4c11</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies (also used in wasm build tests -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24272.19</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24274.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24274.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24274.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24274.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24274.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24274.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24274.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24274.1</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

52 changes: 28 additions & 24 deletions
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,29 +200,28 @@ jobs:
 publishArtifacts: false

 # Publish test results
 - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
 - ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
 - task: PublishTestResults@2
 displayName: Publish XUnit Test Results
 inputs:
 testResultsFormat: 'xUnit'
 testResultsFiles: '*.xml'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()
 - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
 - task: PublishTestResults@2
 displayName: Publish TRX Test Results
 inputs:
 testResultsFormat: 'VSTest'
 testResultsFiles: '*.trx'
 searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
 testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
 mergeTestResults: ${{ parameters.mergeTestResults }}
 continueOnError: true
 condition: always()

 # gather artifacts
 - ${{ if ne(parameters.artifacts.publish, '') }}:
Expand All@@ -246,6 +245,8 @@ jobs:
 SourceFolder: 'artifacts/log'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
 continueOnError: true
 condition: always()

 - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
 - task: CopyFiles@2
Expand All@@ -254,13 +255,16 @@ jobs:
 SourceFolder: 'artifacts/log/$(_BuildConfig)'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
 continueOnError: true
 condition: always()
 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - task: CopyFiles@2
 displayName: Gather buildconfiguration for build retry
 inputs:
 SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
 Contents: '**'
 TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'

 continueOnError: true
 condition: always()
 - ${{ each step in parameters.artifactPublishSteps }}:
 - ${{ step }}

1 change: 1 addition & 0 deletions
eng/common/core-templates/steps/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,7 @@ steps:
 artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
 continueOnError: true
 condition: succeededOrFailed()
 sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/cross/tizen-fetch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ fi

Log()
{
 if [ $VERBOSE -ge $1 ]; then
 if [ $VERBOSE -ge 1 ]; then
 echo ${@:2}
 fi
}
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/dotnet-install.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
 dotnetRoot="$dotnetRoot/$architecture"
fi

InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
 local exit_code=$?
 Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
 ExitWithExitCode $exit_code
Expand Down

5 changes: 4 additions & 1 deletion
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
 - output: buildArtifacts
Expand All@@ -32,13 +33,15 @@ jobs:
 ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
 - output: pipelineArtifact
 targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true 
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
 - output: pipelineArtifact
Expand Down

4 changes: 3 additions & 1 deletion
eng/common/templates-official/steps/publish-pipeline-artifacts.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,4 +23,6 @@ steps:
 ${{ if parameters.args.artifactName }}:
 artifactName: ${{ parameters.args.artifactName }}
 ${{ if parameters.args.properties }}:
 properties: ${{ parameters.args.properties }}
 properties: ${{ parameters.args.properties }}
 ${{ if parameters.args.sbomEnabled }}:
 sbomEnabled: ${{ parameters.args.sbomEnabled }}

2 changes: 2 additions & 0 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ jobs:
 displayName: 'Publish logs'
 continueOnError: true
 condition: always()
 sbomEnabled: false # we don't need SBOM for logs

 - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
 - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
Expand All@@ -59,3 +60,4 @@ jobs:
 artifactName: 'BuildConfiguration'
 displayName: 'Publish build retry configuration'
 continueOnError: true
 sbomEnabled: false # we don't need SBOM for BuildConfiguration

4 changes: 2 additions & 2 deletions
eng/common/tools.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -438,7 +438,7 @@ function StopProcesses {
}

function MSBuild {
 local args=$@
 local args=( "$@" )
 if [[ "$pipelines_log" == true ]]; then
 InitializeBuildTool
 InitializeToolset
Expand DownExpand Up@@ -473,7 +473,7 @@ function MSBuild {
 args+=( "-logger:$selectedPath" )
 fi

 MSBuild-Core ${args[@]}
 MSBuild-Core "${args[@]}"
}

function MSBuild-Core {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "9.0.100-preview.4.24267.66"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24272.5",
 "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24274.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.4.0",
 "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24272.3"
Expand Down