Skip to content

[master] Update dependencies from dotnet/arcade dotnet/runtime #1873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented May 8, 2020

This pull request updates the following dependencies

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

  • Subscription: 8391606a-bc3e-4040-8a3c-08d7d6786e01
  • Build: 20200509.5
  • Date Produced: 5/9/2020 10:31 PM
  • Commit: e18250bd8f23f85f670599177118d6b957f9a3dd
  • Branch: refs/heads/master
  • Updates:
    • Microsoft.Extensions.Logging: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • Microsoft.Extensions.Configuration.Json: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • Microsoft.Extensions.DependencyModel: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • Microsoft.NETCore.Platforms: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • Microsoft.NETCore.App.Internal: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • Microsoft.NETCore.App.Ref: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • System.Diagnostics.DiagnosticSource: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • System.Text.Encodings.Web: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5
    • System.Reflection.Metadata: from 5.0.0-preview.5.20253.7 to 5.0.0-preview.5.20259.5

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

  • Subscription: 536fc7fa-caa6-4464-5774-08d76e1d56cb
  • Build: 20200506.5
  • Date Produced: 5/6/2020 11:36 PM
  • Commit: 8547938aefa24475a04877285553f0b2663ae249
  • Branch: refs/heads/master
  • Updates:
    • Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20228.4 to 5.0.0-beta.20256.5
  • Updates to .NET SDKs:
    • Updates sdk.version to 5.0.100-preview.5.20251.2
    • Updates tools.dotnet to 5.0.100-preview.5.20251.2

@dotnet-maestro dotnet-maestro bot requested a review from dougbu as a code owner May 8, 2020 12:21
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented May 8, 2020

Auto-Merge Status

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

  • Standard Merge Policies Unsuccessful checks: aspnetcore-tooling-ci, aspnetcore-tooling-ci (Build Windows release), aspnetcore-tooling-ci (Build Windows debug)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/runtime [master] Update dependencies from dotnet/runtime dotnet/arcade May 8, 2020
@JunTaoLuo JunTaoLuo force-pushed the darc-master-b62f3247-f9f7-411a-ae6c-762ed7e96c34 branch from 314836a to f394c8b Compare May 8, 2020 23:59
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/runtime dotnet/arcade [master] Update dependencies from dotnet/arcade dotnet/runtime May 9, 2020
@dougbu
Copy link
Contributor

dougbu commented May 10, 2020

Looks like the version of msbuild in use doesn't actually support net5.0 completely or correctly. Trying dotnet msbuild

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented May 10, 2020

Auto-Merge Status

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

  • Standard Merge Policies Unsuccessful checks: aspnetcore-tooling-ci, aspnetcore-tooling-ci (Build Windows release), aspnetcore-tooling-ci (Build Windows debug)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this works, …

@dougbu
Copy link
Contributor

dougbu commented May 10, 2020

Far as I can tell -msbuildEngine didn't change anything

F:\workspace\_work\1\s\.dotnet\sdk\5.0.100-preview.5.20258.4\Microsoft.Common.CurrentVersion.targets(3035,5): error MSB3823: Non-string resources require the property GenerateResourceUsePreserializedResources to be set to true. [F:\workspace\_work\1\s\src\Razor\src\Microsoft.VisualStudio.RazorExtension\Microsoft.VisualStudio.RazorExtension.csproj]
##[error].dotnet\sdk\5.0.100-preview.5.20258.4\Microsoft.Common.CurrentVersion.targets(3035,5): error MSB3823: (NETCORE_ENGINEERING_TELEMETRY=Build) Non-string resources require the property GenerateResourceUsePreserializedResources to be set to true.
F:\workspace\_work\1\s\.dotnet\sdk\5.0.100-preview.5.20258.4\Microsoft.Common.CurrentVersion.targets(3035,5): error MSB3822: Non-string resources require the System.Resources.Extensions assembly at runtime, but it was not found in this project's references. [F:\workspace\_work\1\s\src\Razor\src\Microsoft.VisualStudio.RazorExtension\Microsoft.VisualStudio.RazorExtension.csproj]
##[error].dotnet\sdk\5.0.100-preview.5.20258.4\Microsoft.Common.CurrentVersion.targets(3035,5): error MSB3822: (NETCORE_ENGINEERING_TELEMETRY=Build) Non-string resources require the System.Resources.Extensions assembly at runtime, but it was not found in this project's references.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented May 10, 2020

Auto-Merge Status

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

  • Waiting on checks: aspnetcore-tooling-ci, aspnetcore-tooling-ci (Build Linux release), aspnetcore-tooling-ci (Build Linux debug), aspnetcore-tooling-ci (Build Windows release), aspnetcore-tooling-ci (Build macOS release), aspnetcore-tooling-ci (Build Windows debug), aspnetcore-tooling-ci (Build macOS debug), aspnetcore-tooling-ci (Build Code check)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

