mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-08 03:27:04 +09:00
Update dependencies from https://github.com/dotnet/arcade build 20250314.2 (#113561)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25164.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot]
parent
bed3bb696e
commit
480bf2b7d5
GPG key ID:
B5690EEEBB952194
9 changed files with 94 additions and 80 deletions
|
|
@ -92,87 +92,87 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.25163.2">
|
||||
<Uri>https://github.com/dotnet/runtime-assets</Uri>
|
||||
|
|
@ -332,9 +332,9 @@
|
|||
<Uri>https://github.com/dotnet/xharness</Uri>
|
||||
<Sha>edc52ac68c1bf77e3b107fc8a448674a6d058d8a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25111.5">
|
||||
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25164.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
|
||||
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
|
||||
|
|
|
|||
|
|
@ -85,22 +85,22 @@
|
|||
<!-- SDK dependencies (also used in wasm build tests -->
|
||||
<MicrosoftDotNetApiCompatTaskVersion>9.0.104</MicrosoftDotNetApiCompatTaskVersion>
|
||||
<!-- Arcade dependencies -->
|
||||
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksFeedVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25111.5</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25111.5</MicrosoftDotNetGenAPIVersion>
|
||||
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25111.5</MicrosoftDotNetGenFacadesVersion>
|
||||
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25111.5</MicrosoftDotNetXUnitAssertVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25111.5</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25111.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksArchivesVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksInstallersVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25111.5</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25111.5</MicrosoftDotNetVersionToolsTasksVersion>
|
||||
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25111.5</MicrosoftDotNetPackageTestingVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksFeedVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25164.2</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25164.2</MicrosoftDotNetGenAPIVersion>
|
||||
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25164.2</MicrosoftDotNetGenFacadesVersion>
|
||||
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25164.2</MicrosoftDotNetXUnitAssertVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25164.2</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25164.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksArchivesVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksInstallersVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25164.2</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25164.2</MicrosoftDotNetVersionToolsTasksVersion>
|
||||
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25164.2</MicrosoftDotNetPackageTestingVersion>
|
||||
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
|
||||
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
|
||||
<!-- NuGet dependencies -->
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ steps:
|
|||
PackageName: ${{ parameters.packageName }}
|
||||
BuildDropPath: ${{ parameters.buildDropPath }}
|
||||
PackageVersion: ${{ parameters.packageVersion }}
|
||||
ManifestDirPath: ${{ parameters.manifestDirPath }}
|
||||
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
|
||||
${{ if ne(parameters.IgnoreDirectories, '') }}:
|
||||
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
|
||||
|
||||
|
|
|
|||
|
|
@ -4,18 +4,26 @@ Param(
|
|||
|
||||
. $PSScriptRoot\pipeline-logging-functions.ps1
|
||||
|
||||
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
|
||||
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
|
||||
$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
|
||||
$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
|
||||
$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
|
||||
|
||||
Write-Host "Artifact name before : $ArtifactName"
|
||||
Write-Host "Artifact name after : $SafeArtifactName"
|
||||
|
||||
Write-Host "Creating dir $ManifestDirPath"
|
||||
|
||||
# create directory for sbom manifest to be placed
|
||||
if (!(Test-Path -path $ManifestDirPath))
|
||||
if (!(Test-Path -path $SbomGenerationDir))
|
||||
{
|
||||
New-Item -ItemType Directory -path $ManifestDirPath
|
||||
Write-Host "Successfully created directory $ManifestDirPath"
|
||||
New-Item -ItemType Directory -path $SbomGenerationDir
|
||||
Write-Host "Successfully created directory $SbomGenerationDir"
|
||||
}
|
||||
else{
|
||||
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
|
||||
}
|
||||
|
||||
Write-Host "Updating artifact name"
|
||||
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
|
||||
Write-Host "Artifact name $artifact_name"
|
||||
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
|
||||
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"
|
||||
|
|
|
|||
|
|
@ -14,19 +14,24 @@ done
|
|||
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
|
||||
. $scriptroot/pipeline-logging-functions.sh
|
||||
|
||||
|
||||
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
|
||||
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
|
||||
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
|
||||
manifest_dir=$1
|
||||
|
||||
if [ ! -d "$manifest_dir" ] ; then
|
||||
mkdir -p "$manifest_dir"
|
||||
echo "Sbom directory created." $manifest_dir
|
||||
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
|
||||
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
|
||||
sbom_generation_dir="$manifest_dir/$safe_artifact_name"
|
||||
|
||||
if [ ! -d "$sbom_generation_dir" ] ; then
|
||||
mkdir -p "$sbom_generation_dir"
|
||||
echo "Sbom directory created." $sbom_generation_dir
|
||||
else
|
||||
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
|
||||
fi
|
||||
|
||||
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
|
||||
echo "Artifact name before : "$artifact_name
|
||||
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
|
||||
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
|
||||
echo "Artifact name after : "$safe_artifact_name
|
||||
export ARTIFACT_NAME=$safe_artifact_name
|
||||
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ jobs:
|
|||
parameters:
|
||||
PackageVersion: ${{ parameters.packageVersion }}
|
||||
BuildDropPath: ${{ parameters.buildDropPath }}
|
||||
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
|
||||
publishArtifacts: false
|
||||
|
||||
# publish artifacts
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
|
||||
|
||||
# Enable repos to use a particular version of the on-line dotnet-install scripts.
|
||||
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
|
||||
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
|
||||
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
|
||||
|
||||
# True to use global NuGet cache instead of restoring packages to repository-local directory.
|
||||
|
|
@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
|
|||
if (!(Test-Path $installScript)) {
|
||||
Create-Directory $dotnetRoot
|
||||
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
|
||||
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
|
||||
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
|
||||
|
||||
Retry({
|
||||
Write-Host "GET $uri"
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
|
|||
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
|
||||
|
||||
# Enable repos to use a particular version of the on-line dotnet-install scripts.
|
||||
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
|
||||
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
|
||||
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
|
||||
|
||||
# True to use global NuGet cache instead of restoring packages to repository-local directory.
|
||||
|
|
@ -295,7 +295,7 @@ function with_retries {
|
|||
function GetDotNetInstallScript {
|
||||
local root=$1
|
||||
local install_script="$root/dotnet-install.sh"
|
||||
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
|
||||
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
|
||||
|
||||
if [[ ! -a "$install_script" ]]; then
|
||||
mkdir -p "$root"
|
||||
|
|
|
|||
10
global.json
10
global.json
|
|
@ -1,16 +1,16 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "9.0.103",
|
||||
"version": "9.0.104",
|
||||
"allowPrerelease": true,
|
||||
"rollForward": "major"
|
||||
},
|
||||
"tools": {
|
||||
"dotnet": "9.0.103"
|
||||
"dotnet": "9.0.104"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5",
|
||||
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25111.5",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2",
|
||||
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25164.2",
|
||||
"Microsoft.Build.NoTargets": "3.7.0",
|
||||
"Microsoft.Build.Traversal": "3.4.0",
|
||||
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue