[main] Update dependencies from dotnet/arcade#7397

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
michaelgsharp merged 5 commits into from
Mar 10, 2025
Merged

[main] Update dependencies from dotnet/arcade #7397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00b57cd
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 24, 2025
295acfb
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 25, 2025
2df05f9
Remove unnecessary direct dependencies
ericstj Feb 26, 2025
548d390
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 3, 2025
02cd7f1
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 10, 2025
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
1 change: 0 additions & 1 deletion docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
<ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
<NativeAssemblyReference Include="MatrixFactorizationNative" />
<NativeAssemblyReference Include="FastTreeNative" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
Expand Down
1 change: 0 additions & 1 deletion docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
<PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
Expand Down
1 change: 0 additions & 1 deletion docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -977,7 +977,6 @@
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,38 +7,38 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<!-- Stay on package 8.0 until we stop testing for net6.0
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
</Dependency> -->
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down
1 change: 0 additions & 1 deletion eng/common/core-templates/job/job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ parameters:
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
enableBuildRetry: false
mergeTestResults: false
testRunTitle: ''
Expand Down
13 changes: 4 additions & 9 deletions eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,6 @@ parameters:
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
runAsPublic: false

# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
publishUsingPipelines: false

# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
publishAssetsImmediately: false

Expand DownExpand Up@@ -76,12 +73,11 @@ jobs:
fetchDepth: 3
clean: true

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

Expand All@@ -95,9 +91,8 @@ jobs:
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:OfficialBuildId=$(Build.BuildNumber)
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
Expand Down
1 change: 0 additions & 1 deletion eng/common/core-templates/jobs/codeql-build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ jobs:
enablePublishBuildArtifacts: false
enablePublishTestResults: false
enablePublishBuildAssets: false
enablePublishUsingPipelines: false
enableTelemetry: true

variables:
Expand Down
4 changes: 0 additions & 4 deletions eng/common/core-templates/jobs/jobs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,6 @@ parameters:
# Optional: Include PublishBuildArtifacts task
enablePublishBuildArtifacts: false

# Optional: Enable publishing using release pipelines
enablePublishUsingPipelines: false

# Optional: Enable running the source-build jobs to build repo from source
enableSourceBuild: false

Expand DownExpand Up@@ -112,7 +109,6 @@ jobs:
- Source_Build_Complete

runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/generate-sbom.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
PackageVersion: 9.0.0
PackageVersion: 10.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
PackageName: '.NET'
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand DownExpand Up@@ -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 }}'

Expand Down
20 changes: 14 additions & 6 deletions eng/common/generate-sbom-prep.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
17 changes: 11 additions & 6 deletions eng/common/generate-sbom-prep.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions eng/common/native/install-dependencies.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@ case "$os" in
libssl-dev libkrb5-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "alpine" ]; then
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
else
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
1 change: 1 addition & 0 deletions eng/common/templates-official/job/job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ jobs:
parameters:
PackageVersion: ${{ parameters.packageVersion }}
BuildDropPath: ${{ parameters.buildDropPath }}
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
publishArtifacts: false