dotnet-maestro bot and others added 12 commits May 10, 2020 13:50
…0507.11

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
…506.5

- Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20228.4 -> 5.0.0-beta.20256.5
…0508.3

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
…0509.5

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
@dougbu dougbu force-pushed the darc-master-b62f3247-f9f7-411a-ae6c-762ed7e96c34 branch from 6194380 to c0ede3c Compare May 10, 2020 20:50
@@ -155,6 +157,7 @@
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostPackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150PackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="$(MicrosoftVisualStudioSDKAnalyzersVersion)" PrivateAssets="all" />
<PackageReference Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsPackageVersion)" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI looks like this is an expected change along with the GenerateResourceUsePreserializedResources property, see the comment at dotnet/msbuild#4704 (comment)

@JunTaoLuo
Copy link
Contributor

JunTaoLuo commented May 11, 2020

There are two types of test failures that I'm unsure how to resolve and I'm opting to disable them for now see https://github.com/dotnet/aspnetcore/issues/21679 for issue tracking re-enabling these tests.

  • There is a test in Microsoft.NET.Sdk.Razor.Test that fails since it uses desktop MSBuild which doesn't recognize net5.0 tfm yet. @dsplaisted suggests that this will need a Nuget update in VS before it will work
  • There are also 5 tests in Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test and 5 tests in Microsoft.AspNetCore.Mvc.Razor.Extensions.Test that fails due to CS1701 warnings during compilation. Warnings CS1701 and CS1702 should be removed roslyn#19640 suggests these errors shouldn't affect netcoreapp so it seems like the tests running in net5.0 should just ignore these warnings. This might warrant more investigation on why the error is occuring in the first place.

@JunTaoLuo JunTaoLuo force-pushed the darc-master-b62f3247-f9f7-411a-ae6c-762ed7e96c34 branch from a50be17 to 978618d Compare May 11, 2020 02:01
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented May 11, 2020

Auto-Merge Status

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

  • Waiting on checks: aspnetcore-tooling-ci, aspnetcore-tooling-ci (Build Linux release), aspnetcore-tooling-ci (Build Linux debug), aspnetcore-tooling-ci (Build Windows release), aspnetcore-tooling-ci (Build Windows debug), aspnetcore-tooling-ci (Build Code check)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

@JunTaoLuo
Copy link
Contributor

@dougbu feel free to merge it after you review the latest changes.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented May 11, 2020

Auto-Merge Status

This pull request will be merged because the following merge policies have succeeded.

  • ✔️ Standard Merge Policies Succeeded - Successful checks: aspnetcore-tooling-ci, aspnetcore-tooling-ci (Build Linux release), aspnetcore-tooling-ci (Build Linux debug), aspnetcore-tooling-ci (Build macOS release), aspnetcore-tooling-ci (Build macOS debug), aspnetcore-tooling-ci (Build Windows release), aspnetcore-tooling-ci (Build Windows debug), aspnetcore-tooling-ci (Build Test: Linux Source Build), aspnetcore-tooling-ci (Build Code check)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.
  • ✔️ Standard Merge Policies Succeeded - No version downgrade detected.

@dotnet-maestro dotnet-maestro bot merged commit a60b721 into master May 11, 2020
@dotnet-maestro dotnet-maestro bot deleted the darc-master-b62f3247-f9f7-411a-ae6c-762ed7e96c34 branch May 11, 2020 02:32
@dougbu
Copy link
Contributor

dougbu commented May 11, 2020

@dougbu feel free to merge it after you review the latest changes.

I didn't have to 😃

JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request May 17, 2020
…t/razor#1873)

* Update dependencies from https://github.com/dotnet/runtime build 20200507.11

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20257.11

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

- Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20228.4 -> 5.0.0-beta.20256.5

* Update SDKs and TFMs

* Try fixing SDK target

* Try removing reference to xunit?

* Try again?

* Revert test tfm

* Remove more xunit references

* Update dependencies from https://github.com/dotnet/runtime build 20200508.3

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20258.3

* Use `dotnet msbuild` in CI builds

* Update dependencies from https://github.com/dotnet/runtime build 20200509.5

- Microsoft.Extensions.Logging: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.Extensions.Configuration.Json: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.Extensions.DependencyModel: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.Platforms: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Internal: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- Microsoft.NETCore.App.Ref: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Diagnostics.DiagnosticSource: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Text.Encodings.Web: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5
- System.Reflection.Metadata: 5.0.0-preview.5.20253.7 -> 5.0.0-preview.5.20259.5

* Try undoing `$(EnableFrameworkPathOverride) workaround

* Fix windows builds

* Fix NET.sdk.Razor.Test

* Try fix codecheck

* Skip tests failing with CS1701

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: John Luo <johluo@microsoft.com>
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>\n\nCommit migrated from dotnet/razor@a60b721
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants