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

[release/6.0.1xx] Update dependencies from dotnet/arcade (#12457)

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

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21515.3 -> To Version 6.0.0-beta.21519.3

* Resolve source-build patch conflicts

* Restore the windowsdesktop feed

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2021-10-20 09:14:05 -07:00 committed by GitHub
parent 286b597ea3
commit 83818e8038
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -197,19 +197,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21515.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21519.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f389f732d8cdca8ee1e38a534cf10c8c3182ba39</Sha>
<Sha>85f3aa16d8797b5020f1fda11df1a958feb5f8df</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21515.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21519.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f389f732d8cdca8ee1e38a534cf10c8c3182ba39</Sha>
<Sha>85f3aa16d8797b5020f1fda11df1a958feb5f8df</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21515.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21519.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f389f732d8cdca8ee1e38a534cf10c8c3182ba39</Sha>
<Sha>85f3aa16d8797b5020f1fda11df1a958feb5f8df</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21519.4">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21515.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21519.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21515.3",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21515.3"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3"
}
}

19
src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch
View file

@ -5,8 +5,7 @@ Subject: [PATCH] Build Microsoft.DotNet.Build.Tasks.Workloads for net6.0
---
.../src/Microsoft.DotNet.Build.Tasks.Workloads.csproj | 1 +
.../src/VisualStudioComponent.cs | 4 ++++
2 files changed, 5 insertions(+)
1 files changed, 1 insertions(+)
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
index ae34705a..bda5d581 100644
@ -20,22 +19,6 @@ index ae34705a..bda5d581 100644
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>Latest</LangVersion>
<IsPackable>true</IsPackable>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
index ee7e9d6d..b69b6823 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/VisualStudioComponent.cs
@@ -247,7 +247,11 @@ public TaskItem Generate(string projectPath)
// processing direct pack dependencies
if (workload.Extends?.Count() > 0)
{
+#if NET6_0
+ foreach (WorkloadId dependency in workload.Extends)
+#else
foreach (WorkloadDefinitionId dependency in workload.Extends)
+#endif
{
// Component dependencies, aka. workload extensions only have minimum version dependencies.
component.AddDependency($"{Utils.ToSafeId(dependency.ToString())}", new Version("1.0.0.0"), maxVersion: null);
--
2.29.2

25
src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch
View file

@ -1,25 +0,0 @@
From 4577f60202649281d2c96c4d8b67d331b7e71c35 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Fri, 10 Sep 2021 13:52:54 +0000
Subject: [PATCH] Respond to WorkloadDefinition breaking API change
See https://github.com/dotnet/arcade/issues/7880 for details
---
.../src/GenerateWorkloadMsis.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
index 50340821..a65453f2 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
@@ -121,6 +121,7 @@ private IEnumerable<WorkloadPack> GetWorkloadPacks()
// platform includes Windows
var workloads = manifests.SelectMany(m => m.Workloads).
Select(w => w.Value).
+ OfType<WorkloadDefinition>().
Where(wd => (wd.Platforms == null) || wd.Platforms.Any(p => p.StartsWith("win")));
var packIds = workloads.Where(w => w.Packs != null).SelectMany(w => w.Packs).Distinct();
--
2.29.2

10
src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch
View file

@ -13,20 +13,20 @@ Temporary workaround until source-build is built with recent source-built.
1 file changed, 4 insertions(+)
diff --git a/Directory.Build.props b/Directory.Build.props
index 960eb6c9..fa87aaac 100644
index 37feef5..c5aee85 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,6 +18,10 @@
<IsShipping>false</IsShipping>
</PropertyGroup>
+ <PropertyGroup>
+ <NoWarn>$(NoWarn);NU1603</NoWarn>
+ </PropertyGroup>
+
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
<!--
When building using source-build the process is:
<PropertyGroup Condition="'$(DotNetBuildOffline)' == 'true'">
<!--
Arcade has a special version prop for CodeAnalysis.CSharp in GenFacades
--
2.29.2

86
src/SourceBuild/tarball/patches/arcade/0010-Upgrade-newtonsoft-dependency-to-13.0.1.patch
View file

@ -1,86 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "msimons@microsoft.com" <MichaelSimons>
Date: Mon, 18 Oct 2021 19:31:58 +0000
Subject: [PATCH] Upgrade newtonsoft dependency to 13.0.1
---
Directory.Build.props | 10 ----------
eng/Versions.props | 2 +-
.../Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj | 2 --
.../Microsoft.DotNet.Helix.Sdk.Tests.csproj | 2 ++
.../Microsoft.DotNet.VersionTools.Tasks.Tests.csproj | 2 ++
5 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 960eb6c9..37feef5e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,16 +18,6 @@
<NoWarn>$(NoWarn);NU1603</NoWarn>
</PropertyGroup>
- <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
- <!--
- When building using source-build the process is:
- - Newtonsoft.Json versions 9.0.1 and 12.0.2 are built by source-build
- - Version 12.0.2 is written to Version.props
- - Arcade needs to use 9.0.1 so we need to override Version.props value here
- -->
- <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
- </PropertyGroup>
-
<PropertyGroup Condition="'$(DotNetBuildOffline)' == 'true'">
<!--
Arcade has a special version prop for CodeAnalysis.CSharp in GenFacades
diff --git a/eng/Versions.props b/eng/Versions.props
index ca9aee2c..3d3dadfe 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,7 +40,7 @@
<MoqVersion>4.8.3</MoqVersion>
<MonoOptionsVersion>5.3.0.1</MonoOptionsVersion>
<McMasterExtensionsCommandLineUtils>2.3.0</McMasterExtensionsCommandLineUtils>
- <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
+ <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<SystemTextJsonVersion>4.7.0</SystemTextJsonVersion>
<NuGetVersioningVersion>4.4.0</NuGetVersioningVersion>
<NuGetVersion>5.6.0-preview.2.6489</NuGetVersion>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
index dba28495..1b13d643 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
@@ -17,8 +17,6 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
<PackageReference Include="Microsoft.SymbolUploader" Version="$(MicrosoftSymbolUploaderVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
- <!-- This is here so that we agree with the feed tasks project's transitive reference to NewtonSoft.Json and Azure.Core -->
- <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
index 5de33cd0..fbe08347 100644
--- a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
@@ -11,6 +11,8 @@
<PackageReference Include="coverlet.collector" Version="1.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Include="Moq" Version="4.8.3" />
+ <!-- This is here so that we agree with the project's transitive references to NewtonSoft.Json -->
+ <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
</ItemGroup>
diff --git a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
index 7d9fb9a1..193648cb 100644
--- a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
+++ b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
@@ -7,6 +7,8 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
+ <!-- This is here so that we agree with the project's transitive references to NewtonSoft.Json -->
+ <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="NuGet.Frameworks" Version="$(NuGetVersion)" />
</ItemGroup>