mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update dependencies from https://github.com/dotnet/arcade build 20220704.1

Browse source 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22327.2 -> To Version 7.0.0-beta.22354.1

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22325-02 -> To Version 1.2.0-beta-22353-01 (parent: Microsoft.DotNet.Arcade.Sdk
This commit is contained in:
dotnet-maestro[bot] 2022-07-05 12:38:53 +00:00
parent f1f162ce75
commit 827fe4a851
5 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -196,33 +196,33 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22327.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22354.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
<Sha>66cb5f1f50059cbafe25d1b75a1adbbced840d85</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22327.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22354.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
<Sha>66cb5f1f50059cbafe25d1b75a1adbbced840d85</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22327.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22354.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
<Sha>66cb5f1f50059cbafe25d1b75a1adbbced840d85</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22327.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>993b067a1849e4884360b4548cbf74f0bfaa2f35</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22325-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22353-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>bef48cb62fb4341d5dcdc29d2d75b598cad389fd</Sha>
<Sha>39d159f2a663d836dc54704cfa74414be3e3338f</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22325.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22328.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>351ae3d0bc892fe4cdbab6f5f60052216514f935</Sha>
<Sha>ed12ca72fa781b3bdb1f4ca20bfc9467350e893c</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

2
eng/Versions.props
View file

@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22327.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22354.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
eng/common/init-tools-native.ps1
View file

@ -87,6 +87,7 @@ try {
$NativeTools.PSObject.Properties | ForEach-Object {
$ToolName = $_.Name
$ToolVersion = $_.Value
$InstalledTools = @{}
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
if ($ToolVersion -eq "latest") {
@ -111,9 +112,10 @@ try {
$ToolPath = Convert-Path -Path $BinPath
Write-Host "Adding $ToolName to the path ($ToolPath)..."
Write-Host "##vso[task.prependpath]$ToolPath"
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
}
}
exit 0
return $InstalledTools
} else {
$NativeTools.PSObject.Properties | ForEach-Object {
$ToolName = $_.Name

2
eng/common/tools.ps1
View file

@ -635,7 +635,7 @@ function InitializeNativeTools() {
InstallDirectory = "$ToolsDir"
}
}
if (Test-Path variable:NativeToolsOnMachine) {
if ($env:NativeToolsOnMachine) {
Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
$nativeArgs += @{ PathPromotion = $true }
}

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "7.0.100-preview.2.22153.17",
"dotnet": "7.0.100-preview.5.22307.18",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22327.2"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22354.1",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22354.1"
}
}