Skip to content

Commit 2c6886b

Browse files
dotnet-maestro[bot]radical
dotnet-maestro[bot]
and
radical
authored
[release/8.0-staging] Update dependencies from dotnet/arcade (#96777)
* Update dependencies from https://github.com/dotnet/arcade build 20240109.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.23620.2 -> To Version 8.0.0-beta.24059.4 * workloads: Update sdk used for testing to 8.0.101 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Ankit Jain <radical@gmail.com>
1 parent 508b876 commit 2c6886b

File tree

5 files changed

+72
-59
lines changed

5 files changed

+72
-59
lines changed

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23620.2">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.4">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
116+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23620.2">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24059.4">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
126+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23620.2">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24059.4">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
130+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23620.2">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24059.4">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
134+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23620.2">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24059.4">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
138+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23620.2">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24059.4">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
142+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23620.2">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24059.4">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
146+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23620.2">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24059.4">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
150+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23620.2">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24059.4">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
154+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23620.2">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24059.4">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
158+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23620.2">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24059.4">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
162+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23620.2">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24059.4">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
166+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23620.2">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24059.4">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
170+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23620.2">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24059.4">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
174+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23620.2">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24059.4">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
178+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23620.2">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24059.4">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
182+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23620.2">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24059.4">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
186+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24060.2">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>a417169d3ba558fd6daa522f04e686574bbce520</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23620.2">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24059.4">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
339+
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23620.2</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23620.2</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23620.2</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23620.2</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23620.2</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23620.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23620.2</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23620.2</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23620.2</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23620.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23620.2</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23620.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23620.2</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23620.2</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23620.2</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24059.4</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24059.4</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24059.4</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24059.4</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24059.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24059.4</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24059.4</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24059.4</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->
@@ -258,7 +258,7 @@
258258
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
259259
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
260260
<!-- installer version, for testing workloads -->
261-
<MicrosoftDotnetSdkInternalVersion>8.0.100</MicrosoftDotnetSdkInternalVersion>
261+
<MicrosoftDotnetSdkInternalVersion>8.0.101</MicrosoftDotnetSdkInternalVersion>
262262
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
263263
</PropertyGroup>
264264
</Project>

‎eng/common/tools.ps1‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,15 @@ function InitializeBuildTool() {
601601
ExitWithExitCode 1
602602
}
603603
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
604-
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
604+
605+
# Use override if it exists - commonly set by source-build
606+
if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
607+
$initializeBuildToolFramework="net8.0"
608+
} else {
609+
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
610+
}
611+
612+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
605613
} elseif ($msbuildEngine -eq "vs") {
606614
try {
607615
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

‎eng/common/tools.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,12 @@ function InitializeBuildTool {
341341
# return values
342342
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
343343
_InitializeBuildToolCommand="msbuild"
344-
_InitializeBuildToolFramework="net8.0"
344+
# use override if it exists - commonly set by source-build
345+
if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
346+
_InitializeBuildToolFramework="net8.0"
347+
else
348+
_InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
349+
fi
345350
}
346351

347352
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116

‎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": "8.0.100",
3+
"version": "8.0.101",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "8.0.100"
8+
"dotnet": "8.0.101"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23620.2",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23620.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23620.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24059.4",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24059.4",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"

0 commit comments

Comments
 (0)