[master] Update dependencies from dotnet/arcade by dotnet-maestro[bot] · Pull Request #1279 · dotnet/extensions

dotnet-maestro · 2019-03-19T12:28:38Z

This pull request updates the following dependencies

Updates from https://github.com/dotnet/arcade

Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19167.10
Microsoft.DotNet.GenAPI - 1.0.0-beta.19167.10
Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19167.10

From https://github.com/dotnet/arcade

Build: 20190320.2
Date Produced: 3/20/2019 5:43 PM
Commit: f70fa34786cff993625a4548ae0125335eabe82e
Branch: refs/heads/master
Updates:
- Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19170.2
- Microsoft.DotNet.GenAPI -> 1.0.0-beta.19170.2
- Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19170.2

From https://github.com/dotnet/arcade

Build: 20190321.3
Date Produced: 3/22/2019 12:37 AM
Commit: b3bcf3034ff395bd09066114379ec64736b13633
Branch: refs/heads/master
Updates:
- Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19171.3
- Microsoft.DotNet.GenAPI -> 1.0.0-beta.19171.3
- Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19171.3

From https://github.com/dotnet/arcade

Build: 20190321.6
Date Produced: 3/22/2019 4:35 AM
Commit: 2eb45ff0eed6f86f1071b16b11a447cadeeeec59
Branch: refs/heads/master
Updates:
- Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19171.6
- Microsoft.DotNet.GenAPI -> 1.0.0-beta.19171.6
- Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19171.6

From https://github.com/dotnet/arcade

Build: 20190321.6
Date Produced: 3/22/2019 4:35 AM
Commit: 2eb45ff0eed6f86f1071b16b11a447cadeeeec59
Branch: refs/heads/master
Updates:
- Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19171.6
- Microsoft.DotNet.GenAPI -> 1.0.0-beta.19171.6
- Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19171.6

From https://github.com/dotnet/arcade

Build: 20190321.6
Date Produced: 3/22/2019 4:35 AM
Commit: 2eb45ff0eed6f86f1071b16b11a447cadeeeec59
Branch: refs/heads/master
Updates:
- Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19171.6
- Microsoft.DotNet.GenAPI -> 1.0.0-beta.19171.6
- Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19171.6

From https://github.com/dotnet/arcade

Build: 20190325.7
Date Produced: 3/25/2019 8:34 PM
Commit: 002cce7e8e3e043c50acae673741ee3962411e10
Branch: refs/heads/master
Updates:
- Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19175.7
- Microsoft.DotNet.GenAPI -> 1.0.0-beta.19175.7
- Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19175.7

From https://github.com/dotnet/arcade

Build: 20190325.9
Date Produced: 3/25/2019 10:36 PM
Commit: 13daa29185518ef3c6d4074fd07efbc5236a76c5
Branch: refs/heads/master
Updates:
- Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19175.9
- Microsoft.DotNet.GenAPI -> 1.0.0-beta.19175.9
- Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19175.9

From https://github.com/dotnet/arcade

Build: 20190326.14
Date Produced: 3/27/2019 12:08 AM
Commit: e23a3e2fd09a6222361ce47b78d23ab42867924c
Branch: refs/heads/master
Updates:
- Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19176.14
- Microsoft.DotNet.GenAPI -> 1.0.0-beta.19176.14
- Microsoft.DotNet.Helix.Sdk -> 2.0.0-beta.19176.14

dotnet-maestro · 2019-03-19T12:33:42Z

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

❌ All Checks Successful Unsuccessful checks: Extensions-ci, Extensions-ci (Ubuntu 16.04 release), Extensions-ci (Ubuntu 16.04 debug), Extensions-ci (Windows release), Extensions-ci (OSX release), Extensions-ci (OSX debug), Extensions-ci (Windows debug)

dougbu · 2019-03-21T05:23:11Z

@tmat looks like this repo hit the licensing breaking change:

F:\vsagent\95\s\.packages\microsoft.dotnet.arcade.sdk\1.0.0-beta.19167.10\tools\RepositoryValidation.proj(33,5): error : License file content 'F:\vsagent\95\s\LICENSE.txt' doesn't match the expected license 'F:\vsagent\95\s\.packages\microsoft.dotnet.arcade.sdk\1.0.0-beta.19167.10\tools\Licenses\Apache-2.0.txt'.

Is anything more needed than what you did in dotnet/razor#237 ?

tmat · 2019-03-21T06:11:09Z

This error is reported when the content of the license file doesn't match expected content.

I think it's the copyright in APPENDIX - I don't think the intention of the license was to actually replace

Copyright [yyyy] [name of copyright owner]

with our specific copyright text in the license file itself. The text does not make sense as it is - it's talking about "fields enclosed by brackets" but there are no brackets in the license text. Rather I believe that the copyright should be inserted when you're using the template in a source file header. See http://www.apache.org/dev/apply-license.html#new

APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright (c) .NET Foundation and Contributors

If you believe this is in fact correct license text then the rest of the repos that use Apache 2.0 have it wrong and we need to fix them.

dotnet-maestro · 2019-03-21T12:28:39Z

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

❌ All Checks Successful Unsuccessful checks: Extensions-ci, Extensions-ci (Ubuntu 16.04 release), Extensions-ci (Ubuntu 16.04 debug), Extensions-ci (OSX release), Extensions-ci (OSX debug), Extensions-ci (Windows release), Extensions-ci (Windows debug)

dougbu · 2019-03-22T00:05:49Z

The LICENSE.txt files in the roots of our four repos all contain identical text and Arcade is complaining about the string-substitution done to the instructions at the end (an appendix after "END OF TERMS AND CONDITIONS"). There's a few ways forward:

Undo the string substitutions to get the Arcade checks to succeed
Remove everything after "END OF TERMS AND CONDITIONS" since they're instructions to the code owner and not information for other readers
Maybe ignore everything after "END OF TERMS AND CONDITIONS" in the Arcade checks i.e. leave our text changes alone (treat them as if they just don't matter)

@tmat do the Arcade checks currently verify the lines after "END OF TERMS AND CONDITIONS" exist? And, are options 2 (if yes) or 3 valid from your perspective?

@Eilon what do you suggest?

tmat · 2019-03-22T00:08:12Z

The checks simply validate line by line the entire file. We have an option to skip a specific line.

I'd suggest to use the Apache license as is - per http://www.apache.org/dev/apply-license.html#new the instruction for using it is to make a copy of the file. I assume that means an exact copy with not alterations.

Eilon · 2019-03-22T04:57:47Z

I'm 99.999% certain that you must put your copyright notice in the file. Why else would the text be there in a way that indicates to have a copyright statement in brackets?

Eilon · 2019-03-22T05:02:05Z

Oh sorry I missed which file we're talking about. I believe @tmat is correct. I'll fix our license files 🐑 😄

Eilon · 2019-03-22T05:03:35Z

Starting with dotnet/aspnetcore#8733. I'll do other repos later.

dotnet-maestro · 2019-03-22T12:26:56Z

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

❌ All Checks Successful Unsuccessful checks: Extensions-ci, Extensions-ci (Ubuntu 16.04 release), Extensions-ci (OSX release), Extensions-ci (Ubuntu 16.04 debug), Extensions-ci (OSX debug), Extensions-ci (Windows release), Extensions-ci (Windows debug)

dougbu · 2019-03-25T04:39:40Z

@tmat this and the other attempts to upgrade Arcade are failing with new errors e.g.

F:\workspace\_work\1\s\.dotnet\sdk\3.0.100-preview3-010280\Sdks\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets(199,5): error : LicenseUrl cannot be empty. [F:\workspace\_work\1\s\src\FileProviders\Embedded\src\Microsoft.Extensions.FileProviders.Embedded.csproj]
F:\workspace\_work\1\s\.dotnet\sdk\3.0.100-preview3-010280\Sdks\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets(199,5): error : Enabling license acceptance requires a license or a licenseUrl to be specified. The licenseUrl will be deprecated, consider using the license metadata. [F:\workspace\_work\1\s\src\FileProviders\Embedded\src\Microsoft.Extensions.FileProviders.Embedded.csproj]

Is it mandatory to update the .NET Core SDK? Or, is additional metadata now required? Or, …

dotnet-maestro · 2019-03-25T04:41:45Z

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

❌ All Checks Successful Unsuccessful checks: Extensions-ci, Extensions-ci (Ubuntu 16.04 release), Extensions-ci (OSX release), Extensions-ci (Ubuntu 16.04 debug), Extensions-ci (OSX debug), Extensions-ci (Windows release), Extensions-ci (Windows debug)

tmat · 2019-03-25T16:42:29Z

Let me take a look.

tmat · 2019-03-25T17:40:21Z

This is odd. I believe we are passing the right information to nuget Pack target:

Expanding NuspecProperties:

@nkolev92 Could you please take a look at the above argument values?

tmat · 2019-03-25T17:45:21Z

Ah, never mind. Found the issue.

This file:
src\FileProviders\Embedded\src\Microsoft.Extensions.FileProviders.Embedded.csproj

is overriding the NuspecProperties explicitly.

tmat · 2019-03-25T17:57:46Z

@dougbu Have a fix here: #1307 (don't have permissions to push directly to this branch)

dotnet-maestro · 2019-03-26T12:27:12Z

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

❌ All Checks Successful Unsuccessful checks: Extensions-ci, Extensions-ci (Windows release)

dougbu · 2019-03-26T22:32:53Z

Reopening to see if that breaks the Linux jobs out of jail.

…321.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.6 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19171.6 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19171.6

…325.9 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19175.9 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19175.9 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19175.9

dotnet-maestro · 2019-03-27T12:28:18Z

Auto-Merge Status

This pull request has been merged because the following merge policies have succeeded.

✔️ All Checks Successful Succeeded - Successful checks: license/cla, Extensions-ci, Extensions-ci (OSX release), Extensions-ci (OSX debug), Extensions-ci (Ubuntu 16.04 release), Extensions-ci (Ubuntu 16.04 debug), Extensions-ci (Windows release), Extensions-ci (Windows debug), Extensions-ci (Code check)

…326.14 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19176.14 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19176.14 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19176.14

* Update dependencies from https://github.com/dotnet/arcade build 20190321.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.6 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19171.6 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19171.6 * Use Arcade NuSpec helpers * Fix Release flaky test leg * Fix Release flaky non-Windows test legs * Update dependencies from https://github.com/dotnet/arcade build 20190325.9 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19175.9 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19175.9 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19175.9 * Update dependencies from https://github.com/dotnet/arcade build 20190326.14 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19176.14 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19176.14 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19176.14 \n\nCommit migrated from dotnet/extensions@d353f7b

dotnet-maestro bot requested a review from dougbu as a code owner March 19, 2019 12:28

This was referenced Mar 22, 2019

[master] Update dependencies from dotnet/arcade dotnet/razor#346

Merged

[master] Update dependencies from dotnet/arcade dotnet/efcore#15075

Closed

dougbu mentioned this pull request Mar 26, 2019

Use Arcade NuSpec helpers #1307

Closed

dougbu closed this Mar 26, 2019

dougbu reopened this Mar 26, 2019

dotnet-maestro and others added 5 commits March 26, 2019 21:55

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

a56289d

…321.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.6 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19171.6 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19171.6

Use Arcade NuSpec helpers

ee98708

Fix Release flaky test leg

809e4f4

Fix Release flaky non-Windows test legs

c88b13f

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

1f18b9a

…325.9 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19175.9 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19175.9 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19175.9

dougbu force-pushed the darc-master-eeee90b4-00bb-4941-b4e6-fa86c87e7aba branch from 905a6e7 to 1f18b9a Compare March 27, 2019 04:57

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

d9caba9

…326.14 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19176.14 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19176.14 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19176.14

dougbu approved these changes Mar 27, 2019

View reviewed changes

dotnet-maestro bot merged commit d353f7b into master Mar 27, 2019

dotnet-maestro bot deleted the darc-master-eeee90b4-00bb-4941-b4e6-fa86c87e7aba branch March 27, 2019 14:40

ghost locked as resolved and limited conversation to collaborators May 29, 2023

Conversation

dotnet-maestro bot commented Mar 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

From https://github.com/dotnet/arcade

From https://github.com/dotnet/arcade

From https://github.com/dotnet/arcade

From https://github.com/dotnet/arcade

From https://github.com/dotnet/arcade

From https://github.com/dotnet/arcade

From https://github.com/dotnet/arcade

From https://github.com/dotnet/arcade

Uh oh!

dotnet-maestro bot commented Mar 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Auto-Merge Status

Uh oh!

dougbu commented Mar 21, 2019

Uh oh!

tmat commented Mar 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dotnet-maestro bot commented Mar 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Auto-Merge Status

Uh oh!

dougbu commented Mar 22, 2019

Uh oh!

tmat commented Mar 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Eilon commented Mar 22, 2019

Uh oh!

Eilon commented Mar 22, 2019

Uh oh!

Eilon commented Mar 22, 2019

Uh oh!

dotnet-maestro bot commented Mar 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Auto-Merge Status

Uh oh!

dougbu commented Mar 25, 2019

Uh oh!

dotnet-maestro bot commented Mar 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Auto-Merge Status

Uh oh!

tmat commented Mar 25, 2019

Uh oh!

tmat commented Mar 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tmat commented Mar 25, 2019

Uh oh!

tmat commented Mar 25, 2019

Uh oh!

dotnet-maestro bot commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Auto-Merge Status

Uh oh!

dougbu commented Mar 26, 2019

Uh oh!

dotnet-maestro bot commented Mar 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Auto-Merge Status

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dotnet-maestro bot commented Mar 19, 2019 •

edited

Loading

dotnet-maestro bot commented Mar 19, 2019 •

edited

Loading

tmat commented Mar 21, 2019 •

edited

Loading

dotnet-maestro bot commented Mar 21, 2019 •

edited

Loading

tmat commented Mar 22, 2019 •

edited

Loading

dotnet-maestro bot commented Mar 22, 2019 •

edited

Loading

dotnet-maestro bot commented Mar 25, 2019 •

edited

Loading

tmat commented Mar 25, 2019 •

edited

Loading

dotnet-maestro bot commented Mar 26, 2019 •

edited

Loading

dotnet-maestro bot commented Mar 27, 2019 •

edited

Loading