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

Merge pull request #14095 from dotnet/darc-main-cddd3ad7-672a-4c51-930c-4d4a6cb4dc7a

Browse source 
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Marc Paine 2022-07-07 14:10:47 -07:00 • committed by GitHub
commit 26dd251aed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
eng/Version.Details.xml
View file

@ -196,32 +196,32 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22355.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22356.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9f45238c23d89cf44a10705db1217e66a441ba5a</Sha>
<Sha>78adce7e3545bf5a5252fd9963969d8950fadea6</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22355.4">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22356.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9f45238c23d89cf44a10705db1217e66a441ba5a</Sha>
<Sha>78adce7e3545bf5a5252fd9963969d8950fadea6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22355.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22356.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9f45238c23d89cf44a10705db1217e66a441ba5a</Sha>
<Sha>78adce7e3545bf5a5252fd9963969d8950fadea6</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22356.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>2288850ad99cac4de5968ed609144bfdc81567ce</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22354-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22355-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>39d159f2a663d836dc54704cfa74414be3e3338f</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22328.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22355.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>ed12ca72fa781b3bdb1f4ca20bfc9467350e893c</Sha>
<Sha>03edf62ccaba877b7cc24f939de2cf1bcb5d069e</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.22355.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22356.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
eng/common/generate-locproject.ps1
View file

@ -10,9 +10,7 @@ Param(
Set-StrictMode -Version 2.0
$ErrorActionPreference = "Stop"
. $PSScriptRoot\tools.ps1
Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
. $PSScriptRoot\pipeline-logging-functions.ps1
$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json"
$exclusions = @{ Exclusions = @() }

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22355.4",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22355.4"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22356.3",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22356.3"
}
}