Skip to content

Commit cb11c6f

Browse files
[main] Source code updates from dotnet/dotnet (#16023)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 40693ae commit cb11c6f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="6a953e76162f3f079405f80e28664fa51b136740" BarId="276981" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="8b29a1682219da555ee27e4fdda55dc3884b316f" BarId="277635" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>

eng/Versions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project>
22
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
3-
43
<PropertyGroup>
54
<!-- This repo version -->
65
<VersionPrefix>10.0.0</VersionPrefix>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.7.25322.101",
3+
"version": "10.0.100-preview.7.25372.107",
44
"rollForward": "latestFeature",
55
"paths": [
66
".dotnet",
@@ -9,7 +9,7 @@
99
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1010
},
1111
"tools": {
12-
"dotnet": "10.0.100-preview.7.25322.101"
12+
"dotnet": "10.0.100-preview.7.25372.107"
1313
},
1414
"msbuild-sdks": {
1515
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25379.3",

src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33

44
<PropertyGroup>
55
<IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
6-
<AspNetCoreRuntimeVersion>10.0.0-preview.7.25322.101</AspNetCoreRuntimeVersion>
6+
<!-- Use the bundled runtime version as the SDK doesn't expose an equivalent bundled version for aspnetcore.
7+
The runtime and aspnetcore versions are aligned since .NET 10 P6. -->
8+
<AspNetCoreRuntimeVersion>$(BundledNETCoreAppPackageVersion)</AspNetCoreRuntimeVersion>
79
<DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
810
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
9-
<!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->
1011
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
1112
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'sdk' ">$(NETCoreSdkVersion)</DotNetCliVersion>
1213
<DotNetCliChannel Condition=" '$(DotNetCliChannel)' == '' ">Current</DotNetCliChannel>

0 commit comments

Comments
 (0)