Skip to content

Commit 1345190

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Update dependencies from dotnet/arcade (#86494)
* Update dependencies from https://github.com/dotnet/arcade build 20230519.1 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23269.1 * Update dependencies from https://github.com/dotnet/arcade build 20230519.2 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23269.2 * Update dependencies from https://github.com/dotnet/arcade build 20230524.6 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23274.6 * Update dependencies from https://github.com/dotnet/arcade build 20230525.2 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23275.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230526.2 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23276.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230527.1 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23277.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230529.1 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23279.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230529.4 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23279.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230530.1 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23268.1 -> To Version 8.0.0-beta.23280.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23266.1 -> To Version 1.0.0-beta.23272.1 (parent: Microsoft.DotNet.Arcade.Sdk * Remove duplicate package references --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent aca0eab commit 1345190

File tree

9 files changed

+73
-65
lines changed

9 files changed

+73
-65
lines changed

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -107,84 +107,84 @@
107107
</Dependency>
108108
</ProductDependencies>
109109
<ToolsetDependencies>
110-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23268.1">
110+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23280.1">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
112+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
113113
<SourceBuild RepoName="arcade" ManagedOnly="true" />
114114
</Dependency>
115115
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23252.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
116116
<Uri>https://github.com/dotnet/sourcelink</Uri>
117117
<Sha>54eb3b811c57f5e94617d31a102fc9cb664ccdd5</Sha>
118118
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
119119
</Dependency>
120-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23266.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23272.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
121121
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
122-
<Sha>9e7fbcab4e5275f63c0cd37553ba426de9194309</Sha>
122+
<Sha>a8431741d7de7531e4268a8eeb6871fb48b62a43</Sha>
123123
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23268.1">
125+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23280.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
127+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23268.1">
129+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23280.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
131+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23268.1">
133+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23280.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
135+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23268.1">
137+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23280.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
139+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23268.1">
141+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23280.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
143+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23268.1">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23280.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
147+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23268.1">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23280.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
151+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23268.1">
153+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23280.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
155+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23268.1">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23280.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
159+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23268.1">
161+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23280.1">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
163+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23268.1">
165+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23280.1">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
167+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23268.1">
169+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23280.1">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
171+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23268.1">
173+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23280.1">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
175+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
176176
</Dependency>
177-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23268.1">
177+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23280.1">
178178
<Uri>https://github.com/dotnet/arcade</Uri>
179-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
179+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
180180
</Dependency>
181-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23268.1">
181+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23280.1">
182182
<Uri>https://github.com/dotnet/arcade</Uri>
183-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
183+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
184184
</Dependency>
185-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23268.1">
185+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23280.1">
186186
<Uri>https://github.com/dotnet/arcade</Uri>
187-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
187+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
188188
</Dependency>
189189
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23273.1">
190190
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -315,9 +315,9 @@
315315
<Uri>https://github.com/dotnet/xharness</Uri>
316316
<Sha>5d3b745c64e8092c2ce3ce1feca85d87d814f292</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23268.1">
318+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23280.1">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>f4269875971171c278c2cd695e9ef94b6516e4be</Sha>
320+
<Sha>affe3f66d36e48946fd59ac9fa31b004cb558e7d</Sha>
321321
</Dependency>
322322
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23272.4">
323323
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,21 @@
8383
<!-- SDK dependencies -->
8484
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.2.23107.1</MicrosoftDotNetApiCompatTaskVersion>
8585
<!-- Arcade dependencies -->
86-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23268.1</MicrosoftDotNetBuildTasksFeedVersion>
87-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23268.1</MicrosoftDotNetCodeAnalysisVersion>
88-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23268.1</MicrosoftDotNetGenAPIVersion>
89-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23268.1</MicrosoftDotNetGenFacadesVersion>
90-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23268.1</MicrosoftDotNetXUnitExtensionsVersion>
91-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23268.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
92-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23268.1</MicrosoftDotNetBuildTasksArchivesVersion>
93-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23268.1</MicrosoftDotNetBuildTasksInstallersVersion>
94-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23268.1</MicrosoftDotNetBuildTasksPackagingVersion>
95-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23268.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
96-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23268.1</MicrosoftDotNetBuildTasksTemplatingVersion>
97-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23268.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
98-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23268.1</MicrosoftDotNetRemoteExecutorVersion>
99-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23268.1</MicrosoftDotNetVersionToolsTasksVersion>
100-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23268.1</MicrosoftDotNetPackageTestingVersion>
86+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23280.1</MicrosoftDotNetBuildTasksFeedVersion>
87+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23280.1</MicrosoftDotNetCodeAnalysisVersion>
88+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23280.1</MicrosoftDotNetGenAPIVersion>
89+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23280.1</MicrosoftDotNetGenFacadesVersion>
90+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23280.1</MicrosoftDotNetXUnitExtensionsVersion>
91+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23280.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
92+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23280.1</MicrosoftDotNetBuildTasksArchivesVersion>
93+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23280.1</MicrosoftDotNetBuildTasksInstallersVersion>
94+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23280.1</MicrosoftDotNetBuildTasksPackagingVersion>
95+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23280.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
96+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23280.1</MicrosoftDotNetBuildTasksTemplatingVersion>
97+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23280.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
98+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23280.1</MicrosoftDotNetRemoteExecutorVersion>
99+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23280.1</MicrosoftDotNetVersionToolsTasksVersion>
100+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23280.1</MicrosoftDotNetPackageTestingVersion>
101101
<!-- NuGet dependencies -->
102102
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
103103
<!-- Installer dependencies -->

‎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.4.1" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ jobs:
7575
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
7676
- name: EnableRichCodeNavigation
7777
value: 'true'
78+
# Retry signature validation up to three times, waiting 2 seconds between attempts.
79+
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
80+
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
81+
value: 3,2000
7882
- ${{ each variable in parameters.variables }}:
7983
# handle name-value variable syntax
8084
# example:
@@ -83,7 +87,7 @@ jobs:
8387
- ${{ if ne(variable.name, '') }}:
8488
- name: ${{ variable.name }}
8589
value: ${{ variable.value }}
86-
90+
8791
# handle variable groups
8892
- ${{ if ne(variable.group, '') }}:
8993
- group: ${{ variable.group }}
@@ -169,7 +173,7 @@ jobs:
169173
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
170174
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
171175
- task: MicroBuildCleanup@1
172-
displayName: Execute Microbuild cleanup tasks
176+
displayName: Execute Microbuild cleanup tasks
173177
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
174178
continueOnError: ${{ parameters.continueOnError }}
175179
env:
@@ -219,7 +223,7 @@ jobs:
219223
displayName: Publish XUnit Test Results
220224
inputs:
221225
testResultsFormat: 'xUnit'
222-
testResultsFiles: '*.xml'
226+
testResultsFiles: '*.xml'
223227
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
224228
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
225229
mergeTestResults: ${{ parameters.mergeTestResults }}
@@ -230,7 +234,7 @@ jobs:
230234
displayName: Publish TRX Test Results
231235
inputs:
232236
testResultsFormat: 'VSTest'
233-
testResultsFiles: '*.trx'
237+
testResultsFiles: '*.trx'
234238
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
235239
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
236240
mergeTestResults: ${{ parameters.mergeTestResults }}

‎eng/common/templates/steps/source-build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ steps:
6868
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
6969
fi
7070
71+
baseOsArgs=
72+
if [ '${{ parameters.platform.baseOS }}' != '' ]; then
73+
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
74+
fi
75+
7176
publishArgs=
7277
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
7378
publishArgs='--publish'
@@ -86,6 +91,7 @@ steps:
8691
$internalRestoreArgs \
8792
$targetRidArgs \
8893
$runtimeOsArgs \
94+
$baseOsArgs \
8995
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
9096
/p:ArcadeBuildFromSource=true \
9197
/p:AssetManifestFileName=$assetManifestFileName

‎eng/common/tools.ps1‎

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

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
388-
$defaultXCopyMSBuildVersion = '17.4.1'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
388+
$defaultXCopyMSBuildVersion = '17.6.0-2'
389389

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

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "8.0.100-preview.4.23260.5"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23268.1",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23268.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23268.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23280.1",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23280.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23280.1",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-preview.5.23279.2"

‎src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" />
2120
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
2221
</ItemGroup>
2322

‎src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" />
2423
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
2524
</ItemGroup>
2625

0 commit comments

Comments
 (0)