Skip to content

Commit 3d9e014

Browse files
dotnet-maestro[bot]ViktorHoferlewingmarafakoeplinger
authored
[main] Update dependencies from dotnet/arcade (#112730)
* Update dependencies from https://github.com/dotnet/arcade build 20250219.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25119.2 * Address some of the NU1510 and NU1511 warnings * Address more NU1511 warnings * Fix build break * workload sdk to >= darc sdk * Temporarily remove WasmFingerprintDotnetJs=true test data from blazor test * Update dependencies from https://github.com/dotnet/arcade build 20250220.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25120.6 * Update dependencies from https://github.com/dotnet/arcade build 20250224.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25124.2 * Bump MicrosoftDotNetApiCompatTaskVersion * Update dependencies from https://github.com/dotnet/arcade build 20250225.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25125.2 * Bump MicrosoftDotNetApiCompatTaskVersion --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Larry Ewing <[email protected]> Co-authored-by: Marek Fišera <[email protected]> Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 39c94e0 commit 3d9e014

File tree

40 files changed

+224
-211
lines changed

40 files changed

+224
-211
lines changed

‎eng/Version.Details.xml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25125.2">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
89+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25113.2">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25125.2">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
94+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25125.2">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
99+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25125.2">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
103+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25113.2">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25125.2">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
107+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25113.2">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25125.2">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
111+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25113.2">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25125.2">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
115+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25125.2">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
119+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25113.2">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25125.2">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
123+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25113.2">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25125.2">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
127+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25113.2">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25125.2">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
131+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25113.2">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25125.2">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
135+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25113.2">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25125.2">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
139+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25113.2">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25125.2">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
143+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25113.2">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25125.2">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
147+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25113.2">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25125.2">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
151+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25113.2">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25125.2">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
155+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25125.2">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
159+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25113.2">
161+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25125.2">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
163+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25113.2">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25125.2">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
167+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25120.1">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>cf1b2925785f504d4d52773bcab470044e35ea15</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25113.2">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25125.2">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
353+
<Sha>5b1e2d133be215e729cf90016ae12b520950ce7a</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25104.10">
356356
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -402,9 +402,9 @@
402402
<Sha>bfe9d9f9059008d919d867fe5bdfabfe8b6ed69d</Sha>
403403
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.2.25108.4">
405+
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.3.25126.5">
406406
<Uri>https://github.com/dotnet/sdk</Uri>
407-
<Sha>c0f88f2416d2e61f302411bdfbab3b2e87b9d35c</Sha>
407+
<Sha>c921fd0a32c3e6001b10791dd0a30f8ef80f915f</Sha>
408408
</Dependency>
409409
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25104.10">
410410
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,24 @@
8383
<PropertyGroup>
8484
<StaticCsVersion>0.2.0</StaticCsVersion>
8585
<!-- SDK dependencies (also used in wasm build tests -->
86-
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.2.25108.4</MicrosoftDotNetApiCompatTaskVersion>
86+
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.3.25126.5</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25113.2</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25113.2</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25113.2</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25113.2</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25113.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25113.2</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25113.2</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25113.2</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25125.2</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25125.2</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25125.2</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25125.2</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25125.2</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25125.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25125.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25125.2</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25125.2</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25125.2</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,11 @@ jobs:
7676
fetchDepth: 3
7777
clean: true
7878

79-
- task: DownloadBuildArtifacts@0
80-
displayName: Download artifact
79+
- task: DownloadPipelineArtifact@2
80+
displayName: Download Asset Manifests
8181
inputs:
8282
artifactName: AssetManifests
83-
downloadPath: '$(Build.StagingDirectory)/Download'
84-
checkDownloadedFiles: true
83+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
8584
condition: ${{ parameters.condition }}
8685
continueOnError: ${{ parameters.continueOnError }}
8786

@@ -95,7 +94,7 @@ jobs:
9594
scriptLocation: scriptPath
9695
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9796
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98-
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
97+
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
9998
/p:MaestroApiEndpoint=https://maestro.dot.net
10099
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
101100
/p:OfficialBuildId=$(Build.BuildNumber)

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

Lines changed: 1 addition & 1 deletion
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

‎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/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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-alpha.1.25077.2",
3+
"version": "10.0.100-preview.3.25125.5",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "10.0.100-alpha.1.25077.2"
8+
"dotnet": "10.0.100-preview.3.25125.5"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
12-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25113.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25125.2",
12+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25125.2",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25125.2",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25068.1"

‎src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,4 @@
3232
BuildInParallel="$(BuildInParallel)" />
3333
</Target>
3434

35-
<Import Project="$(RepositoryEngineeringDir)PackageDownloadAndReference.targets" />
36-
3735
</Project>

‎src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
55
<EnableDefaultItems>true</EnableDefaultItems>
66
<NoWarn>$(NoWarn);CS8002</NoWarn>
7-
8-
<!-- third party DI containers bring in NS1.x dependencies -->
9-
<FlagNetStandard1XDependencies>false</FlagNetStandard1XDependencies>
107
</PropertyGroup>
118

129
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
@@ -23,17 +20,11 @@
2320
<PackageReference Include="LightInject.Microsoft.DependencyInjection" Version="3.7.1" />
2421
<PackageReference Include="Grace.DependencyInjection.Extensions" Version="7.1.0" />
2522
<PackageReference Include="Stashbox.Extensions.Dependencyinjection" Version="4.2.3" />
26-
<!-- Update the transitive STJ to a non-vulnerable version. -->
27-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2823
</ItemGroup>
2924

3025
<!-- These packages don't support .NETFramework -->
3126
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
3227
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="8.0.1" />
33-
<!-- Lamar depends on System.Runtime.Loader which brings in 1.x packages.
34-
Those have audit warnings when runtime.* packages are brought in for RID-specific restore.
35-
Avoid by referencing the latest Microsoft.NETCore.Targets which will prevent all 1.x runtime.* packages from being referenced. -->
36-
<PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
3728
</ItemGroup>
3829

3930
</Project>

‎src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<RoslynApiVersion>$(MicrosoftCodeAnalysisVersion_3_11)</RoslynApiVersion>
55
<IsHighAotMemoryUsageTest>true</IsHighAotMemoryUsageTest>
6-
<!-- this Roslyn version brings in NS1.x dependencies -->
7-
<FlagNetStandard1XDependencies>false</FlagNetStandard1XDependencies>
86
</PropertyGroup>
97

108
<ItemGroup>

0 commit comments

Comments
 (0)