# publish artifacts
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
$defaultXCopyMSBuildVersion = '17.12.0'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
$defaultXCopyMSBuildVersion = '17.13.0'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-alpha.1.25077.2",
"dotnet": "10.0.100-preview.3.25125.5",
"runtimes": {
"dotnet": [
"$(DotNetRuntime60Version)",
Expand All@@ -13,8 +13,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.2.0"
}
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.ML.Console/Microsoft.ML.Console.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
<ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
<ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
<ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />

<NativeAssemblyReference Include="FastTreeNative" />
<NativeAssemblyReference Include="CpuMathNative" />
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
<PackageReference Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>

</Project>
7 changes: 0 additions & 7 deletions test/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,13 +34,6 @@
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
<PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />

<!-- workaround stale references in test packages by
1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
<PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
<PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
</ItemGroup>

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#7397

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

michaelgsharp
merged 5 commits into

from

Mar 10, 2025
 Merged


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

Show all changes


5 commits


Select commit
Hold shift + click to select a range
00b57cd

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 24, 2025
295acfb

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 25, 2025
2df05f9

Remove unnecessary direct dependencies


ericstj Feb 26, 2025
548d390

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 3, 2025
02cd7f1

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 10, 2025

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


1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <NativeAssemblyReference Include="MatrixFactorizationNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
 <PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -977,7 +977,6 @@
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,38 +7,38 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <!-- Stay on package 8.0 until we stop testing for net6.0
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
 </Dependency> -->
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
 <MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ parameters:
 enablePublishBuildArtifacts: false
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 enableBuildRetry: false
 mergeTestResults: false
 testRunTitle: ''
Expand Down

13 changes: 4 additions & 9 deletions
eng/common/core-templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,6 @@ parameters:
 # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
 runAsPublic: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishUsingPipelines: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishAssetsImmediately: false

Expand DownExpand Up@@ -76,12 +73,11 @@ jobs:
 fetchDepth: 3
 clean: true

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

Expand All@@ -95,9 +91,8 @@ jobs:
 scriptLocation: scriptPath
 scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
 /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
 /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
 /p:MaestroApiEndpoint=https://maestro.dot.net
 /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
 /p:OfficialBuildId=$(Build.BuildNumber)
 condition: ${{ parameters.condition }}
 continueOnError: ${{ parameters.continueOnError }}
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/jobs/codeql-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ jobs:
 enablePublishBuildArtifacts: false
 enablePublishTestResults: false
 enablePublishBuildAssets: false
 enablePublishUsingPipelines: false
 enableTelemetry: true

 variables:
Expand Down

4 changes: 0 additions & 4 deletions
eng/common/core-templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,6 @@ parameters:
 # Optional: Include PublishBuildArtifacts task
 enablePublishBuildArtifacts: false

 # Optional: Enable publishing using release pipelines
 enablePublishUsingPipelines: false

 # Optional: Enable running the source-build jobs to build repo from source
 enableSourceBuild: false

Expand DownExpand Up@@ -112,7 +109,6 @@ jobs:
 - Source_Build_Complete

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
 publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
 enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
 artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/core-templates/steps/generate-sbom.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
 PackageVersion: 9.0.0
 PackageVersion: 10.0.0
 BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 PackageName: '.NET'
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand DownExpand Up@@ -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 }}'

Expand Down

20 changes: 14 additions & 6 deletions
eng/common/generate-sbom-prep.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

17 changes: 11 additions & 6 deletions
eng/common/generate-sbom-prep.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

5 changes: 3 additions & 2 deletions
eng/common/native/install-dependencies.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@ case "$os" in
 libssl-dev libkrb5-dev pigz cpio

 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
 dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
 pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
 $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "alpine" ]; then
 apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
 else
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/sdk-task.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ try {
 $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
 }
 if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
 }
 if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
 $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down

