Skip to content

Commit 32f27e3

Browse files
dotnet-maestro[bot]mmitcheeerhardtAdamYoblickViktorHofer
authored
[release/5.0-preview6] Update dependencies from dotnet/arcade (#833)
* 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 * [master] Update dependencies from dotnet/arcade (#826) * [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 <eric.erhardt@microsoft.com> * 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 <mmitche@microsoft.com> * 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 <Adam.Yoblick@microsoft.com> * [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 <Adam.Yoblick@microsoft.com> * 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 <mmitche@microsoft.com> Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> Co-authored-by: Adam Yoblick <Adam.Yoblick@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> * Add preview6 channel info Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell <mmitche@microsoft.com> Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> Co-authored-by: Adam Yoblick <Adam.Yoblick@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 0c1aa17 commit 32f27e3

34 files changed

+1089
-538
lines changed

‎azure-pipelines.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ variables:
3030
value: .NETCoreValidation
3131

3232
# Fill in missing channel name variables.
33-
- name: Net_5_Preview3_Channel_Id
34-
value: 739
33+
- name: Net_5_Preview6_Channel_Id
34+
value: 1013
3535

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

107-
- dependsOn: Net5_Preview3_Publish
107+
- dependsOn: Net5_Preview6_Publish
108108
channel:
109-
name: .NET 5 Preview 3
110-
bar: Net_5_Preview3_Channel_Id
111-
storage: release/5.0-preview3
109+
name: .NET 5 Preview 6
110+
bar: Net_5_Preview6_Channel_Id
111+
storage: release/5.0-preview6
112112
public: true
113113

114114
- dependsOn: General_Testing_Publish

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,25 +140,25 @@
140140
</Dependency>
141141
</ProductDependencies>
142142
<ToolsetDependencies>
143-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20201.2">
143+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20280.1">
144144
<Uri>https://github.com/dotnet/arcade</Uri>
145-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
145+
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
146146
</Dependency>
147-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20201.2">
147+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20280.1">
148148
<Uri>https://github.com/dotnet/arcade</Uri>
149-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
149+
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
150150
</Dependency>
151-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20201.2">
151+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20280.1">
152152
<Uri>https://github.com/dotnet/arcade</Uri>
153-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
153+
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
154154
</Dependency>
155-
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20201.2">
155+
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20280.1">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
157+
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20201.2">
159+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20280.1">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
161+
<Sha>fef373440d604c428950236fbc2b99ce0df368a9</Sha>
162162
</Dependency>
163163
</ToolsetDependencies>
164164
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
<!--Package versions-->
4343
<PropertyGroup>
4444
<!-- arcade -->
45-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20201.2</MicrosoftDotNetBuildTasksFeedVersion>
46-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20201.2</MicrosoftDotNetBuildTasksPackagingVersion>
47-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20201.2</MicrosoftDotNetVersionToolsTasksVersion>
45+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20280.1</MicrosoftDotNetBuildTasksFeedVersion>
46+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20280.1</MicrosoftDotNetBuildTasksPackagingVersion>
47+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20280.1</MicrosoftDotNetVersionToolsTasksVersion>
4848
<!-- core-setup -->
4949
<MicrosoftNETCoreAppRefVersion>5.0.0-preview.6.20279.7</MicrosoftNETCoreAppRefVersion>
5050
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.0-preview.6.20279.7</MicrosoftNETCoreAppRuntimewinx64Version>

‎eng/common/SetupNugetSources.ps1

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) {
8383
$passwordElement.SetAttribute("value", $Password)
8484
}
8585

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

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

126+
$userName = "dn-bot"
127+
126128
# Insert credential nodes for Maestro's private feeds
127-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
129+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
128130

129131
$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
130132
if ($dotnet3Source -ne $null) {
131-
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
132-
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
133+
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
134+
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
133135
}
134136

135137
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
136138
if ($dotnet31Source -ne $null) {
137-
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
138-
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
139+
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
140+
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
139141
}
140142

141143
$doc.Save($filename)

‎eng/common/build.ps1

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Param(
2020
[switch] $publish,
2121
[switch] $clean,
2222
[switch][Alias('bl')]$binaryLog,
23+
[switch][Alias('nobl')]$excludeCIBinarylog,
2324
[switch] $ci,
2425
[switch] $prepareMachine,
2526
[switch] $help,
@@ -58,6 +59,7 @@ function Print-Usage() {
5859
Write-Host "Advanced settings:"
5960
Write-Host " -projects <value> Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
6061
Write-Host " -ci Set when running on CI server"
62+
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
6163
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6264
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6365
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
@@ -86,7 +88,7 @@ function Build {
8688
InitializeCustomToolset
8789

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

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

136138
if ($ci) {
137-
$binaryLog = $true
139+
if (-not $excludeCIBinarylog) {
140+
$binaryLog = $true
141+
}
138142
$nodeReuse = $false
139143
}
140144

‎eng/common/build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ usage()
3232
echo "Advanced settings:"
3333
echo " --projects <value> Project or solution file(s) to build"
3434
echo " --ci Set when running on CI server"
35+
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
3536
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
3637
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
3738
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
@@ -68,6 +69,7 @@ clean=false
6869
warn_as_error=true
6970
node_reuse=true
7071
binary_log=false
72+
exclude_ci_binary_log=false
7173
pipelines_log=false
7274

7375
projects=''
@@ -98,6 +100,9 @@ while [[ $# > 0 ]]; do
98100
-binarylog|-bl)
99101
binary_log=true
100102
;;
103+
-excludeCIBinarylog|-nobl)
104+
exclude_ci_binary_log=true
105+
;;
101106
-pipelineslog|-pl)
102107
pipelines_log=true
103108
;;
@@ -156,8 +161,10 @@ done
156161

157162
if [[ "$ci" == true ]]; then
158163
pipelines_log=true
159-
binary_log=true
160164
node_reuse=false
165+
if [[ "$exclude_ci_binary_log" == false ]]; then
166+
binary_log=true
167+
fi
161168
fi
162169

163170
. "$scriptroot/tools.sh"

‎eng/common/cross/build-rootfs.sh

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
set -e
4+
35
usage()
46
{
57
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
@@ -15,6 +17,8 @@ __CodeName=xenial
1517
__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
1618
__InitialDir=$PWD
1719
__BuildArch=arm
20+
__AlpineArch=armv7
21+
__QEMUArch=arm
1822
__UbuntuArch=armhf
1923
__UbuntuRepo="http://ports.ubuntu.com/"
2024
__LLDB_Package="liblldb-3.9-dev"
@@ -26,9 +30,10 @@ __UbuntuPackages="build-essential"
2630
__AlpinePackages="alpine-base"
2731
__AlpinePackages+=" build-base"
2832
__AlpinePackages+=" linux-headers"
29-
__AlpinePackagesEdgeTesting=" lldb-dev"
30-
__AlpinePackagesEdgeMain=" llvm9-libs"
33+
__AlpinePackagesEdgeCommunity=" lldb-dev"
34+
__AlpinePackagesEdgeMain=" llvm10-libs"
3135
__AlpinePackagesEdgeMain+=" python3"
36+
__AlpinePackagesEdgeMain+=" libedit"
3237

3338
# symlinks fixer
3439
__UbuntuPackages+=" symlinks"
@@ -55,12 +60,11 @@ __AlpinePackages+=" openssl-dev"
5560
__AlpinePackages+=" zlib-dev"
5661

5762
__FreeBSDBase="12.1-RELEASE"
58-
__FreeBSDPkg="1.10.5"
63+
__FreeBSDPkg="1.12.0"
5964
__FreeBSDPackages="libunwind"
6065
__FreeBSDPackages+=" icu"
6166
__FreeBSDPackages+=" libinotify"
6267
__FreeBSDPackages+=" lttng-ust"
63-
__FreeBSDPackages+=" llvm-90"
6468
__FreeBSDPackages+=" krb5"
6569

6670
__UnprocessedBuildArgs=
@@ -78,7 +82,7 @@ while :; do
7882
arm)
7983
__BuildArch=arm
8084
__UbuntuArch=armhf
81-
__AlpineArch=armhf
85+
__AlpineArch=armv7
8286
__QEMUArch=arm
8387
;;
8488
arm64)
@@ -205,7 +209,7 @@ fi
205209

206210
if [ -d "$__RootfsDir" ]; then
207211
if [ $__SkipUnmount == 0 ]; then
208-
umount $__RootfsDir/*
212+
umount $__RootfsDir/* || true
209213
fi
210214
rm -rf $__RootfsDir
211215
fi
@@ -231,9 +235,9 @@ if [[ "$__CodeName" == "alpine" ]]; then
231235
add $__AlpinePackagesEdgeMain
232236

233237
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
234-
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
238+
-X http://dl-cdn.alpinelinux.org/alpine/edge/community \
235239
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
236-
add $__AlpinePackagesEdgeTesting
240+
add $__AlpinePackagesEdgeCommunity
237241

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

262268
if [ $__SkipUnmount == 0 ]; then
263-
umount $__RootfsDir/*
269+
umount $__RootfsDir/* || true
264270
fi
265271

266272
if [[ "$__BuildArch" == "arm" && "$__CodeName" == "trusty" ]]; then

‎eng/common/internal/Tools.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<TargetFramework>net472</TargetFramework>
66
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
7+
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
78
</PropertyGroup>
89
<ItemGroup>
910
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->

‎eng/common/native/CommonLibrary.psm1

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,12 @@ function Get-File {
145145
New-Item -path $DownloadDirectory -force -itemType "Directory" | Out-Null
146146
}
147147

148+
$TempPath = "$Path.tmp"
148149
if (Test-Path -IsValid -Path $Uri) {
149-
Write-Verbose "'$Uri' is a file path, copying file to '$Path'"
150-
Copy-Item -Path $Uri -Destination $Path
150+
Write-Verbose "'$Uri' is a file path, copying temporarily to '$TempPath'"
151+
Copy-Item -Path $Uri -Destination $TempPath
152+
Write-Verbose "Moving temporary file to '$Path'"
153+
Move-Item -Path $TempPath -Destination $Path
151154
return $?
152155
}
153156
else {
@@ -157,8 +160,10 @@ function Get-File {
157160
while($Attempt -Lt $DownloadRetries)
158161
{
159162
try {
160-
Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $Path
161-
Write-Verbose "Downloaded to '$Path'"
163+
Invoke-WebRequest -UseBasicParsing -Uri $Uri -OutFile $TempPath
164+
Write-Verbose "Downloaded to temporary location '$TempPath'"
165+
Move-Item -Path $TempPath -Destination $Path
166+
Write-Verbose "Moved temporary file to '$Path'"
162167
return $True
163168
}
164169
catch {
@@ -359,16 +364,21 @@ function Expand-Zip {
359364
return $False
360365
}
361366
}
362-
if (-Not (Test-Path $OutputDirectory)) {
363-
New-Item -path $OutputDirectory -Force -itemType "Directory" | Out-Null
367+
368+
$TempOutputDirectory = Join-Path "$(Split-Path -Parent $OutputDirectory)" "$(Split-Path -Leaf $OutputDirectory).tmp"
369+
if (Test-Path $TempOutputDirectory) {
370+
Remove-Item $TempOutputDirectory -Force -Recurse
364371
}
372+
New-Item -Path $TempOutputDirectory -Force -ItemType "Directory" | Out-Null
365373

366374
Add-Type -assembly "system.io.compression.filesystem"
367-
[io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$OutputDirectory")
375+
[io.compression.zipfile]::ExtractToDirectory("$ZipPath", "$TempOutputDirectory")
368376
if ($? -Eq $False) {
369377
Write-Error "Unable to extract '$ZipPath'"
370378
return $False
371379
}
380+
381+
Move-Item -Path $TempOutputDirectory -Destination $OutputDirectory
372382
}
373383
catch {
374384
Write-Host $_

0 commit comments

Comments
 (0)