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

[main] Update dependencies from dotnet/arcade (#14385)

Browse source 
* Update dependencies from https://github.com/dotnet/arcade build 20220823.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22423.2

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Resolve llvm source-build patch conflict

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

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22419.1 -> To Version 7.0.0-beta.22424.3

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Update global.json patch for llvm.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2022-08-25 11:01:42 -07:00 • committed by GitHub
parent b9635390c8
commit 86925059c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
eng/Version.Details.xml
View file

@ -19,7 +19,7 @@
</Dependency> </Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22364.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64"> <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22364.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/llvm-project</Uri> <Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>75e182c26dbf5d9f8ccca0ac68ee63b0bebb17b8</Sha> <Sha>754d13817d834b716d339183e21aac7d2489c496</Sha>
<SourceBuildTarball RepoName="llvm-project" ManagedOnly="true" /> <SourceBuildTarball RepoName="llvm-project" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22411.12" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22411.12" CoherentParentDependency="Microsoft.NET.Sdk">
@ -200,18 +200,18 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22419.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha> <Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22419.1"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha> <Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22419.1"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22424.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>34dff939b4a91e4693f78a856e0e055c1a3f3fba</Sha> <Sha>258a37cd6a7884f771d0f991d9f24d29e292abd0</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22422.1"> <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22422.1">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -226,14 +226,14 @@
<Sha>c1bc837421e41a673cb30bf670c0cdd83ac09b75</Sha> <Sha>c1bc837421e41a673cb30bf670c0cdd83ac09b75</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" /> <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22418-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22423-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>a74d21bcfa0f928b0cb1dab9fa6ff8a17248c584</Sha> <Sha>0bba6b2d342056cb3fb3906f25929a92e063c5f8</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" /> <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22418.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22420.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri> <Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>a125e2b00ca0add2a2a23e0ba67f8ae6a4b1a1ee</Sha> <Sha>d106fdda2b3eda55f12e72977de336ab3afa1d91</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" /> <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>

2
eng/Versions.props
View file

@ -26,7 +26,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22419.1</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22424.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->

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

@ -62,7 +62,7 @@ $locJson = @{
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
$continue = $true $continue = $true
foreach ($exclusion in $exclusions.Exclusions) { foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion)) if ($_.FullName.Contains($exclusion))
{ {
$continue = $false $continue = $false
} }
@ -98,7 +98,7 @@ $locJson = @{
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true $continue = $true
foreach ($exclusion in $exclusions.Exclusions) { foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion)) if ($_.FullName.Contains($exclusion))
{ {
$continue = $false $continue = $false
} }

4
global.json
View file

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

4
src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch
View file

@ -16,8 +16,8 @@ index df77e9a199d6..19b99be1f71b 100644
+++ b/global.json +++ b/global.json
@@ -5,6 +5,6 @@ @@ -5,6 +5,6 @@
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1", "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1", "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3",
- "Microsoft.Build.Traversal": "2.0.2" - "Microsoft.Build.Traversal": "2.0.2"
+ "Microsoft.Build.Traversal": "2.0.34" + "Microsoft.Build.Traversal": "2.0.34"
} }