1 change: 1 addition & 0 deletions
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ jobs:
 parameters:
 PackageVersion: ${{ parameters.packageVersion }}
 BuildDropPath: ${{ parameters.buildDropPath }}
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 publishArtifacts: false

 # publish artifacts
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

 # If the version of msbuild is going to be xcopied,
 # use this version. Version matches a package here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
 $defaultXCopyMSBuildVersion = '17.12.0'
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
 $defaultXCopyMSBuildVersion = '17.13.0'

 if (!$vsRequirements) {
 if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "tools": {
 "dotnet": "10.0.100-alpha.1.25077.2",
 "dotnet": "10.0.100-preview.3.25125.5",
 "runtimes": {
 "dotnet": [
 "$(DotNetRuntime60Version)",
Expand All@@ -13,8 +13,8 @@
 }
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.2.0"
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
 <ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />

 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="CpuMathNative" />
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@

 <ItemGroup>
 <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
 <PackageReference Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

</Project>

7 changes: 0 additions & 7 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,13 +34,6 @@
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
 <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
 <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />

 <!-- workaround stale references in test packages by 
 1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
 2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
 <PackageReference Include="NETStandard.Library" Version="2.0.3" />
 <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
 <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
 <PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 </ItemGroup>

Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
 </ItemGroup>

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#7397

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

michaelgsharp
merged 5 commits into

from

Mar 10, 2025
 Merged


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

Show all changes


5 commits


Select commit
Hold shift + click to select a range
00b57cd

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 24, 2025
295acfb

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 25, 2025
2df05f9

Remove unnecessary direct dependencies


ericstj Feb 26, 2025
548d390

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 3, 2025
02cd7f1

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 10, 2025

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


1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <NativeAssemblyReference Include="MatrixFactorizationNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
 <PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -977,7 +977,6 @@
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,38 +7,38 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <!-- Stay on package 8.0 until we stop testing for net6.0
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
 </Dependency> -->
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
 <MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ parameters:
 enablePublishBuildArtifacts: false
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 enableBuildRetry: false
 mergeTestResults: false
 testRunTitle: ''
Expand Down

13 changes: 4 additions & 9 deletions
eng/common/core-templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,6 @@ parameters:
 # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
 runAsPublic: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishUsingPipelines: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishAssetsImmediately: false

Expand DownExpand Up@@ -76,12 +73,11 @@ jobs:
 fetchDepth: 3
 clean: true

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

Expand All@@ -95,9 +91,8 @@ jobs:
 scriptLocation: scriptPath
 scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
 /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
 /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
 /p:MaestroApiEndpoint=https://maestro.dot.net
 /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
 /p:OfficialBuildId=$(Build.BuildNumber)
 condition: ${{ parameters.condition }}
 continueOnError: ${{ parameters.continueOnError }}
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/jobs/codeql-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ jobs:
 enablePublishBuildArtifacts: false
 enablePublishTestResults: false
 enablePublishBuildAssets: false
 enablePublishUsingPipelines: false
 enableTelemetry: true

 variables:
Expand Down

4 changes: 0 additions & 4 deletions
eng/common/core-templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,6 @@ parameters:
 # Optional: Include PublishBuildArtifacts task
 enablePublishBuildArtifacts: false

 # Optional: Enable publishing using release pipelines
 enablePublishUsingPipelines: false

 # Optional: Enable running the source-build jobs to build repo from source
 enableSourceBuild: false

Expand DownExpand Up@@ -112,7 +109,6 @@ jobs:
 - Source_Build_Complete

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
 publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
 enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
 artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/core-templates/steps/generate-sbom.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
 PackageVersion: 9.0.0
 PackageVersion: 10.0.0
 BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 PackageName: '.NET'
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand DownExpand Up@@ -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 }}'

Expand Down

20 changes: 14 additions & 6 deletions
eng/common/generate-sbom-prep.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

17 changes: 11 additions & 6 deletions
eng/common/generate-sbom-prep.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

5 changes: 3 additions & 2 deletions
eng/common/native/install-dependencies.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@ case "$os" in
 libssl-dev libkrb5-dev pigz cpio

 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
 dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
 pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
 $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "alpine" ]; then
 apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
 else
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/sdk-task.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ try {
 $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
 }
 if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
 }
 if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
 $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down

1 change: 1 addition & 0 deletions
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ jobs:
 parameters:
 PackageVersion: ${{ parameters.packageVersion }}
 BuildDropPath: ${{ parameters.buildDropPath }}
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 publishArtifacts: false

 # publish artifacts
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

 # If the version of msbuild is going to be xcopied,
 # use this version. Version matches a package here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
 $defaultXCopyMSBuildVersion = '17.12.0'
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
 $defaultXCopyMSBuildVersion = '17.13.0'

 if (!$vsRequirements) {
 if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "tools": {
 "dotnet": "10.0.100-alpha.1.25077.2",
 "dotnet": "10.0.100-preview.3.25125.5",
 "runtimes": {
 "dotnet": [
 "$(DotNetRuntime60Version)",
Expand All@@ -13,8 +13,8 @@
 }
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.2.0"
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
 <ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />

 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="CpuMathNative" />
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@

 <ItemGroup>
 <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
 <PackageReference Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

</Project>

7 changes: 0 additions & 7 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,13 +34,6 @@
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
 <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
 <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />

 <!-- workaround stale references in test packages by 
 1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
 2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
 <PackageReference Include="NETStandard.Library" Version="2.0.3" />
 <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
 <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
 <PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 </ItemGroup>

Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
 </ItemGroup>

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#7397

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

michaelgsharp
merged 5 commits into

from

Mar 10, 2025
 Merged


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

Show all changes


5 commits


Select commit
Hold shift + click to select a range
00b57cd

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 24, 2025
295acfb

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 25, 2025
2df05f9

Remove unnecessary direct dependencies


ericstj Feb 26, 2025
548d390

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 3, 2025
02cd7f1

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 10, 2025

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


1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <NativeAssemblyReference Include="MatrixFactorizationNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
 <PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -977,7 +977,6 @@
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,38 +7,38 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <!-- Stay on package 8.0 until we stop testing for net6.0
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
 </Dependency> -->
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
 <MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ parameters:
 enablePublishBuildArtifacts: false
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 enableBuildRetry: false
 mergeTestResults: false
 testRunTitle: ''
Expand Down

13 changes: 4 additions & 9 deletions
eng/common/core-templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,6 @@ parameters:
 # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
 runAsPublic: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishUsingPipelines: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishAssetsImmediately: false

Expand DownExpand Up@@ -76,12 +73,11 @@ jobs:
 fetchDepth: 3
 clean: true

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

Expand All@@ -95,9 +91,8 @@ jobs:
 scriptLocation: scriptPath
 scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
 /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
 /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
 /p:MaestroApiEndpoint=https://maestro.dot.net
 /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
 /p:OfficialBuildId=$(Build.BuildNumber)
 condition: ${{ parameters.condition }}
 continueOnError: ${{ parameters.continueOnError }}
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/jobs/codeql-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ jobs:
 enablePublishBuildArtifacts: false
 enablePublishTestResults: false
 enablePublishBuildAssets: false
 enablePublishUsingPipelines: false
 enableTelemetry: true

 variables:
Expand Down

4 changes: 0 additions & 4 deletions
eng/common/core-templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,6 @@ parameters:
 # Optional: Include PublishBuildArtifacts task
 enablePublishBuildArtifacts: false

 # Optional: Enable publishing using release pipelines
 enablePublishUsingPipelines: false

 # Optional: Enable running the source-build jobs to build repo from source
 enableSourceBuild: false

Expand DownExpand Up@@ -112,7 +109,6 @@ jobs:
 - Source_Build_Complete

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
 publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
 enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
 artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/core-templates/steps/generate-sbom.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
 PackageVersion: 9.0.0
 PackageVersion: 10.0.0
 BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 PackageName: '.NET'
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand DownExpand Up@@ -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 }}'

Expand Down

20 changes: 14 additions & 6 deletions
eng/common/generate-sbom-prep.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

17 changes: 11 additions & 6 deletions
eng/common/generate-sbom-prep.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

5 changes: 3 additions & 2 deletions
eng/common/native/install-dependencies.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@ case "$os" in
 libssl-dev libkrb5-dev pigz cpio

 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
 dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
 pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
 $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "alpine" ]; then
 apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
 else
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/sdk-task.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ try {
 $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
 }
 if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
 }
 if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
 $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down

