[main] Update dependencies from dotnet/arcade (#16327)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
parent
0267d1f9e7
commit
dfc77021af
4 changed files with 11 additions and 10 deletions
|
@ -193,18 +193,18 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23253.3">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23253.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
|
<Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23253.3">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23253.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
|
<Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23253.3">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23253.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>5c98e75aa0078eebd3b8f9d6a6fbed1a1a5eb075</Sha>
|
<Sha>39d795a2d83c7ee351a26c4544f5352e62e30da1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23226.1">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23226.1">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23253.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23253.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
|
|
|
@ -399,7 +399,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
||||||
# Locate Visual Studio installation or download x-copy msbuild.
|
# Locate Visual Studio installation or download x-copy msbuild.
|
||||||
$vsInfo = LocateVisualStudio $vsRequirements
|
$vsInfo = LocateVisualStudio $vsRequirements
|
||||||
if ($vsInfo -ne $null) {
|
if ($vsInfo -ne $null) {
|
||||||
$vsInstallDir = $vsInfo.installationPath
|
# Ensure vsInstallDir has a trailing slash
|
||||||
|
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
|
||||||
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
|
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
|
||||||
|
|
||||||
InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion
|
InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.21.0"
|
"cmake": "3.21.0"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.3",
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23253.5",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23253.3"
|
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23253.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue