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

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

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

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

* Reference net7.0 version of BuildTasksInstallers assembly

* Remove backported arcade patch

* Remove patch that was for bootstrapping source-build

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

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

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

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

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22271-02 -> To Version 1.2.0-beta-22325-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Revert "Remove patch that was for bootstrapping source-build"

This reverts commit eb2dc3d7c1e6f23e191e7c49279c3b25ebf023ff.

* Update fsharp System.Memory package version to 4.5.5

* Don't directly reference SCI and SCM 5.0.0 from SDK

* Add backport links to new source-build patches

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

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

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22271-02 -> To Version 1.2.0-beta-22325-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Update source-build xml doc baseline

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2022-06-28 18:08:30 +00:00 committed by GitHub
parent f922a74fb9
commit a9bd605e2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 65 additions and 1157 deletions
Show stats 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.22322.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22327.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha>
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22322.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22327.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha>
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22322.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22327.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>eaa4673f2a82355f7cd2f1c1243578be2e961d0f</Sha>
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</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-22271-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22325-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>9dd9f81089f875d2452db9d6c8397a8e0b19d688</Sha>
<Sha>bef48cb62fb4341d5dcdc29d2d75b598cad389fd</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22317.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22325.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>6f4bd1389b461c56a4188d72c05144f52d30781f</Sha>
<Sha>351ae3d0bc892fe4cdbab6f5f60052216514f935</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.22322.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22327.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

2
eng/common/tools.ps1
View file

@ -573,7 +573,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

2
eng/common/tools.sh
View file

@ -312,7 +312,7 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
_InitializeBuildToolFramework="netcoreapp3.1"
_InitializeBuildToolFramework="net7.0"
}
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116

4
global.json
View file

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

1
src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt
View file

@ -2,6 +2,7 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyz
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.xml
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml
Microsoft.AspNetCore.App.Ref/ref/netx.y/Microsoft.AspNetCore.OutputCaching.xml
Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.xml
Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.xml
Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml

1139
src/SourceBuild/tarball/patches/arcade/0001-Retarget-arcade-projects-to-net7.0.patch
View file

File diff suppressed because it is too large Load diff

25
src/SourceBuild/tarball/patches/fsharp/0001-Update-System.Memory-to-4.5.5.patch Normal file
View file

@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Fri, 24 Jun 2022 14:57:53 -0700
Subject: [PATCH] Update System.Memory to 4.5.5
Prevents package downgrade error.
Backport: https://github.com/dotnet/fsharp/pull/13394
---
eng/Versions.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 6571c5fb2..aa3b4e11f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -93,7 +93,7 @@
<SystemIoCompressionVersion>4.3.0</SystemIoCompressionVersion>
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
<SystemLinqQueryableVersion>4.3.0</SystemLinqQueryableVersion>
- <SystemMemoryVersion>4.5.4</SystemMemoryVersion>
+ <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
<SystemNetRequestsVersion>4.3.0</SystemNetRequestsVersion>
<SystemNetSecurityVersion>4.3.1</SystemNetSecurityVersion>
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>

23
src/SourceBuild/tarball/patches/sdk/0001-Don-t-directly-reference-SCI-and-SCM-5.0.0.patch Normal file
View file

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
Date: Mon, 27 Jun 2022 11:42:04 -0700
Subject: [PATCH] Don't directly reference SCI and SCM 5.0.0
Backport: https://github.com/dotnet/sdk/pull/26289
---
.../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
index 69e4b02162..f6991efb5f 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -61,7 +61,7 @@
<!-- Packages that are in-box for .NET Core, so we only need to reference them for .NET Framework -->
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource)' != 'true'">
<!--
MSBuild depends on a new version of SRM/SCI; HostModel a very old one.
In order to keep working with MSBuild 17.2, which had binding redirects

4
src/redist/targets/GenerateMSIs.targets
View file

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' != 'true' ">net6.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">net6.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">net7.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">net472</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
</PropertyGroup>