Skip to content

Commit 1557f12

Browse files
authored
Forward NetCoreAppToolCurrentVersion in DotNetBuild.props (#109331)
* Forward NetCoreAppToolCurrent in DotNetBuild.props * Update DotNetBuild.props * Revert "Allow the cdac build tool to roll forward to whatever SDK is available (prerelease or otherwise) (#108946)" This reverts commit 2cbc23a.
1 parent 97f5045 commit 1557f12

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

eng/DotNetBuild.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@
9797
<InnerBuildArgs Condition="$(UseSystemLibs.Contains('+rapidjson+'))">$(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_RAPIDJSON=true</InnerBuildArgs>
9898
<InnerBuildArgs Condition="$(UseSystemLibs.Contains('+zlib+'))">$(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_ZLIB=true</InnerBuildArgs>
9999

100+
<!-- Needed until https://github.com/dotnet/runtime/issues/109329 is fixed. -->
101+
<InnerBuildArgs Condition="'$(NetCoreAppToolCurrentVersion)' != ''">$(InnerBuildArgs) /p:NetCoreAppToolCurrentVersion=$(NetCoreAppToolCurrentVersion)</InnerBuildArgs>
100102
</PropertyGroup>
101103
</Target>
102104

src/coreclr/tools/cdac-build-tool/cdac-build-tool.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<IsShipping>false</IsShipping> <!-- This tool is an implementation detail of the build process, it does not ship -->
1515
<Description>.NET runtime data contract build tool</Description>
1616
<RootNamespace>Microsoft.DotNet.Diagnostics.DataContract</RootNamespace>
17-
<RollForward>Major</RollForward>
1817
</PropertyGroup>
1918

2019
<ItemGroup>

0 commit comments

Comments
 (0)