Skip to content

Commit 7eb3f0f

Browse files
dotnet-maestro[bot]radekdoulik
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20230901.1 (#469)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 45c0a26 commit 7eb3f0f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23425.2">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>90c167d5c57de4a8bced566379dbd893556c94e8</Sha>
13+
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23425.2">
16+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23451.1">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>90c167d5c57de4a8bced566379dbd893556c94e8</Sha>
18+
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23425.2">
20+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23451.1">
2121
<Uri>https://github.com/dotnet/arcade</Uri>
22-
<Sha>90c167d5c57de4a8bced566379dbd893556c94e8</Sha>
22+
<Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
2323
</Dependency>
2424
</ToolsetDependencies>
2525
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23425.2</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23451.1</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

eng/common/cross/toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ elseif(ILLUMOS)
207207
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
208208
elseif(HAIKU)
209209
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
210+
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
210211

211212
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
212213
function(locate_toolchain_exec exec var)
@@ -217,7 +218,6 @@ elseif(HAIKU)
217218
endif()
218219

219220
find_program(EXEC_LOCATION_${exec}
220-
PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin"
221221
NAMES
222222
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
223223
"${TOOLSET_PREFIX}${exec}")

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "8.0.100-preview.7.23376.3"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23425.2",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23451.1",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

0 commit comments

Comments
 (0)