Merge pull request #14633 from dotnet/darc-main-9d09b708-ad75-40d0-9bcb-104b0c498b2c

[main] Update dependencies from dotnet/arcade
This commit is contained in:
Marc Paine 2022-09-30 09:40:49 -07:00 committed by GitHub
commit 475156d1d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions

View file

@ -193,18 +193,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22478.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22479.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>839e1e3b415fc2747dde68f47d940faa414020ec</Sha>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22478.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22479.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>839e1e3b415fc2747dde68f47d940faa414020ec</Sha>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22478.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22479.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>839e1e3b415fc2747dde68f47d940faa414020ec</Sha>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22462.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -219,9 +219,9 @@
<Sha>a7794a9e26ec88739e3cfc9825cb107d53a7e6f9</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22477-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22478-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>50130a9bdd1a63b0cfaa1f267d3f7bff2ca7e631</Sha>
<Sha>9d3d07c9b25717607023b42a5a639117eadba860</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22462.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

View file

@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22478.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

View file

@ -113,6 +113,7 @@ try {
$ToolPath = Convert-Path -Path $BinPath
Write-Host "Adding $ToolName to the path ($ToolPath)..."
Write-Host "##vso[task.prependpath]$ToolPath"
$env:PATH = "$ToolPath;$env:PATH"
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
}
}

View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22478.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22478.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22479.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22479.2"
}
}