[automated] Merge branch 'release/3.1' => 'main' #30603

dotnet-maestro-bot · 2021-03-03T18:10:00Z

I detected changes in the release/3.1 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/3.1 by the following committers:

JunTaoLuo

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/3.1
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/3.1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-main

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/3.1-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/3.1-to-main main
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/3.1-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-main

or if you are using SSH

git checkout -b merge/release/3.1-to-main main
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/3.1-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/3.1-to-main

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

…ng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Extensions.Logging**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.12 to 3.1.13 (parent: Microsoft.Extensions.Logging) - **Microsoft.AspNetCore.Analyzer.Testing**: from 3.1.12-servicing.21069.9 to 3.1.13-servicing.21116.4 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.12-servicing.21069.9 to 3.1.13-servicing.21116.4 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.ActivatorUtilities.Sources**: from 3.1.12-servicing.21069.9 to 3.1.13-servicing.21116.4 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.Abstractions**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.Memory**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.SqlServer**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.StackExchangeRedis**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.12-servicing.21069.9 to 3.1.13-servicing.21116.4 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Abstractions**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.AzureKeyVault**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Binder**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.CommandLine**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.EnvironmentVariables**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.FileExtensions**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Ini**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Json**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.KeyPerFile**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.UserSecrets**: from 3.1.12 to 3.1.13 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configura...

…ng/internal/dotnet-aspnetcore-tooling This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20210217.3 - **Date Produced**: 2/17/2021 8:18 PM - **Commit**: 1756aa62b0ee24952b064aabf88f240da51179b1 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.Razor.Language**: [from 3.1.12 to 3.1.13][1] - **Microsoft.CodeAnalysis.Razor**: [from 3.1.12 to 3.1.13][1] - **Microsoft.NET.Sdk.Razor**: [from 3.1.12 to 3.1.13][1] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 3.1.12 to 3.1.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling/branches?baseVersion=GC7f783df&targetVersion=GC1756aa6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)

* Enable ARM64 installers build. (dotnet#25579) Changes WiX toolset used to 3.14 to support ARM64 Generates targeting pack from the x86/x64 leg, as it gets produced using a zip that gets generated there. The ARM64 leg now produces all the necessary msi's, exe, and wixlib needed for the installer to generate a bundle. * Build tageting pack installers * Set TP version to 3.1.10

ghost

Auto-approving branch merge.

TanayParikh · 2021-03-04T18:53:22Z

Attempted to resolve conflicts via c2d64fd.

@wtgodbe / @JunTaoLuo can I please get a review, is this ready for merging?

JunTaoLuo · 2021-03-08T21:11:55Z

Directory.Build.props

@@ -137,7 +137,8 @@
    <RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
    <TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>

-    <!-- This is used to produce targeting pack installers/packages once per major.minor. -->
+    <!-- Produce targeting pack installers/packages once per major.minor except in extraordinary cases i.e. 3.1.14 win-arm64. -->


This is 3.1 specific, revert the changes in this file.

JunTaoLuo · 2021-03-08T21:12:32Z

.azure/pipelines/ci.yml

@@ -355,6 +405,7 @@ stages:
      - name: MacOS_arm64_Packages
        path: artifacts/packages/

+  # Build MacOS


Where did this come from?

wtgodbe · 2021-03-08T21:13:36Z

@JunTaoLuo do we really want any of these changes in main? Doesn't the win-arm64 build in main work as-is?

JunTaoLuo · 2021-03-08T21:15:01Z

.azure/pipelines/ci.yml

+          env:
+            Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
+      - script: ./build.cmd


No this isn't needed, the script is already defined below, this is a duplication. The two script steps and push vs packages should be removed. @wtgodbe are the private feeds credentials needed?

No, main already does the right thing w.r.t SetupPrivateFeedCredentials. I think this PR should probably be a no-op, unless you think some of the win-arm64 stuff you did in 3.1 is needed to fix something in main

I am waiting for the decision here before applying the changes I understand from the other ocmments.

I don't think we want any of the changes to this file - @JunTaoLuo do you agree?

Agreed @wtgodbe. We don't want changes to .azure/pipelines/ci.yml in this PR.

JunTaoLuo · 2021-03-08T21:16:51Z

The changes to be merged forward should be very minor. There were some versioning updates that is useful. But I've requested that many non-relevant parts be reverted.

…31CodeMergeMarch

Merge in internal commit & update SDK/baseline

…net#30439) * Make sure SharedFx & TargetingPack msi names match (dotnet#28298) * Make sure SharedFx & TargetingPack msi names match * Insert packageVersion into OutputName when available * Move props around again * Fix .msi names (dotnet#28572)

- remove remaining way user NuGet.config can infect builds

…308.9 (dotnet#30809) [release/3.1] Update dependencies from dotnet/arcade

pranavkm · 2021-03-15T21:02:38Z

@JunTaoLuo could you have another look?

dougbu · 2021-03-18T21:21:32Z

@JunTaoLuo and @wtgodbe it looks like something is missing from the 3.1 changes that we need in main. Either of you know off hand❔ Problem is in the Build Installers job e.g.

D:\workspace\_work\1\s\src\Installers\Windows\TargetingPack\TargetingPack.wixproj(69,5): error MSB3932: Failed to unzip file "D:\workspace\_work\1\s\artifacts\installers\Release\aspnetcore-targeting-pack-6.0.0.zip" because the file does not exist or is inaccessible.

wtgodbe · 2021-03-18T21:25:15Z

src/Installers/Windows/TargetingPack/TargetingPack.wixproj

@@ -61,7 +63,7 @@
  <Target Name="ExtractIntermediateTargetingPack" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <TargetingPackHarvestRoot Condition="'$(TargetingPackHarvestRoot)' == ''">$(InstallersOutputPath)</TargetingPackHarvestRoot>
-      <IntermediateTargetingPackZip>$(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(PackageVersion).zip</IntermediateTargetingPackZip>
+      <IntermediateTargetingPackZip>$(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(TargetingPackVersionPrefix).zip</IntermediateTargetingPackZip>


@dougbu pretty sure this is it - TargetingPackVersionPrefix is VersionPrefix, which is 6.0, whereas PackageVersion is 6.0.0, so this changes the name of the zip:

aspnetcore/eng/Versions.props

Lines 26 to 31 in 8481b93

<VersionPrefix>$(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>



<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>

@JunTaoLuo was this by design?

If it is intentional, we need to change this too:

aspnetcore/src/Installers/Windows/TargetingPack/TargetingPack.wixproj

Line 64 in 8481b93

<IntermediateTargetingPackZip>$(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(PackageVersion).zip</IntermediateTargetingPackZip>

And probably some ingestion stuff in dotnet/installer

@wtgodbe are you saying we need to redo the merge to get more of your b8a46a8 work❔

More generally, do we want that in main❔ This might be a no-op merge without it.

This change didn't come from mine, it came from 69108ce. b8a46a8 is already in main

Hmm why did this work in servicing then? Is it because VersionPrefix is 3.1.x in servicing but 6.0 in main? I need to check if there is a better property to use instead of TargetingPackVersionPrefix.

Ah I figured it out. This is actually a package version mismatch between TargetingPack.wixproj and App.Ref.csproj.

In the csproj:

<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>

but in wixproj it's looking for:

<IntermediateTargetingPackZip>$(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(TargetingPackVersionPrefix).zip</IntermediateTargetingPackZip>

Even though TargetingPackVersionPrefix is 6.0.0 in both cases, in the csproj, it's producing the artifact aspnetcore-targeting-pack-6.0.0-ci.zip instead. The -ci suffix is not accounted for here. In servicing, there is no such suffix so no errors were encountered in 3.1

dougbu · 2021-03-21T23:50:00Z

/ping @JunTaoLuo

dotnet-bot and others added 3 commits February 17, 2021 17:07

dotnet-maestro-bot requested review from dougbu and a team as code owners March 3, 2021 18:10

dotnet-maestro-bot force-pushed the merge/release/3.1-to-main branch from fd0a4e4 to 69108ce Compare March 3, 2021 18:10

ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Mar 3, 2021

ghost approved these changes Mar 3, 2021

View reviewed changes

ghost added the tell-mode Indicates a PR which is being merged during tell-mode label Mar 3, 2021

wtgodbe added 2 commits March 3, 2021 11:01

Run SetupPrivateFeedCredentials in win-arm64 job (dotnet#30604)

82baa7b

Move artifacts block to bottom of win-arm64 leg (dotnet#30634)

3b1fd90

TanayParikh requested review from wtgodbe and JunTaoLuo March 4, 2021 18:54

JunTaoLuo reviewed Mar 8, 2021

View reviewed changes

wtgodbe and others added 8 commits March 9, 2021 10:56

Merge commit 'cf2c5c9c6dca430b97aa96429b84d0da07eb77f1' into wtgodbe/…

58dc488

…31CodeMergeMarch

Update baseline & SDK

31f427a

Merge pull request dotnet#30780 from dotnet/wtgodbe/31CodeMergeMarch

25c12c6

Merge in internal commit & update SDK/baseline

[release/3.1] Clear disabled package sources (dotnet#30400)

1159b3b

- remove remaining way user NuGet.config can infect builds

Update MessagePack-CSharp (dotnet#30607)

5d28335

Fix spelling of property (dotnet#30516)

d16a305

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

dd5d990

…308.9 (dotnet#30809) [release/3.1] Update dependencies from dotnet/arcade

jkotalik closed this Mar 11, 2021

jkotalik reopened this Mar 11, 2021

Merge remote-tracking branch 'origin/release/3.1'

29bec2b

pranavkm force-pushed the merge/release/3.1-to-main branch from c2d64fd to 29bec2b Compare March 15, 2021 21:02

wtgodbe reviewed Mar 18, 2021

View reviewed changes

dougbu assigned JunTaoLuo Mar 21, 2021

dotnet-maestro-bot requested review from BrennanConroy, halter73, javiercn, jkotalik, pranavkm, Tratcher and a team as code owners March 22, 2021 20:56

dotnet-maestro-bot requested a review from a team March 22, 2021 20:56

Fixup targeting pack intermediate zip version

1ab35bc

JunTaoLuo force-pushed the merge/release/3.1-to-main branch from 04fa40f to 1ab35bc Compare March 22, 2021 21:04

JunTaoLuo merged commit 26a88e0 into dotnet:main Mar 23, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'release/3.1' => 'main' #30603

[automated] Merge branch 'release/3.1' => 'main' #30603

dotnet-maestro-bot commented Mar 3, 2021

ghost left a comment

TanayParikh commented Mar 4, 2021

JunTaoLuo Mar 8, 2021

JunTaoLuo Mar 8, 2021

wtgodbe commented Mar 8, 2021

JunTaoLuo Mar 8, 2021

wtgodbe Mar 8, 2021

sebastienros Mar 8, 2021

wtgodbe Mar 9, 2021

dougbu Mar 10, 2021

JunTaoLuo commented Mar 8, 2021

pranavkm commented Mar 15, 2021

dougbu commented Mar 18, 2021

wtgodbe Mar 18, 2021

wtgodbe Mar 18, 2021

dougbu Mar 18, 2021

dougbu Mar 18, 2021

wtgodbe Mar 18, 2021

JunTaoLuo Mar 19, 2021

JunTaoLuo Mar 22, 2021

dougbu commented Mar 21, 2021

	<VersionPrefix>$(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
	<!--
	TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats.
	It's also used in root Directory.Build.targets to determine the version of the last-built targeting pack.
	-->
	<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>

[automated] Merge branch 'release/3.1' => 'main' #30603

[automated] Merge branch 'release/3.1' => 'main' #30603

Conversation

dotnet-maestro-bot commented Mar 3, 2021

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

ghost left a comment

Choose a reason for hiding this comment

TanayParikh commented Mar 4, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wtgodbe commented Mar 8, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JunTaoLuo commented Mar 8, 2021

pranavkm commented Mar 15, 2021

dougbu commented Mar 18, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dougbu commented Mar 21, 2021