1 change: 1 addition & 0 deletions
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ jobs:
 parameters:
 PackageVersion: ${{ parameters.packageVersion }}
 BuildDropPath: ${{ parameters.buildDropPath }}
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 publishArtifacts: false

 # publish artifacts
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

 # If the version of msbuild is going to be xcopied,
 # use this version. Version matches a package here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
 $defaultXCopyMSBuildVersion = '17.12.0'
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
 $defaultXCopyMSBuildVersion = '17.13.0'

 if (!$vsRequirements) {
 if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "tools": {
 "dotnet": "10.0.100-alpha.1.25077.2",
 "dotnet": "10.0.100-preview.3.25125.5",
 "runtimes": {
 "dotnet": [
 "$(DotNetRuntime60Version)",
Expand All@@ -13,8 +13,8 @@
 }
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.2.0"
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
 <ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />

 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="CpuMathNative" />
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@

 <ItemGroup>
 <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
 <PackageReference Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

</Project>

7 changes: 0 additions & 7 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,13 +34,6 @@
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
 <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
 <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />

 <!-- workaround stale references in test packages by 
 1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
 2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
 <PackageReference Include="NETStandard.Library" Version="2.0.3" />
 <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
 <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
 <PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 </ItemGroup>

Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
 </ItemGroup>

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#7397

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

michaelgsharp
merged 5 commits into

from

Mar 10, 2025
 Merged


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

Show all changes


5 commits


Select commit
Hold shift + click to select a range
00b57cd

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 24, 2025
295acfb

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 25, 2025
2df05f9

Remove unnecessary direct dependencies


ericstj Feb 26, 2025
548d390

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 3, 2025
02cd7f1

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 10, 2025

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


1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <NativeAssemblyReference Include="MatrixFactorizationNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
 <PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -977,7 +977,6 @@
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,38 +7,38 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <!-- Stay on package 8.0 until we stop testing for net6.0
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
 </Dependency> -->
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
 <MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ parameters:
 enablePublishBuildArtifacts: false
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 enableBuildRetry: false
 mergeTestResults: false
 testRunTitle: ''
Expand Down

13 changes: 4 additions & 9 deletions
eng/common/core-templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,6 @@ parameters:
 # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
 runAsPublic: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishUsingPipelines: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishAssetsImmediately: false

Expand DownExpand Up@@ -76,12 +73,11 @@ jobs:
 fetchDepth: 3
 clean: true

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

Expand All@@ -95,9 +91,8 @@ jobs:
 scriptLocation: scriptPath
 scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
 /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
 /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
 /p:MaestroApiEndpoint=https://maestro.dot.net
 /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
 /p:OfficialBuildId=$(Build.BuildNumber)
 condition: ${{ parameters.condition }}
 continueOnError: ${{ parameters.continueOnError }}
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/jobs/codeql-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ jobs:
 enablePublishBuildArtifacts: false
 enablePublishTestResults: false
 enablePublishBuildAssets: false
 enablePublishUsingPipelines: false
 enableTelemetry: true

 variables:
Expand Down

4 changes: 0 additions & 4 deletions
eng/common/core-templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,6 @@ parameters:
 # Optional: Include PublishBuildArtifacts task
 enablePublishBuildArtifacts: false

 # Optional: Enable publishing using release pipelines
 enablePublishUsingPipelines: false

 # Optional: Enable running the source-build jobs to build repo from source
 enableSourceBuild: false

Expand DownExpand Up@@ -112,7 +109,6 @@ jobs:
 - Source_Build_Complete

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
 publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
 enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
 artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/core-templates/steps/generate-sbom.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
 PackageVersion: 9.0.0
 PackageVersion: 10.0.0
 BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 PackageName: '.NET'
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand DownExpand Up@@ -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 }}'

Expand Down

20 changes: 14 additions & 6 deletions
eng/common/generate-sbom-prep.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

17 changes: 11 additions & 6 deletions
eng/common/generate-sbom-prep.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

5 changes: 3 additions & 2 deletions
eng/common/native/install-dependencies.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@ case "$os" in
 libssl-dev libkrb5-dev pigz cpio

 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
 dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
 pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
 $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "alpine" ]; then
 apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
 else
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/sdk-task.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ try {
 $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
 }
 if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
 }
 if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
 $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down

