Skip to content

Commit affe54a

Browse files
authored
Update to newer SDK and respond to feedback
1 parent 6b04cd0 commit affe54a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<RepositoryUrl>https://github.com/dotnet/arcade</RepositoryUrl>
1717
<!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
1818
<WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
19-
<!-- TODO: Remove when Arcade SDK updated TargetFrameworkDefaults.props for .NET 10. -->
19+
<!-- TODO: Remove when arcade updates to a new Arcade SDK with matching TargetFrameworkDefaults.props. -->
2020
<NetCurrent>net10.0</NetCurrent>
2121
<NetPrevious>net9.0</NetPrevious>
2222
<NetToolCurrent>$(NetCurrent)</NetToolCurrent>

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-alpha.1.24551.9",
3+
"version": "10.0.100-alpha.1.24573.1",
44
"rollForward": "latestFeature"
55
},
66
"tools": {
7-
"dotnet": "10.0.100-alpha.1.24551.9"
7+
"dotnet": "10.0.100-alpha.1.24573.1"
88
},
99
"msbuild-sdks": {
1010
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
6-
<AspNetCoreRuntimeVersion>10.0.0-alpha.2.24531.4</AspNetCoreRuntimeVersion>
6+
<AspNetCoreRuntimeVersion>10.0.0-alpha.2.24572.1</AspNetCoreRuntimeVersion>
77
<DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
88
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
99
<!-- 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 -->

0 commit comments

Comments
 (0)