Skip to content

Commit c36975c

Browse files
dotnet-maestro[bot]ericstj
dotnet-maestro[bot]
and
ericstj
authored
[main] Update dependencies from dotnet/arcade (#7397)
* Update dependencies from https://github.com/dotnet/arcade build 20250220.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25120.6 * Update dependencies from https://github.com/dotnet/arcade build 20250225.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25125.2 * Remove unnecessary direct dependencies * Update dependencies from https://github.com/dotnet/arcade build 20250226.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25126.4 * Update dependencies from https://github.com/dotnet/arcade build 20250307.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25157.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eric StJohn <[email protected]>
1 parent 3093647 commit c36975c

File tree

23 files changed

+57
-67
lines changed

23 files changed

+57
-67
lines changed

‎docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<ProjectReference Include="..\..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
2020
<NativeAssemblyReference Include="MatrixFactorizationNative" />
2121
<NativeAssemblyReference Include="FastTreeNative" />
22-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2322
</ItemGroup>
2423
<ItemGroup>
2524
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />

‎docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545

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

‎docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,6 @@
977977
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
978978
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
979979
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
980-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
981980
</ItemGroup>
982981

983982
<ItemGroup>

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
12+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
16+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
20+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
24+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25113.2">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
33+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
37+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
41+
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9595
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
9696
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
97-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
97+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
9898
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
9999
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
100100
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

‎eng/common/core-templates/job/job.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ parameters:
2323
enablePublishBuildArtifacts: false
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
26-
enablePublishUsingPipelines: false
2726
enableBuildRetry: false
2827
mergeTestResults: false
2928
testRunTitle: ''

‎eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ parameters:
2020
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
2121
runAsPublic: false
2222

23-
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
24-
publishUsingPipelines: false
25-
2623
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
2724
publishAssetsImmediately: false
2825

@@ -76,12 +73,11 @@ jobs:
7673
fetchDepth: 3
7774
clean: true
7875

79-
- task: DownloadBuildArtifacts@0
80-
displayName: Download artifact
76+
- task: DownloadPipelineArtifact@2
77+
displayName: Download Asset Manifests
8178
inputs:
8279
artifactName: AssetManifests
83-
downloadPath: '$(Build.StagingDirectory)/Download'
84-
checkDownloadedFiles: true
80+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
8581
condition: ${{ parameters.condition }}
8682
continueOnError: ${{ parameters.continueOnError }}
8783

@@ -95,9 +91,8 @@ jobs:
9591
scriptLocation: scriptPath
9692
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9793
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98-
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
94+
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
9995
/p:MaestroApiEndpoint=https://maestro.dot.net
100-
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
10196
/p:OfficialBuildId=$(Build.BuildNumber)
10297
condition: ${{ parameters.condition }}
10398
continueOnError: ${{ parameters.continueOnError }}

‎eng/common/core-templates/jobs/codeql-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
enablePublishBuildArtifacts: false
1616
enablePublishTestResults: false
1717
enablePublishBuildAssets: false
18-
enablePublishUsingPipelines: false
1918
enableTelemetry: true
2019

2120
variables:

‎eng/common/core-templates/jobs/jobs.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ parameters:
55
# Optional: Include PublishBuildArtifacts task
66
enablePublishBuildArtifacts: false
77

8-
# Optional: Enable publishing using release pipelines
9-
enablePublishUsingPipelines: false
10-
118
# Optional: Enable running the source-build jobs to build repo from source
129
enableSourceBuild: false
1310

@@ -112,7 +109,6 @@ jobs:
112109
- Source_Build_Complete
113110

114111
runAsPublic: ${{ parameters.runAsPublic }}
115-
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
116112
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
117113
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118114
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

‎eng/common/core-templates/steps/generate-sbom.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
66

77
parameters:
8-
PackageVersion: 9.0.0
8+
PackageVersion: 10.0.0
99
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
1010
PackageName: '.NET'
1111
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
@@ -38,7 +38,7 @@ steps:
3838
PackageName: ${{ parameters.packageName }}
3939
BuildDropPath: ${{ parameters.buildDropPath }}
4040
PackageVersion: ${{ parameters.packageVersion }}
41-
ManifestDirPath: ${{ parameters.manifestDirPath }}
41+
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
4242
${{ if ne(parameters.IgnoreDirectories, '') }}:
4343
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
4444

‎eng/common/generate-sbom-prep.ps1

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,26 @@ Param(
44

55
. $PSScriptRoot\pipeline-logging-functions.ps1
66

7+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
8+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
9+
$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
10+
$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
11+
$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
12+
13+
Write-Host "Artifact name before : $ArtifactName"
14+
Write-Host "Artifact name after : $SafeArtifactName"
15+
716
Write-Host "Creating dir $ManifestDirPath"
17+
818
# create directory for sbom manifest to be placed
9-
if (!(Test-Path -path $ManifestDirPath))
19+
if (!(Test-Path -path $SbomGenerationDir))
1020
{
11-
New-Item -ItemType Directory -path $ManifestDirPath
12-
Write-Host "Successfully created directory $ManifestDirPath"
21+
New-Item -ItemType Directory -path $SbomGenerationDir
22+
Write-Host "Successfully created directory $SbomGenerationDir"
1323
}
1424
else{
1525
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
1626
}
1727

1828
Write-Host "Updating artifact name"
19-
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
20-
Write-Host "Artifact name $artifact_name"
21-
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
29+
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"

‎eng/common/generate-sbom-prep.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@ done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515
. $scriptroot/pipeline-logging-functions.sh
1616

17+
18+
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
19+
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
20+
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
1721
manifest_dir=$1
1822

19-
if [ ! -d "$manifest_dir" ] ; then
20-
mkdir -p "$manifest_dir"
21-
echo "Sbom directory created." $manifest_dir
23+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
24+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
25+
sbom_generation_dir="$manifest_dir/$safe_artifact_name"
26+
27+
if [ ! -d "$sbom_generation_dir" ] ; then
28+
mkdir -p "$sbom_generation_dir"
29+
echo "Sbom directory created." $sbom_generation_dir
2230
else
2331
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
2432
fi
2533

26-
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
2734
echo "Artifact name before : "$artifact_name
28-
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
29-
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
3035
echo "Artifact name after : "$safe_artifact_name
3136
export ARTIFACT_NAME=$safe_artifact_name
3237
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"

‎eng/common/native/install-dependencies.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ case "$os" in
2727
libssl-dev libkrb5-dev pigz cpio
2828

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

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/templates-official/job/job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
parameters:
1717
PackageVersion: ${{ parameters.packageVersion }}
1818
BuildDropPath: ${{ parameters.buildDropPath }}
19+
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
1920
publishArtifacts: false
2021

2122
# publish artifacts

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
383383

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

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

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-alpha.1.25077.2",
3+
"dotnet": "10.0.100-preview.3.25125.5",
44
"runtimes": {
55
"dotnet": [
66
"$(DotNetRuntime60Version)",
@@ -13,8 +13,8 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
17-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
17+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25157.1",
1818
"Microsoft.Build.NoTargets": "3.7.0",
1919
"Microsoft.Build.Traversal": "3.2.0"
2020
}

‎src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<ItemGroup>
99
<PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
1010
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
11-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
1211
</ItemGroup>
1312

1413
<ItemGroup>

‎src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<ProjectReference Include="..\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
2828
<ProjectReference Include="..\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
2929
<ProjectReference Include="..\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
30-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
3130

3231
<NativeAssemblyReference Include="FastTreeNative" />
3332
<NativeAssemblyReference Include="CpuMathNative" />

‎src/Microsoft.ML.Tokenizers/Microsoft.ML.Tokenizers.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
21-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2221
</ItemGroup>
2322

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

2929
</Project>

‎test/Directory.Build.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@
3434
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
3535
<PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
3636
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
37-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" GeneratePathProperty="true" />
38-
39-
<!-- workaround stale references in test packages by
40-
1) updating NETStandard.Library - the newer version brings less references on netstandard2.0 compatible frameworks.
41-
2) updating Microsoft.NETCore.Targets - the newer version prevents .NETCore 1.x era runtime.* packages from being referenced. -->
42-
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
43-
<PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
4437
</ItemGroup>
4538

4639
<ItemGroup>

‎test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
2626
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
2727
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
28-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2928
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
3029
</ItemGroup>
3130

‎test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767

6868
<ItemGroup>
6969
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
70-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
7170
<PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
7271
</ItemGroup>
7372

0 commit comments

Comments
 (0)