1 change: 1 addition & 0 deletions
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ jobs:
 parameters:
 PackageVersion: ${{ parameters.packageVersion }}
 BuildDropPath: ${{ parameters.buildDropPath }}
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 publishArtifacts: false

 # publish artifacts
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

 # If the version of msbuild is going to be xcopied,
 # use this version. Version matches a package here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
 $defaultXCopyMSBuildVersion = '17.12.0'
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
 $defaultXCopyMSBuildVersion = '17.13.0'

 if (!$vsRequirements) {
 if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "tools": {
 "dotnet": "10.0.100-alpha.1.25077.2",
 "dotnet": "10.0.100-preview.3.25125.5",
 "runtimes": {
 "dotnet": [
 "$(DotNetRuntime60Version)",
Expand All@@ -13,8 +13,8 @@
 }
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.2.0"
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
 <ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />

 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="CpuMathNative" />
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@

 <ItemGroup>
 <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
 <PackageReference Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

</Project>

7 changes: 0 additions & 7 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,13 +34,6 @@
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
 <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
 <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />

 <!-- workaround stale references in test packages by 
 1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
 2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
 <PackageReference Include="NETStandard.Library" Version="2.0.3" />
 <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
 <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
 <PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 </ItemGroup>

Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
 </ItemGroup>

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#7397

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

michaelgsharp
merged 5 commits into

from

Mar 10, 2025
 Merged


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

Show all changes


5 commits


Select commit
Hold shift + click to select a range
00b57cd

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 24, 2025
295acfb

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 25, 2025
2df05f9

Remove unnecessary direct dependencies


ericstj Feb 26, 2025
548d390

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 3, 2025
02cd7f1

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 10, 2025

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


1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <NativeAssemblyReference Include="MatrixFactorizationNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
 <PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -977,7 +977,6 @@
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,38 +7,38 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <!-- Stay on package 8.0 until we stop testing for net6.0
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
 </Dependency> -->
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
 <MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ parameters:
 enablePublishBuildArtifacts: false
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 enableBuildRetry: false
 mergeTestResults: false
 testRunTitle: ''
Expand Down

13 changes: 4 additions & 9 deletions
eng/common/core-templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,6 @@ parameters:
 # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
 runAsPublic: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishUsingPipelines: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishAssetsImmediately: false

Expand DownExpand Up@@ -76,12 +73,11 @@ jobs:
 fetchDepth: 3
 clean: true

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

Expand All@@ -95,9 +91,8 @@ jobs:
 scriptLocation: scriptPath
 scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
 /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
 /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
 /p:MaestroApiEndpoint=https://maestro.dot.net
 /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
 /p:OfficialBuildId=$(Build.BuildNumber)
 condition: ${{ parameters.condition }}
 continueOnError: ${{ parameters.continueOnError }}
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/jobs/codeql-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ jobs:
 enablePublishBuildArtifacts: false
 enablePublishTestResults: false
 enablePublishBuildAssets: false
 enablePublishUsingPipelines: false
 enableTelemetry: true

 variables:
Expand Down

4 changes: 0 additions & 4 deletions
eng/common/core-templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,6 @@ parameters:
 # Optional: Include PublishBuildArtifacts task
 enablePublishBuildArtifacts: false

 # Optional: Enable publishing using release pipelines
 enablePublishUsingPipelines: false

 # Optional: Enable running the source-build jobs to build repo from source
 enableSourceBuild: false

Expand DownExpand Up@@ -112,7 +109,6 @@ jobs:
 - Source_Build_Complete

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
 publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
 enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
 artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/core-templates/steps/generate-sbom.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
 PackageVersion: 9.0.0
 PackageVersion: 10.0.0
 BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 PackageName: '.NET'
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand DownExpand Up@@ -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 }}'

Expand Down

20 changes: 14 additions & 6 deletions
eng/common/generate-sbom-prep.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

17 changes: 11 additions & 6 deletions
eng/common/generate-sbom-prep.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

5 changes: 3 additions & 2 deletions
eng/common/native/install-dependencies.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@ case "$os" in
 libssl-dev libkrb5-dev pigz cpio

 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
 dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
 pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
 $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "alpine" ]; then
 apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
 else
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/sdk-task.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ try {
 $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
 }
 if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
 }
 if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
 $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down

1 change: 1 addition & 0 deletions
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ jobs:
 parameters:
 PackageVersion: ${{ parameters.packageVersion }}
 BuildDropPath: ${{ parameters.buildDropPath }}
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 publishArtifacts: false

 # publish artifacts
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

 # If the version of msbuild is going to be xcopied,
 # use this version. Version matches a package here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
 $defaultXCopyMSBuildVersion = '17.12.0'
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
 $defaultXCopyMSBuildVersion = '17.13.0'

 if (!$vsRequirements) {
 if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "tools": {
 "dotnet": "10.0.100-alpha.1.25077.2",
 "dotnet": "10.0.100-preview.3.25125.5",
 "runtimes": {
 "dotnet": [
 "$(DotNetRuntime60Version)",
Expand All@@ -13,8 +13,8 @@
 }
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.2.0"
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
 <ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />

 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="CpuMathNative" />
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@

 <ItemGroup>
 <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
 <PackageReference Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

</Project>

7 changes: 0 additions & 7 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,13 +34,6 @@
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
 <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
 <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />

 <!-- workaround stale references in test packages by 
 1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
 2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
 <PackageReference Include="NETStandard.Library" Version="2.0.3" />
 <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
 <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
 <PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 </ItemGroup>

Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
 </ItemGroup>

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#7397

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

michaelgsharp
merged 5 commits into

from

Mar 10, 2025
 Merged


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

Show all changes


5 commits


Select commit
Hold shift + click to select a range
00b57cd

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 24, 2025
295acfb

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 25, 2025
2df05f9

Remove unnecessary direct dependencies


ericstj Feb 26, 2025
548d390

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 3, 2025
02cd7f1

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 10, 2025

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


1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <NativeAssemblyReference Include="MatrixFactorizationNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
 <PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -977,7 +977,6 @@
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,38 +7,38 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <!-- Stay on package 8.0 until we stop testing for net6.0
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
 </Dependency> -->
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
 <MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ parameters:
 enablePublishBuildArtifacts: false
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 enableBuildRetry: false
 mergeTestResults: false
 testRunTitle: ''
Expand Down

13 changes: 4 additions & 9 deletions
eng/common/core-templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,6 @@ parameters:
 # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
 runAsPublic: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishUsingPipelines: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishAssetsImmediately: false

Expand DownExpand Up@@ -76,12 +73,11 @@ jobs:
 fetchDepth: 3
 clean: true

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

Expand All@@ -95,9 +91,8 @@ jobs:
 scriptLocation: scriptPath
 scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
 /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
 /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
 /p:MaestroApiEndpoint=https://maestro.dot.net
 /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
 /p:OfficialBuildId=$(Build.BuildNumber)
 condition: ${{ parameters.condition }}
 continueOnError: ${{ parameters.continueOnError }}
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/jobs/codeql-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ jobs:
 enablePublishBuildArtifacts: false
 enablePublishTestResults: false
 enablePublishBuildAssets: false
 enablePublishUsingPipelines: false
 enableTelemetry: true

 variables:
Expand Down

4 changes: 0 additions & 4 deletions
eng/common/core-templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,6 @@ parameters:
 # Optional: Include PublishBuildArtifacts task
 enablePublishBuildArtifacts: false

 # Optional: Enable publishing using release pipelines
 enablePublishUsingPipelines: false

 # Optional: Enable running the source-build jobs to build repo from source
 enableSourceBuild: false

Expand DownExpand Up@@ -112,7 +109,6 @@ jobs:
 - Source_Build_Complete

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
 publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
 enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
 artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/core-templates/steps/generate-sbom.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
 PackageVersion: 9.0.0
 PackageVersion: 10.0.0
 BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 PackageName: '.NET'
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand DownExpand Up@@ -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 }}'

Expand Down

20 changes: 14 additions & 6 deletions
eng/common/generate-sbom-prep.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

17 changes: 11 additions & 6 deletions
eng/common/generate-sbom-prep.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

5 changes: 3 additions & 2 deletions
eng/common/native/install-dependencies.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@ case "$os" in
 libssl-dev libkrb5-dev pigz cpio

 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
 dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
 pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
 $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "alpine" ]; then
 apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
 else
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/sdk-task.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ try {
 $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
 }
 if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
 }
 if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
 $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down

1 change: 1 addition & 0 deletions
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ jobs:
 parameters:
 PackageVersion: ${{ parameters.packageVersion }}
 BuildDropPath: ${{ parameters.buildDropPath }}
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 publishArtifacts: false

 # publish artifacts
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

 # If the version of msbuild is going to be xcopied,
 # use this version. Version matches a package here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
 $defaultXCopyMSBuildVersion = '17.12.0'
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
 $defaultXCopyMSBuildVersion = '17.13.0'

 if (!$vsRequirements) {
 if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "tools": {
 "dotnet": "10.0.100-alpha.1.25077.2",
 "dotnet": "10.0.100-preview.3.25125.5",
 "runtimes": {
 "dotnet": [
 "$(DotNetRuntime60Version)",
Expand All@@ -13,8 +13,8 @@
 }
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.2.0"
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
 <ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />

 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="CpuMathNative" />
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@

 <ItemGroup>
 <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
 <PackageReference Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

</Project>

7 changes: 0 additions & 7 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,13 +34,6 @@
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
 <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
 <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />

 <!-- workaround stale references in test packages by 
 1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
 2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
 <PackageReference Include="NETStandard.Library" Version="2.0.3" />
 <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
 <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
 <PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 </ItemGroup>

Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
 </ItemGroup>

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#7397

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

michaelgsharp
merged 5 commits into

from

Mar 10, 2025
 Merged


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

Show all changes


5 commits


Select commit
Hold shift + click to select a range
00b57cd

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 24, 2025
295acfb

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Feb 25, 2025
2df05f9

Remove unnecessary direct dependencies


ericstj Feb 26, 2025
548d390

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 3, 2025
02cd7f1

Update dependencies from https://github.com/dotnet/arcade build 20250…


dotnet-maestro[bot] Mar 10, 2025

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


1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,6 @@
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <NativeAssemblyReference Include="MatrixFactorizationNative" />
 <NativeAssemblyReference Include="FastTreeNative" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>
 <ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
 <PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -977,7 +977,6 @@
 <PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,38 +7,38 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <!-- Stay on package 8.0 until we stop testing for net6.0
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
 </Dependency> -->
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
 <Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
 <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
 <MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ parameters:
 enablePublishBuildArtifacts: false
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 enableBuildRetry: false
 mergeTestResults: false
 testRunTitle: ''
Expand Down

13 changes: 4 additions & 9 deletions
eng/common/core-templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,6 @@ parameters:
 # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
 runAsPublic: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishUsingPipelines: false

 # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
 publishAssetsImmediately: false

Expand DownExpand Up@@ -76,12 +73,11 @@ jobs:
 fetchDepth: 3
 clean: true

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

Expand All@@ -95,9 +91,8 @@ jobs:
 scriptLocation: scriptPath
 scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
 /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
 /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
 /p:MaestroApiEndpoint=https://maestro.dot.net
 /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
 /p:OfficialBuildId=$(Build.BuildNumber)
 condition: ${{ parameters.condition }}
 continueOnError: ${{ parameters.continueOnError }}
Expand Down

1 change: 0 additions & 1 deletion
eng/common/core-templates/jobs/codeql-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@ jobs:
 enablePublishBuildArtifacts: false
 enablePublishTestResults: false
 enablePublishBuildAssets: false
 enablePublishUsingPipelines: false
 enableTelemetry: true

 variables:
Expand Down

4 changes: 0 additions & 4 deletions
eng/common/core-templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,6 @@ parameters:
 # Optional: Include PublishBuildArtifacts task
 enablePublishBuildArtifacts: false

 # Optional: Enable publishing using release pipelines
 enablePublishUsingPipelines: false

 # Optional: Enable running the source-build jobs to build repo from source
 enableSourceBuild: false

Expand DownExpand Up@@ -112,7 +109,6 @@ jobs:
 - Source_Build_Complete

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
 publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
 enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
 artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/core-templates/steps/generate-sbom.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
 PackageVersion: 9.0.0
 PackageVersion: 10.0.0
 BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
 PackageName: '.NET'
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
Expand DownExpand Up@@ -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 }}'

Expand Down

20 changes: 14 additions & 6 deletions
eng/common/generate-sbom-prep.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

17 changes: 11 additions & 6 deletions
eng/common/generate-sbom-prep.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

5 changes: 3 additions & 2 deletions
eng/common/native/install-dependencies.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,9 @@ case "$os" in
 libssl-dev libkrb5-dev pigz cpio

 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
 dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then
 pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
 $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
 elif [ "$ID" = "alpine" ]; then
 apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
 else
Expand Down

2 changes: 1 addition & 1 deletion
eng/common/sdk-task.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ try {
 $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
 }
 if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
 $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
 }
 if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
 $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down

1 change: 1 addition & 0 deletions
eng/common/templates-official/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ jobs:
 parameters:
 PackageVersion: ${{ parameters.packageVersion }}
 BuildDropPath: ${{ parameters.buildDropPath }}
 ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 publishArtifacts: false

 # publish artifacts
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

 # If the version of msbuild is going to be xcopied,
 # use this version. Version matches a package here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
 $defaultXCopyMSBuildVersion = '17.12.0'
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
 $defaultXCopyMSBuildVersion = '17.13.0'

 if (!$vsRequirements) {
 if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "tools": {
 "dotnet": "10.0.100-alpha.1.25077.2",
 "dotnet": "10.0.100-preview.3.25125.5",
 "runtimes": {
 "dotnet": [
 "$(DotNetRuntime60Version)",
Expand All@@ -13,8 +13,8 @@
 }
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
 "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
 "Microsoft.Build.NoTargets": "3.7.0",
 "Microsoft.Build.Traversal": "3.2.0"
 }
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@
 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
 <ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />

 <NativeAssemblyReference Include="FastTreeNative" />
 <NativeAssemblyReference Include="CpuMathNative" />
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,12 +18,12 @@

 <ItemGroup>
 <PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

 <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
 <PackageReference Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 </ItemGroup>

</Project>

7 changes: 0 additions & 7 deletions
test/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,13 +34,6 @@
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
 <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
 <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
 <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />

 <!-- workaround stale references in test packages by 
 1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
 2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
 <PackageReference Include="NETStandard.Library" Version="2.0.3" />
 <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
 </ItemGroup>

 <ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@
 <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
 <PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
 <PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
 </ItemGroup>

Expand Down

1 change: 0 additions & 1 deletion
test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj

View file


Open in desktop

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

 <ItemGroup>
 <PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
 <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
 <PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
 </ItemGroup>

Expand Down