зеркало из https://github.com/dotnet/msbuild.git
[main] Update dependencies from dotnet/arcade (#9206)
This commit is contained in:
Родитель
ae132d6c83
Коммит
007f0a6fe4
|
@ -58,14 +58,14 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23425.2">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>90c167d5c57de4a8bced566379dbd893556c94e8</Sha>
|
||||
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23423.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||
<Sha>ed9a83526483c094fb51e7000b6f816ce6cb0325</Sha>
|
||||
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
|
||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.8.0-rc.117">
|
||||
|
@ -77,9 +77,9 @@
|
|||
<Sha>2fe37da588ea81d852d3a42e290f8da4d610882f</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23425.2">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23463.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>90c167d5c57de4a8bced566379dbd893556c94e8</Sha>
|
||||
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
Otherwise, this version of dotnet will not be installed and the build will error out. -->
|
||||
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
|
||||
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23425.2</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23463.1</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
|
||||
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
|
||||
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23474.3</MicrosoftNetCompilersToolsetVersion>
|
||||
|
|
|
@ -207,6 +207,7 @@ elseif(ILLUMOS)
|
|||
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
|
||||
elseif(HAIKU)
|
||||
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
|
||||
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
|
||||
|
||||
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
|
||||
function(locate_toolchain_exec exec var)
|
||||
|
@ -217,7 +218,6 @@ elseif(HAIKU)
|
|||
endif()
|
||||
|
||||
find_program(EXEC_LOCATION_${exec}
|
||||
PATHS "${CROSS_ROOTFS}/cross-tools-x86_64/bin"
|
||||
NAMES
|
||||
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
|
||||
"${TOOLSET_PREFIX}${exec}")
|
||||
|
|
|
@ -10,6 +10,6 @@
|
|||
"xcopy-msbuild": "17.7.2"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1"
|
||||
}
|
||||
}
|
Загрузка…
Ссылка в новой задаче