Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade (#826)
Browse files Browse the repository at this point in the history
* [release/5.0-preview5] Update dependencies from dotnet/wpf (#766)

* Update dependencies from https://github.com/dotnet/wpf build 20200511.5

- Microsoft.DotNet.Wpf.GitHub: 5.0.0-preview.5.20222.1 -> 5.0.0-preview.5.20261.5

Dependency coherency updates

- Microsoft.NETCore.Platforms: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.Private.Winforms: 5.0.0-preview.5.20221.7 -> 5.0.0-preview.5.20261.3 (parent: Microsoft.DotNet.Wpf.GitHub)
- Microsoft.NETCore.Targets: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.Win32.Registry: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.Win32.SystemEvents: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.Windows.Compatibility: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.CodeDom: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.PerformanceCounter: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.IO.FileSystem.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Cng: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Pkcs: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.ProtectedData: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Principal.Windows: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Text.Encodings.Web: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Text.Json: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Threading.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)

* Update dependencies from https://github.com/dotnet/wpf build 20200511.8

- Microsoft.DotNet.Wpf.GitHub: 5.0.0-preview.5.20222.1 -> 5.0.0-preview.5.20261.8

Dependency coherency updates

- Microsoft.NETCore.Platforms: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.Private.Winforms: 5.0.0-preview.5.20221.7 -> 5.0.0-preview.5.20261.5 (parent: Microsoft.DotNet.Wpf.GitHub)
- Microsoft.NETCore.Targets: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.Win32.Registry: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.Win32.SystemEvents: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.Windows.Compatibility: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.CodeDom: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.PerformanceCounter: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.IO.FileSystem.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Cng: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Pkcs: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.ProtectedData: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Security.Principal.Windows: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Text.Encodings.Web: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Text.Json: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Threading.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20260.5 (parent: Microsoft.Private.Winforms)

* Update dependencies from https://github.com/dotnet/wpf build 20200512.6

- Microsoft.DotNet.Wpf.GitHub: 5.0.0-preview.5.20222.1 -> 5.0.0-preview.5.20262.6

Dependency coherency updates

- Microsoft.NETCore.Platforms: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- Microsoft.Private.Winforms: 5.0.0-preview.5.20221.7 -> 5.0.0-preview.5.20262.4 (parent: Microsoft.DotNet.Wpf.GitHub)
- Microsoft.NETCore.Targets: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- Microsoft.Win32.Registry: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- Microsoft.Win32.SystemEvents: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- Microsoft.Windows.Compatibility: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.CodeDom: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Configuration.ConfigurationManager: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.EventLog: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Diagnostics.PerformanceCounter: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.DirectoryServices: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Drawing.Common: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.IO.FileSystem.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Resources.Extensions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.IO.Packaging: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Security.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Cng: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Pkcs: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.ProtectedData: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Security.Cryptography.Xml: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Security.Permissions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Security.Principal.Windows: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Text.Encodings.Web: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Text.Json: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Threading.AccessControl: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- System.Windows.Extensions: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: 5.0.0-preview.4.20220.15 -> 5.0.0-preview.5.20262.7 (parent: Microsoft.Private.Winforms)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Remove references to PlatformAbstractions. (#763) (#771)

* Remove references to PlatformAbstractions.

This will allow us to remove the PlatformAbstractions library from dotnet/runtime.

I needed to update the SDK used so I can use the new RuntimeInformation.RuntimeIdentifier API that is only in .NET 5.

Contributes to dotnet/runtime#3470

* Remove leftover UsingTask

* Add back CrossGenRootPath to sign binaries

* Fix the tests by updating the TFM to 5.0

Co-authored-by: Eric Erhardt <[email protected]>

* Update dependencies from https://github.com/dotnet/wpf build 20200514.5 (#772)

Microsoft.DotNet.Wpf.GitHub
 From Version 5.0.0-preview.5.20262.6 -> To Version 5.0.0-preview.5.20264.5

Dependency coherency updates

Microsoft.NETCore.Platforms,Microsoft.Private.Winforms,Microsoft.NETCore.Targets,Microsoft.Win32.Registry,Microsoft.Win32.SystemEvents,Microsoft.Windows.Compatibility,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.Diagnostics.PerformanceCounter,System.DirectoryServices,System.Drawing.Common,System.IO.FileSystem.AccessControl,System.Resources.Extensions,System.IO.Packaging,System.Security.AccessControl,System.Security.Cryptography.Cng,System.Security.Cryptography.Pkcs,System.Security.Cryptography.ProtectedData,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,System.Text.Encodings.Web,System.Text.Json,System.Threading.AccessControl,System.Windows.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64
 From Version 5.0.0-preview.5.20262.7 -> To Version 5.0.0-preview.5.20263.12 (parent: Microsoft.Private.Winforms

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* [release/5.0-preview5] Update dependencies from dotnet/arcade (#767)

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

- Microsoft.DotNet.VersionTools.Tasks: 5.0.0-beta.20201.2 -> 5.0.0-beta.20258.8
- Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20201.2 -> 5.0.0-beta.20258.8
- Microsoft.DotNet.Build.Tasks.Feed: 5.0.0-beta.20201.2 -> 5.0.0-beta.20258.8
- Microsoft.DotNet.Build.Tasks.Packaging: 5.0.0-beta.20201.2 -> 5.0.0-beta.20258.8
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk: 5.0.0-beta.20201.2 -> 5.0.0-beta.20258.8

* Add publishing for preview5

* Add dotnet-tools

* ProjectUrl -> PackageProjectUrl

* Attempt project url fix

* Revert "ProjectUrl -> PackageProjectUrl"

This reverts commit 940609d.

* Revert "Attempt project url fix"

This reverts commit 1a33da0.

* Fix package urls

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <[email protected]>

* Fix repo url prop (#773)

* [release/5.0-preview5] Port #768 (#774)

* port change from dotnet/core-setup#8426

* PR feedback: remove tabs and fix syntax error

* Missed a file deletion

Co-authored-by: Adam Yoblick <[email protected]>

* [release/5.0-preview5] Update dependencies from dotnet/wpf (#775)

* Update dependencies from https://github.com/dotnet/wpf build 20200519.1

Microsoft.DotNet.Wpf.GitHub
 From Version 5.0.0-preview.5.20264.5 -> To Version 5.0.0-preview.5.20269.1

Dependency coherency updates

Microsoft.NETCore.Platforms,Microsoft.Private.Winforms,Microsoft.NETCore.Targets,Microsoft.Win32.Registry,Microsoft.Win32.SystemEvents,Microsoft.Windows.Compatibility,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.Diagnostics.PerformanceCounter,System.DirectoryServices,System.Drawing.Common,System.IO.FileSystem.AccessControl,System.Resources.Extensions,System.IO.Packaging,System.Security.AccessControl,System.Security.Cryptography.Cng,System.Security.Cryptography.Pkcs,System.Security.Cryptography.ProtectedData,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,System.Text.Encodings.Web,System.Text.Json,System.Threading.AccessControl,System.Windows.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64
 From Version 5.0.0-preview.5.20263.12 -> To Version 5.0.0-preview.5.20268.9 (parent: Microsoft.Private.Winforms

* Fix NetCoreAppFramework due to changes in the runtime repo

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Adam Yoblick <[email protected]>

* Update dependencies from https://github.com/dotnet/wpf build 20200521.5 (#790)

Microsoft.DotNet.Wpf.GitHub
 From Version 5.0.0-preview.5.20269.1 -> To Version 5.0.0-preview.5.20271.5

Dependency coherency updates

Microsoft.NETCore.Platforms,Microsoft.Private.Winforms,Microsoft.NETCore.Targets,Microsoft.Win32.Registry,Microsoft.Win32.SystemEvents,Microsoft.Windows.Compatibility,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.Diagnostics.PerformanceCounter,System.DirectoryServices,System.Drawing.Common,System.IO.FileSystem.AccessControl,System.Resources.Extensions,System.IO.Packaging,System.Security.AccessControl,System.Security.Cryptography.Cng,System.Security.Cryptography.Pkcs,System.Security.Cryptography.ProtectedData,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,System.Text.Encodings.Web,System.Text.Json,System.Threading.AccessControl,System.Windows.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64
 From Version 5.0.0-preview.5.20268.9 -> To Version 5.0.0-preview.5.20268.11 (parent: Microsoft.Private.Winforms

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Change tfm to net5.0 (#800) (#804)

* Update dependencies from https://github.com/dotnet/wpf build 20200526.3 (#805)

Microsoft.DotNet.Wpf.GitHub
 From Version 5.0.0-preview.5.20271.5 -> To Version 5.0.0-preview.5.20276.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/wpf build 20200526.4 (#806)

Microsoft.DotNet.Wpf.GitHub
 From Version 5.0.0-preview.5.20276.3 -> To Version 5.0.0-preview.5.20276.4

Dependency coherency updates

Microsoft.Private.Winforms
 From Version 5.0.0-preview.5.20271.5 -> To Version 5.0.0-preview.5.20276.2 (parent: Microsoft.DotNet.Wpf.GitHub

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/wpf build 20200528.3 (#816)

Microsoft.DotNet.Wpf.GitHub
 From Version 5.0.0-preview.5.20276.4 -> To Version 5.0.0-preview.5.20278.3

Dependency coherency updates

Microsoft.NETCore.Platforms,Microsoft.Private.Winforms,Microsoft.NETCore.Targets,Microsoft.Win32.Registry,Microsoft.Win32.SystemEvents,Microsoft.Windows.Compatibility,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.Diagnostics.PerformanceCounter,System.DirectoryServices,System.Drawing.Common,System.IO.FileSystem.AccessControl,System.Resources.Extensions,System.IO.Packaging,System.Security.AccessControl,System.Security.Cryptography.Cng,System.Security.Cryptography.Pkcs,System.Security.Cryptography.ProtectedData,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,System.Text.Encodings.Web,System.Text.Json,System.Threading.AccessControl,System.Windows.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64
 From Version 5.0.0-preview.5.20268.11 -> To Version 5.0.0-preview.5.20278.1 (parent: Microsoft.Private.Winforms

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

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

Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk
 From Version 5.0.0-beta.20201.2 -> To Version 5.0.0-beta.20280.1

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <[email protected]>
Co-authored-by: Eric Erhardt <[email protected]>
Co-authored-by: Adam Yoblick <[email protected]>
Co-authored-by: Viktor Hofer <[email protected]>
  • Loading branch information
6 people authored Jun 3, 2020
1 parent 3a7e411 commit cc54c39
Show file tree
Hide file tree
Showing 34 changed files with 1,089 additions and 538 deletions.
12 changes: 6 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ variables:
value: .NETCoreValidation

# Fill in missing channel name variables.
- name: Net_5_Preview3_Channel_Id
value: 739
- name: Net_5_Preview5_Channel_Id
value: 857

# Produce test-signed build for PR and Public builds
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down Expand Up @@ -104,11 +104,11 @@ stages:
storage: master
public: true

- dependsOn: Net5_Preview3_Publish
- dependsOn: Net5_Preview5_Publish
channel:
name: .NET 5 Preview 3
bar: Net_5_Preview3_Channel_Id
storage: release/5.0-preview3
name: .NET 5 Preview 5
bar: Net_5_Preview5_Channel_Id
storage: release/5.0-preview5
public: true

- dependsOn: General_Testing_Publish
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,25 +140,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20201.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20201.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20201.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20201.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20201.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20280.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<!--Package versions-->
<PropertyGroup>
<!-- arcade -->
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20201.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20201.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20201.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20280.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20280.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20280.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- core-setup -->
<MicrosoftNETCoreAppRefVersion>5.0.0-preview.6.20279.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.0-preview.6.20279.7</MicrosoftNETCoreAppRuntimewinx64Version>
Expand Down
14 changes: 8 additions & 6 deletions eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) {
$passwordElement.SetAttribute("value", $Password)
}

function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
Expand Down Expand Up @@ -123,19 +123,21 @@ if ($creds -eq $null) {
$doc.DocumentElement.AppendChild($creds) | Out-Null
}

$userName = "dn-bot"

# Insert credential nodes for Maestro's private feeds
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password

$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
if ($dotnet3Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
}

$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
}

$doc.Save($filename)
8 changes: 6 additions & 2 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Param(
[switch] $publish,
[switch] $clean,
[switch][Alias('bl')]$binaryLog,
[switch][Alias('nobl')]$excludeCIBinarylog,
[switch] $ci,
[switch] $prepareMachine,
[switch] $help,
Expand Down Expand Up @@ -58,6 +59,7 @@ function Print-Usage() {
Write-Host "Advanced settings:"
Write-Host " -projects <value> Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
Write-Host " -ci Set when running on CI server"
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Expand Down Expand Up @@ -86,7 +88,7 @@ function Build {
InitializeCustomToolset

$bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
$platformArg = if ($platform) { "/p:TargetArchitecture=$platform" } else { '' }
$platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }

if ($projects) {
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
Expand Down Expand Up @@ -134,7 +136,9 @@ try {
}

if ($ci) {
$binaryLog = $true
if (-not $excludeCIBinarylog) {
$binaryLog = $true
}
$nodeReuse = $false
}

Expand Down
9 changes: 8 additions & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ usage()
echo "Advanced settings:"
echo " --projects <value> Project or solution file(s) to build"
echo " --ci Set when running on CI server"
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
Expand Down Expand Up @@ -68,6 +69,7 @@ clean=false
warn_as_error=true
node_reuse=true
binary_log=false
exclude_ci_binary_log=false
pipelines_log=false

projects=''
Expand Down Expand Up @@ -98,6 +100,9 @@ while [[ $# > 0 ]]; do
-binarylog|-bl)
binary_log=true
;;
-excludeCIBinarylog|-nobl)
exclude_ci_binary_log=true
;;
-pipelineslog|-pl)
pipelines_log=true
;;
Expand Down Expand Up @@ -156,8 +161,10 @@ done

if [[ "$ci" == true ]]; then
pipelines_log=true
binary_log=true
node_reuse=false
if [[ "$exclude_ci_binary_log" == false ]]; then
binary_log=true
fi
fi

. "$scriptroot/tools.sh"
Expand Down
30 changes: 18 additions & 12 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

set -e

usage()
{
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
Expand All @@ -15,6 +17,8 @@ __CodeName=xenial
__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
__InitialDir=$PWD
__BuildArch=arm
__AlpineArch=armv7
__QEMUArch=arm
__UbuntuArch=armhf
__UbuntuRepo="http://ports.ubuntu.com/"
__LLDB_Package="liblldb-3.9-dev"
Expand All @@ -26,9 +30,10 @@ __UbuntuPackages="build-essential"
__AlpinePackages="alpine-base"
__AlpinePackages+=" build-base"
__AlpinePackages+=" linux-headers"
__AlpinePackagesEdgeTesting=" lldb-dev"
__AlpinePackagesEdgeMain=" llvm9-libs"
__AlpinePackagesEdgeCommunity=" lldb-dev"
__AlpinePackagesEdgeMain=" llvm10-libs"
__AlpinePackagesEdgeMain+=" python3"
__AlpinePackagesEdgeMain+=" libedit"

# symlinks fixer
__UbuntuPackages+=" symlinks"
Expand All @@ -55,12 +60,11 @@ __AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="12.1-RELEASE"
__FreeBSDPkg="1.10.5"
__FreeBSDPkg="1.12.0"
__FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu"
__FreeBSDPackages+=" libinotify"
__FreeBSDPackages+=" lttng-ust"
__FreeBSDPackages+=" llvm-90"
__FreeBSDPackages+=" krb5"

__UnprocessedBuildArgs=
Expand All @@ -78,7 +82,7 @@ while :; do
arm)
__BuildArch=arm
__UbuntuArch=armhf
__AlpineArch=armhf
__AlpineArch=armv7
__QEMUArch=arm
;;
arm64)
Expand Down Expand Up @@ -205,7 +209,7 @@ fi

if [ -d "$__RootfsDir" ]; then
if [ $__SkipUnmount == 0 ]; then
umount $__RootfsDir/*
umount $__RootfsDir/* || true
fi
rm -rf $__RootfsDir
fi
Expand All @@ -231,9 +235,9 @@ if [[ "$__CodeName" == "alpine" ]]; then
add $__AlpinePackagesEdgeMain

$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-X http://dl-cdn.alpinelinux.org/alpine/edge/community \
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
add $__AlpinePackagesEdgeTesting
add $__AlpinePackagesEdgeCommunity

rm -r $__ApkToolsDir
elif [[ "$__CodeName" == "freebsd" ]]; then
Expand All @@ -246,11 +250,13 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
# get and build package manager
wget -O - https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz | tar -C $__RootfsDir/tmp -zxf -
cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
./autogen.sh && ./configure --prefix=$__RootfsDir/host && make install
# needed for install to succeed
mkdir -p $__RootfsDir/host/etc
./autogen.sh && ./configure --prefix=$__RootfsDir/host && make && make install
rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg}
# install packages we need.
$__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
$__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update
INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
elif [[ -n $__CodeName ]]; then
qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
Expand All @@ -260,7 +266,7 @@ elif [[ -n $__CodeName ]]; then
chroot $__RootfsDir symlinks -cr /usr

if [ $__SkipUnmount == 0 ]; then
umount $__RootfsDir/*
umount $__RootfsDir/* || true
fi

if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then
Expand Down
1 change: 1 addition & 0 deletions eng/common/internal/Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
</PropertyGroup>
<ItemGroup>
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
Expand Down
24 changes: 17 additions & 7 deletions eng/common/native/CommonLibrary.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,12 @@ function Get-File {
New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null
}

$TempPath = "$Path.tmp"
if (Test-Path -IsValid -Path $Uri) {
Write-Verbose "'$Uri' is a file path, copying file to '$Path'"
Copy-Item -Path $Uri -Destination $Path
Write-Verbose "'$Uri' is a file path, copying temporarily to '$TempPath'"
Copy-Item -Path $Uri -Destination $TempPath
Write-Verbose "Moving temporary file to '$Path'"
Move-Item -Path $TempPath -Destination $Path
return $?
}
else {
Expand All @@ -157,8 +160,10 @@ function Get-File {
while($Attempt -Lt $DownloadRetries)
{
try {
Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $Path
Write-Verbose "Downloaded to '$Path'"
Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $TempPath
Write-Verbose "Downloaded to temporary location '$TempPath'"
Move-Item -Path $TempPath -Destination $Path
Write-Verbose "Moved temporary file to '$Path'"
return $True
}
catch {
Expand Down Expand Up @@ -359,16 +364,21 @@ function Expand-Zip {
return $False
}
}
if (-Not (Test-Path $OutputDirectory)) {
New-Item -path $OutputDirectory -Force -itemType "Directory" | Out-Null

$TempOutputDirectory = Join-Path "$(Split-Path -Parent $OutputDirectory)" "$(Split-Path -Leaf $OutputDirectory).tmp"
if (Test-Path $TempOutputDirectory) {
Remove-Item $TempOutputDirectory -Force -Recurse
}
New-Item -Path $TempOutputDirectory -Force -ItemType "Directory" | Out-Null

Add-Type -assembly "system.io.compression.filesystem"
[io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$OutputDirectory")
[io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$TempOutputDirectory")
if ($? -Eq $False) {
Write-Error "Unable to extract '$ZipPath'"
return $False
}

Move-Item -Path $TempOutputDirectory -Destination $OutputDirectory
}
catch {
Write-Host $_
Expand Down
Loading

0 comments on commit cc54c39

Please sign in to comment.